Fixed class names in tpl