diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
index 3c534e26ef..b27b8a52eb 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/audit-insert-SqlMap.xml
@@ -5,15 +5,15 @@
 <mapper namespace="alfresco.audit.insert">
 
     <insert id="insert_AuditModel" parameterType="AuditModel" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AuditModel_AutoIncrement"/>
+        <include refid="alfresco.audit.insert_AuditModel_AutoIncrement"/>
     </insert>
     
     <insert id="insert_AuditApplication" parameterType="AuditApplication" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AuditApplication_AutoIncrement"/>
+        <include refid="alfresco.audit.insert_AuditApplication_AutoIncrement"/>
     </insert>
     
     <insert id="insert_AuditEntry" parameterType="AuditEntry" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AuditEntry_AutoIncrement"/>
+        <include refid="alfresco.audit.insert_AuditEntry_AutoIncrement"/>
     </insert>
     
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
index 9f52956d70..613ebebb40 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/avm-insert-SqlMap.xml
@@ -5,19 +5,19 @@
 <mapper namespace="alfresco.avm.insert">
 
     <insert id="insert_AVMStore" parameterType="AVMStore" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AVMStore_AutoIncrement"/>
+        <include refid="alfresco.avm.insert_AVMStore_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_AVMStoreProperty" parameterMap="parameter_StorePropertyPatternMap" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AVMStoreProperty_AutoIncrement"/>
+    <insert id="insert_AVMStoreProperty" parameterMap="alfresco.avm.parameter_StorePropertyPatternMap" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.avm.insert_AVMStoreProperty_AutoIncrement"/>
     </insert>
     
     <insert id="insert_AVMNode" parameterType="AVMNode" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AVMNode_AutoIncrement"/>
+        <include refid="alfresco.avm.insert_AVMNode_AutoIncrement"/>
     </insert>
     
     <insert id="insert_AVMVersionRoot" parameterType="AVMVersionRoot" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AVMVersionRoot_AutoIncrement"/>
+        <include refid="alfresco.avm.insert_AVMVersionRoot_AutoIncrement"/>
     </insert>
     
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
index c98e0c4b8b..319e741284 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/content-insert-SqlMap.xml
@@ -12,11 +12,11 @@
         <include refid="alfresco.content.insert_Encoding_AutoIncrement"/>
     </insert>
 
-    <insert id="insert_ContentUrl" parameterMap="parameter_ContentUrl" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert_ContentUrl" parameterMap="alfresco.content.parameter_ContentUrl" useGeneratedKeys="true" keyProperty="id">
         <include refid="alfresco.content.insert_ContentUrl_AutoIncrement"/>
     </insert>
 
-    <insert id="insert_ContentData" parameterMap="parameter_ContentData" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insert_ContentData" parameterMap="alfresco.content.parameter_ContentData" useGeneratedKeys="true" keyProperty="id">
         <include refid="alfresco.content.insert_ContentData_AutoIncrement"/>
     </insert>
 
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
index a976c4060f..6e3cef57fb 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/locks-insert-SqlMap.xml
@@ -5,11 +5,11 @@
 <mapper namespace="alfresco.lock.insert">
 
     <insert id="insert_LockResource" parameterType="LockResource" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_LockResource_AutoIncrement"/>
+        <include refid="alfresco.lock.insert_LockResource_AutoIncrement"/>
     </insert>
 
     <insert id="insert_Lock" parameterType="Lock" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_Lock_AutoIncrement"/>
+        <include refid="alfresco.lock.insert_Lock_AutoIncrement"/>
     </insert>
 
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
index cf50d9d712..c972148ff8 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/permissions-insert-SqlMap.xml
@@ -4,36 +4,36 @@
 
 <mapper namespace="alfresco.permissions.insert">
 
