diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 94d3626d95..a00716b4e0 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -828,6 +828,7 @@ website_web_content_forms=Web Content Forms
 website_save_location=Save Location
 website_save_location_info=Use the following pattern when saving content
 website_filename_pattern=Filename pattern
+website_filename_match=Filename pattern match
 website_workflow=Workflow
 website_workflow_info=Use the following workflow
 website_form_summary=Using workflow ''{0}'', with filename pattern ''{1}'', {2} rendering engine(s) selected.
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 6a5561563a..f4bdc9896f 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -282,11 +282,12 @@ public class CreateWebContentWizard extends BaseContentWizard
             LOGGER.debug("creating workflow package");
          
          // create package paths (layered to user sandbox area as target)
-         String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
-         String sandboxPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getSandbox());
-         String packagesPath = AVMWorkflowUtil.createAVMLayeredPackage(this.avmService, sandboxPath);
+         String stagingPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getStagingStore());
+         String packagesPath = AVMWorkflowUtil.createAVMLayeredPackage(this.avmService, stagingPath);
          
          // construct diffs for selected items for submission
+         String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
+         String sandboxPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getSandbox());
          List<AVMDifference> diffs = new ArrayList<AVMDifference>(8);
          for (Rendition rendition : this.getRenditions())
          {
@@ -315,6 +316,10 @@ public class CreateWebContentWizard extends BaseContentWizard
                AVMNodeConverter.ToNodeRef(-1, packageDesc.getPath()));
          this.nodeService.setProperty(packageNodeRef, WorkflowModel.PROP_IS_SYSTEM_PACKAGE, true);
          parameters.put(WorkflowModel.ASSOC_PACKAGE, packageNodeRef);
+         // TODO: capture label and comment?
+         parameters.put(AVMWorkflowUtil.PROP_LABEL, this.fileName);
+         parameters.put(AVMWorkflowUtil.PROP_FROM_PATH, AVMConstants.buildAVMStoreRootPath(
+               this.avmBrowseBean.getSandbox()));
          
          if (LOGGER.isDebugEnabled())
             LOGGER.debug("starting workflow " + wd + " with parameters " + parameters);
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index 4031dc3724..7c399178bf 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -500,7 +500,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
       {
          UIListItem item = new UIListItem();
          item.setValue(form);
-         item.setLabel(form.getName());
+         item.setLabel(form.getTitle());
          item.setDescription(form.getDescription());
          item.setImage(WebResources.IMAGE_WEBFORM_32);
          items.add(item);
@@ -519,7 +519,10 @@ public class CreateWebsiteWizard extends BaseWizardBean
       if (index != -1)
       {
          Form form = (Form)this.formsList.get(index).getValue();
-         this.forms.add(this.new FormWrapper(form));
+         FormWrapper wrapper = new FormWrapper(form);
+         wrapper.setTitle(form.getTitle());
+         wrapper.setDescription(form.getDescription());
+         this.forms.add(wrapper);
       }
    }
    
diff --git a/source/web/jsp/wcm/create-form-wizard/summary.jsp b/source/web/jsp/wcm/create-form-wizard/summary.jsp
index 84a73a740e..f2fe6c7728 100644
--- a/source/web/jsp/wcm/create-form-wizard/summary.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/summary.jsp
@@ -32,17 +32,17 @@
 
 <h:panelGrid columns="2" cellpadding="3" cellspacing="3" border="0">
   <a:selectList id="form-list" 
-		multiSelect="false"
-		activeSelect="true" 
-		style="width:100%" 
-		itemStyleClass="selectListItem">
+                multiSelect="false"
+                activeSelect="true" 
+                style="width:100%" 
+                itemStyleClass="selectListItem">
     <a:listItem label="${WizardManager.bean.formTitle}"
-		value="${WizardManager.bean.formName}"
+                value="${WizardManager.bean.formName}"
                 image="/images/icons/webform_large.gif">
       <jsp:attribute name="description">
