diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml
index cd3c4e1842..c1a93cc6b8 100644
--- a/config/alfresco/model/wcmModel.xml
+++ b/config/alfresco/model/wcmModel.xml
@@ -23,8 +23,8 @@
       <aspect name="wcm:template">
    	     <title>XForms Template</title>
    	     <properties>
-   	        <property name="wcm:roottagname">
-   	           <title>Root Tag Name</title>
+   	        <property name="wcm:schemaroottagname">
+   	           <title>Schema Root Tag Name</title>
    	           <type>d:text</type>
    	           <mandatory>true</mandatory>
    	        </property>
@@ -38,7 +38,7 @@
    	              <many>false</many>
    	           </source>
    	           <target>
-   	           	  <class>wcm:templateoutputmethod</class>
+		      <class>wcm:templateoutputmethod</class>
    	              <role>wcm:presentation</role>
    	              <mandatory>false</mandatory>
    	              <many>true</many>
@@ -52,7 +52,7 @@
       <aspect name="wcm:templateoutputmethod">
          <title>XML Transformer</title>
          <properties>
-            <property name="wcm:outputtype">
+            <property name="wcm:templateoutputmethodtype">
                <title>Type</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
@@ -67,4 +67,4 @@
           
    </aspects>
 
-</model>
\ No newline at end of file
+</model>
diff --git a/source/java/org/alfresco/model/WCMModel.java b/source/java/org/alfresco/model/WCMModel.java
index 133b3a01d0..54c728d1c8 100644
--- a/source/java/org/alfresco/model/WCMModel.java
+++ b/source/java/org/alfresco/model/WCMModel.java
@@ -16,11 +16,11 @@ public interface WCMModel
     
     // The XForms data capture template aspect.
     public static final QName ASPECT_TEMPLATE = QName.createQName(WCM_MODEL_URI, "template");
-    public static final QName PROP_ROOT_TAG_NAME = QName.createQName(WCM_MODEL_URI, "roottagname");
+    public static final QName PROP_SCHEMA_ROOT_TAG_NAME = QName.createQName(WCM_MODEL_URI, "schemaroottagname");
     public static final QName ASSOC_TEMPLATE_OUTPUT_METHODS = QName.createQName(WCM_MODEL_URI, "templateoutputmethods");
     
     // An XML to something else tranformer aspect.
     public static final QName ASPECT_TEMPLATE_OUTPUT_METHOD = QName.createQName(WCM_MODEL_URI, "templateoutputmethod");
-    public static final QName PROP_OUTPUT_TYPE = QName.createQName(WCM_MODEL_URI, "outputtype");
+    public static final QName PROP_TEMPLATE_OUTPUT_METHOD_TYPE = QName.createQName(WCM_MODEL_URI, "templateoutputmethodtype");
     public static final QName PROP_TEMPLATE_SOURCE = QName.createQName(WCM_MODEL_URI, "templatesource");
 }