diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java
index 3ff88c0a4..26d9e2f3a 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/EntityWithIdClass.java
@@ -23,13 +23,13 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 
 /**
- * A persistent class using a {@link TestId separate class} as its primary identifier.
+ * A persistent class using a {@link IdTestClass separate class} as its primary identifier.
  * 
  * @author Pinaki Poddar
  *
  */
 @Entity
-@IdClass(TestId.class)
+@IdClass(IdTestClass.class)
 public class EntityWithIdClass {
 	@Id
 	private String name;
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/IdTestClass.java
similarity index 96%
rename from openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestId.java
rename to openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/IdTestClass.java
index d00df8b58..ace7af81d 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/TestId.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/criteria/IdTestClass.java
@@ -31,7 +31,7 @@ package org.apache.openjpa.persistence.criteria;
  * @author Pinaki Poddar
  *
  */
-public class TestId {
+public class IdTestClass {
         String name;
         long   ssn;
         
@@ -52,7 +52,7 @@ public class TestId {
                         return false;
                 if (getClass() != obj.getClass())
                         return false;
-                TestId other = (TestId) obj;
+                IdTestClass other = (IdTestClass) obj;
                 if (name == null) {
                         if (other.name != null)
                                 return false;