diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
index 10b33d5311d..15603157641 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/CaseInstance.xml
@@ -316,7 +316,7 @@
             CASE_DEF.VERSION_ as CaseDefinitionVersion,
             CASE_DEF.DEPLOYMENT_ID_ as CaseDefinitionDeploymentId
         from ${prefix}ACT_CMMN_RU_CASE_INST RES
-        <!-- Doing an inner join on the definition table is OK, since it is a 1:1 relationship -->
+        <!-- Doing an inner join on the definition table is OK. It is an N:1 relationship -->
         inner join ${prefix}ACT_CMMN_CASEDEF CASE_DEF on RES.CASE_DEF_ID_ = CASE_DEF.ID_
         <include refid="commonSelectCaseInstancesByQueryCriteriaSql" />
         ${orderBy}
@@ -325,7 +325,7 @@
 
     <select id="selectCaseInstanceCountByQueryCriteria" parameterType="org.flowable.cmmn.engine.impl.runtime.CaseInstanceQueryImpl" resultType="long">
         select count(distinct RES.ID_) from ${prefix}ACT_CMMN_RU_CASE_INST RES
-        <!-- Doing an inner join on the definition table is OK, since it is a 1:1 relationship -->
+        <!-- Doing an inner join on the definition table is OK. It is an N:1 relationship -->
         inner join ${prefix}ACT_CMMN_CASEDEF CASE_DEF on RES.CASE_DEF_ID_ = CASE_DEF.ID_
         <include refid="commonSelectCaseInstancesByQueryCriteriaSql" />
     </select>
@@ -369,7 +369,7 @@
 
     <sql id="selectCaseInstancesWithVariablesByQueryCriteriaSql">
         from ${prefix}ACT_CMMN_RU_CASE_INST RES
-        <!-- Doing an inner join on the definition table is OK, since it is a 1:1 relationship -->
+        <!-- Doing an inner join on the definition table is OK. It is an N:1 relationship -->
         inner join ${prefix}ACT_CMMN_CASEDEF CASE_DEF on RES.CASE_DEF_ID_ = CASE_DEF.ID_
         <include refid="commonSelectCaseInstancesByQueryCriteriaSql"/>
     </sql>
diff --git a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
index 01b782cb4a1..7e2109e9b88 100644
--- a/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
+++ b/modules/flowable-cmmn-engine/src/main/resources/org/flowable/cmmn/db/mapping/entity/HistoricCaseInstance.xml
@@ -338,7 +338,7 @@
     <sql id="selectHistoricCaseInstancesWithVariablesByQueryCriteriaSql">
         from ${prefix}ACT_CMMN_HI_CASE_INST RES
         <!--
-            Doing a join on the definition table is OK, since it is a 1:1 relationship.
+            Doing a join on the definition table is OK, since it is an N:1 relationship.
             This has to be an outer join because historic data might exists, but definitions might have been deleted
         -->
         left outer join ${prefix}ACT_CMMN_CASEDEF CASE_DEF on RES.CASE_DEF_ID_ = CASE_DEF.ID_
@@ -348,7 +348,7 @@
     <sql id="selectHistoricCaseInstancesByQueryCriteriaSql">
         from ${prefix}ACT_CMMN_HI_CASE_INST RES
         <!--
-            Doing a join on the definition table is OK, since it is a 1:1 relationship.
+            Doing a join on the definition table is OK, since it is an N:1 relationship.
             This has to be an outer join because historic data might exists, but definitions might have been deleted
         -->
         left outer join ${prefix}ACT_CMMN_CASEDEF CASE_DEF on RES.CASE_DEF_ID_ = CASE_DEF.ID_
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
index e447601be4b..d89c7dcb8b6 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/Execution.xml
@@ -655,7 +655,7 @@
 
     <sql id="selectExecutionsByQueryCriteriaSql">
         from ${prefix}ACT_RU_EXECUTION RES
-        <!-- Doing an inner join on the definition table is OK, since it is a 1:1 relationship -->
+        <!-- Doing an inner join on the definition table is OK. It is an N:1 relationship -->
         inner join ${prefix}ACT_RE_PROCDEF P on RES.PROC_DEF_ID_ = P.ID_
         <include refid="commonSelectExecutionsByQueryCriteriaSql"/>
     </sql>
@@ -693,7 +693,7 @@
 
   <sql id="selectProcessInstanceWithVariablesByQueryCriteriaSql">
     from ${prefix}ACT_RU_EXECUTION RES
-    <!-- Doing an inner join on the definition table is OK, since it is a 1:1 relationship -->
+    <!-- Doing an inner join on the definition table is OK. It is an N:1 relationship -->
     inner join ${prefix}ACT_RE_PROCDEF P on RES.PROC_DEF_ID_ = P.ID_
     <include refid="commonSelectExecutionsByQueryCriteriaSql"/>
   </sql>
diff --git a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
index b82ca98b68b..d259d25f1e9 100644
--- a/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
+++ b/modules/flowable-engine/src/main/resources/org/flowable/db/mapping/entity/HistoricProcessInstance.xml
@@ -449,7 +449,7 @@
     <sql id="selectHistoricProcessInstancesByQueryCriteriaSql">
         from ${prefix}ACT_HI_PROCINST RES
         <!--
-                Doing a join on the definition table is OK, since it is a 1:1 relationship.
+                Doing a join on the definition table is OK, since it is an N:1 relationship.
                 This has to be an outer join because historic data might exists, but definitions might have been deleted
         -->
         left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_
@@ -497,7 +497,7 @@
   <sql id="selectHistoricProcessInstancesWithVariablesByQueryCriteriaSql">
     from ${prefix}ACT_HI_PROCINST RES
     <!--
-        Doing a join on the definition table is OK, since it is a 1:1 relationship.
+        Doing a join on the definition table is OK, since it is an N:1 relationship.
         This has to be an outer join because historic data might exists, but definitions might have been deleted
      -->
     left outer join ${prefix}ACT_RE_PROCDEF DEF on RES.PROC_DEF_ID_ = DEF.ID_