Index: src/java/org/apache/jdo/tck/pc/company/IInsurance.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/IInsurance.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/IInsurance.java	(working copy)
@@ -30,4 +30,6 @@
     void setInsid(long insid);
     void setCarrier(String carrier);
     void setEmployee(IEmployee employee);
+
+    public int compareTo(Object o);
 }
Index: src/java/org/apache/jdo/tck/pc/company/Department.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Department.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Department.java	(working copy)
@@ -246,7 +246,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        Department otherDept = (Department)other;
+        IDepartment otherDept = (IDepartment)other;
         String where = "Department<" + deptid + ">";
         return 
             helper.equals(deptid, otherDept.getDeptid(), where + ".deptid") & 
@@ -294,7 +294,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Department)o1).compareTo(o2);
+        return ((IDepartment)o1).compareTo(o2);
     }
 
     /** 
Index: src/java/org/apache/jdo/tck/pc/company/Company.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Company.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Company.java	(working copy)
@@ -233,7 +233,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Company)o1).compareTo(o2);
+        return ((ICompany)o1).compareTo(o2);
     }
 
     /** 
Index: src/java/org/apache/jdo/tck/pc/company/Person.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Person.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Person.java	(working copy)
@@ -293,7 +293,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Person)o1).compareTo(o2);
+        return ((IPerson)o1).compareTo(o2);
     }
 
    /** 
Index: src/java/org/apache/jdo/tck/pc/company/Project.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Project.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Project.java	(working copy)
@@ -233,7 +233,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Project)o1).compareTo(o2);
+        return ((IProject)o1).compareTo(o2);
     }
 
     /** 
Index: src/java/org/apache/jdo/tck/pc/company/IDepartment.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/IDepartment.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/IDepartment.java	(working copy)
@@ -39,4 +39,5 @@
     void setEmployees(Set employees);
     void setFundedEmps(Set employees);
 
+    public int compareTo(Object o);
 }
Index: src/java/org/apache/jdo/tck/pc/company/ICompany.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/ICompany.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/ICompany.java	(working copy)
@@ -37,4 +37,6 @@
     void setDepartments(Set depts);
     void setFounded(Date date);
     void setName(String string);
+
+    public int compareTo(Object o);
 }
Index: src/java/org/apache/jdo/tck/pc/company/IPerson.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/IPerson.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/IPerson.java	(working copy)
@@ -42,4 +42,5 @@
     void setBirthdate(Date birthdate);
     void setPhoneNumbers(Map phoneNumbers);
 
+    public int compareTo(Object o);
 }
Index: src/java/org/apache/jdo/tck/pc/company/IProject.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/IProject.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/IProject.java	(working copy)
@@ -36,5 +36,6 @@
     void setBudget(BigDecimal budget);
     void setReviewers(Set reviewers);
     void setMembers(Set employees);
-    
+
+    public int compareTo(Object o);
 }
Index: src/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/FullTimeEmployee.java	(working copy)
@@ -117,7 +117,7 @@
      */
     public boolean deepCompareFields(Object other, 
                                      EqualityHelper helper) {
-        FullTimeEmployee otherEmp = (FullTimeEmployee)other;
+        IFullTimeEmployee otherEmp = (IFullTimeEmployee)other;
         String where = "FullTimeEmployee<" + getPersonid() + ">";
         return super.deepCompareFields(otherEmp, helper) &
             helper.closeEnough(salary, otherEmp.getSalary(), where + ".salary");
Index: src/java/org/apache/jdo/tck/pc/company/Address.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Address.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Address.java	(working copy)
@@ -209,7 +209,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Address)o1).compareTo(o2);
+        return ((IAddress)o1).compareTo(o2);
     }
 
     /** 
Index: src/java/org/apache/jdo/tck/pc/company/Insurance.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/Insurance.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/Insurance.java	(working copy)
@@ -153,7 +153,7 @@
      * Compare two instances. This is a method in Comparator.
      */
     public int compare(Object o1, Object o2) {
-        return ((Insurance)o1).compareTo(o2);
+        return ((IInsurance)o1).compareTo(o2);
     }
 
     /** 
Index: src/java/org/apache/jdo/tck/pc/company/IAddress.java
===================================================================
--- src/java/org/apache/jdo/tck/pc/company/IAddress.java	(revision 391925)
+++ src/java/org/apache/jdo/tck/pc/company/IAddress.java	(working copy)
@@ -36,4 +36,6 @@
     void setState(String state);
     void setZipcode(String zipcode);
     void setCountry(String country);
+
+    public int compareTo(Object o);
 }