-    <insert id="insert_Acl" parameterType="Acl" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_Acl_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_Acl" parameterType="Acl" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_Acl_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_AclMember" parameterType="AclMember" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AclMember_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_AclMember" parameterType="AclMember" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_AclMember_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_AclChangeSet" parameterType="AclChangeSet" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AclChangeSet_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_AclChangeSet" parameterType="AclChangeSet" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_AclChangeSet_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_Ace" parameterType="Ace" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_Ace_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_Ace" parameterType="Ace" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_Ace_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_AceContext" parameterType="AceContext" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AceContext_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_AceContext" parameterType="AceContext" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_AceContext_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_Permission" parameterType="Permission" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_Permission_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_Permission" parameterType="Permission" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_Permission_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_Authority" parameterType="Authority" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_Authority_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_Authority" parameterType="Authority" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_Authority_AutoIncrement"/>
     </insert>
     
-    <insert id="insert_AuthorityAlias" parameterType="AuthorityAlias" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_AuthorityAlias_AutoIncrement"/>
+    <insert id="alfresco.permissions.insert_AuthorityAlias" parameterType="AuthorityAlias" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.permissions.insert_AuthorityAlias_AutoIncrement"/>
     </insert>
     
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
index c3b5f99451..bf3ba97661 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/propval-insert-SqlMap.xml
@@ -5,31 +5,31 @@
 <mapper namespace="alfresco.propval.insert">
 
     <insert id="insert_PropertyClass" parameterType="PropertyClass" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyClass_AutoIncrement"/>
+        <include refid="alfresco.propval.insert_PropertyClass_AutoIncrement"/>
     </insert>
 
     <insert id="insert_PropertyStringValue" parameterType="PropertyStringValue" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyStringValue_AutoIncrement"/>
+        <include refid="alfresco.propval.insert_PropertyStringValue_AutoIncrement"/>
     </insert>
 
     <insert id="insert_PropertyDoubleValue" parameterType="PropertyDoubleValue" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyDoubleValue_AutoIncrement"/>
+        <include refid="alfresco.propval.insert_PropertyDoubleValue_AutoIncrement"/>
     </insert>
 
-    <insert id="insert_PropertySerializableValue" parameterMap="parameter_PropertySerializableValue" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertySerializableValue_AutoIncrement"/>
+    <insert id="insert_PropertySerializableValue" parameterMap="alfresco.propval.parameter_PropertySerializableValue" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.propval.insert_PropertySerializableValue_AutoIncrement"/>
     </insert>
 
     <insert id="insert_PropertyValue" parameterType="PropertyValue" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyValue_AutoIncrement"/>
+        <include refid="alfresco.propval.insert_PropertyValue_AutoIncrement"/>
     </insert>
 
-    <insert id="insert_PropertyRoot" parameterMap="parameter_PropertyRoot" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyRoot_AutoIncrement"/>
+    <insert id="insert_PropertyRoot" parameterMap="alfresco.propval.parameter_PropertyRoot" useGeneratedKeys="true" keyProperty="id">
+        <include refid="alfresco.propval.insert_PropertyRoot_AutoIncrement"/>
     </insert>
 
     <insert id="insert_PropertyUniqueContext" parameterType="PropertyUniqueContext" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_PropertyUniqueContext_AutoIncrement"/>
+        <include refid="alfresco.propval.insert_PropertyUniqueContext_AutoIncrement"/>
     </insert>
 
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
index c6b75039cd..27b7b048a7 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.MySQLInnoDBDialect/usage-insert-SqlMap.xml
@@ -5,7 +5,7 @@
 <mapper namespace="alfresco.usage.insert">
 
     <insert id="insert_UsageDelta" parameterType="UsageDelta" useGeneratedKeys="true" keyProperty="id">
-        <include refid="insert_UsageDelta_AutoIncrement"/>
+        <include refid="alfresco.usage.insert_UsageDelta_AutoIncrement"/>
     </insert>
     
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
index 60d48b5fb9..79a6195d10 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/audit-insert-SqlMap.xml
@@ -10,7 +10,7 @@
             select nextVal('alf_audit_model_seq')
         </selectKey>
         
-        <include refid="insert_AuditModel_Sequence"/>
+        <include refid="alfresco.audit.insert_AuditModel_Sequence"/>
         
     </insert>
     
@@ -20,7 +20,7 @@
             select nextVal('alf_audit_app_seq')
         </selectKey>
         
-        <include refid="insert_AuditApplication_Sequence"/>
+        <include refid="alfresco.audit.insert_AuditApplication_Sequence"/>
         
     </insert>
     
