Merged pull request #57 (corrected typo, no automatic merge)

modules/activiti-engine/src/main/resources/org/activiti/db/mapping/entity/HistoricProcessInstance.xml

@@ -115,7 +115,7 @@
   <sql id="selectHistoricProcessInstancesByQueryCriteriaSql">
     from ${prefix}ACT_HI_PROCINST RES
     <if test="processKeyNotIn != null || processDefinitionKey != null">
-      inner join ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
+      inner join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
     </if>
     <foreach collection="queryVariableValues" index="index" item="queryVariableValue">
       inner join ${prefix}ACT_HI_VARINST  A${index} on RES.PROC_INST_ID_ = A${index}.PROC_INST_ID_

modules/activiti-explorer/src/main/java/org/activiti/editor/ui/ConvertProcessDefinitionPopupWindow.java

@@ -144,6 +144,7 @@ public class ConvertProcessDefinitionPopupWindow extends PopupWindow implements
               modelObjectNode.put(MODEL_REVISION, 1);
               modelObjectNode.put(MODEL_DESCRIPTION, processDefinition.getDescription());
               modelData.setMetaInfo(modelObjectNode.toString());
+              modelData.setName(processDefinition.getName());
               
               repositoryService.saveModel(modelData);