diff --git a/base/src/org/compiere/model/MPInstance.java b/base/src/org/compiere/model/MPInstance.java
index d2ec3b7b85..44153a0397 100644
--- a/base/src/org/compiere/model/MPInstance.java
+++ b/base/src/org/compiere/model/MPInstance.java
@@ -127,7 +127,7 @@ public class MPInstance extends X_AD_PInstance
 			return m_parameters;
 		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
 		String whereClause = "AD_PInstance_ID=?";
-		List <MPInstancePara> list = new Query(getCtx(), MPInstancePara.Table_Name, whereClause, null) // @TODO: Review implications of using transaction 
+		List <MPInstancePara> list = new Query(getCtx(), I_AD_PInstance_Para.Table_Name, whereClause, null) // @TODO: Review implications of using transaction 
 		.setParameters(getAD_PInstance_ID())
 		.list();
 
diff --git a/base/src/org/compiere/model/MPaySelection.java b/base/src/org/compiere/model/MPaySelection.java
index ea5d25de54..17f49e1821 100644
--- a/base/src/org/compiere/model/MPaySelection.java
+++ b/base/src/org/compiere/model/MPaySelection.java
@@ -85,7 +85,7 @@ public class MPaySelection extends X_C_PaySelection
 		}
 		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
 		String whereClause = "C_PaySelection_ID=?";
-		List <MPaySelectionLine> list = new Query(getCtx(), MPaySelectionLine.Table_Name, whereClause, get_TrxName())
+		List <MPaySelectionLine> list = new Query(getCtx(), I_C_PaySelectionLine.Table_Name, whereClause, get_TrxName())
 			.setParameters(getC_PaySelection_ID())
 			.setOrderBy("Line")
 			.list()
diff --git a/base/src/org/compiere/model/MPayment.java b/base/src/org/compiere/model/MPayment.java
index 0cc66bb91a..cb2fa35baa 100644
--- a/base/src/org/compiere/model/MPayment.java
+++ b/base/src/org/compiere/model/MPayment.java
@@ -93,7 +93,7 @@ public final class MPayment extends X_C_Payment
 	{
 		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
 		String whereClause = "C_BPartner_ID=?";
-		List <MPayment> list = new Query(ctx, MPayment.Table_Name, whereClause, trxName)
+		List <MPayment> list = new Query(ctx, I_C_Payment.Table_Name, whereClause, trxName)
 		.setParameters(C_BPartner_ID)
 		.list();
 
diff --git a/base/src/org/compiere/model/MProductBOM.java b/base/src/org/compiere/model/MProductBOM.java
index d7136f9c4c..dbe0b8ccca 100644
--- a/base/src/org/compiere/model/MProductBOM.java
+++ b/base/src/org/compiere/model/MProductBOM.java
@@ -61,7 +61,7 @@ public class MProductBOM extends X_M_Product_BOM
 	{
  		//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
 		final String whereClause = "M_Product_ID=?";
-		List <MProductBOM> list = new Query(ctx, MProductBOM.Table_Name, whereClause, trxName)
+		List <MProductBOM> list = new Query(ctx, I_M_Product_BOM.Table_Name, whereClause, trxName)
 		.setParameters(M_Product_ID)
 		.setOrderBy("Line")
 		.list();