Updating TemplateControllers so that they use form type strings rather than instances