Fixing templates, classname