Renamed templates
Upgraded to parameterized module