diff --git a/config/alfresco/model/workflowModel.xml b/config/alfresco/model/workflowModel.xml
index 22f27518cc..34b90769e8 100644
--- a/config/alfresco/model/workflowModel.xml
+++ b/config/alfresco/model/workflowModel.xml
@@ -37,8 +37,8 @@
 
          <associations>
 
-            <association name="wf:reviewers">
-               <title>Reviewers</title>
+            <association name="wf:reviewer">
+               <title>Reviewer</title>
                <source>
                   <mandatory>false</mandatory>
                   <many>false</many>
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml b/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml
index 1b242cb5ba..a1d0064cbb 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml
+++ b/source/java/org/alfresco/repo/workflow/jbpm/review_and_approve_processdefinition.xml
@@ -3,9 +3,9 @@
 <process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="Review and Approve">
    <swimlane name="Initiator"></swimlane>
    <start-state name="start">
-     <task name="Submit" swimlane="Initiator" blocking="true">
+     <task name="wf:submitReviewTask" swimlane="Initiator" blocking="true">
         <controller>
-          <variable name="reviewer" access="write,required" />
+          <variable name="reviewer" access="write,required" mapped-name="wf:reviewer" />
         </controller>
       </task>
       <transition name="" to="Review"></transition>