Updating the templates to regular convention