Tidied up HTML template names.