renaming manual components
Merge pull request #7466 from guardian/rename-manual-templates

Renaming manual templates