Removed the .html extension
Better naming of the template types