Remove underscores from id templates
Merge pull request #4470 from guardian/identity-template-rename

Remove underscores from id templates