Revised blanked replacements
Renamed templates