Renamed some templates