Minor template name fixes