Renamed templates to less generic names