Implement templates renames