diff --git a/config/alfresco/model/wcmModel.xml b/config/alfresco/model/wcmModel.xml
index 24bcb577b5..f722ea3147 100644
--- a/config/alfresco/model/wcmModel.xml
+++ b/config/alfresco/model/wcmModel.xml
@@ -64,9 +64,9 @@
    
    <aspects>
    	
-   	<!-- An XForms capture template aspect. -->
-      <aspect name="wcm:template">
-         <title>XForms Template</title>
+   	<!-- An XForms capture form aspect. -->
+      <aspect name="wcm:form">
+         <title>XForms Form</title>
          <properties>
             <property name="wcm:schemaroottagname">
                <title>Schema Root Tag Name</title>
@@ -75,15 +75,15 @@
             </property>
          </properties>
          <associations>
-            <association name="wcm:templateoutputmethods">
-               <title>Template Output Methods</title>
+            <association name="wcm:formtransformers">
+               <title>Form Output Methods</title>
                <source>
                   <role>wcm:capture</role>
                   <mandatory>false</mandatory>
                   <many>false</many>
                </source>
                <target>
-                  <class>wcm:templateoutputmethod</class>
+                  <class>wcm:formtransformer</class>
                   <role>wcm:presentation</role>
                   <mandatory>false</mandatory>
                   <many>true</many>
@@ -93,37 +93,53 @@
       </aspect>
       
       <!-- An XML to something else transformer. -->
-      <aspect name="wcm:templateoutputmethod">
-         <title>Template Output Method</title>
+      <aspect name="wcm:formtransformer">
+         <title>Form Output Method</title>
          <properties>
-            <property name="wcm:templateoutputmethodtype">
+            <property name="wcm:formtransformertype">
                <title>Type</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:templateoutputmethodderivedfileextension">
+            <property name="wcm:formtransformerderivedfileextension">
                <title>File extension for generated assets</title>
                <type>d:text</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:templatesource">
-               <title>Template Source</title>
+            <property name="wcm:formsource">
+               <title>Form Source</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
          </properties>
       </aspect>
 
-      <aspect name="wcm:templatederived">
-         <title>XML file generated by a template</title>
+      <aspect name="wcm:formderived">
+         <title>XML file generated by a form</title>
          <properties>
-            <property name="wcm:templatederivedfrom">
-               <title>Template that generated this asset</title>
+            <property name="wcm:formderivedfrom">
+               <title>Form that generated this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
-            <property name="wcm:templatederivedfromname">
-               <title>Template that generated this asset</title>
+            <property name="wcm:formderivedfromname">
+               <title>Form that generated this asset</title>
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+         </properties>
+      </aspect>
+
+      <aspect name="wcm:formtransformerderived">
+         <title>XML file generated by a form</title>
+         <properties>
+            <property name="wcm:formtransformerderivedfrom">
+               <title>Form Output Method that generated this asset</title>
+               <type>d:noderef</type>
+               <mandatory>true</mandatory>
+            </property>
+            <property name="wcm:primaryformderived">
+               <title>Primary XML Asset used to generate this asset</title>
                <type>d:noderef</type>
                <mandatory>true</mandatory>
             </property>
diff --git a/source/java/org/alfresco/model/WCMModel.java b/source/java/org/alfresco/model/WCMModel.java
index 3aea4aefb9..681402a30b 100644
--- a/source/java/org/alfresco/model/WCMModel.java
+++ b/source/java/org/alfresco/model/WCMModel.java
@@ -1,5 +1,18 @@
-/**
- * 
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
  */
 package org.alfresco.model;
 
@@ -24,18 +37,22 @@ public interface WCMModel
     public static final QName TYPE_AVM_LAYERED_FOLDER = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmlayeredfolder");
     public static final QName PROP_AVM_DIR_INDIRECTION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "avmdirindirection");
     
-    // The XForms data capture template aspect.
-    public static final QName ASPECT_TEMPLATE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "template");
+    // 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_TEMPLATE_OUTPUT_METHODS = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templateoutputmethods");
+    public static final QName ASSOC_FORM_TRANSFORMERS = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formtransformers");
     
     // An XML to something else tranformer aspect.
-    public static final QName ASPECT_TEMPLATE_OUTPUT_METHOD = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templateoutputmethod");
-    public static final QName PROP_TEMPLATE_OUTPUT_METHOD_TYPE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templateoutputmethodtype");
-    public static final QName PROP_TEMPLATE_OUTPUT_METHOD_DERIVED_FILE_EXTENSION = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templateoutputmethodderivedfileextension");
-    public static final QName PROP_TEMPLATE_SOURCE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templatesource");
+    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 PROP_FORM_SOURCE = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "formsource");
 
-    public static final QName ASPECT_TEMPLATE_DERIVED = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templatederived");
-    public static final QName PROP_TEMPLATE_DERIVED_FROM = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templatederivedfrom");
-    public static final QName PROP_TEMPLATE_DERIVED_FROM_NAME = QName.createQName(NamespaceService.WCM_MODEL_1_0_URI, "templatederivedfromname");
+    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_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");
 }