more template clean-up and renaming