diff --git a/forms/FileIFrameField.php b/forms/FileIFrameField.php
index 098637e20..c33194ca2 100755
--- a/forms/FileIFrameField.php
+++ b/forms/FileIFrameField.php
@@ -10,6 +10,8 @@
  */
 class FileIFrameField extends FileField {
 	
+	protected $template = 'FileIFrameField';
+	
 	public static $allowed_actions = array (
 		'iframe',
 		'EditFileForm',
@@ -109,7 +111,7 @@ class FileIFrameField extends FileField {
 		
 		Requirements::css('sapphire/css/FileIFrameField.css');
 		
-		return $this->renderWith('FileIFrameField');
+		return $this->renderWith($this->template);
 	}
 	
 	/**
diff --git a/forms/FormField.php b/forms/FormField.php
index a28700db1..417eb483f 100755
--- a/forms/FormField.php
+++ b/forms/FormField.php
@@ -68,6 +68,11 @@ class FormField extends RequestHandler {
 	 */
 	protected $disabled = false;
 	
+	/**
+	 * @var String
+	 */
+	protected $template;
+	
 	/**
 	 * @var Custom Validation Message for the Field
 	 */
@@ -356,6 +361,22 @@ class FormField extends RequestHandler {
 		return $this->customValidationMessage;
 	}
 	
+	/**
+	 * Set name of template (without path or extension)
+	 * 
+	 * @param String
+	 */
+	function setTemplate($template) {
+		$this->template = $template;
+	}
+	
+	/**
+	 * @return String
+	 */
+	function getTemplate() {
+		return $this->template;
+	}
+	
 	/**
 	 * Returns the form field - used by templates.
 	 * Although FieldHolder is generally what is inserted into templates, all of the field holder
diff --git a/forms/SelectionGroup.php b/forms/SelectionGroup.php
index 308a5f7e6..672e9aa2e 100755
--- a/forms/SelectionGroup.php
+++ b/forms/SelectionGroup.php
@@ -7,6 +7,9 @@
  * @subpackage fields-structural
  */
 class SelectionGroup extends CompositeField {
+	
+	protected $template = "SelectionGroup";
+	
 	/**
 	 * Create a new selection group.
 	 * @param name The field name of the selection group.
@@ -83,7 +86,7 @@ class SelectionGroup extends CompositeField {
 		Requirements::javascript(SAPPHIRE_DIR   . '/javascript/SelectionGroup.js');
 		Requirements::css(SAPPHIRE_DIR . '/css/SelectionGroup.css');
 		
-		return $this->renderWith("SelectionGroup");
+		return $this->renderWith($this->template);
 	}
 }
 
diff --git a/forms/TabSet.php b/forms/TabSet.php
index 2f4795af3..71ee92ab0 100644
--- a/forms/TabSet.php
+++ b/forms/TabSet.php
@@ -27,6 +27,8 @@
  */
 class TabSet extends CompositeField {
 	
+	protected $template = "TabSetFieldHolder";
+	
 	/**
 	 * @param string $name Identifier
 	 * @param string $title (Optional) Natural language title of the tabset
@@ -80,7 +82,7 @@ class TabSet extends CompositeField {
 		
 		Requirements::javascript(SAPPHIRE_DIR . '/javascript/TabSet.js');
 		
-		return $this->renderWith("TabSetFieldHolder");
+		return $this->renderWith($this->template);
 	}
 	
 	/**
diff --git a/forms/ToggleCompositeField.php b/forms/ToggleCompositeField.php
index a63bb851c..f178b379b 100755
--- a/forms/ToggleCompositeField.php
+++ b/forms/ToggleCompositeField.php
@@ -6,6 +6,8 @@
  */
 class ToggleCompositeField extends CompositeField {
 	
+	protected $template = "ToggleCompositeField";
+	
 	/**
 	 * @var $headingLevel int
 	 */
@@ -26,7 +28,7 @@ class ToggleCompositeField extends CompositeField {
 		Requirements::javascript(SAPPHIRE_DIR . "/javascript/prototype_improvements.js");
 		Requirements::javascript(SAPPHIRE_DIR . "/javascript/ToggleCompositeField.js");
 		
-		return $this->renderWith("ToggleCompositeField");
+		return $this->renderWith($this->template);
 	}	
 	
 	/**