diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
index 5b0f564ae..4d85f4b9e 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
@@ -224,7 +224,7 @@ public class JDBCConfigurationImpl
             "org.apache.openjpa.jdbc.kernel.ConstraintUpdateManager",
             "batching-constraint",
             BatchingConstraintUpdateManager.class.getName(),
-            "batching-order",
+            "batching-operation-order",
             BatchingOperationOrderUpdateManager.class.getName(),
         };
         updateManagerPlugin.setAliases(aliases);
diff --git a/openjpa-project/src/doc/manual/ref_guide_conf.xml b/openjpa-project/src/doc/manual/ref_guide_conf.xml
index b8ef9e12a..6693ddc71 100644
--- a/openjpa-project/src/doc/manual/ref_guide_conf.xml
+++ b/openjpa-project/src/doc/manual/ref_guide_conf.xml
@@ -3713,7 +3713,7 @@ openjpa.jdbc.UpdateManager</literal>
 UpdateManager</literal>
             </para>
             <para>
-<emphasis role="bold">Default: </emphasis><literal>constraint-batching</literal>
+<emphasis role="bold">Default: </emphasis><literal>batching-constraint</literal>
             </para>
             <para>
             <emphasis role="bold">Possible values: </emphasis><literal>default</literal>,