* Renamed file names to be more consitend with template naming