-	<div>${WizardManager.bean.formDescription}</div>
-	<div>${msg.schema_root_element_name}: ${WizardManager.bean.schemaRootElementName}</div>
-	<div>${msg.schema_root_element_name}: ${WizardManager.bean.outputPathPatternForFormInstanceData}</div>
+        <div>${WizardManager.bean.formDescription}</div>
+        <div>${msg.schema_root_element_name}: ${WizardManager.bean.schemaRootElementName}</div>
+        <div>${msg.schema_root_element_name}: ${WizardManager.bean.outputPathPatternForFormInstanceData}</div>
       </jsp:attribute>
     </a:listItem>
   </a:selectList>
@@ -55,20 +55,20 @@
 
 <h:panelGrid columns="1" cellpadding="3" cellspacing="3" border="0">
   <a:selectList id="rendering-engine-template-list" 
-		multiSelect="false"
-		activeSelect="true" 
-		style="width:100%" 
-		itemStyleClass="selectListItem">
+                multiSelect="false"
+                activeSelect="true" 
+                style="width:100%" 
+                itemStyleClass="selectListItem">
     <c:forEach items="${WizardManager.bean.renderingEngineTemplates}" var="ret">
       <a:listItem label="${ret.title}"
-		  value="${ret.fileName}"
+                  value="${ret.fileName}"
                   image="/images/icons/template_large.gif">
-	<jsp:attribute name="description">
-	  <div>${msg.description}: ${ret.description}</div>
-	  <div>${msg.rendering_engine_type}: ${ret.renderingEngine.name}</div>
-	  <div>${msg.output_path_pattern}: ${ret.outputPathPatternForRendition}</div>
-	  <div>${msg.mimetype_for_renditions}: ${ret.mimetypeForRendition}</div>
-	</jsp:attribute>
+        <jsp:attribute name="description">
+          <div>${msg.description}: ${ret.description}</div>
+          <div>${msg.rendering_engine_type}: ${ret.renderingEngine.name}</div>
+          <div>${msg.output_path_pattern}: ${ret.outputPathPatternForRendition}</div>
+          <div>${msg.mimetype_for_renditions}: ${ret.mimetypeForRendition}</div>
+        </jsp:attribute>
       </a:listItem>
     </c:forEach>
   </a:selectList>
@@ -91,7 +91,7 @@
   </c:choose>
   <c:if test="${WizardManager.bean.defaultWorkflowDefinition != null}">
     <h:outputText value="#{msg.name}:"/>
-    <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.name}"/>
+    <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.title}"/>
     <h:outputText value="#{msg.description}:"/>
     <h:outputText value="#{WizardManager.bean.defaultWorkflowDefinition.description}"/>
   </c:if>
diff --git a/source/web/jsp/wcm/create-website-wizard/settings.jsp b/source/web/jsp/wcm/create-website-wizard/settings.jsp
index 034908632a..72945f6769 100644
--- a/source/web/jsp/wcm/create-website-wizard/settings.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/settings.jsp
@@ -52,7 +52,7 @@
          <f:facet name="header">
             <h:outputText value="#{msg.configure}" />
          </f:facet>
-         <h:outputText value="#{msg.website_filename_pattern}:" style="padding-right:4px" />
+         <h:outputText value="#{msg.website_filename_match}:" style="padding-right:4px" />
          <h:inputText value="#{row.filenamePattern}" />
          <h:commandButton id="cmd-1" rendered="#{WizardManager.bean.editMode == false}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:formTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />
          <h:commandButton id="cmd-2" rendered="#{WizardManager.bean.editMode == true}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:editFormTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />
diff --git a/source/web/jsp/wcm/create-website-wizard/summary.jsp b/source/web/jsp/wcm/create-website-wizard/summary.jsp
index f17680adc4..03b496a018 100644
--- a/source/web/jsp/wcm/create-website-wizard/summary.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/summary.jsp
@@ -58,7 +58,7 @@
       <f:verbatim>${r.filenamePattern}</f:verbatim>
       <h:outputText value="#{msg.workflow}:" styleClass="mainSubTitle" />
       <c:if test="${r.workflow != null}">
-         <f:verbatim>${r.workflow.name}</f:verbatim>
+         <f:verbatim>${r.workflow.title}</f:verbatim>
       </c:if>
       <c:if test="${r.workflow == null}">
          <f:verbatim>${msg.none}</f:verbatim>