diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessInstanceHistoryLogQueryImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessInstanceHistoryLogQueryImpl.java
index b3c838f8ddc4c144818d1d721fde63f54efbb7ba..e53a7fbcb9c36a980751d2cae553fb2385848080 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessInstanceHistoryLogQueryImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ProcessInstanceHistoryLogQueryImpl.java
@@ -77,7 +77,7 @@ public class ProcessInstanceHistoryLogQueryImpl implements ProcessInstanceHistor
   public ProcessInstanceHistoryLog execute(CommandContext commandContext) {
 
     // Fetch historic process instance
-    HistoricProcessInstanceEntity historicProcessInstance = commandContext.getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+    HistoricProcessInstanceEntity historicProcessInstance = commandContext.getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
     if (historicProcessInstance == null) {
       return null;
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/DestroyScopeOperation.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/DestroyScopeOperation.java
index 2ebbad3d66039b092fb26051027ffdde217d80cd..316d26278c5107082f1923f1835b5eb5136457b9 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/DestroyScopeOperation.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/DestroyScopeOperation.java
@@ -39,12 +39,12 @@ public class DestroyScopeOperation extends AbstractOperation {
     if (execution.isScope()) {
       parentScopeExecution = executionEntity;
     } else {
-      ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(execution.getParentId());
+      ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(execution.getParentId());
       while (currentlyExaminedExecution != null && parentScopeExecution == null) {
         if (currentlyExaminedExecution.isScope()) {
           parentScopeExecution = currentlyExaminedExecution;
         } else {
-          currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+          currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
         }
       }
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java
index 1dd96ee7ae4c510af1deb170fe6d60aeaa5e77b1..399d185a4c760cbbee51765458c8342b580a1d03 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/agenda/EndExecutionOperation.java
@@ -47,7 +47,7 @@ public class EndExecutionOperation extends AbstractOperation {
     // Find parent execution. If not found, it's the process instance and other logic needs to happen
     ExecutionEntity parentExecution = null;
     if (executionEntity.getParentId() != null) {
-      parentExecution = executionEntityManager.getEntity(executionEntity.getParentId());
+      parentExecution = executionEntityManager.findById(executionEntity.getParentId());
     }
     
     if (parentExecution != null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java
index 8e83dc5cc512db96e7058ee2660c5167523d4237..9a180c6fe1b15898d809515061e50bbbb4373bc9 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/BoundaryEventActivityBehavior.java
@@ -74,15 +74,15 @@ public class BoundaryEventActivityBehavior extends FlowNodeActivityBehavior {
     // Which is what we need.
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity attachedRefScopeExecution = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity attachedRefScopeExecution = executionEntityManager.findById(executionEntity.getParentId());
 
     ExecutionEntity parentScopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(attachedRefScopeExecution.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(attachedRefScopeExecution.getParentId());
     while (currentlyExaminedExecution != null && parentScopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         parentScopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 
@@ -112,15 +112,15 @@ public class BoundaryEventActivityBehavior extends FlowNodeActivityBehavior {
     
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
 
-    ExecutionEntity parentExecutionEntity = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity parentExecutionEntity = executionEntityManager.findById(executionEntity.getParentId());
 
     ExecutionEntity scopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(parentExecutionEntity.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(parentExecutionEntity.getParentId());
     while (currentlyExaminedExecution != null && scopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         scopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CancelEndEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CancelEndEventActivityBehavior.java
index 6dc653802f92a4ba48d597ea3d1ca8e4a0b1cd26..947457ffe05ec61298a5470e4e40c3365cb28d31 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CancelEndEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/CancelEndEventActivityBehavior.java
@@ -45,7 +45,7 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
     
     // find cancel boundary event:
     ExecutionEntity parentScopeExecution = null;
-    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findExecutionById(executionEntity.getParentId());
+    ExecutionEntity currentlyExaminedExecution = executionEntityManager.findById(executionEntity.getParentId());
     while (currentlyExaminedExecution != null && parentScopeExecution == null) {
       if (currentlyExaminedExecution.getCurrentFlowElement() instanceof SubProcess) {
         parentScopeExecution = currentlyExaminedExecution;
@@ -59,7 +59,7 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
         }
         
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
     
@@ -85,12 +85,12 @@ public class CancelEndEventActivityBehavior extends FlowNodeActivityBehavior {
     }
 
     ExecutionEntity newParentScopeExecution = null;
-    currentlyExaminedExecution = executionEntityManager.findExecutionById(parentScopeExecution.getParentId());
+    currentlyExaminedExecution = executionEntityManager.findById(parentScopeExecution.getParentId());
     while (currentlyExaminedExecution != null && newParentScopeExecution == null) {
       if (currentlyExaminedExecution.isScope()) {
         newParentScopeExecution = currentlyExaminedExecution;
       } else {
-        currentlyExaminedExecution = executionEntityManager.findExecutionById(currentlyExaminedExecution.getParentId());
+        currentlyExaminedExecution = executionEntityManager.findById(currentlyExaminedExecution.getParentId());
       }
     }
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/GatewayActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/GatewayActivityBehavior.java
index d747e9a4df243f4d0b1a0454b04aeb10cffdf257..f4fc630f5b5599492705dad073ff717f1d4d83b2 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/GatewayActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/GatewayActivityBehavior.java
@@ -34,7 +34,7 @@ public abstract class GatewayActivityBehavior extends FlowNodeActivityBehavior {
     ExecutionEntity parentScopeExecution = null;
     ExecutionEntity currentExecution = (ExecutionEntity) execution;
     while (!found && currentExecution != null && currentExecution.getParentId() != null) {
-      parentScopeExecution = executionEntityManager.findExecutionById(currentExecution.getParentId());
+      parentScopeExecution = executionEntityManager.findById(currentExecution.getParentId());
       if (parentScopeExecution != null && parentScopeExecution.isScope()) {
         found = true;
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java
index 038828dc2cb0ef3f271fbd6351d9e259567f16d4..63342baf72d1ccae4e73d7ee13689ff61aca43de 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/ParallelMultiInstanceBehavior.java
@@ -216,7 +216,7 @@ public class ParallelMultiInstanceBehavior extends MultiInstanceActivityBehavior
     ExecutionEntity parentScopeExecution = null;
     ExecutionEntity currentExecution = (ExecutionEntity) execution;
     while (!found && currentExecution != null && currentExecution.getParentId() != null) {
-      parentScopeExecution = executionEntityManager.findExecutionById(currentExecution.getParentId());
+      parentScopeExecution = executionEntityManager.findById(currentExecution.getParentId());
       if (parentScopeExecution != null && parentScopeExecution.isScope()) {
         found = true;
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java
index a1e61cafd1b5a4539f69395bd4593991794c9171..28fd54f907c70b2635e270bf2471e7b84a11b624 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/behavior/TerminateEndEventActivityBehavior.java
@@ -71,7 +71,7 @@ public class TerminateEndEventActivityBehavior extends FlowNodeActivityBehavior
 				  executionEntityManager.deleteProcessInstanceExecutionEntity(scopeExecutionEntity.getId(), 
 				      execution.getCurrentFlowElement().getId(), "terminate end event", 
 				      false, false, true);
-					ExecutionEntity superExecutionEntity = executionEntityManager.findExecutionById(scopeExecutionEntity.getSuperExecutionId());
+					ExecutionEntity superExecutionEntity = executionEntityManager.findById(scopeExecutionEntity.getSuperExecutionId());
 					commandContext.getAgenda().planTakeOutgoingSequenceFlowsOperation(superExecutionEntity);
 					
 				} else {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java
index 0a0dda8fbbdd4480d49cd70dd934bb51f4cab42b..87db1b93e7ba9fe589fe15387620c4bc61797d8f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorPropagation.java
@@ -86,7 +86,7 @@ public class ErrorPropagation {
               
               for (String processInstanceId : toDeleteProcessInstanceIds) {
                 
-                ExecutionEntity processInstanceEntity = executionEntityManager.findExecutionById(processInstanceId);
+                ExecutionEntity processInstanceEntity = executionEntityManager.findById(processInstanceId);
                 
                 // Delete
                 executionEntityManager.deleteProcessInstanceExecutionEntity(processInstanceEntity.getId(), 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorThrowingEventListener.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorThrowingEventListener.java
index 9af3b038700f207026960ddb9d7a1b930d680210..979236e8f4acc3311f12c3169642622f1a10e3bb 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorThrowingEventListener.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ErrorThrowingEventListener.java
@@ -35,7 +35,7 @@ public class ErrorThrowingEventListener extends BaseDelegateEventListener {
 
       if (event.getExecutionId() != null) {
         // Get the execution based on the event's execution ID instead
-        execution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(event.getExecutionId());
+        execution = Context.getCommandContext().getExecutionEntityManager().findById(event.getExecutionId());
       }
 
       if (execution == null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ScopeUtil.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ScopeUtil.java
index 118d422b4233cf8e2cdf03c667b103fbe8c96f70..59e3fa74ee64f2268a94227f3f0e921aea0b9ec3 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ScopeUtil.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/helper/ScopeUtil.java
@@ -47,7 +47,7 @@ public class ScopeUtil {
       // check whether compensating execution is already created (which is the case when compensating an embedded subprocess,
       // where the compensating execution is created when leaving the subprocess and holds snapshot data).
       if (eventSubscription.getConfiguration() != null) {
-        compensatingExecution = executionEntityManager.findExecutionById(eventSubscription.getConfiguration());
+        compensatingExecution = executionEntityManager.findById(eventSubscription.getConfiguration());
         // move the compensating execution under this execution:
         compensatingExecution.setParent((ExecutionEntity) execution);
         compensatingExecution.setEventScope(false);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractCompleteTaskCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractCompleteTaskCmd.java
index f1bbaff65b2fd822bb79eb0fc50ab608805e4da2..585fab3b9731b465e6cd457f972b3895c14fd722 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractCompleteTaskCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractCompleteTaskCmd.java
@@ -53,7 +53,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
 
     fireEvent(commandContext, taskEntity, TaskListener.EVENTNAME_COMPLETE);
     if (Authentication.getAuthenticatedUserId() != null && taskEntity.getProcessInstanceId() != null) {
-      ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getProcessInstanceId());
+      ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findById(taskEntity.getProcessInstanceId());
       commandContext.getIdentityLinkEntityManager().involveUser(processInstanceEntity, Authentication.getAuthenticatedUserId(),IdentityLinkType.PARTICIPANT);
     }
 
@@ -70,7 +70,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
 
     // Continue process (if not a standalone task)
     if (taskEntity.getExecutionId() != null) {
-      ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getExecutionId());
+      ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findById(taskEntity.getExecutionId());
       commandContext.getAgenda().planTriggerExecutionOperation(executionEntity);
     }
   }
@@ -82,7 +82,7 @@ public abstract class AbstractCompleteTaskCmd extends NeedsActiveTaskCmd<Void> {
       List<TaskListener> taskEventListeners = taskDefinition.getTaskListener(taskEventName);
       if (taskEventListeners != null) {
         for (TaskListener taskListener : taskEventListeners) {
-          ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(taskEntity.getExecutionId());
+          ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(taskEntity.getExecutionId());
           if (execution != null) {
             taskEntity.setEventName(taskEventName);
           }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java
index 6a2a6f640f206870145fb7aac99bcd6311ca8fbc..4ec5e0ebe6b4e905e05919b2738d1a223baf2e73 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessDefinitionStateCmd.java
@@ -113,7 +113,7 @@ public abstract class AbstractSetProcessDefinitionStateCmd implements Command<Vo
 
     if (processDefinitionId != null) {
 
-      ProcessDefinitionEntity processDefinitionEntity = processDefinitionManager.findProcessDefinitionById(processDefinitionId);
+      ProcessDefinitionEntity processDefinitionEntity = processDefinitionManager.findById(processDefinitionId);
       if (processDefinitionEntity == null) {
         throw new ActivitiObjectNotFoundException("Cannot find process definition for id '" + processDefinitionId + "'", ProcessDefinition.class);
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessInstanceStateCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessInstanceStateCmd.java
index ad9b9cb766801d80dde257c2a8d26043bcd2f7c1..7e71390088ee36e17c71d2f7a39ebc80a3ea0635 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessInstanceStateCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AbstractSetProcessInstanceStateCmd.java
@@ -45,7 +45,7 @@ public abstract class AbstractSetProcessInstanceStateCmd implements Command<Void
       throw new ActivitiIllegalArgumentException("ProcessInstanceId cannot be null.");
     }
 
-    ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity executionEntity = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (executionEntity == null) {
       throw new ActivitiObjectNotFoundException("Cannot find processInstance for id '" + executionId + "'.", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddCommentCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddCommentCmd.java
index 0ff391a92ebf70b847e09e9acf7ce60954f060c0..94436bf7f82b02b63baaae83d8523d9bc2bf903b 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddCommentCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddCommentCmd.java
@@ -56,7 +56,7 @@ public class AddCommentCmd implements Command<Comment> {
     TaskEntity task = null;
     // Validate task
     if (taskId != null) {
-      task = commandContext.getTaskEntityManager().findTaskById(taskId);
+      task = commandContext.getTaskEntityManager().findById(taskId);
 
       if (task == null) {
         throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);
@@ -69,7 +69,7 @@ public class AddCommentCmd implements Command<Comment> {
 
     ExecutionEntity execution = null;
     if (processInstanceId != null) {
-      execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
       if (execution == null) {
         throw new ActivitiObjectNotFoundException("execution " + processInstanceId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessDefinitionCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessDefinitionCmd.java
index c31649840948d15eb35d9a5c2a78a829041ea620..96b9c1be4581efcaeab39f98d91fcdaf84ad8060 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessDefinitionCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessDefinitionCmd.java
@@ -54,7 +54,7 @@ public class AddIdentityLinkForProcessDefinitionCmd implements Command<Void>, Se
   }
 
   public Void execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java
index d827e9e9c131bd2951931751894758a45665b383..aff708534ba08bec99d0ba47a512c2f47dec1e4f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/AddIdentityLinkForProcessInstanceCmd.java
@@ -68,7 +68,7 @@ public class AddIdentityLinkForProcessInstanceCmd implements Command<Void>, Seri
   public Void execute(CommandContext commandContext) {
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionEntityManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionEntityManager.findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process instance with id " + processInstanceId, ExecutionEntity.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobsCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobsCmd.java
index cd144d18f6f371ffd3337f02232aab8a47fe0467..8bb6f1ae2c565e358b126ff6cb7e0f342ed4a685 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobsCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CancelJobsCmd.java
@@ -45,7 +45,7 @@ public class CancelJobsCmd implements Command<Void>, Serializable {
   public Void execute(CommandContext commandContext) {
     JobEntity jobToDelete = null;
     for (String jobId : jobIds) {
-      jobToDelete = commandContext.getJobEntityManager().findJobById(jobId);
+      jobToDelete = commandContext.getJobEntityManager().findById(jobId);
 
       if (jobToDelete != null) {
         // When given job doesn't exist, ignore
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ChangeDeploymentTenantIdCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ChangeDeploymentTenantIdCmd.java
index bfd577f755eabb6af173743e7e4072002696e8d4..14822f6ecab05714683dc4c9561f435537259002 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ChangeDeploymentTenantIdCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ChangeDeploymentTenantIdCmd.java
@@ -46,7 +46,7 @@ public class ChangeDeploymentTenantIdCmd implements Command<Void>, Serializable
 
     // Update all entities
 
-    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findById(deploymentId);
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("Could not find deployment with id " + deploymentId, Deployment.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateAttachmentCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateAttachmentCmd.java
index bc85d881a6bb6c95a5c61d3b2667328e6f91dbc0..2e070a8ff67c8ddf754439c29067843b97093994 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateAttachmentCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/CreateAttachmentCmd.java
@@ -104,7 +104,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
       // process definition
       String processDefinitionId = null;
       if (attachment.getProcessInstanceId() != null) {
-        ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+        ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }
@@ -120,7 +120,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
   }
 
   protected TaskEntity verifyTaskParameters(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);
@@ -134,7 +134,7 @@ public class CreateAttachmentCmd implements Command<Attachment> {
   }
 
   protected ExecutionEntity verifyExecutionParameters(CommandContext commandContext) {
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("Process instance " + processInstanceId + " doesn't exist", ProcessInstance.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteAttachmentCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteAttachmentCmd.java
index c20e003019eada824a3d634b978c9c09c3438759..3f4fb599988a2071afd2c145a1b9818310f6ddf5 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteAttachmentCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteAttachmentCmd.java
@@ -43,7 +43,7 @@ public class DeleteAttachmentCmd implements Command<Object>, Serializable {
     String processInstanceId = attachment.getProcessInstanceId();
     String processDefinitionId = null;
     if (attachment.getProcessInstanceId() != null) {
-      ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
       if (process != null) {
         processDefinitionId = process.getProcessDefinitionId();
         if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, process.getProcessDefinitionId())) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteCommentCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteCommentCmd.java
index d4308b07cd12d655994f1206f153a5b8b6b7f782..d8dc043050993f6c011736276758c5c7a63c6332 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteCommentCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteCommentCmd.java
@@ -53,7 +53,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       }
       
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (execution != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, execution.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -61,7 +61,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
         }
       
       } else if (comment.getTaskId() != null) {
-        Task task = commandContext.getTaskEntityManager().findTaskById(comment.getTaskId());
+        Task task = commandContext.getTaskEntityManager().findById(comment.getTaskId());
         if (task != null && task.getProcessDefinitionId() != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, task.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -76,7 +76,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       ArrayList<Comment> comments = new ArrayList<Comment>();
       if (processInstanceId != null) {
         
-        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+        ExecutionEntity execution = (ExecutionEntity) commandContext.getExecutionEntityManager().findById(processInstanceId);
         if (execution != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, execution.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
@@ -87,7 +87,7 @@ public class DeleteCommentCmd implements Command<Void>, Serializable {
       }
       if (taskId != null) {
         
-        Task task = commandContext.getTaskEntityManager().findTaskById(taskId);
+        Task task = commandContext.getTaskEntityManager().findById(taskId);
         if (task != null && task.getProcessDefinitionId() != null && Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, task.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
           activiti5CompatibilityHandler.deleteComment(commentId, taskId, processInstanceId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java
index e1ad871ceac547ec2d97ab11769d9be882fc7bdb..ddc63791611b3e785f3dfdd97af05696a7ceb698 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteGroupCmd.java
@@ -34,7 +34,7 @@ public class DeleteGroupCmd implements Command<Void>, Serializable {
     if (groupId == null) {
       throw new ActivitiIllegalArgumentException("groupId is null");
     }
-    commandContext.getGroupEntityManager().deleteGroup(groupId);
+    commandContext.getGroupEntityManager().delete(groupId);
 
     return null;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricProcessInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricProcessInstanceCmd.java
index 18378ec98bdc42a04e78f699137f0b30a401c697..ba9884fce3763716e001175151df7244e8f3ebf0 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricProcessInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricProcessInstanceCmd.java
@@ -41,7 +41,7 @@ public class DeleteHistoricProcessInstanceCmd implements Command<Object>, Serial
       throw new ActivitiIllegalArgumentException("processInstanceId is null");
     }
     // Check if process instance is still running
-    HistoricProcessInstance instance = commandContext.getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+    HistoricProcessInstance instance = commandContext.getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
     if (instance == null) {
       throw new ActivitiObjectNotFoundException("No historic process instance found with id: " + processInstanceId, HistoricProcessInstance.class);
@@ -56,7 +56,7 @@ public class DeleteHistoricProcessInstanceCmd implements Command<Object>, Serial
       return null;
     }
     
-    commandContext.getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(processInstanceId);
+    commandContext.getHistoricProcessInstanceEntityManager().delete(processInstanceId);
 
     return null;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricTaskInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricTaskInstanceCmd.java
index 70d9d48d6cb6cc397eb4a729d3ab3cc740d06629..d529ffba41a1323f034a322d3ccbb46bd5f921ba 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricTaskInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteHistoricTaskInstanceCmd.java
@@ -36,7 +36,7 @@ public class DeleteHistoricTaskInstanceCmd implements Command<Object>, Serializa
     if (taskId == null) {
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
-    commandContext.getHistoricTaskInstanceEntityManager().deleteHistoricTaskInstanceById(taskId);
+    commandContext.getHistoricTaskInstanceEntityManager().delete(taskId);
     return null;
   }
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessDefinitionCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessDefinitionCmd.java
index a988b31aac457e0c16f57346e02470cee3817e91..46393c6d37d652dfeeee3520e03843a0e25a45fb 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessDefinitionCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessDefinitionCmd.java
@@ -55,7 +55,7 @@ public class DeleteIdentityLinkForProcessDefinitionCmd implements Command<Object
   }
 
   public Void execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessInstanceCmd.java
index 89bf03767eb7db7807245a256fe4cc622eeee56c..8a5d9bea54d968e7b50b89158a553e100eef679c 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteIdentityLinkForProcessInstanceCmd.java
@@ -62,7 +62,7 @@ public class DeleteIdentityLinkForProcessInstanceCmd implements Command<Object>,
   }
 
   public Void execute(CommandContext commandContext) {
-    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process instance with id " + processInstanceId, ExecutionEntity.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java
index 43c231c5f4733847419a5bd5de59c525e356658a..fd346463c127ef324e2aad63572d8f42d6dfda78 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteJobCmd.java
@@ -62,7 +62,7 @@ public class DeleteJobCmd implements Command<Object>, Serializable {
       log.debug("Deleting job {}", jobId);
     }
 
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job == null) {
       throw new ActivitiObjectNotFoundException("No job found with id '" + jobId + "'", Job.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
index b96b43d57296bd840c80cf254aacebbb2c66c270..b318c7639869f4b9e0bbc6e36b19965886eebb2e 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteProcessInstanceCmd.java
@@ -53,7 +53,7 @@ public class DeleteProcessInstanceCmd implements Command<Void>, Serializable {
         .dispatchEvent(ActivitiEventBuilder.createCancelledEvent(this.processInstanceId, this.processInstanceId, null, deleteReason));
     }
 
-    ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstanceEntity = commandContext.getExecutionEntityManager().findById(processInstanceId);
     
     if (processInstanceEntity == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java
index 44d68c42fc320a1b29bd85d1c60f1c79f094a01a..bbd20a8afba52731729e08e6dfc1701f7316b5da 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeleteUserCmd.java
@@ -34,7 +34,7 @@ public class DeleteUserCmd implements Command<Void>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    commandContext.getUserEntityManager().deleteUser(userId);
+    commandContext.getUserEntityManager().delete(userId);
 
     return null;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java
index b18a50ca691fd024311d2808b913aa601b16cfca..838ff052f72e0ecaa954a73a77d9c04fcb18d44f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/DeployCmd.java
@@ -95,7 +95,7 @@ public class DeployCmd<T> implements Command<Deployment>, Serializable {
     deployment.setNew(true);
 
     // Save the data
-    commandContext.getDeploymentEntityManager().insertDeployment(deployment);
+    commandContext.getDeploymentEntityManager().insert(deployment);
 
     if (commandContext.getProcessEngineConfiguration().getEventDispatcher().isEnabled()) {
       commandContext.getProcessEngineConfiguration().getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, deployment));
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ExecuteJobsCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ExecuteJobsCmd.java
index bcba38f155f293df4454bb55d3398ab5f8a2844c..05d8faa116d3bc44817ca0ad9b444f14818b00e3 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ExecuteJobsCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/ExecuteJobsCmd.java
@@ -58,7 +58,7 @@ public class ExecuteJobsCmd implements Command<Object>, Serializable {
     }
 
     if (job == null) {
-      job = commandContext.getJobEntityManager().findJobById(jobId);
+      job = commandContext.getJobEntityManager().findById(jobId);
     }
 
     if (job == null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindActiveActivityIdsCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindActiveActivityIdsCmd.java
index 66aab9cf92002d50cc03932e12f67ab143bd4179..ca01a8e673ec681bf53e2ea9a783020a3dde4d0d 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindActiveActivityIdsCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/FindActiveActivityIdsCmd.java
@@ -44,7 +44,7 @@ public class FindActiveActivityIdsCmd implements Command<List<String>>, Serializ
     }
 
     ExecutionEntityManager executionEntityManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity execution = executionEntityManager.findExecutionById(executionId);
+    ExecutionEntity execution = executionEntityManager.findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java
index 60acff6d254b3e5426dcfcd49d09d2f51d372f92..3db75afbfafab3d3708cf2d5be710a819c7c1f6d 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetDeploymentResourceCmd.java
@@ -47,7 +47,7 @@ public class GetDeploymentResourceCmd implements Command<InputStream>, Serializa
 
     ResourceEntity resource = commandContext.getResourceEntityManager().findResourceByDeploymentIdAndResourceName(deploymentId, resourceName);
     if (resource == null) {
-      if (commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId) == null) {
+      if (commandContext.getDeploymentEntityManager().findById(deploymentId) == null) {
         throw new ActivitiObjectNotFoundException("deployment does not exist: " + deploymentId, Deployment.class);
       } else {
         throw new ActivitiObjectNotFoundException("no resource found with name '" + resourceName + "' in deployment '" + deploymentId + "'", InputStream.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java
index c0e9436307beb473c377ea72f4edd1612aefeb66..27d0d6c7a57cb671fd2c70e7bdd690c8793f2e69 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariableCmd.java
@@ -48,7 +48,7 @@ public class GetExecutionVariableCmd implements Command<Object>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java
index 5c48f61c6779498d60e00bf87a610f5102b501ec..e565936ed349facfb7e908e71abbe2b233b5186e 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetExecutionVariablesCmd.java
@@ -49,7 +49,7 @@ public class GetExecutionVariablesCmd implements Command<Map<String, Object>>, S
       throw new ActivitiIllegalArgumentException("executionId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetHistoricIdentityLinksForTaskCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetHistoricIdentityLinksForTaskCmd.java
index d5884200dade265c2c208b7a8811b4e09fc24997..358fbbe74a751e144ee54387e8e7afac115acb1d 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetHistoricIdentityLinksForTaskCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetHistoricIdentityLinksForTaskCmd.java
@@ -52,7 +52,7 @@ public class GetHistoricIdentityLinksForTaskCmd implements Command<List<Historic
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   protected List<HistoricIdentityLink> getLinksForTask(CommandContext commandContext) {
-    HistoricTaskInstanceEntity task = commandContext.getHistoricTaskInstanceEntityManager().findHistoricTaskInstanceById(taskId);
+    HistoricTaskInstanceEntity task = commandContext.getHistoricTaskInstanceEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("No historic task exists with the given id: " + taskId, HistoricTaskInstance.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessDefinitionCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessDefinitionCmd.java
index 7e556469784eae969d73342335a5cdef81e79cc5..cce6642832cdccafbea2521f4328fd520e9a07ce 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessDefinitionCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessDefinitionCmd.java
@@ -36,7 +36,7 @@ public class GetIdentityLinksForProcessDefinitionCmd implements Command<List<Ide
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processDefinitionId, ProcessDefinition.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessInstanceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessInstanceCmd.java
index 96e82d6933e6c12f9e24f8dde605a87a4fa0df58..aea7064bccd77e3e97d711cd37cc5b93cc75f8f6 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessInstanceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForProcessInstanceCmd.java
@@ -36,7 +36,7 @@ public class GetIdentityLinksForProcessInstanceCmd implements Command<List<Ident
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("Cannot find process definition with id " + processInstanceId, ExecutionEntity.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForTaskCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForTaskCmd.java
index 12027289baeff515bd9ef0df32bea2acda961b3b..c5d490cc2a9304b0229a292edb3ff905ce945df8 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForTaskCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetIdentityLinksForTaskCmd.java
@@ -37,7 +37,7 @@ public class GetIdentityLinksForTaskCmd implements Command<List<IdentityLink>>,
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
   public List<IdentityLink> execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     List<IdentityLink> identityLinks = (List) task.getIdentityLinks();
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetJobExceptionStacktraceCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetJobExceptionStacktraceCmd.java
index 676601fdd38edc59afc20ce954978ed064291b58..905ab392f41cb7332286803d1c691189997b5831 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetJobExceptionStacktraceCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetJobExceptionStacktraceCmd.java
@@ -39,7 +39,7 @@ public class GetJobExceptionStacktraceCmd implements Command<String>, Serializab
       throw new ActivitiIllegalArgumentException("jobId is null");
     }
 
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
 
     if (job == null) {
       throw new ActivitiObjectNotFoundException("No job found with id " + jobId, Job.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetModelCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetModelCmd.java
index 23c33d70e5e2b5ef2565909fd50c159dae585deb..96cfad9dad439d6ae372efef458b0c8bf495e58a 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetModelCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetModelCmd.java
@@ -32,6 +32,6 @@ public class GetModelCmd implements Command<ModelEntity>, Serializable {
   }
 
   public ModelEntity execute(CommandContext commandContext) {
-    return commandContext.getModelEntityManager().findModelById(modelId);
+    return commandContext.getModelEntityManager().findById(modelId);
   }
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextIdBlockCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextIdBlockCmd.java
index cfeb8f9e7bd340b481ce002e6ba460fc40998d2e..f875aa899e8e157a1823c9425eaeda2cfb373059 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextIdBlockCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetNextIdBlockCmd.java
@@ -30,7 +30,7 @@ public class GetNextIdBlockCmd implements Command<IdBlock> {
   }
 
   public IdBlock execute(CommandContext commandContext) {
-    PropertyEntity property = (PropertyEntity) commandContext.getPropertyEntityManager().findPropertyById("next.dbid");
+    PropertyEntity property = (PropertyEntity) commandContext.getPropertyEntityManager().findById("next.dbid");
     long oldValue = Long.parseLong(property.getValue());
     long newValue = oldValue + idBlockSize;
     property.setValue(Long.toString(newValue));
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetRenderedTaskFormCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetRenderedTaskFormCmd.java
index 0415f9285493b8f6f09cc84194ae707381966234..6d7f0e8eca563703d89342d0538b9b044a65f120 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetRenderedTaskFormCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetRenderedTaskFormCmd.java
@@ -40,7 +40,7 @@ public class GetRenderedTaskFormCmd implements Command<Object>, Serializable {
   }
 
   public Object execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Task '" + taskId + "' not found", Task.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskFormCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskFormCmd.java
index 3f1d193a44e2130e5757f7f48d5ee8dca209d945..714f15429366217160fa005a53fa2d6e80e76cfb 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskFormCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskFormCmd.java
@@ -37,7 +37,7 @@ public class GetTaskFormCmd implements Command<TaskFormData>, Serializable {
   }
 
   public TaskFormData execute(CommandContext commandContext) {
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
     if (task == null) {
       throw new ActivitiObjectNotFoundException("No task found for taskId '" + taskId + "'", Task.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariableCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariableCmd.java
index 3040720bfc33cc19b2aeecc988610af91b615391..49ec338f878f91477ef590ffb65828be91f78e64 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariableCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariableCmd.java
@@ -47,7 +47,7 @@ public class GetTaskVariableCmd implements Command<Object>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariablesCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariablesCmd.java
index 599d8fb799696311baf013343ab81b6d5775421d..6e628b581f30dc0162390d71fe07666571277484 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariablesCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetTaskVariablesCmd.java
@@ -46,7 +46,7 @@ public class GetTaskVariablesCmd implements Command<Map<String, Object>>, Serial
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetUserPictureCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetUserPictureCmd.java
index 26f1de909c3116b8e14fccd314df4ac01d862a05..52eb45df5ae94d47e183698b4177394a9e03530f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetUserPictureCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetUserPictureCmd.java
@@ -38,7 +38,7 @@ public class GetUserPictureCmd implements Command<Picture>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    User user = commandContext.getUserEntityManager().findUserById(userId);
+    User user = commandContext.getUserEntityManager().findById(userId);
     if (user == null) {
       throw new ActivitiObjectNotFoundException("user " + userId + " doesn't exist", User.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasExecutionVariableCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasExecutionVariableCmd.java
index c0f25e34ecc4bf56ac73c075b091c035fb101ad2..7927a5ff69023c96acbc82109fdbe75a8fb49635 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasExecutionVariableCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasExecutionVariableCmd.java
@@ -45,7 +45,7 @@ public class HasExecutionVariableCmd implements Command<Boolean>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasTaskVariableCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasTaskVariableCmd.java
index 7a1ff6a157ee0acf0b84f379ac2166c2fecea1cc..bbf50ff2b7503d9f0a6dab83b79422e7ca1f5044 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasTaskVariableCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/HasTaskVariableCmd.java
@@ -46,7 +46,7 @@ public class HasTaskVariableCmd implements Command<Boolean>, Serializable {
       throw new ActivitiIllegalArgumentException("variableName is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("task " + taskId + " doesn't exist", Task.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/JobRetryCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/JobRetryCmd.java
index dea48c44dee95bbc204afb7cdcd8c79e0e64a6a7..4dc4cc38b04be01d62391ebcd4eca51a5e4df8ff 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/JobRetryCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/JobRetryCmd.java
@@ -56,7 +56,7 @@ public class JobRetryCmd implements Command<Object> {
   }
 
   public Object execute(CommandContext commandContext) {
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job == null) {
       return null;
     }
@@ -152,7 +152,7 @@ public class JobRetryCmd implements Command<Object> {
     if (executionId == null) {
       return null;
     }
-    return commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    return commandContext.getExecutionEntityManager().findById(executionId);
   }
 
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/LockExclusiveJobCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/LockExclusiveJobCmd.java
index 8c60dac49acd817b935a0942c38ae3cfc7355bab..7c64e482c28789771c7f1d8b36f671db6e590c4c 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/LockExclusiveJobCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/LockExclusiveJobCmd.java
@@ -49,7 +49,7 @@ public class LockExclusiveJobCmd implements Command<Object>, Serializable {
 
     if (job.isExclusive()) {
       if (job.getExecutionId() != null) {
-        ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(job.getExecutionId());
+        ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(job.getExecutionId());
         if (execution != null) {
           commandContext.getExecutionEntityManager().updateProcessInstanceLockTime(execution.getProcessInstanceId());
         }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveExecutionCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveExecutionCmd.java
index 52ac9c1348567e31ba449ccea6df4e0fbdf7b0d8..0b771bb199b43ae457092401ccd0040f759c0d60 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveExecutionCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveExecutionCmd.java
@@ -40,7 +40,7 @@ public abstract class NeedsActiveExecutionCmd<T> implements Command<T>, Serializ
       throw new ActivitiIllegalArgumentException("executionId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveTaskCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveTaskCmd.java
index 8e9cd9a2e26309f3e69bb47224d1697dd69bf309..f604c4f6f4f2e7e0b42a95e50569e260bcb6a9cc 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveTaskCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/NeedsActiveTaskCmd.java
@@ -43,7 +43,7 @@ public abstract class NeedsActiveTaskCmd<T> implements Command<T>, Serializable
       throw new ActivitiIllegalArgumentException("taskId is null");
     }
 
-    TaskEntity task = commandContext.getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = commandContext.getTaskEntityManager().findById(taskId);
 
     if (task == null) {
       throw new ActivitiObjectNotFoundException("Cannot find task with id " + taskId, Task.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveAttachmentCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveAttachmentCmd.java
index ad2499ae1177480d29a392f91cf1b81271280f34..ac8aedac383e1761afc462f801ab0550152d325f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveAttachmentCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveAttachmentCmd.java
@@ -43,7 +43,7 @@ public class SaveAttachmentCmd implements Command<Object>, Serializable {
     String processInstanceId = updateAttachment.getProcessInstanceId();
     String processDefinitionId = null;
     if (updateAttachment.getProcessInstanceId() != null) {
-      ExecutionEntity process = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+      ExecutionEntity process = commandContext.getExecutionEntityManager().findById(processInstanceId);
       if (process != null) {
         processDefinitionId = process.getProcessDefinitionId();
         if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, process.getProcessDefinitionId())) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
index da88496f54e004971b940c95ce41d79eb292fe36..f2f0f19f49a629cb68e7b035f77cf305d5255e3f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveGroupCmd.java
@@ -16,8 +16,10 @@ import java.io.Serializable;
 
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.identity.Group;
+import org.activiti.engine.impl.db.PersistentObject;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.GroupEntity;
 
 /**
  * @author Joram Barrez
@@ -37,7 +39,11 @@ public class SaveGroupCmd implements Command<Void>, Serializable {
     }
 
     if (commandContext.getGroupEntityManager().isNewGroup(group)) {
-      commandContext.getGroupEntityManager().insertGroup(group);
+      if (group instanceof GroupEntity) {
+        commandContext.getGroupEntityManager().insert((GroupEntity) group);
+      } else {
+        commandContext.getDbSqlSession().insert((PersistentObject) group);
+      }
     } else {
       commandContext.getGroupEntityManager().updateGroup(group);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
index 10721edd83e616a47a09af9c82eabc946151826f..028a4826a72ac3c8411093b1a8f404dd144f46e5 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SaveUserCmd.java
@@ -16,8 +16,10 @@ import java.io.Serializable;
 
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.identity.User;
+import org.activiti.engine.impl.db.PersistentObject;
 import org.activiti.engine.impl.interceptor.Command;
 import org.activiti.engine.impl.interceptor.CommandContext;
+import org.activiti.engine.impl.persistence.entity.UserEntity;
 
 /**
  * @author Joram Barrez
@@ -36,7 +38,11 @@ public class SaveUserCmd implements Command<Void>, Serializable {
       throw new ActivitiIllegalArgumentException("user is null");
     }
     if (commandContext.getUserEntityManager().isNewUser(user)) {
-      commandContext.getUserEntityManager().insertUser(user);
+      if (user instanceof UserEntity) {
+        commandContext.getUserEntityManager().insert((UserEntity) user,true);
+      } else {
+        commandContext.getDbSqlSession().insert((PersistentObject) user);
+      }
     } else {
       commandContext.getUserEntityManager().updateUser(user);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetDeploymentCategoryCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetDeploymentCategoryCmd.java
index 313616e8a7ccf1ecf655e4ac6746269c6d72e36d..732d28b9dcec691286fd37bcff4060630c48c11b 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetDeploymentCategoryCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetDeploymentCategoryCmd.java
@@ -41,7 +41,7 @@ public class SetDeploymentCategoryCmd implements Command<Void> {
       throw new ActivitiIllegalArgumentException("Deployment id is null");
     }
 
-    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = commandContext.getDeploymentEntityManager().findById(deploymentId);
 
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("No deployment found for id = '" + deploymentId + "'", Deployment.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetJobRetriesCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetJobRetriesCmd.java
index 3d7e687e031a31e5529d580e67595a991166845a..2d2f2f9e3476e85d66c1f69302e8c6e289925648 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetJobRetriesCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetJobRetriesCmd.java
@@ -48,7 +48,7 @@ public class SetJobRetriesCmd implements Command<Void>, Serializable {
   }
 
   public Void execute(CommandContext commandContext) {
-    JobEntity job = commandContext.getJobEntityManager().findJobById(jobId);
+    JobEntity job = commandContext.getJobEntityManager().findById(jobId);
     if (job != null) {
       
       if (Activiti5Util.isActiviti5ProcessDefinitionId(commandContext, job.getProcessDefinitionId())) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionCategoryCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionCategoryCmd.java
index 20bee5d6d209563403c636833efec862a03b07ad..93956116f594b4a1b13187faa465ab151324142b 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionCategoryCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionCategoryCmd.java
@@ -44,7 +44,7 @@ public class SetProcessDefinitionCategoryCmd implements Command<Void> {
       throw new ActivitiIllegalArgumentException("Process definition id is null");
     }
 
-    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+    ProcessDefinitionEntity processDefinition = commandContext.getProcessDefinitionEntityManager().findById(processDefinitionId);
 
     if (processDefinition == null) {
       throw new ActivitiObjectNotFoundException("No process definition found for id = '" + processDefinitionId + "'", ProcessDefinition.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionVersionCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionVersionCmd.java
index f0a530560fdf90e2493ec967b90a29cdcbe8987d..dda22e0aab53a098ecf228cbf7f6116be85579ea 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionVersionCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessDefinitionVersionCmd.java
@@ -75,7 +75,7 @@ public class SetProcessDefinitionVersionCmd implements Command<Void>, Serializab
     // same
     // process definition that the process instance is using
     ExecutionEntityManager executionManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionManager.findById(processInstanceId);
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id = '" + processInstanceId + "'.", ProcessInstance.class);
     } else if (!processInstance.isProcessInstanceType()) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceBusinessKeyCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceBusinessKeyCmd.java
index fde64422959a7f2a67b3069309ab7080722c424c..703460ef05c7cab1ac1fb02d4ed903bc29bd7cce 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceBusinessKeyCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceBusinessKeyCmd.java
@@ -50,7 +50,7 @@ public class SetProcessInstanceBusinessKeyCmd implements Command<Void>, Serializ
 
   public Void execute(CommandContext commandContext) {
     ExecutionEntityManager executionManager = commandContext.getExecutionEntityManager();
-    ExecutionEntity processInstance = executionManager.findExecutionById(processInstanceId);
+    ExecutionEntity processInstance = executionManager.findById(processInstanceId);
     if (processInstance == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id = '" + processInstanceId + "'.", ProcessInstance.class);
     } else if (!processInstance.isProcessInstanceType()) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceNameCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceNameCmd.java
index d21e37f1c2394c04be3bf4b17913564a2e5d6d6b..a39c6ad80ea835a42f29e582cb82e1f89d82c7cc 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceNameCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetProcessInstanceNameCmd.java
@@ -40,7 +40,7 @@ public class SetProcessInstanceNameCmd implements Command<Void>, Serializable {
       throw new ActivitiIllegalArgumentException("processInstanceId is null");
     }
 
-    ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(processInstanceId);
+    ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("process instance " + processInstanceId + " doesn't exist", ProcessInstance.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetUserPictureCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetUserPictureCmd.java
index ba91b9beec8da46f05d7ed20078439969f892645..1031aa92deb5b4c2f5071a72f630d4b5aa8b5339 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetUserPictureCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SetUserPictureCmd.java
@@ -40,7 +40,7 @@ public class SetUserPictureCmd implements Command<Object>, Serializable {
     if (userId == null) {
       throw new ActivitiIllegalArgumentException("userId is null");
     }
-    User user = commandContext.getUserEntityManager().findUserById(userId);
+    User user = commandContext.getUserEntityManager().findById(userId);
     if (user == null) {
       throw new ActivitiObjectNotFoundException("user " + userId + " doesn't exist", User.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SignalEventReceivedCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SignalEventReceivedCmd.java
index a35e67e2798b4eaa63d322787f08ac92f1fb2cb7..8c0a0e6213ca4c6e8ee726bcea7c61433725ad27 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SignalEventReceivedCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/SignalEventReceivedCmd.java
@@ -73,7 +73,7 @@ public class SignalEventReceivedCmd implements Command<Void> {
       signalEvents = eventSubscriptionEntityManager.findSignalEventSubscriptionsByEventName(eventName, tenantId);
     } else {
 
-      ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+      ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
       if (execution == null) {
         throw new ActivitiObjectNotFoundException("Cannot find execution with id '" + executionId + "'", Execution.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/UnlockExclusiveJobCmd.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/UnlockExclusiveJobCmd.java
index e8bab9048ddfbd910b23d4678f1bd3b21bb19b08..96c2ac715675737894d9f7d55e463de36482ea33 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/UnlockExclusiveJobCmd.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/UnlockExclusiveJobCmd.java
@@ -50,7 +50,7 @@ public class UnlockExclusiveJobCmd implements Command<Object>, Serializable {
 
     if (job.isExclusive()) {
       if (job.getProcessInstanceId() != null) {
-        ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(job.getProcessInstanceId());
+        ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(job.getProcessInstanceId());
         if (execution != null) {
           commandContext.getExecutionEntityManager().clearProcessInstanceLockTime(execution.getId());
         } 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/context/ExecutionContext.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/context/ExecutionContext.java
index fe123b52c34c93ed68ebdf66206bce603db6d834..a0ad82a513dd0a4b0612ddd84e22afca16276ec3 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/context/ExecutionContext.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/context/ExecutionContext.java
@@ -43,7 +43,7 @@ public class ExecutionContext {
 
   public DeploymentEntity getDeployment() {
     String deploymentId = getProcessDefinition().getDeploymentId();
-    DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findDeploymentById(deploymentId);
+    DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findById(deploymentId);
     return deployment;
   }
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/AbstractEventHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/AbstractEventHandler.java
index d931a775470dd9d0f14a3f54acaff07a011db969..4fe1a1c8bd9e6f661a1c3aced7568e0e770c52c2 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/AbstractEventHandler.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/AbstractEventHandler.java
@@ -101,7 +101,7 @@ public abstract class AbstractEventHandler implements EventHandler {
     
     if (flowNode instanceof SubProcess) {
       // The parent of the boundary event execution will be the one on which the boundary event is set
-      ExecutionEntity parentExecutionEntity = commandContext.getExecutionEntityManager().findExecutionById(boundaryEventExecution.getParentId());
+      ExecutionEntity parentExecutionEntity = commandContext.getExecutionEntityManager().findById(boundaryEventExecution.getParentId());
       if (parentExecutionEntity != null) {
         dispatchActivityCancelledForChildExecution(eventSubscription, parentExecutionEntity, boundaryEventExecution, commandContext);
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/CompensationEventHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/CompensationEventHandler.java
index 7f0dfad284df08b90ae2098974308fdb0d15abfa..6bf6596f8ca3c3b92861904c1597f3ba7354931c 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/CompensationEventHandler.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/event/CompensationEventHandler.java
@@ -45,7 +45,7 @@ public class CompensationEventHandler implements EventHandler {
       throw new ActivitiException("Compensating execution not set for compensate event subscription with id " + eventSubscription.getId());
     }
 
-    ExecutionEntity compensatingExecution = commandContext.getExecutionEntityManager().findExecutionById(configuration);
+    ExecutionEntity compensatingExecution = commandContext.getExecutionEntityManager().findById(configuration);
 
     String processDefinitionId = compensatingExecution.getProcessDefinitionId();
     Process process = ProcessDefinitionUtil.getProcess(processDefinitionId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java
index 1677dea1b659dddbc7fd6a3d4c6c18d64fc2b918..8fca8701c1e9fb726b17fff71fb8cac3804e80c8 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/history/DefaultHistoryManager.java
@@ -96,7 +96,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   public void recordProcessInstanceEnd(String processInstanceId, String deleteReason, String activityId) {
 
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
       if (historicProcessInstance != null) {
         historicProcessInstance.markEnded(deleteReason);
@@ -108,7 +108,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   @Override
   public void recordProcessInstanceNameChange(String processInstanceId, String newName) {
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
 
       if (historicProcessInstance != null) {
         historicProcessInstance.setName(newName);
@@ -373,7 +373,7 @@ public class DefaultHistoryManager extends AbstractManager implements HistoryMan
   @Override
   public void recordProcessDefinitionChange(String processInstanceId, String processDefinitionId) {
     if (isHistoryLevelAtLeast(HistoryLevel.ACTIVITY)) {
-      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findHistoricProcessInstance(processInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = getHistoricProcessInstanceEntityManager().findById(processInstanceId);
       if (historicProcessInstance != null) {
         historicProcessInstance.setProcessDefinitionId(processDefinitionId);
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java
index bb097b28a4936ad7d09381be6945462af9d1e6db..6bda3c5e914b8255d069dbe89204a0a9b1200371 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/jobexecutor/ProcessEventJobHandler.java
@@ -36,7 +36,7 @@ public class ProcessEventJobHandler implements JobHandler {
     EventSubscriptionEntityManager eventSubscriptionEntityManager = commandContext.getEventSubscriptionEntityManager();
     
     // lookup subscription:
-    EventSubscriptionEntity eventSubscriptionEntity = eventSubscriptionEntityManager.getEntity(configuration);
+    EventSubscriptionEntity eventSubscriptionEntity = eventSubscriptionEntityManager.findById(configuration);
 
     // if event subscription is null, ignore
     if (eventSubscriptionEntity != null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java
index 6c1cd37e2d131c5324c6557c2f7059c37552d51c..035fa1d6c52047239d3a65cab149810d4866d922 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/deploy/DeploymentManager.java
@@ -63,7 +63,7 @@ public class DeploymentManager {
     ProcessDefinitionEntity processDefinition = cacheEntry != null ? cacheEntry.getProcessDefinitionEntity() : null;
 
     if (processDefinition == null) {
-      processDefinition = Context.getCommandContext().getProcessDefinitionEntityManager().findProcessDefinitionById(processDefinitionId);
+      processDefinition = Context.getCommandContext().getProcessDefinitionEntityManager().findById(processDefinitionId);
       if (processDefinition == null) {
         throw new ActivitiObjectNotFoundException("no deployed process definition found with id '" + processDefinitionId + "'", ProcessDefinition.class);
       }
@@ -111,7 +111,7 @@ public class DeploymentManager {
     ProcessDefinitionCacheEntry cachedProcessDefinition = processDefinitionCache.get(processDefinitionId);
 
     if (cachedProcessDefinition == null) {
-      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findDeploymentById(deploymentId);
+      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findById(deploymentId);
       deployment.setNew(false);
       deploy(deployment, null);
       cachedProcessDefinition = processDefinitionCache.get(processDefinitionId);
@@ -127,7 +127,7 @@ public class DeploymentManager {
     CommandContext commandContext = Context.getCommandContext();
     DeploymentEntityManager deploymentEntityManager = commandContext.getDeploymentEntityManager();
 
-    DeploymentEntity deployment = deploymentEntityManager.findDeploymentById(deploymentId);
+    DeploymentEntity deployment = deploymentEntityManager.findById(deploymentId);
     if (deployment == null) {
       throw new ActivitiObjectNotFoundException("Could not find a deployment with id '" + deploymentId + "'.", DeploymentEntity.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AbstractEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AbstractEntityManager.java
index 12bb19ec6cc3222535b36e72e1a2bbf2cab5a2dc..c0b588f0168be43c2490555946ccbd7163088f9f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AbstractEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AbstractEntityManager.java
@@ -50,7 +50,7 @@ public class AbstractEntityManager<Entity extends PersistentObject> extends Abst
   
   @Override
   public void delete(String id) {
-    Entity entity = getEntity(id);
+    Entity entity = findById(id);
     delete(entity);
   }
   
@@ -73,22 +73,21 @@ public class AbstractEntityManager<Entity extends PersistentObject> extends Abst
    */
 
   @Override
-  public Entity getEntity(String entityId) {
+  public Entity findById(String entityId) {
 
     // Cache
-    for (Entity cachedEntity : getPersistentObjectCache().findInCache(getManagedPersistentObject())) {
-      if (entityId.equals(cachedEntity.getId())) {
-        return cachedEntity;
-      }
+    Entity cachedEntity = getPersistentObjectCache().findInCache(getManagedPersistentObject(), entityId);
+    if (cachedEntity != null) {
+      return cachedEntity;
     }
-
+    
     // Database
     return getDbSqlSession().selectById(getManagedPersistentObject(), entityId);
   }
   
   @Override
   @SuppressWarnings("unchecked")
-  public Entity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher) {
+  public Entity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher) {
     // Cache
     for (Entity cachedEntity : getPersistentObjectCache().findInCache(getManagedPersistentObject())) {
       if (cachedEntityMatcher.isRetained(cachedEntity)) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AttachmentEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AttachmentEntityManagerImpl.java
index b82ae8175952f8c629053b3c8337c8c9f3477a96..4306dc751aa76149c64cdc23280956b078e1e1b7 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AttachmentEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/AttachmentEntityManagerImpl.java
@@ -27,6 +27,11 @@ import org.activiti.engine.task.Task;
  */
 public class AttachmentEntityManagerImpl extends AbstractEntityManager<AttachmentEntity> implements AttachmentEntityManager {
 
+  @Override
+  public Class<AttachmentEntity> getManagedPersistentObject() {
+    return AttachmentEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public List<Attachment> findAttachmentsByProcessInstanceId(String processInstanceId) {
@@ -55,7 +60,7 @@ public class AttachmentEntityManagerImpl extends AbstractEntityManager<Attachmen
     if (dispatchEvents && attachments != null && !attachments.isEmpty()) {
       // Forced to fetch the task to get hold of the process definition
       // for event-dispatching, if available
-      Task task = getTaskEntityManager().findTaskById(taskId);
+      Task task = getTaskEntityManager().findById(taskId);
       if (task != null) {
         processDefinitionId = task.getProcessDefinitionId();
         processInstanceId = task.getProcessInstanceId();
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManager.java
index 44552c1dadedf45fc94f5df9a0f8665a2134c6ea..0e523cd2f390654f8890cceb26e00d7af9175297 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManager.java
@@ -21,8 +21,6 @@ public interface ByteArrayEntityManager extends EntityManager<ByteArrayEntity> {
 
   ByteArrayEntity createAndInsert(String name, byte[] bytes);
 
-  ByteArrayEntity findById(String byteArrayEntityId);
-
   /**
    * Deletes the {@link ByteArrayEntity} with the given id from the database. 
    * Important: this operation will NOT do any optimistic locking, to avoid loading the bytes in memory. So use this method
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManagerImpl.java
index bae9aae7a7369d74de62fde9b82314a7dfc254dd..bedcae67450b19b43fb9371f91773751f43c52c4 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ByteArrayEntityManagerImpl.java
@@ -19,6 +19,11 @@ package org.activiti.engine.impl.persistence.entity;
  * @author Marcus Klimstra (CGI)
  */
 public class ByteArrayEntityManagerImpl extends AbstractEntityManager<ByteArrayEntity> implements ByteArrayEntityManager {
+   
+  @Override
+  public Class<ByteArrayEntity> getManagedPersistentObject() {
+    return ByteArrayEntity.class;
+  }
   
   @Override
   public ByteArrayEntity createAndInsert(byte[] bytes) {
@@ -32,11 +37,6 @@ public class ByteArrayEntityManagerImpl extends AbstractEntityManager<ByteArrayE
     return byteArrayEntity;
   }
 
-  @Override
-  public ByteArrayEntity findById(String byteArrayEntityId) {
-    return getDbSqlSession().selectById(ByteArrayEntity.class, byteArrayEntityId);
-  }
-
   @Override
   public void deleteByteArrayById(String byteArrayEntityId) {
     getDbSqlSession().delete("deleteByteArrayNoRevisionCheck", byteArrayEntityId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManager.java
index 5f0be5a36825a41e1b90d9def929e306777cc807..293c1d85f4f18eceaa6c8886e66c4b8fb092d24b 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManager.java
@@ -22,8 +22,6 @@ import org.activiti.engine.task.Event;
  */
 public interface CommentEntityManager extends EntityManager<CommentEntity> {
 
-  void insert(CommentEntity commentEntity);
-
   List<Comment> findCommentsByTaskId(String taskId);
 
   List<Comment> findCommentsByTaskIdAndType(String taskId, String type);
@@ -46,6 +44,4 @@ public interface CommentEntityManager extends EntityManager<CommentEntity> {
 
   Event findEvent(String commentId);
 
-  void delete(CommentEntity commentEntity);
-
 }
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManagerImpl.java
index 5833b42c80c597e447b2a182db76ab1cf8ee7a44..5d2f4b8034671bcea501363c5350e7ceed689720 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/CommentEntityManagerImpl.java
@@ -29,6 +29,11 @@ import org.activiti.engine.task.Event;
  */
 public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntity> implements CommentEntityManager {
 
+  @Override
+  public Class<CommentEntity> getManagedPersistentObject() {
+    return CommentEntity.class;
+  }
+  
   @Override
   public void insert(CommentEntity commentEntity) {
     checkHistoryEnabled();
@@ -41,7 +46,7 @@ public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntit
       String processDefinitionId = null;
       String processInstanceId = comment.getProcessInstanceId();
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity process = getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity process = getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }
@@ -142,7 +147,7 @@ public class CommentEntityManagerImpl extends AbstractEntityManager<CommentEntit
       String processDefinitionId = null;
       String processInstanceId = comment.getProcessInstanceId();
       if (comment.getProcessInstanceId() != null) {
-        ExecutionEntity process = getExecutionEntityManager().findExecutionById(comment.getProcessInstanceId());
+        ExecutionEntity process = getExecutionEntityManager().findById(comment.getProcessInstanceId());
         if (process != null) {
           processDefinitionId = process.getProcessDefinitionId();
         }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java
index 60b7f0eaae850c4f08f28b30611d29361d3b4927..2565a273b1871656b3fde4a822e697fa86cecd95 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManager.java
@@ -24,12 +24,8 @@ import org.activiti.engine.repository.Deployment;
  */
 public interface DeploymentEntityManager extends EntityManager<DeploymentEntity> {
 
-  void insertDeployment(DeploymentEntity deployment);
-
   DeploymentEntity findLatestDeploymentByName(String deploymentName);
 
-  DeploymentEntity findDeploymentById(String deploymentId);
-
   List<Deployment> findDeploymentsByQueryCriteria(DeploymentQueryImpl deploymentQuery, Page page);
 
   List<String> getDeploymentResourceNames(String deploymentId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManagerImpl.java
index 8a3624e6362631d41a6d5f31f061123a58eae523..bd9557c153cf4b562523f630a5bb507032d7d4b0 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/DeploymentEntityManagerImpl.java
@@ -42,7 +42,12 @@ import org.apache.commons.collections.CollectionUtils;
 public class DeploymentEntityManagerImpl extends AbstractEntityManager<DeploymentEntity> implements DeploymentEntityManager {
 
   @Override
-  public void insertDeployment(DeploymentEntity deployment) {
+  public Class<DeploymentEntity> getManagedPersistentObject() {
+    return DeploymentEntity.class;
+  }
+  
+  @Override
+  public void insert(DeploymentEntity deployment) {
     getDbSqlSession().insert(deployment);
 
     for (ResourceEntity resource : deployment.getResources().values()) {
@@ -187,11 +192,6 @@ public class DeploymentEntityManagerImpl extends AbstractEntityManager<Deploymen
     return null;
   }
 
-  @Override
-  public DeploymentEntity findDeploymentById(String deploymentId) {
-    return (DeploymentEntity) getDbSqlSession().selectOne("selectDeploymentById", deploymentId);
-  }
-
   @Override
   public long findDeploymentCountByQueryCriteria(DeploymentQueryImpl deploymentQuery) {
     return (Long) getDbSqlSession().selectOne("selectDeploymentCountByQueryCriteria", deploymentQuery);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EntityManager.java
index d1443ae751adeace7324891bae548b7b276d72d7..23dd9c363139f6c5fa8762162d6d3ea817ec84ac 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EntityManager.java
@@ -26,9 +26,9 @@ public interface EntityManager<Entity extends PersistentObject> {
 
   void insert(Entity entity, boolean fireCreateEvent);
 
-  Entity getEntity(String entityId);
+  Entity findById(String entityId);
 
-  Entity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher);
+  Entity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<Entity> cachedEntityMatcher);
 
   /**
    * Gets a list by querying the database and the cache using {@link CachedPersistentObjectMatcher}.
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventLogEntryEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventLogEntryEntityManagerImpl.java
index f5fa1ef4b21caecde55b8302c3d2aa91ec06582d..d8a9385663e18846e927afa35982e87611ff724f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventLogEntryEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventLogEntryEntityManagerImpl.java
@@ -24,6 +24,11 @@ import org.activiti.engine.event.EventLogEntry;
  */
 public class EventLogEntryEntityManagerImpl extends AbstractEntityManager<EventLogEntryEntity> implements EventLogEntryEntityManager {
 
+  @Override
+  public Class<EventLogEntryEntity> getManagedPersistentObject() {
+    return EventLogEntryEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public List<EventLogEntry> findAllEventLogEntries() {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntity.java
index 5298fce83b2fa42653dc32a7cda74ad62edfbe2f..309adb1af3e8bd98fd9cfa712c9bebeb324c046f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntity.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/EventSubscriptionEntity.java
@@ -104,7 +104,7 @@ public abstract class EventSubscriptionEntity implements PersistentObject, HasRe
   
   public ExecutionEntity getExecution() {
     if (execution == null && executionId != null) {
-      execution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(executionId);
+      execution = Context.getCommandContext().getExecutionEntityManager().findById(executionId);
     }
     return execution;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
index 67f4e88b216f9ce317ed5672f56a8e22a8c5d289..6826ea0c5e4e00a5b98a4c9364711e717f2777e7 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntity.java
@@ -318,7 +318,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureProcessInstanceInitialized() {
     if ((processInstance == null) && (processInstanceId != null)) {
-      processInstance = Context.getCommandContext().getExecutionEntityManager().findExecutionById(processInstanceId);
+      processInstance = Context.getCommandContext().getExecutionEntityManager().findById(processInstanceId);
     }
   }
 
@@ -343,7 +343,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureParentInitialized() {
     if (parent == null && parentId != null) {
-      parent = Context.getCommandContext().getExecutionEntityManager().findExecutionById(parentId);
+      parent = Context.getCommandContext().getExecutionEntityManager().findById(parentId);
     }
   }
 
@@ -383,7 +383,7 @@ public class ExecutionEntity extends VariableScopeImpl
 
   protected void ensureSuperExecutionInitialized() {
     if (superExecution == null && superExecutionId != null) {
-      superExecution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(superExecutionId);
+      superExecution = Context.getCommandContext().getExecutionEntityManager().findById(superExecutionId);
     }
   }
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
index c213aff172993f881a6b2778f5bca9cc6830e949..285c805927a187ae9ee6a0d0921bd2346087ded6 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManager.java
@@ -39,8 +39,6 @@ public interface ExecutionEntityManager extends EntityManager<ExecutionEntity> {
 
   List<ExecutionEntity> findChildExecutionsByProcessInstanceId(String processInstanceId);
 
-  ExecutionEntity findExecutionById(String executionId);
-
   List<ExecutionEntity> findExecutionsByParentExecutionAndActivityIds(String parentExecutionId, Collection<String> activityIds);
 
   long findExecutionCountByQueryCriteria(ExecutionQueryImpl executionQuery);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
index 64a4b3c2d1404fa3527566e26427466937c63031..05368ed3639dac66f35e68fb9e72c87a83c5d8ac 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ExecutionEntityManagerImpl.java
@@ -58,7 +58,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
 
   @Override
   public ExecutionEntity findSubProcessInstanceBySuperExecutionId(final String superExecutionId) {
-    return getEntity("selectSubProcessInstanceBySuperExecutionId", superExecutionId, new CachedPersistentObjectMatcher<ExecutionEntity>() {
+    return findByQuery("selectSubProcessInstanceBySuperExecutionId", superExecutionId, new CachedPersistentObjectMatcher<ExecutionEntity>() {
 
       public boolean isRetained(ExecutionEntity executionEntity) {
         return executionEntity.getSuperExecutionId() != null && superExecutionId.equals(executionEntity.getSuperExecutionId());
@@ -87,11 +87,6 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
     }, true);
   }
 
-  @Override
-  public ExecutionEntity findExecutionById(final String executionId) {
-    return getEntity(executionId);
-  }
-  
   @Override
   public List<ExecutionEntity> findExecutionsByParentExecutionAndActivityIds(final String parentExecutionId, final Collection<String> activityIds) {
     
@@ -362,7 +357,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
 
   @Override
   public void deleteProcessInstance(String processInstanceId, String deleteReason, boolean cascade) {
-    ExecutionEntity execution = findExecutionById(processInstanceId);
+    ExecutionEntity execution = findById(processInstanceId);
 
     if (execution == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
@@ -408,7 +403,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
     deleteExecutionAndRelatedData(execution, deleteReason, false);
 
     if (deleteHistory) {
-      getHistoricProcessInstanceEntityManager().deleteHistoricProcessInstanceById(execution.getId());
+      getHistoricProcessInstanceEntityManager().delete(execution.getId());
     }
   }
   
@@ -422,7 +417,7 @@ public class ExecutionEntityManagerImpl extends AbstractEntityManager<ExecutionE
   public void deleteProcessInstanceExecutionEntity(String processInstanceId, 
       String currentFlowElementId, String deleteReason, boolean cascade, boolean cancel, boolean fireEvent) {
     
-    ExecutionEntity processInstanceEntity = findExecutionById(processInstanceId);
+    ExecutionEntity processInstanceEntity = findById(processInstanceId);
     
     if (processInstanceEntity == null) {
       throw new ActivitiObjectNotFoundException("No process instance found for id '" + processInstanceId + "'", ProcessInstance.class);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManager.java
index daed5bea60ace74183a480cca2e313cf139a681e..97f56985570a16f73a85a63115b88ed636e11723 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManager.java
@@ -28,12 +28,8 @@ public interface GroupEntityManager extends EntityManager<GroupEntity> {
 
   Group createNewGroup(String groupId);
 
-  void insertGroup(Group group);
-
   void updateGroup(Group updatedGroup);
 
-  void deleteGroup(String groupId);
-
   GroupQuery createNewGroupQuery();
 
   List<Group> findGroupByQueryCriteria(GroupQueryImpl query, Page page);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManagerImpl.java
index eb2380e382218328a87c0b1c503d77779817edd3..6db4224948ea8100bfbb88df087be37321c67e0a 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/GroupEntityManagerImpl.java
@@ -22,7 +22,6 @@ import org.activiti.engine.identity.Group;
 import org.activiti.engine.identity.GroupQuery;
 import org.activiti.engine.impl.GroupQueryImpl;
 import org.activiti.engine.impl.Page;
-import org.activiti.engine.impl.db.PersistentObject;
 
 /**
  * @author Tom Baeyens
@@ -31,19 +30,15 @@ import org.activiti.engine.impl.db.PersistentObject;
  */
 public class GroupEntityManagerImpl extends AbstractEntityManager<GroupEntity> implements GroupEntityManager {
 
+  @Override
+  public Class<GroupEntity> getManagedPersistentObject() {
+    return GroupEntity.class;
+  }
+  
   public Group createNewGroup(String groupId) {
     return new GroupEntity(groupId);
   }
 
-  public void insertGroup(Group group) {
-    getDbSqlSession().insert((PersistentObject) group);
-
-    if (getEventDispatcher().isEnabled()) {
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, group));
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_INITIALIZED, group));
-    }
-  }
-
   public void updateGroup(Group updatedGroup) {
     getDbSqlSession().update((GroupEntity) updatedGroup);
 
@@ -51,8 +46,9 @@ public class GroupEntityManagerImpl extends AbstractEntityManager<GroupEntity> i
       getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_UPDATED, updatedGroup));
     }
   }
-
-  public void deleteGroup(String groupId) {
+  
+  @Override
+  public void delete(String groupId) {
     GroupEntity group = getDbSqlSession().selectById(GroupEntity.class, groupId);
 
     if (group != null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
index 6269b04d10f16851b35db1cfa262243b298b382f..1ca08014f859fe3ff58c7e234a20c5e6653ff590 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManager.java
@@ -23,8 +23,6 @@ import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
  */
 public interface HistoricProcessInstanceEntityManager extends EntityManager<HistoricProcessInstanceEntity> {
 
-  HistoricProcessInstanceEntity findHistoricProcessInstance(String processInstanceId);
-
   long findHistoricProcessInstanceCountByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
 
   List<HistoricProcessInstance> findHistoricProcessInstancesByQueryCriteria(HistoricProcessInstanceQueryImpl historicProcessInstanceQuery);
@@ -35,8 +33,6 @@ public interface HistoricProcessInstanceEntityManager extends EntityManager<Hist
 
   long findHistoricProcessInstanceCountByNativeQuery(Map<String, Object> parameterMap);
   
-  void deleteHistoricProcessInstanceById(String historicProcessInstanceId);
-
   void deleteHistoricProcessInstanceByProcessDefinitionId(String processDefinitionId);
 
 }
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
index 1d57829c39fe489799b741beca4689e13aceca0a..9db928dcd1b9eb6721bb95e9697e046da7bb91c2 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricProcessInstanceEntityManagerImpl.java
@@ -27,13 +27,10 @@ import org.activiti.engine.impl.HistoricProcessInstanceQueryImpl;
 public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityManager<HistoricProcessInstanceEntity> implements HistoricProcessInstanceEntityManager {
 
   @Override
-  public HistoricProcessInstanceEntity findHistoricProcessInstance(String processInstanceId) {
-    if (getHistoryManager().isHistoryEnabled()) {
-      return (HistoricProcessInstanceEntity) getDbSqlSession().selectById(HistoricProcessInstanceEntity.class, processInstanceId);
-    }
-    return null;
+  public Class<HistoricProcessInstanceEntity> getManagedPersistentObject() {
+    return HistoricProcessInstanceEntity.class;
   }
-
+  
   @Override
   @SuppressWarnings("unchecked")
   public void deleteHistoricProcessInstanceByProcessDefinitionId(String processDefinitionId) {
@@ -41,16 +38,15 @@ public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityMana
       List<String> historicProcessInstanceIds = getDbSqlSession().selectList("selectHistoricProcessInstanceIdsByProcessDefinitionId", processDefinitionId);
 
       for (String historicProcessInstanceId : historicProcessInstanceIds) {
-        deleteHistoricProcessInstanceById(historicProcessInstanceId);
+        delete(historicProcessInstanceId);
       }
     }
   }
-
+  
   @Override
-  @SuppressWarnings("unchecked")
-  public void deleteHistoricProcessInstanceById(String historicProcessInstanceId) {
+  public void delete(String historicProcessInstanceId) {
     if (getHistoryManager().isHistoryEnabled()) {
-      HistoricProcessInstanceEntity historicProcessInstance = findHistoricProcessInstance(historicProcessInstanceId);
+      HistoricProcessInstanceEntity historicProcessInstance = findById(historicProcessInstanceId);
 
       getHistoricDetailEntityManager().deleteHistoricDetailsByProcessInstanceId(historicProcessInstanceId);
       getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstanceByProcessInstanceId(historicProcessInstanceId);
@@ -67,7 +63,7 @@ public class HistoricProcessInstanceEntityManagerImpl extends AbstractEntityMana
 
       List<HistoricProcessInstance> selectList = getDbSqlSession().selectList("selectHistoricProcessInstancesByQueryCriteria", subProcessesQueryImpl);
       for (HistoricProcessInstance child : selectList) {
-        deleteHistoricProcessInstanceById(child.getId());
+        delete(child.getId());
       }
     }
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java
index eccedac14c16e9f0ad81c13ece30c7bc344c9171..becc8f9abb0fcc1a54113e54d7d67525d3795a28 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManager.java
@@ -29,14 +29,10 @@ public interface HistoricTaskInstanceEntityManager extends EntityManager<Histori
 
   List<HistoricTaskInstance> findHistoricTaskInstancesAndVariablesByQueryCriteria(HistoricTaskInstanceQueryImpl historicTaskInstanceQuery);
 
-  HistoricTaskInstanceEntity findHistoricTaskInstanceById(String taskId);
-
   List<HistoricTaskInstance> findHistoricTaskInstancesByNativeQuery(Map<String, Object> parameterMap, int firstResult, int maxResults);
 
   long findHistoricTaskInstanceCountByNativeQuery(Map<String, Object> parameterMap);
   
-  void deleteHistoricTaskInstanceById(String taskId);
-  
   void deleteHistoricTaskInstancesByProcessInstanceId(String processInstanceId);
 
 }
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManagerImpl.java
index 623afc6c6501ce5ed4b0c486cf43cd6a1f216ea6..65a43beff3a52eae65480c40313f8cfc5758ff65 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/HistoricTaskInstanceEntityManagerImpl.java
@@ -17,12 +17,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.compatibility.Activiti5CompatibilityHandler;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.HistoricTaskInstanceQueryImpl;
 import org.activiti.engine.impl.history.HistoryLevel;
-import org.activiti.engine.impl.interceptor.CommandContext;
 import org.activiti.engine.impl.util.Activiti5Util;
 
 /**
@@ -31,13 +29,18 @@ import org.activiti.engine.impl.util.Activiti5Util;
  */
 public class HistoricTaskInstanceEntityManagerImpl extends AbstractEntityManager<HistoricTaskInstanceEntity> implements HistoricTaskInstanceEntityManager {
 
+  @Override
+  public Class<HistoricTaskInstanceEntity> getManagedPersistentObject() {
+    return HistoricTaskInstanceEntity.class;
+  }
+  
   @Override
   @SuppressWarnings("unchecked")
   public void deleteHistoricTaskInstancesByProcessInstanceId(String processInstanceId) {
     if (getHistoryManager().isHistoryLevelAtLeast(HistoryLevel.AUDIT)) {
       List<String> taskInstanceIds = (List<String>) getDbSqlSession().selectList("selectHistoricTaskInstanceIdsByProcessInstanceId", processInstanceId);
       for (String taskInstanceId : taskInstanceIds) {
-        deleteHistoricTaskInstanceById(taskInstanceId);
+        delete(taskInstanceId);
       }
     }
   }
@@ -98,34 +101,23 @@ public class HistoricTaskInstanceEntityManagerImpl extends AbstractEntityManager
   }
 
   @Override
-  public HistoricTaskInstanceEntity findHistoricTaskInstanceById(String taskId) {
-    if (taskId == null) {
-      throw new ActivitiIllegalArgumentException("Invalid historic task id : null");
-    }
-    if (getHistoryManager().isHistoryEnabled()) {
-      return (HistoricTaskInstanceEntity) getDbSqlSession().selectOne("selectHistoricTaskInstance", taskId);
-    }
-    return null;
-  }
-
-  @Override
-  public void deleteHistoricTaskInstanceById(String taskId) {
+  public void delete(String id) {
     if (getHistoryManager().isHistoryEnabled()) {
-      HistoricTaskInstanceEntity historicTaskInstance = findHistoricTaskInstanceById(taskId);
+      HistoricTaskInstanceEntity historicTaskInstance = findById(id);
       if (historicTaskInstance != null) {
         
         if (historicTaskInstance.getProcessDefinitionId() != null 
             && Activiti5Util.isActiviti5ProcessDefinitionId(getCommandContext(), historicTaskInstance.getProcessDefinitionId())) {
           Activiti5CompatibilityHandler activiti5CompatibilityHandler = Activiti5Util.getActiviti5CompatibilityHandler(); 
-          activiti5CompatibilityHandler.deleteHistoricTask(taskId);
+          activiti5CompatibilityHandler.deleteHistoricTask(id);
           return;
         }
 
-        getHistoricDetailEntityManager().deleteHistoricDetailsByTaskId(taskId);
-        getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstancesByTaskId(taskId);
-        getCommentEntityManager().deleteCommentsByTaskId(taskId);
-        getAttachmentEntityManager().deleteAttachmentsByTaskId(taskId);
-        getHistoricIdentityLinkEntityManager().deleteHistoricIdentityLinksByTaskId(taskId);
+        getHistoricDetailEntityManager().deleteHistoricDetailsByTaskId(id);
+        getHistoricVariableInstanceEntityManager().deleteHistoricVariableInstancesByTaskId(id);
+        getCommentEntityManager().deleteCommentsByTaskId(id);
+        getAttachmentEntityManager().deleteAttachmentsByTaskId(id);
+        getHistoricIdentityLinkEntityManager().deleteHistoricIdentityLinksByTaskId(id);
         
         getDbSqlSession().delete(historicTaskInstance);
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityInfoEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityInfoEntityManagerImpl.java
index c08e9b81ce74d27be1c9b89d11479b5211bd921e..6dd560991050d5137896a13b4477ef7ffe2255a7 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityInfoEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityInfoEntityManagerImpl.java
@@ -25,6 +25,11 @@ import java.util.Set;
  */
 public class IdentityInfoEntityManagerImpl extends AbstractEntityManager<IdentityInfoEntity> implements IdentityInfoEntityManager {
 
+  @Override
+  public Class<IdentityInfoEntity> getManagedPersistentObject() {
+    return IdentityInfoEntity.class;
+  }
+  
   @Override
   public void deleteUserInfoByUserIdAndKey(String userId, String key) {
     IdentityInfoEntity identityInfoEntity = findUserInfoByUserIdAndKey(userId, key);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntity.java
index 3ac0ab6bcf3d7b53f92f81c0aad3e3f1602c2804..de61fa6becf7fad1cd064b1ca5410d1235c5f2f2 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntity.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntity.java
@@ -149,7 +149,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public TaskEntity getTask() {
     if ((task == null) && (taskId != null)) {
-      this.task = Context.getCommandContext().getTaskEntityManager().findTaskById(taskId);
+      this.task = Context.getCommandContext().getTaskEntityManager().findById(taskId);
     }
     return task;
   }
@@ -161,7 +161,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public ExecutionEntity getProcessInstance() {
     if ((processInstance == null) && (processInstanceId != null)) {
-      this.processInstance = Context.getCommandContext().getExecutionEntityManager().findExecutionById(processInstanceId);
+      this.processInstance = Context.getCommandContext().getExecutionEntityManager().findById(processInstanceId);
     }
     return processInstance;
   }
@@ -173,7 +173,7 @@ public class IdentityLinkEntity implements Serializable, IdentityLink, BulkDelet
 
   public ProcessDefinitionEntity getProcessDef() {
     if ((processDef == null) && (processDefId != null)) {
-      this.processDef = Context.getCommandContext().getProcessDefinitionEntityManager().findProcessDefinitionById(processDefId);
+      this.processDef = Context.getCommandContext().getProcessDefinitionEntityManager().findById(processDefId);
     }
     return processDef;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntityManagerImpl.java
index 63ec751cc46b215673b1b897a77852589e65f6b9..cef07ba35a95d74cb38a40869c4a521325c1f29a 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/IdentityLinkEntityManagerImpl.java
@@ -30,6 +30,11 @@ import org.activiti.engine.task.IdentityLinkType;
  */
 public class IdentityLinkEntityManagerImpl extends AbstractEntityManager<IdentityLinkEntity> implements IdentityLinkEntityManager {
   
+  @Override
+  public Class<IdentityLinkEntity> getManagedPersistentObject() {
+    return IdentityLinkEntity.class;
+  }
+  
   @Override
   public void insert(IdentityLinkEntity entity, boolean fireCreateEvent) {
     super.insert(entity, fireCreateEvent);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManager.java
index 5840ea1e24fbe51eade657a0733b032d45485af6..4404d231e8a147afb4f73044d13d7c2a98fc3c10 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManager.java
@@ -33,8 +33,6 @@ public interface JobEntityManager extends EntityManager<JobEntity> {
   void retryAsyncJob(JobEntity job);
   
 
-  JobEntity findJobById(String jobId);
-
   List<JobEntity> findNextJobsToExecute(Page page);
 
   List<JobEntity> findNextTimerJobsToExecute(Page page);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManagerImpl.java
index 855bc6980f27ac1c65f573db3d7d5da4b809e397..d8816b5d402982ca1fe6de74b3631380b96372f8 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/JobEntityManagerImpl.java
@@ -75,7 +75,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
     // add link to execution
     if (jobEntity.getExecutionId() != null) {
-      ExecutionEntity execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      ExecutionEntity execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
       execution.getJobs().add(jobEntity);
 
       // Inherit tenant if (if applicable)
@@ -162,11 +162,6 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
     getCommandContext().getTransactionContext().addTransactionListener(TransactionState.COMMITTED, transactionListener);
   }
 
-  @Override
-  public JobEntity findJobById(String jobId) {
-    return (JobEntity) getDbSqlSession().selectOne("selectJob", jobId);
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public List<JobEntity> findNextJobsToExecute(Page page) {
@@ -298,7 +293,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
     // remove link to execution
     if (jobEntity.getExecutionId() != null) {
-      ExecutionEntity execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      ExecutionEntity execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
       execution.getJobs().remove(this);
     }
     
@@ -323,7 +318,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
     
     ExecutionEntity execution = null;
     if (jobEntity.getExecutionId() != null) {
-      execution = getExecutionEntityManager().findExecutionById(jobEntity.getExecutionId());
+      execution = getExecutionEntityManager().findById(jobEntity.getExecutionId());
     }
 
     Map<String, JobHandler> jobHandlers = getProcessEngineConfiguration().getJobHandlers();
@@ -389,7 +384,7 @@ public class JobEntityManagerImpl extends AbstractEntityManager<JobEntity> imple
 
         VariableScope executionEntity = null;
         if (timerEntity.getExecutionId() != null) {
-          executionEntity = getExecutionEntityManager().findExecutionById(timerEntity.getExecutionId());
+          executionEntity = getExecutionEntityManager().findById(timerEntity.getExecutionId());
         }
         
         if (executionEntity == null) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MembershipEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MembershipEntityManagerImpl.java
index 1365e2132eb4f3abcab6344fa7ab33c627658e78..2fdab30e8592eba0c4c0417180e26529e5c15dba 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MembershipEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/MembershipEntityManagerImpl.java
@@ -25,6 +25,11 @@ import org.activiti.engine.delegate.event.impl.ActivitiEventBuilder;
  */
 public class MembershipEntityManagerImpl extends AbstractEntityManager<MembershipEntity> implements MembershipEntityManager {
 
+  @Override
+  public Class<MembershipEntity> getManagedPersistentObject() {
+    return MembershipEntity.class;
+  }
+  
   public void createMembership(String userId, String groupId) {
     MembershipEntity membershipEntity = new MembershipEntity();
     membershipEntity.setUserId(userId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManager.java
index 84bfcd96f38111788ef522465c9bdb53e06317cc..e86ba280eed0d5606dc52a595b6dc96e85f7d9d7 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManager.java
@@ -30,8 +30,6 @@ public interface ModelEntityManager extends EntityManager<ModelEntity> {
 
   void insertEditorSourceExtraForModel(String modelId, byte[] modelSource);
 
-  ModelEntity findModelById(String modelId);
-  
   List<Model> findModelsByQueryCriteria(ModelQueryImpl query, Page page);
 
   long findModelCountByQueryCriteria(ModelQueryImpl query);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManagerImpl.java
index 19d625ab91934209c65ece8aae9f79f55e9791cf..45bac2caca0e4146c669cd6caed95df882d614b3 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ModelEntityManagerImpl.java
@@ -27,6 +27,11 @@ import org.activiti.engine.repository.Model;
  * @author Joram Barrez
  */
 public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> implements ModelEntityManager {
+  
+  @Override
+  public Class<ModelEntity> getManagedPersistentObject() {
+    return ModelEntity.class;
+  }
 
   @Override
   public Model createNewModel() {
@@ -61,7 +66,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public void insertEditorSourceForModel(String modelId, byte[] modelSource) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model != null) {
       ByteArrayRef ref = new ByteArrayRef(model.getEditorSourceValueId());
       ref.setValue("source", modelSource);
@@ -91,7 +96,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public void insertEditorSourceExtraForModel(String modelId, byte[] modelSource) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model != null) {
       ByteArrayRef ref = new ByteArrayRef(model.getEditorSourceExtraValueId());
       ref.setValue("source-extra", modelSource);
@@ -114,14 +119,9 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
     return (Long) getDbSqlSession().selectOne("selectModelCountByQueryCriteria", query);
   }
 
-  @Override
-  public ModelEntity findModelById(String modelId) {
-    return (ModelEntity) getDbSqlSession().selectOne("selectModel", modelId);
-  }
-
   @Override
   public byte[] findEditorSourceByModelId(String modelId) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model == null || model.getEditorSourceValueId() == null) {
       return null;
     }
@@ -132,7 +132,7 @@ public class ModelEntityManagerImpl extends AbstractEntityManager<ModelEntity> i
 
   @Override
   public byte[] findEditorSourceExtraByModelId(String modelId) {
-    ModelEntity model = findModelById(modelId);
+    ModelEntity model = findById(modelId);
     if (model == null || model.getEditorSourceExtraValueId() == null) {
       return null;
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManager.java
index 4e307dc469f06795f811285620287f7a2eb5012d..dd82d62efeace724bd51ef29de7a4e2375cc80ec 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManager.java
@@ -24,8 +24,6 @@ import org.activiti.engine.repository.ProcessDefinition;
  */
 public interface ProcessDefinitionEntityManager extends EntityManager<ProcessDefinitionEntity> {
 
-  ProcessDefinitionEntity findProcessDefinitionById(String processDefinitionId);
-  
   ProcessDefinitionEntity findLatestProcessDefinitionByKey(String processDefinitionKey);
 
   ProcessDefinitionEntity findLatestProcessDefinitionByKeyAndTenantId(String processDefinitionKey, String tenantId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManagerImpl.java
index d6de6a4a290d9f08cd1483a1b4d6636e9e11de32..38fcf7a0aaf4ed415812220473d82c17491a9621 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ProcessDefinitionEntityManagerImpl.java
@@ -30,6 +30,11 @@ import org.activiti.engine.repository.ProcessDefinition;
  */
 public class ProcessDefinitionEntityManagerImpl extends AbstractEntityManager<ProcessDefinitionEntity> implements ProcessDefinitionEntityManager {
 
+  @Override
+  public Class<ProcessDefinitionEntity> getManagedPersistentObject() {
+    return ProcessDefinitionEntity.class;
+  }
+  
   @Override
   public ProcessDefinitionEntity findLatestProcessDefinitionByKey(String processDefinitionKey) {
     return (ProcessDefinitionEntity) getDbSqlSession().selectOne("selectLatestProcessDefinitionByKey", processDefinitionKey);
@@ -48,11 +53,6 @@ public class ProcessDefinitionEntityManagerImpl extends AbstractEntityManager<Pr
     getDbSqlSession().delete("deleteProcessDefinitionsByDeploymentId", deploymentId);
   }
 
-  @Override
-  public ProcessDefinitionEntity findProcessDefinitionById(String processDefinitionId) {
-    return (ProcessDefinitionEntity) getDbSqlSession().selectOne("selectProcessDefinitionById", processDefinitionId);
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public List<ProcessDefinition> findProcessDefinitionsByQueryCriteria(ProcessDefinitionQueryImpl processDefinitionQuery, Page page) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManager.java
index 1cd04a8d52b8913044cf3189f444003d6ee21b0e..6843413954bdca3e375cae3179d63ee7bc5cb24f 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManager.java
@@ -17,6 +17,4 @@ package org.activiti.engine.impl.persistence.entity;
  */
 public interface PropertyEntityManager extends EntityManager<PropertyEntity> {
 
-  PropertyEntity findPropertyById(String propertyId);
-
 }
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManagerImpl.java
index db6c3e15171305cf7a186bc9f197d7a4d777a191..cbf31659d2c2e14fd6677f70194fe720c6c04782 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/PropertyEntityManagerImpl.java
@@ -20,8 +20,8 @@ package org.activiti.engine.impl.persistence.entity;
 public class PropertyEntityManagerImpl extends AbstractEntityManager<PropertyEntity> implements PropertyEntityManager {
 
   @Override
-  public PropertyEntity findPropertyById(String propertyId) {
-    return getDbSqlSession().selectById(PropertyEntity.class, propertyId);
+  public Class<PropertyEntity> getManagedPersistentObject() {
+    return PropertyEntity.class;
   }
-
+  
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntityManagerImpl.java
index 7b36304fb092fcbe3e5229e4c554e59ce2086895..7c221f1b1c99b1d352385de614f27559251ae0bd 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/ResourceEntityManagerImpl.java
@@ -22,6 +22,11 @@ import java.util.Map;
  * @author Joram Barrez
  */
 public class ResourceEntityManagerImpl extends AbstractEntityManager<ResourceEntity> implements ResourceEntityManager {
+  
+  @Override
+  public Class<ResourceEntity> getManagedPersistentObject() {
+    return ResourceEntity.class;
+  }
 
   @Override
   public void deleteResourcesByDeploymentId(String deploymentId) {
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java
index 80bca821b6684da8f61cf954d1ee13a1049b0c87..165156e552503f5215a43908f31d343d226edcdf 100755
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntity.java
@@ -215,7 +215,7 @@ public class TaskEntity extends VariableScopeImpl implements Task, DelegateTask,
 
   public ExecutionEntity getExecution() {
     if ((execution == null) && (executionId != null)) {
-      this.execution = Context.getCommandContext().getExecutionEntityManager().findExecutionById(executionId);
+      this.execution = Context.getCommandContext().getExecutionEntityManager().findById(executionId);
     }
     return execution;
   }
@@ -681,7 +681,7 @@ public class TaskEntity extends VariableScopeImpl implements Task, DelegateTask,
 
   public ExecutionEntity getProcessInstance() {
     if (processInstance == null && processInstanceId != null) {
-      processInstance = Context.getCommandContext().getExecutionEntityManager().findExecutionById(processInstanceId);
+      processInstance = Context.getCommandContext().getExecutionEntityManager().findById(processInstanceId);
     }
     return processInstance;
   }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java
index f0ece41a8e174ed90d37ad7a3f459f5123b1a1ae..34887af162d55c19da65ef026a6ef27b24d5f1b1 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManager.java
@@ -20,8 +20,6 @@ public interface TaskEntityManager extends EntityManager<TaskEntity> {
 
   void insert(TaskEntity taskEntity, ExecutionEntity execution);
 
-  TaskEntity findTaskById(String id);
-
   List<TaskEntity> findTasksByExecutionId(String executionId);
 
   List<TaskEntity> findTasksByProcessInstanceId(String processInstanceId);
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManagerImpl.java
index 5b9969aeb894fa9a50f7b10250e819842438c64f..d014b29244a5fef3041723862c4fee07ce4d5f32 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/TaskEntityManagerImpl.java
@@ -20,7 +20,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.activiti.engine.ActivitiException;
-import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.compatibility.Activiti5CompatibilityHandler;
 import org.activiti.engine.delegate.DelegateExecution;
 import org.activiti.engine.delegate.TaskListener;
@@ -148,7 +147,7 @@ public class TaskEntityManagerImpl extends AbstractEntityManager<TaskEntity> imp
       getVariableInstanceEntityManager().deleteVariableInstanceByTask(task);
 
       if (cascade) {
-        getHistoricTaskInstanceEntityManager().deleteHistoricTaskInstanceById(taskId);
+        getHistoricTaskInstanceEntityManager().delete(taskId);
       } else {
         getHistoryManager().recordTaskEnd(taskId, deleteReason);
       }
@@ -168,14 +167,6 @@ public class TaskEntityManagerImpl extends AbstractEntityManager<TaskEntity> imp
     }
   }
 
-  @Override
-  public TaskEntity findTaskById(String id) {
-    if (id == null) {
-      throw new ActivitiIllegalArgumentException("Invalid task id : null");
-    }
-    return (TaskEntity) getDbSqlSession().selectById(TaskEntity.class, id);
-  }
-
   @Override
   public List<TaskEntity> findTasksByExecutionId(final String executionId) {
     return getList("selectTasksByExecutionId", executionId, new CachedPersistentObjectMatcher<TaskEntity>() {
@@ -260,7 +251,7 @@ public class TaskEntityManagerImpl extends AbstractEntityManager<TaskEntity> imp
   @Override
   public void deleteTask(String taskId, String deleteReason, boolean cascade) {
     
-    TaskEntity task = getTaskEntityManager().findTaskById(taskId);
+    TaskEntity task = getTaskEntityManager().findById(taskId);
 
     if (task != null) {
       if (task.getExecutionId() != null) {
@@ -276,7 +267,7 @@ public class TaskEntityManagerImpl extends AbstractEntityManager<TaskEntity> imp
       String reason = (deleteReason == null || deleteReason.length() == 0) ? TaskEntity.DELETE_REASON_DELETED : deleteReason;
       deleteTask(task, reason, cascade, false);
     } else if (cascade) {
-      getHistoricTaskInstanceEntityManager().deleteHistoricTaskInstanceById(taskId);
+      getHistoricTaskInstanceEntityManager().delete(taskId);
     }
   }
 
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManager.java
index 2c4cbb0e5f37bbf09952db7d94c156123ee0d281..d550e18a80c010652bfaa968b9e2a1b4b68da9be 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManager.java
@@ -30,16 +30,8 @@ public interface UserEntityManager extends EntityManager<UserEntity> {
 
   User createNewUser(String userId);
 
-  void insertUser(User user);
-
   void updateUser(User updatedUser);
 
-  User findUserById(String userId);
-
-  void deleteUser(String userId);
-  
-  void deletePicture(User user);
-
   List<User> findUserByQueryCriteria(UserQueryImpl query, Page page);
 
   long findUserCountByQueryCriteria(UserQueryImpl query);
@@ -65,5 +57,7 @@ public interface UserEntityManager extends EntityManager<UserEntity> {
   Picture getUserPicture(String userId);
 
   void setUserPicture(String userId, Picture picture);
+  
+  void deletePicture(User user);
 
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManagerImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManagerImpl.java
index e22a3b048e06fe08c545f3b1f7e9af9c87c188af..4118bcdb3a8ea04e92b296c3f81e7ea8ca78392b 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManagerImpl.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/UserEntityManagerImpl.java
@@ -34,20 +34,16 @@ import org.activiti.engine.impl.db.PersistentObject;
  * @author Joram Barrez
  */
 public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> implements UserEntityManager {
+  
+  @Override
+  public Class<UserEntity> getManagedPersistentObject() {
+    return UserEntity.class;
+  }
 
   public User createNewUser(String userId) {
     return new UserEntity(userId);
   }
 
-  public void insertUser(User user) {
-    getDbSqlSession().insert((PersistentObject) user);
-
-    if (getEventDispatcher().isEnabled()) {
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_CREATED, user));
-      getEventDispatcher().dispatchEvent(ActivitiEventBuilder.createEntityEvent(ActivitiEventType.ENTITY_INITIALIZED, user));
-    }
-  }
-
   public void updateUser(User updatedUser) {
     getDbSqlSession().update((PersistentObject) updatedUser);
 
@@ -56,10 +52,6 @@ public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> imp
     }
   }
 
-  public User findUserById(String userId) {
-    return (UserEntity) getDbSqlSession().selectOne("selectUserById", userId);
-  }
-  
   public void delete(UserEntity userEntity) {
     super.delete(userEntity);
     deletePicture(userEntity);
@@ -74,8 +66,8 @@ public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> imp
   }
 
   @SuppressWarnings("unchecked")
-  public void deleteUser(String userId) {
-    UserEntity user = (UserEntity) findUserById(userId);
+  public void delete(String userId) {
+    UserEntity user = findById(userId);
     if (user != null) {
       List<IdentityInfoEntity> identityInfos = getDbSqlSession().selectList("selectIdentityInfoByUserId", userId);
       for (IdentityInfoEntity identityInfo : identityInfos) {
@@ -121,7 +113,7 @@ public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> imp
   }
 
   public Boolean checkPassword(String userId, String password) {
-    User user = findUserById(userId);
+    User user = findById(userId);
     if ((user != null) && (password != null) && (password.equals(user.getPassword()))) {
       return true;
     }
@@ -152,13 +144,13 @@ public class UserEntityManagerImpl extends AbstractEntityManager<UserEntity> imp
 
   @Override
   public Picture getUserPicture(String userId) {
-    UserEntity user = (UserEntity) findUserById(userId);
+    UserEntity user = findById(userId);
     return user.getPicture();
   }
 
   @Override
   public void setUserPicture(String userId, Picture picture) {
-    UserEntity user = (UserEntity) findUserById(userId);
+    UserEntity user = findById(userId);
     if (user == null) {
       throw new ActivitiObjectNotFoundException("user " + userId + " doesn't exist", User.class);
     }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntityManager.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntityManager.java
index 96861ea7d1c612d7b87ad995314c4c4a704d4efe..ee97e94b593467b345fbc69d39f1b0c254995209 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntityManager.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/persistence/entity/VariableInstanceEntityManager.java
@@ -40,10 +40,6 @@ public interface VariableInstanceEntityManager extends EntityManager<VariableIns
 
   List<VariableInstanceEntity> findVariableInstancesByTaskAndNames(String taskId, Collection<String> names);
 
-  void delete(VariableInstanceEntity entity);
-
-  void delete(VariableInstanceEntity entity, boolean fireDeleteEvent);
-
   void deleteVariableInstanceByTask(TaskEntity task);
 
 }
\ No newline at end of file
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/rules/RulesHelper.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/rules/RulesHelper.java
index c151bb69be3a7ca2b278a4ad5ab46c7664633efd..2d38bb388585d905a718fc4cdf46fe986d6d84d0 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/rules/RulesHelper.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/rules/RulesHelper.java
@@ -31,7 +31,7 @@ public class RulesHelper {
 
     KnowledgeBase knowledgeBase = (KnowledgeBase) knowledgeBaseCache.get(deploymentId);
     if (knowledgeBase == null) {
-      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findDeploymentById(deploymentId);
+      DeploymentEntity deployment = Context.getCommandContext().getDeploymentEntityManager().findById(deploymentId);
       if (deployment == null) {
         throw new ActivitiObjectNotFoundException("no deployment with id " + deploymentId, Deployment.class);
       }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/FormHandlerUtil.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/FormHandlerUtil.java
index 2587080d25f9f5bca4b3a8020941cc2a6cf962f9..0f9e358a8e511b7275f1c919ebc70c99e85862f3 100644
--- a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/FormHandlerUtil.java
+++ b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/util/FormHandlerUtil.java
@@ -39,7 +39,7 @@ public class FormHandlerUtil {
       
       List<FormProperty> formProperties = startEvent.getFormProperties();
       String formKey = startEvent.getFormKey();
-      DeploymentEntity deploymentEntity = commandContext.getDeploymentEntityManager().findDeploymentById(processDefinitionEntity.getDeploymentId());
+      DeploymentEntity deploymentEntity = commandContext.getDeploymentEntityManager().findById(processDefinitionEntity.getDeploymentId());
       
       startFormHandler.parseConfiguration(formProperties, formKey, deploymentEntity, processDefinitionEntity);
       return startFormHandler;
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Deployment.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Deployment.xml
index 3f256b3c9dd7e3b1a164b117bdd498d8eda40777..3b1eeea465075717b75035056d156e22ea5a0d93 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Deployment.xml
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/Deployment.xml
@@ -120,7 +120,7 @@
     select * from ${prefix}ACT_RE_DEPLOYMENT D where NAME_=#{parameter} order by D.DEPLOY_TIME_ desc
   </select>
   
-  <select id="selectDeploymentById" parameterType="string" resultMap="deploymentResultMap">
+  <select id="selectDeployment" parameterType="string" resultMap="deploymentResultMap">
     select * from ${prefix}ACT_RE_DEPLOYMENT where ID_ = #{id}
   </select>
 
diff --git a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/User.xml b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/User.xml
index 272c6d802a9bb87910a469f4a70b0f5882b9bc03..93df0d5a08585633a41a0aa0919040997596bd1a 100644
--- a/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/User.xml
+++ b/modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/User.xml
@@ -78,7 +78,7 @@
   
   <!-- USER SELECT -->
 
-  <select id="selectUserById" parameterType="string" resultMap="userResultMap">
+  <select id="selectUser" parameterType="string" resultMap="userResultMap">
     select * from ${prefix}ACT_ID_USER where ID_ = #{id,jdbcType=VARCHAR}
   </select>
     
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java
index 91b74372d9ce0bcb387fe0d69bd11c4cfe41c592..4547c96831767327d81173659b65f9c3383937ae 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/api/form/FormServiceTest.java
@@ -95,7 +95,7 @@ public class FormServiceTest extends PluggableActivitiTestCase {
     try {
       formService.getRenderedTaskForm(null);
       fail("ActivitiException expected");
-    } catch (ActivitiIllegalArgumentException ae) {
+    } catch (ActivitiObjectNotFoundException e) {
       // Expected Exception
     }
   }
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessInstanceSuspensionTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessInstanceSuspensionTest.java
index 71897f728cbc0bb06f6d3a4d4bb49489b538c833..20e69a961b0d2e0b1893e751d5db248385f1a5ba 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessInstanceSuspensionTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/ProcessInstanceSuspensionTest.java
@@ -102,7 +102,7 @@ public class ProcessInstanceSuspensionTest extends PluggableActivitiTestCase {
     processEngineConfiguration.getCommandExecutor().execute(new Command<Void>() {
       public Void execute(CommandContext commandContext) {
         Date currentTime = processEngineConfiguration.getClock().getCurrentTime();
-        commandContext.getJobEntityManager().findJobById(job.getId()).setDuedate(new Date(currentTime.getTime() - 10000));
+        commandContext.getJobEntityManager().findById(job.getId()).setDuedate(new Date(currentTime.getTime() - 10000));
         return null;
       }
 
diff --git a/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/VariableScopeTest.java b/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/VariableScopeTest.java
index 77205fd7f3f168209777039c448ca2e6c570bf80..5d9275b8d6d60f61da0e87cf06800f8559fef6cc 100644
--- a/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/VariableScopeTest.java
+++ b/modules/activiti-engine/src/test/java/org/activiti/engine/test/db/VariableScopeTest.java
@@ -272,7 +272,7 @@ public class VariableScopeTest extends PluggableActivitiTestCase {
         throw new ActivitiIllegalArgumentException("executionId is null");
       }
 
-      ExecutionEntity execution = commandContext.getExecutionEntityManager().findExecutionById(executionId);
+      ExecutionEntity execution = commandContext.getExecutionEntityManager().findById(executionId);
 
       if (execution == null) {
         throw new ActivitiObjectNotFoundException("execution " + executionId + " doesn't exist", Execution.class);
diff --git a/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java b/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java
index d51214e55ce73ec1c19c5affa8a351b2bfb7a1e1..a712408890fb404f2600b6e3d5ea854047ea1b56 100644
--- a/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java
+++ b/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPGroupManager.java
@@ -60,11 +60,6 @@ public class LDAPGroupManager extends AbstractManager implements GroupEntityMana
     throw new ActivitiException("LDAP group manager doesn't support creating a new group");
   }
 
-  @Override
-  public void insertGroup(Group group) {
-    throw new ActivitiException("LDAP group manager doesn't support inserting a group");
-  }
-
   @Override
   public void updateGroup(Group updatedGroup) {
     throw new ActivitiException("LDAP group manager doesn't support updating a group");
@@ -75,11 +70,6 @@ public class LDAPGroupManager extends AbstractManager implements GroupEntityMana
     throw new ActivitiException("LDAP group manager doesn't support inserting or updating a group");
   }
 
-  @Override
-  public void deleteGroup(String groupId) {
-    throw new ActivitiException("LDAP group manager doesn't support deleting a group");
-  }
-
   @Override
   public GroupQuery createNewGroupQuery() {
     return new GroupQueryImpl(Context.getProcessEngineConfiguration().getCommandExecutor());
@@ -187,12 +177,12 @@ public class LDAPGroupManager extends AbstractManager implements GroupEntityMana
   }
 
   @Override
-  public GroupEntity getEntity(String entityId) {
+  public GroupEntity findById(String entityId) {
     throw new ActivitiException("Unsupported by LDAP group manager");
   }
 
   @Override
-  public GroupEntity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<GroupEntity> cachedEntityMatcher) {
+  public GroupEntity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<GroupEntity> cachedEntityMatcher) {
     throw new ActivitiException("Unsupported by LDAP group manager");
   }
 
diff --git a/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java b/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java
index 6d1163f6decae78e7e21f40fe1205cb64a263bcd..223a65430d6c3ea2b4173e651e9e9292262c377e 100644
--- a/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java
+++ b/modules/activiti-ldap/src/main/java/org/activiti/ldap/LDAPUserManager.java
@@ -62,11 +62,6 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
     throw new ActivitiException("LDAP user manager doesn't support creating a new user");
   }
 
-  @Override
-  public void insertUser(User user) {
-    throw new ActivitiException("LDAP user manager doesn't support inserting a new user");
-  }
-
   @Override
   public void updateUser(User updatedUser) {
     throw new ActivitiException("LDAP user manager doesn't support updating a user");
@@ -78,7 +73,7 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
   }
 
   @Override
-  public UserEntity findUserById(final String userId) {
+  public UserEntity findById(final String userId) {
     LDAPTemplate ldapTemplate = new LDAPTemplate(ldapConfigurator);
     return ldapTemplate.execute(new LDAPCallBack<UserEntity>() {
 
@@ -107,11 +102,6 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
     });
   }
 
-  @Override
-  public void deleteUser(String userId) {
-    throw new ActivitiException("LDAP user manager doesn't support deleting a user");
-  }
-  
   @Override
   public void deletePicture(User user) {
     throw new ActivitiException("LDAP user manager doesn't support deleting a user picture");
@@ -122,7 +112,7 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
 
     if (query.getId() != null) {
       List<User> result = new ArrayList<User>();
-      result.add(findUserById(query.getId()));
+      result.add(findById(query.getId()));
       return result;
     } else if (query.getFullNameLike() != null){
       
@@ -328,12 +318,7 @@ public class LDAPUserManager extends AbstractManager implements UserEntityManage
   }
 
   @Override
-  public UserEntity getEntity(String entityId) {
-    throw new ActivitiException("Unsupported by LDAP user manager");
-  }
-
-  @Override
-  public UserEntity getEntity(String selectQuery, Object parameter, CachedPersistentObjectMatcher<UserEntity> cachedEntityMatcher) {
+  public UserEntity findByQuery(String selectQuery, Object parameter, CachedPersistentObjectMatcher<UserEntity> cachedEntityMatcher) {
     throw new ActivitiException("Unsupported by LDAP user manager");
   }