diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
index ad8b8de5d..6d7486bb2 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
@@ -580,7 +580,7 @@ public class StateManagerImpl
         
         // Throw exception if field already has a value assigned.
         // @GeneratedValue overrides POJO initial values and setter methods
-        if (!isDefaultValue(field) && !fmd.is_generated())
+        if (!isDefaultValue(field) && !fmd.isValueGenerated())
             throw new InvalidStateException(_loc.get(
                     "existing-value-override-excep", fmd.getFullName(false)));
 
@@ -591,7 +591,7 @@ public class StateManagerImpl
 
         // for other fields just assign the field or flush if needed
         if (_broker.getStoreManager().assignField(this, field, preFlushing)) {
-            fmd.set_generated(true);
+            fmd.setValueGenerated(true);
             return true;
         }
         if (!preFlushing)
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
index 135c52b1d..dca02966b 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
@@ -2051,11 +2051,11 @@ public class FieldMetaData
         }
     }
 
-    public boolean is_generated() {
+    public boolean isValueGenerated() {
         return _generated;
     }
 
-    public void set_generated(boolean _generated) {
-        this._generated = _generated;
+    public void setValueGenerated(boolean generated) {
+        this._generated = generated;
     }
 }
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
index 0a9bd2767..f0776424f 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
@@ -448,7 +448,7 @@ public class ApplicationIds {
                                     .getFullName(false)));
                 // Assign the generated value
                 if (store.assignField(sm, pks[i].getIndex(), preFlush))
-                    pks[i].set_generated(true);
+                    pks[i].setValueGenerated(true);
                 else
                     return false;
             }