Fixed classes in tpl files