diff --git a/code/Model/EditableFormField/EditableCheckboxGroupField.php b/code/Model/EditableFormField/EditableCheckboxGroupField.php
index ffb5fcd..b5992bc 100755
--- a/code/Model/EditableFormField/EditableCheckboxGroupField.php
+++ b/code/Model/EditableFormField/EditableCheckboxGroupField.php
@@ -25,9 +25,8 @@ class EditableCheckboxGroupField extends EditableMultipleOptionField
 
     public function getFormField()
     {
-        $field = UserFormsCheckboxSetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap());
-        $field->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder');
-        $field->setTemplate('UserFormsCheckboxSetField'); // @todo
+        $field = UserFormsCheckboxSetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap())
+            ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder');
 
         // Set the default checked items
         $defaultCheckedItems = $this->getDefaultOptions();
diff --git a/code/Model/EditableFormField/EditableRadioField.php b/code/Model/EditableFormField/EditableRadioField.php
index 3f2467a..b8279c8 100755
--- a/code/Model/EditableFormField/EditableRadioField.php
+++ b/code/Model/EditableFormField/EditableRadioField.php
@@ -37,7 +37,7 @@ class EditableRadioField extends EditableMultipleOptionField
     {
         $field = OptionsetField::create($this->Name, $this->EscapedTitle, $this->getOptionsMap())
             ->setFieldHolderTemplate(EditableMultipleOptionField::class . '_holder')
-            ->setTemplate('UserFormsOptionSetField'); // @todo
+            ->setTemplate('SilverStripe\\UserForms\\FormField\\UserFormsOptionSetField');
 
         // Set default item
         $defaultOption = $this->getDefaultOptions()->first();
diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index b1d4ff9..ebd3167 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -347,7 +347,7 @@ class EmailRecipient extends DataObject
             )
                 ->addExtraClass('toggle-plain-only'),
             LiteralField::create('EmailPreview', $preview)
-        ));
+        ]);
 
         $fields->fieldByName('Root.EmailContent')->setTitle(_t(__CLASS__.'.EMAILCONTENTTAB', 'Email Content'));
 
diff --git a/templates/forms/UserFormsCheckboxSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
similarity index 100%
rename from templates/forms/UserFormsCheckboxSetField.ss
rename to templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
diff --git a/templates/UserFormsOptionSetField.ss b/templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss
similarity index 100%
rename from templates/UserFormsOptionSetField.ss
rename to templates/SilverStripe/UserForms/FormField/UserFormsOptionSetField.ss