CMS-2893 Remove specific extensions of TemplateKey and TemplateName in TS-classes