Index: api2/test/java/javax/jdo/JDOHelperConfigTest.java
===================================================================
--- api2/test/java/javax/jdo/JDOHelperConfigTest.java	(revision 552930)
+++ api2/test/java/javax/jdo/JDOHelperConfigTest.java	(working copy)
@@ -217,7 +217,7 @@
             PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
         expected.put(
             PROPERTY_SERVER_TIMEZONE_ID,
-            PMF_ATTRIBUTE_ServerTimeZoneID + "." + testVariant);
+            PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
 
         // listeners
         for (int i = 0; i < numListeners; i++) {
Index: api2/src/java/javax/jdo/JDOHelper.java
===================================================================
--- api2/src/java/javax/jdo/JDOHelper.java	(revision 552930)
+++ api2/src/java/javax/jdo/JDOHelper.java	(working copy)
@@ -155,7 +155,7 @@
             PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT,
             PROPERTY_DETACH_ALL_ON_COMMIT);
         xref.put(
-            PMF_ATTRIBUTE_ServerTimeZoneID,
+                PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID,
             PROPERTY_SERVER_TIMEZONE_ID);
 
         return Collections.unmodifiableMap(xref);
Index: api2/src/java/javax/jdo/Constants.java
===================================================================
--- api2/src/java/javax/jdo/Constants.java	(revision 552930)
+++ api2/src/java/javax/jdo/Constants.java	(working copy)
@@ -225,13 +225,13 @@
     static String PMF_ATTRIBUTE_MAPPING
         = "mapping";
     /**
-     * The name of the persistence manager factory element's "mapping"
-     * attribute.
+     * The name of the persistence manager factory element's
+     * "server-time-zone-id" attribute.
      *
      * @since 2.1
      */
-    static String PMF_ATTRIBUTE_ServerTimeZoneID
-        = "server-time-zone-id";
+    static String PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID
+            = "server-time-zone-id";
 
     /**
      * The name of the persistence manager factory property elements in the JDO
Index: api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java
===================================================================
--- api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java	(revision 552930)
+++ api2-legacy/test/java/javax/jdo/JDOHelperConfigTest.java	(working copy)
@@ -217,7 +217,7 @@
             PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT + "." + testVariant);
         expected.put(
             PROPERTY_SERVER_TIMEZONE_ID,
-            PMF_ATTRIBUTE_ServerTimeZoneID + "." + testVariant);
+            PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID + "." + testVariant);
 
         // listeners
         for (int i = 0; i < numListeners; i++) {
Index: api2-legacy/src/java/javax/jdo/JDOHelper.java
===================================================================
--- api2-legacy/src/java/javax/jdo/JDOHelper.java	(revision 552930)
+++ api2-legacy/src/java/javax/jdo/JDOHelper.java	(working copy)
@@ -155,7 +155,7 @@
             PMF_ATTRIBUTE_DETACH_ALL_ON_COMMIT,
             PROPERTY_DETACH_ALL_ON_COMMIT);
         xref.put(
-            PMF_ATTRIBUTE_ServerTimeZoneID,
+                PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID,
             PROPERTY_SERVER_TIMEZONE_ID);
 
         return Collections.unmodifiableMap(xref);
Index: api2-legacy/src/java/javax/jdo/Constants.java
===================================================================
--- api2-legacy/src/java/javax/jdo/Constants.java	(revision 552930)
+++ api2-legacy/src/java/javax/jdo/Constants.java	(working copy)
@@ -225,13 +225,13 @@
     static String PMF_ATTRIBUTE_MAPPING
         = "mapping";
     /**
-     * The name of the persistence manager factory element's "mapping"
-     * attribute.
+     * The name of the persistence manager factory element's
+     * "server-time-zone-id" attribute.
      *
      * @since 2.1
      */
-    static String PMF_ATTRIBUTE_ServerTimeZoneID
-        = "server-time-zone-id";
+    static String PMF_ATTRIBUTE_SERVER_TIME_ZONE_ID
+            = "server-time-zone-id";
 
     /**
      * The name of the persistence manager factory property elements in the JDO