diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
index 4c1e0224ec..3745286837 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.desc.xml
@@ -2,7 +2,7 @@
    <shortname>IMAP Workflow Handler</shortname>
    <description>
       This webscript starts a different workflow. It is used in the IMAP email body links. The workflowType should be a fully-qualified worklfow-definition name, with 
-      engine-name included. eg: activiti$activitiAdhoc. If engine-name is left out, JBPM is used as engine-name for the process.
+      engine-name included. eg: activiti$activitiAdhoc. If engine-name is left out, Activiti is used as engine-name for the process.
       (The optional feature is the reply email with a report.)
    </description>
    <url>/imap/start-workflow?alfTicket={ticket}&amp;nodeRefId={id}&amp;workflowType={wt}&amp;assignTo={at}&amp;workflowDueDateDay={ddd}&amp;workflowDueDateMonth={ddm}&amp;workflowDueDateYear={ddy}&amp;description={desc}&amp;workflowPriority={wp?}</url>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
index 57f9defe60..b56c04fa91 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/imap/start-workflow.get.js
@@ -13,7 +13,7 @@ function main()
     // ALF-13898: accept FULL workflow-definition name if provided, otherwise revert to prefixing behavior
     var workflowType = args.workflowType;
     if(workflowType.indexOf('$') < 0) {
-       workflowType = "jbpm$wf:" + workflowType;
+       workflowType = "activiti$" + workflowType;
     }
     
     var assignTo = people.getPerson(args.assignTo);
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
index ae45d6481d..a9dc492ee2 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/workflow/end-task.post.js
@@ -8,20 +8,11 @@ function main()
 		return;
    }
 
-   // TODO Quick-fix, workaround to handle $ being removed from taskId.
-   // C;heck taskId contains $ and add if not.
    var separatorIndex = taskId.indexOf('$');
    if(separatorIndex == -1)
    {
-      if(taskId.indexOf('jbpm') == 0)
-      {
-         taskId = 'jbpm$' + taskId.substring(4);
-      }
-      else
-      {
-         status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
-         return;
-      }
+       status.setCode(status.STATUS_BAD_REQUEST, "TaskID missing when ending task.");
+       return;
    }
    
    // Check TaskId is valid
diff --git a/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java b/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
index e2d5d363ed..5ae34bedff 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/invite/InviteServiceTest.java
@@ -178,15 +178,6 @@ public class InviteServiceTest extends BaseWebScriptTest
                 {
                     public Object doWork() throws Exception
                     {
-//                        // redeploy invite process definition in case it has been modified
-//                        WorkflowDefinition inviteWfDefinition = workflowService.getDefinitionByName(
-//                                "jbpm$" + WorkflowModelNominatedInvitation.WF_PROCESS_INVITE.toPrefixString(namespaceService));
-//                        workflowService.undeployDefinition(inviteWfDefinition.id);
-//                        ClassPathResource inviteWfResource = new ClassPathResource(
-//                                "alfresco/workflow/invitation-nominated_processdefinition.xml");
-//                        workflowService.deployDefinition(
-//                                JBPMEngine.ENGINE_ID, inviteWfResource.getInputStream(), MimetypeMap.MIMETYPE_XML);
-
                         // Create new invitee email address list
                         inviteeEmailAddrs = new ArrayList<String>();
 
diff --git a/source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java b/source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
index b38bf85ff7..5e5098db48 100644
--- a/source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
+++ b/source/test-java/org/alfresco/repo/web/scripts/site/SiteServiceTest.java
@@ -857,7 +857,7 @@ public class SiteServiceTest extends AbstractSiteServiceTest
         /*
          * Negative test - site does exist but invitation doesn't
          */
-        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/jbpm$8787487"), 404);
+        sendRequest(new GetRequest(URL_SITES + "/" + shortName + "/invitations/activiti$8787487"), 404);
         
         /*
          * Negative test - site does exist but invitation engine is wrong