diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
index f938615bcc2..55ccc930bb1 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/DeadLetterJob.xml
@@ -226,7 +226,7 @@
     	SELECT * FROM dual
   	</insert>
 
-    <select id="selectDeadLetterJobByQueryCriteria" parameterType="org.flowable.job.service.impl.JobQueryImpl" resultMap="jobResultMap">
+    <select id="selectDeadLetterJobByQueryCriteria" parameterType="org.flowable.job.service.impl.DeadLetterJobQueryImpl" resultMap="jobResultMap">
         <if test="needsPaging">${limitBefore}</if>
         SELECT RES.* <if test="needsPaging">${limitBetween}</if>
         <include refid="selectDeadLetterJobByQueryCriteriaSql"/>
@@ -234,7 +234,7 @@
         <if test="needsPaging">${limitAfter}</if>
     </select>
 
-    <select id="selectDeadLetterJobCountByQueryCriteria" parameterType="org.flowable.job.service.impl.JobQueryImpl" resultType="long">
+    <select id="selectDeadLetterJobCountByQueryCriteria" parameterType="org.flowable.job.service.impl.DeadLetterJobQueryImpl" resultType="long">
         select count(RES.ID_)
         <include refid="selectDeadLetterJobByQueryCriteriaSql"/>
     </select>
diff --git a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
index 32a1b565a42..84a5cb40765 100644
--- a/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
+++ b/modules/flowable-job-service/src/main/resources/org/flowable/job/service/db/mapping/entity/SuspendedJob.xml
@@ -234,7 +234,7 @@
         SELECT * FROM dual
     </insert>
 
-    <select id="selectSuspendedJobByQueryCriteria" parameterType="org.flowable.job.service.impl.JobQueryImpl" resultMap="jobResultMap">
+    <select id="selectSuspendedJobByQueryCriteria" parameterType="org.flowable.job.service.impl.SuspendedJobQueryImpl" resultMap="jobResultMap">
         <if test="needsPaging">${limitBefore}</if>
         SELECT RES.* <if test="needsPaging">${limitBetween}</if>
         <include refid="selectSuspendedJobByQueryCriteriaSql" />
@@ -242,7 +242,7 @@
         <if test="needsPaging">${limitAfter}</if>
     </select>
 
-    <select id="selectSuspendedJobCountByQueryCriteria" parameterType="org.flowable.job.service.impl.JobQueryImpl" resultType="long">
+    <select id="selectSuspendedJobCountByQueryCriteria" parameterType="org.flowable.job.service.impl.SuspendedJobQueryImpl" resultType="long">
         select count(RES.ID_)
         <include refid="selectSuspendedJobByQueryCriteriaSql" />
     </select>
diff --git a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
index 7d020c8cf3a..d56ce95e7c3 100644
--- a/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
+++ b/modules/flowable-variable-service/src/main/resources/org/flowable/variable/service/db/mapping/entity/VariableInstance.xml
@@ -186,7 +186,7 @@
         select * from ${prefix}ACT_RU_VARIABLE where ID_ = #{id, jdbcType=VARCHAR}
     </select>
 
-    <select id="selectVariablesByQuery" parameterType="org.flowable.common.engine.impl.db.ListQueryParameterObject" resultMap="variableInstanceResultMap">
+    <select id="selectVariablesByQuery" parameterType="org.flowable.variable.service.impl.InternalVariableInstanceQueryImpl" resultMap="variableInstanceResultMap">
         select *
         from ${prefix}ACT_RU_VARIABLE
         <where>