Changes namespace to Tomaj - breaking change