diff --git a/config/alfresco/messages/patch-service.properties b/config/alfresco/messages/patch-service.properties
index dd6d909591..ed48519c09 100644
--- a/config/alfresco/messages/patch-service.properties
+++ b/config/alfresco/messages/patch-service.properties
@@ -145,9 +145,9 @@ patch.invalidUserPersonAndGroup.result=Fixed ''{0}'' invalid user nodes, ''{1}''
 
 patch.AVMGuidPatch.description=Set GUIDs on AVM nodes.
 patch.AVMGuidPatch.result=AVM GUIDS set.
-
-patch.AVMLayeredSnapshotPatch.description=Set indirectionVersion on Layered Nodes.
-patch.AVMLayeredSnapshotPatch.result=Layered Node indirectionVersions set.
  
 patch.webscripts.description=Adds Web Scripts to Data Dictionary.
 patch.webscriptsExtension.description=Adds Web Scripts Extension to Data Dictionary.
+
+patch.AVMLayeredSnapshot.description=Set indirectionVersion on Layered Nodes.
+patch.AVMLayeredSnapshot.result=Layered Node indirectionVersions set.
diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index b161702864..7045f8f272 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -743,17 +743,6 @@
         </property>
     </bean>
 
-	<bean id="patch.AVMLayeredSnapshotPatch" class="org.alfresco.repo.admin.patch.impl.AVMLayeredSnapshotPatch" parent="basePatch">
-	    <property name="id"><value>patch.AVMLayeredSnapshotPatch</value></property>
-	    <property name="description"><value>patch.AVMLayeredSnapshotPatch.description</value></property>
-	    <property name="fixesFromSchema"><value>0</value></property>
-	    <property name="fixesToSchema"><value>52</value></property>
-	    <property name="targetSchema"><value>53</value></property>
-	    <property name="avmNodeDAO">
-	        <ref bean="avmNodeDAO"/>
-	    </property>
-	</bean>
-
     <bean id="patch.db-V2.1-VersionColumns" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
         <property name="id"><value>patch.db-V2.1-VersionColumns</value></property>
         <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
@@ -782,5 +771,16 @@
             </props>
         </property>
     </bean>
-	
+
+    <bean id="patch.AVMLayeredSnapshot" class="org.alfresco.repo.admin.patch.impl.AVMLayeredSnapshotPatch" parent="basePatch">
+        <property name="id"><value>patch.AVMLayeredSnapshot</value></property>
+        <property name="description"><value>patch.AVMLayeredSnapshot.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>55</value></property>
+        <property name="targetSchema"><value>56</value></property>
+        <property name="avmNodeDAO">
+            <ref bean="avmNodeDAO"/>
+        </property>
+    </bean>
+
 </beans>
diff --git a/config/alfresco/version.properties b/config/alfresco/version.properties
index e722b2790c..8debfe7463 100644
--- a/config/alfresco/version.properties
+++ b/config/alfresco/version.properties
@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=55
+version.schema=56
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java
index a34dde0375..7d372113a4 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/AVMLayeredSnapshotPatch.java
@@ -41,7 +41,7 @@ public class AVMLayeredSnapshotPatch extends AbstractPatch
 {
     private AVMNodeDAO fAVMNodeDAO;
     
-    private static final String MSG_SUCCESS = "patch.AVMLayeredSnapshotPatch.result";
+    private static final String MSG_SUCCESS = "patch.AVMLayeredSnapshot.result";
     
     public AVMLayeredSnapshotPatch()
     {
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
index e0cd447e98..21c75ba6b6 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -212,7 +212,7 @@
 	     nodes that were frozen by the snapshot so that subsequent 
 	     snapshots can find them and force copies. -->
 	<class name="VersionLayeredNodeEntryImpl" proxy="VersionLayeredNodeEntry"
-	       table="avm_version_layered_node_entries">
+	       table="avm_version_layered_node_entry">
 	    <composite-id>
 	        <key-many-to-one name="version" class="VersionRootImpl" column="version_root_id"/>
 	        <key-property name="md5Sum" type="string" length="32" column="md5sum"/>