some fixes in templates
renaming template names