CF #17 - Rename templates for consistency