diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml
index f722ea3147..9d983d37f1 100644
--- a/config/alfresco/model/wcmModel.xml
+++ b/config/alfresco/model/wcmModel.xml
@@ -75,15 +75,15 @@
             </property>
          </properties>
          <associations>
-            <association name="wcm:formtransformers">
-               <title>Form Output Methods</title>
+            <association name="wcm:renderingengines">
+               <title>Form Data Renderers</title>
                <source>
                   <role>wcm:capture</role>
                   <mandatory>false</mandatory>
                   <many>false</many>
                </source>
                <target>
-                  <class>wcm:formtransformer</class>
+                  <class>wcm:renderingengine</class>
                   <role>wcm:presentation</role>
                   <mandatory>false</mandatory>
                   <many>true</many>
@@ -93,15 +93,15 @@
       </aspect>
       
       <!-- An XML to something else transformer. -->
-      <aspect name="wcm:formtransformer">
-         <title>Form Output Method</title>
+      <aspect name="wcm:renderingengine">
+         <title>A Rendering Engine</title>
          <properties>
-            <property name="wcm:formtransformertype">
+            <property name="wcm:rendereringenginetype">
                <title>Type</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:formtransformerderivedfileextension">
+            <property name="wcm:fileextensionforrendition">
                <title>File extension for generated assets</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
@@ -114,15 +114,15 @@
          </properties>
       </aspect>
 
-      <aspect name="wcm:formderived">
+      <aspect name="wcm:forminstancedata">
          <title>XML file generated by a form</title>
          <properties>
-            <property name="wcm:formderivedfrom">
+            <property name="wcm:parentform">
                <title>Form that generated this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:formderivedfromname">
+            <property name="wcm:parentformname">
                <title>Form that generated this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
@@ -130,15 +130,15 @@
          </properties>
       </aspect>
 
-      <aspect name="wcm:formtransformerderived">
+      <aspect name="wcm:rendition">
          <title>XML file generated by a form</title>
          <properties>
-            <property name="wcm:formtransformerderivedfrom">
-               <title>Form Output Method that generated this asset</title>
+            <property name="wcm:parentrenderingengine">
+               <title>Form data renderer that generated this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:primaryformderived">
+            <property name="wcm:primaryforminstancedata">
                <title>Primary XML Asset used to generate this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
diff --git a/source/java/org/alfresco/model/WCMModel.java b/source/java/org/alfresco/model/WCMModel.java
index 681402a30b..de10570133 100644
--- a/source/java/org/alfresco/model/WCMModel.java
+++ b/source/java/org/alfresco/model/WCMModel.java
@@ -40,19 +40,19 @@ public interface WCMModel
     // The XForms data capture form aspect.
     public static final QName ASPECT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "form");
     public static final QName PROP_SCHEMA_ROOT_TAG_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "schemaroottagname");
-    public static final QName ASSOC_FORM_TRANSFORMERS = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformers");
+    public static final QName ASSOC_RENDERING_ENGINES = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingengines");
     
     // An XML to something else tranformer aspect.
-    public static final QName ASPECT_FORM_TRANSFORMER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformer");
-    public static final QName PROP_FORM_TRANSFORMER_TYPE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformertype");
-    public static final QName PROP_FORM_TRANSFORMER_DERIVED_FILE_EXTENSION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformerderivedfileextension");
+    public static final QName ASPECT_RENDERING_ENGINE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingengine");
+    public static final QName PROP_RENDERING_ENGINE_TYPE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "renderingenginetype");
+    public static final QName PROP_FILE_EXTENSION_FOR_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "fileextensionfordatarendition");
     public static final QName PROP_FORM_SOURCE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formsource");
 
-    public static final QName ASPECT_FORM_DERIVED = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formderived");
-    public static final QName PROP_FORM_DERIVED_FROM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formderivedfrom");
-    public static final QName PROP_FORM_DERIVED_FROM_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formderivedfromname");
+    public static final QName ASPECT_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "forminstancedata");
+    public static final QName PROP_PARENT_FORM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentform");
+    public static final QName PROP_PARENT_FORM_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentformname");
 
-    public static final QName ASPECT_FORM_TRANSFORMER_DERIVED = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformerderived");
-    public static final QName PROP_FORM_TRANSFORMER_DERIVED_FROM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformerderivedfrom");
-    public static final QName PROP_PRIMARY_FORM_DERIVED = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "primaryformderived");
+    public static final QName ASPECT_RENDITION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "rendition");
+    public static final QName PROP_PARENT_RENDERING_ENGINE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "parentrenderingengine");
+    public static final QName PROP_PRIMARY_FORM_INSTANCE_DATA = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "primaryforminstancedata");
 }