Some tidy up of template files and naming (#6384)