Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCCompany.java	(working copy)
@@ -39,9 +39,8 @@
 /**
  * This class represents information about a company.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="companies")
 @Implements ("org.apache.jdo.tck.pc.company.ICompany")
-@Table(table="companies")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCDepartment.java	(working copy)
@@ -37,9 +37,8 @@
 /**
  * This class represents a department within a company.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="departments")
 @Implements ("org.apache.jdo.tck.pc.company.IDepartment")
-@Table(table="departments")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCInsurance.java	(working copy)
@@ -32,9 +32,8 @@
  * This class represents an insurance carrier selection for a particular
  * <code>FCEmployee</code>.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="insuranceplans" )
 @Implements ("org.apache.jdo.tck.pc.company.IInsurance")
-@Table(table="insuranceplans")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCPerson.java	(working copy)
@@ -38,9 +38,8 @@
 /**
  * This class represents a person.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="persons")
 @Implements ("org.apache.jdo.tck.pc.company.IPerson")
-@Table(table="persons")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -72,9 +71,8 @@
 
     // maps phone number types ("home", "work", "mobile", etc.) 
     // to phone numbers specified as String
-    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
     @Join(column="EMPID")
-    @JoinTable(table="employee_phoneno_type")
     @Key(types=java.lang.String.class, column="TYPE")
     @Value(types=java.lang.String.class, column="PHONENO")
     private Map phoneNumbers = new HashMap();
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/FCProject.java	(working copy)
@@ -37,9 +37,8 @@
  * This class represents a project, a budgeted task with one or more
  * employees working on it.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="projects")
 @Implements ("org.apache.jdo.tck.pc.company.IProject")
-@Table(table="projects")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
@@ -54,7 +53,7 @@
     @Column(name="BUDGET", jdbcType="DECIMAL", length=11, scale=2)
     private BigDecimal budget;
     @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="proj_reviewer")
+            table="project_reviewer")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
             column="REVIEWER")
     @Join(column="PROJID")
@@ -61,7 +60,7 @@
     //@Join(column="PROJID", foreignKey=@ForeignKey(name="PR_PROJ_FK"))
     private transient Set reviewers = new HashSet();
     @Field(persistenceModifier=FieldPersistenceModifier.PERSISTENT,
-            table="proj_member")
+            table="project_member")
     @Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
             column="MEMBER")
     //@Element(types=org.apache.jdo.tck.pc.companyAnnotatedApp.FCEmployee.class,
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PICompany.java	(working copy)
@@ -27,8 +27,7 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Table(table="companies")
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="companies")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIDepartment.java	(working copy)
@@ -26,9 +26,8 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
+@PersistenceCapable(identityType=IdentityType.APPLICATION, table="departments")
 @Implements ("org.apache.jdo.tck.pc.company.IDepartment")
-@Table(table="departments")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIInsurance.java	(working copy)
@@ -24,8 +24,7 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Table(table="insuranceplans")
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="insuranceplans")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIPerson.java	(working copy)
@@ -27,8 +27,7 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Table(table="persons")
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="persons")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR", indexed="true")
@@ -56,9 +55,8 @@
     })
     PIAddress getAddress();
     Date getBirthdate();
-    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT)
+    @Property(persistenceModifier=FieldPersistenceModifier.PERSISTENT, table="employee_phoneno_type")
     @Join(column="EMPID")
-    @JoinTable(table="employee_phoneno_type")
     @Key(types=java.lang.String.class)
     @Value(types=java.lang.String.class)
     Map getPhoneNumbers();
Index: /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java
===================================================================
--- /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java	(revision 553073)
+++ /home/andy/work/jdo/trunk/tck2/src/java/org/apache/jdo/tck/pc/companyAnnotatedApp/PIProject.java	(working copy)
@@ -26,8 +26,7 @@
  * Javadoc was deliberately omitted because it would distract from
  * the purpose of the interface.
  */
-@PersistenceCapable(identityType=IdentityType.APPLICATION)
-@Table(table="projects")
+@PersistenceCapable(identityType=IdentityType.APPLICATION,table="projects")
 @Inheritance(strategy=InheritanceStrategy.NEW_TABLE)
 @Discriminator(strategy=DiscriminatorStrategy.CLASS_NAME,
         column="DISCRIMINATOR")