@@ -30,7 +30,7 @@
             select nextVal('alf_audit_entry_seq')
         </selectKey>
         
-        <include refid="insert_AuditEntry_Sequence"/>
+        <include refid="alfresco.audit.insert_AuditEntry_Sequence"/>
         
     </insert>
     
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/avm-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/avm-insert-SqlMap.xml
index 2071f25510..4bea77007f 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/avm-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/avm-insert-SqlMap.xml
@@ -14,7 +14,7 @@
         
     </insert>
     
-    <insert id="insert_AVMStoreProperty" parameterMap="parameter_IdStorePropertyPatternMap">
+    <insert id="insert_AVMStoreProperty" parameterMap="alfresco.avm.parameter_IdStorePropertyPatternMap">
     
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('avm_store_properties_seq')
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
index 089c6ac690..9fe39822f9 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/locks-insert-SqlMap.xml
@@ -10,7 +10,7 @@
             select nextVal('alf_lock_resource_seq')
         </selectKey>
         
-        <include refid="insert_LockResource_Sequence"/>
+        <include refid="alfresco.lock.insert_LockResource_Sequence"/>
         
     </insert>
 
@@ -20,7 +20,7 @@
             select nextVal('alf_lock_seq')
         </selectKey>
         
-        <include refid="insert_Lock_Sequence"/>
+        <include refid="alfresco.lock.insert_Lock_Sequence"/>
         
     </insert>
 
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
index 74736fc893..ea8da0163a 100644
--- a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/propval-insert-SqlMap.xml
@@ -9,49 +9,49 @@
         "long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_class_seq')
         </selectKey>
-        <include refid="insert_PropertyClass_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyClass_Sequence"/>
     </insert>
 
     <insert id="insert_PropertyStringValue" parameterType="PropertyStringValue" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_string_value_seq')
         </selectKey>
-        <include refid="insert_PropertyStringValue_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyStringValue_Sequence"/>
     </insert>
 
     <insert id="insert_PropertyDoubleValue" parameterType="PropertyDoubleValue" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_double_value_seq')
         </selectKey>
-        <include refid="insert_PropertyDoubleValue_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyDoubleValue_Sequence"/>
     </insert>
 
-    <insert id="insert_PropertySerializableValue" parameterMap="parameter_IdPropertySerializableValue" >
+    <insert id="insert_PropertySerializableValue" parameterMap="alfresco.propval.parameter_IdPropertySerializableValue" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_serializable_value_seq')
         </selectKey>
-        <include refid="insert_PropertySerializableValue_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertySerializableValue_Sequence"/>
     </insert>
 
     <insert id="insert_PropertyValue" parameterType="PropertyValue" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_value_seq')
         </selectKey>
-        <include refid="insert_PropertyValue_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyValue_Sequence"/>
     </insert>
 
-    <insert id="insert_PropertyRoot" parameterMap="parameter_IdPropertyRoot" >
+    <insert id="insert_PropertyRoot" parameterMap="alfresco.propval.parameter_IdPropertyRoot" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_root_seq')
         </selectKey>
-        <include refid="insert_PropertyRoot_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyRoot_Sequence"/>
     </insert>
 
     <insert id="insert_PropertyUniqueContext" parameterType="PropertyUniqueContext" >
         <selectKey resultType="long" keyProperty="id" order="BEFORE" >
             select nextVal('alf_prop_unique_ctx_seq')
         </selectKey>
-        <include refid="insert_PropertyUniqueContext_Sequence"/>
+        <include refid="alfresco.propval.insert_PropertyUniqueContext_Sequence"/>
     </insert>
 
 </mapper>
\ No newline at end of file
diff --git a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
index 836796178c..8be9d3c225 100755
--- a/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
+++ b/config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/usage-insert-SqlMap.xml
@@ -9,7 +9,7 @@
             select nextVal('alf_usage_delta_seq')
         </selectKey>
     
-        <include refid="insert_UsageDelta_Sequence"/>
+        <include refid="alfresco.usage.insert_UsageDelta_Sequence"/>
     </insert>
     
 </mapper>
\ No newline at end of file