diff --git a/config/alfresco/workflow/workflow-messages.properties b/config/alfresco/workflow/workflow-messages.properties
index 345e247e4e..9c3544c9c3 100644
--- a/config/alfresco/workflow/workflow-messages.properties
+++ b/config/alfresco/workflow/workflow-messages.properties
@@ -8,7 +8,7 @@
 # Review & Approve Workflow
 #
 
-wf_review.workflow.title=Review & Approve
+wf_review.workflow.title=Review & Approve (JBPM)
 wf_review.workflow.description=Review & approval of content
 
 # Review & Approve Task Definitions
@@ -48,7 +48,7 @@ wf_review.node.end.description=End
 # Parallel Review Workflow
 #
 
-wf_parallelreview.workflow.title=Parallel Review & Approve
+wf_parallelreview.workflow.title=Parallel Review & Approve (JBPM)
 wf_parallelreview.workflow.description=Parallel Review & approval of content
 
 # Parallel Review & Approve Task Definitions
@@ -84,7 +84,7 @@ wf_parallelreview.node.review.transition.approve.description=Approve
 # Pooled Review Workflow
 #
 
-wf_reviewpooled.workflow.title=Pooled Review & Approve
+wf_reviewpooled.workflow.title=Pooled Review & Approve (JBPM)
 wf_reviewpooled.workflow.description=Pooled review & approval of content
 
 wf_workflowmodel.type.wf_submitGroupReviewTask.title=Start Group Review
@@ -113,8 +113,8 @@ wf_parallelgroupreview.node.review.transition.approve.description=Approve
 # Adhoc Task Workflow
 #
 
-wf_adhoc.workflow.title=Adhoc
-wf_adhoc.workflow.description=Assign task to colleague
+wf_adhoc.workflow.title=Adhoc Workflow (JBPM)
+wf_adhoc.workflow.description=Assign arbitrary task to colleague using JBPM workflow engine.
 
 # Adhoc Task Definitions
 
@@ -135,8 +135,8 @@ wf_workflowmodel.type.wf_completedAdhocTask.description=Adhoc Task Completed
 # Activiti Adhoc Task Workflow
 #
 
-activitiAdhoc.workflow.title=Activiti Adhoc
-activitiAdhoc.workflow.description=Assign Activiti task to colleague
+activitiAdhoc.workflow.title=Adhoc Workflow (Activiti)
+activitiAdhoc.workflow.description=Assign arbitrary task to colleague using Activiti workflow engine.
 
 # Activiti Adhoc Task Definitions
 
@@ -153,7 +153,7 @@ activitiAdhocmodel.type.wf_completedAdhocTask.description=Activiti Adhoc Task Co
 # Activiti Review & Approve Workflow
 #
 
-activitiReview.workflow.title=Activiti Review & Approve
+activitiReview.workflow.title=Review & Approve (Activiti)
 activitiReview.workflow.description=Review & approval of content
 
 # Activiti Review & Approve Task Definitions
diff --git a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
index df72c74ab1..db28736596 100644
--- a/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
+++ b/source/java/org/alfresco/repo/workflow/WorkflowObjectFactory.java
@@ -120,7 +120,7 @@ public class WorkflowObjectFactory
         String actualVersion = Integer.toString(version);
         
         String baseName= tenantService.getBaseName(defName);
-        String displayId = baseName + ".workflow.";
+        String displayId = baseName + ".workflow";
         String title = getLabel(displayId, TITLE_LABEL, defaultTitle);
         String description = getLabel(displayId, DESC_LABEL, defaultDescription, title);
         return new WorkflowDefinition(