Renamed templates and cleanup