Index: api2/src/java/javax/jdo/PersistenceManagerFactory.java
===================================================================
--- api2/src/java/javax/jdo/PersistenceManagerFactory.java	(revision 770758)
+++ api2/src/java/javax/jdo/PersistenceManagerFactory.java	Wed May 27 16:43:39 PDT 2009
@@ -24,7 +24,7 @@
 
 import javax.jdo.datastore.DataStoreCache;
 import javax.jdo.listener.InstanceLifecycleListener;
-import javax.jdo.metadata.ComponentMetadata;
+import javax.jdo.metadata.TypeMetadata;
 import javax.jdo.metadata.JDOMetadata;
 import javax.jdo.spi.JDOPermission; // for getFetchGroups javadoc
 import java.io.Serializable;
@@ -746,5 +746,5 @@
      * @return The metadata
      * @since 2.3
      */
-    ComponentMetadata getMetadata(String className);
+    TypeMetadata getMetadata(String className);
 }
Index: api2/src/java/javax/jdo/metadata/ClassMetadata.java
===================================================================
--- api2/src/java/javax/jdo/metadata/ClassMetadata.java	(revision 770629)
+++ api2/src/java/javax/jdo/metadata/ClassMetadata.java	Wed May 27 16:43:39 PDT 2009
@@ -22,7 +22,7 @@
  * Represents a class.
  * @since 2.3
  */
-public interface ClassMetadata extends ComponentMetadata {
+public interface ClassMetadata extends TypeMetadata {
     /**
      * Method to define the persistence modifier.
      * @param mod persistence modifier
Index: api2/src/java/javax/jdo/metadata/InterfaceMetadata.java
===================================================================
--- api2/src/java/javax/jdo/metadata/InterfaceMetadata.java	(revision 724172)
+++ api2/src/java/javax/jdo/metadata/InterfaceMetadata.java	Wed May 27 16:43:39 PDT 2009
@@ -20,6 +20,6 @@
  * Represents a persistent-interface.
  * @since 2.3
  */
-public interface InterfaceMetadata extends ComponentMetadata {
+public interface InterfaceMetadata extends TypeMetadata {
     
 }
\ No newline at end of file
Index: api2/src/java/javax/jdo/metadata/ComponentMetadata.java
===================================================================
--- api2/src/java/javax/jdo/metadata/ComponentMetadata.java	(revision 771048)
+++ api2/src/java/javax/jdo/metadata/TypeMetadata.java	Wed May 27 16:43:39 PDT 2009
@@ -24,7 +24,7 @@
  * Represents a class or interface. Extended for the specifics of those cases.
  * @since 2.3
  */
-public interface ComponentMetadata extends Metadata {
+public interface TypeMetadata extends Metadata {
     /**
      * Accessor for the name of this component (set on construction).
      * 
@@ -37,7 +37,7 @@
      * 
      * @param id identity type
      */
-    ComponentMetadata setIdentityType(IdentityType id);
+    TypeMetadata setIdentityType(IdentityType id);
 
     /**
      * Accessor for the identity type to use.
@@ -51,7 +51,7 @@
      * 
      * @param idclass Object-id class
      */
-    ComponentMetadata setObjectIdClass(String idclass);
+    TypeMetadata setObjectIdClass(String idclass);
 
     /**
      * Accessor for the object-id class (if defined).
@@ -65,7 +65,7 @@
      * 
      * @param extent Requires extent?
      */
-    ComponentMetadata setRequiresExtent(boolean extent);
+    TypeMetadata setRequiresExtent(boolean extent);
 
     /**
      * Accessor for whether the component requires an extent.
@@ -79,7 +79,7 @@
      * 
      * @param detachable Detachable?
      */
-    ComponentMetadata setDetachable(boolean detachable);
+    TypeMetadata setDetachable(boolean detachable);
 
     /**
      * Accessor for whether this is detachable.
@@ -93,7 +93,7 @@
      * 
      * @param cacheable Cacheable?
      */
-    ComponentMetadata setCacheable(boolean cacheable);
+    TypeMetadata setCacheable(boolean cacheable);
 
     /**
      * Accessor for whether this is cacheable.
@@ -107,7 +107,7 @@
      * 
      * @param flag serializeRead
      */
-    ComponentMetadata setSerializeRead(boolean flag);
+    TypeMetadata setSerializeRead(boolean flag);
 
     /**
      * Accessor for the value of serializeRead for objects of this type.
@@ -121,7 +121,7 @@
      * 
      * @param embedded Whether it is only stored embedded
      */
-    ComponentMetadata setEmbeddedOnly(boolean embedded);
+    TypeMetadata setEmbeddedOnly(boolean embedded);
 
     /**
      * Accessor for whether this is embedded only.
@@ -135,7 +135,7 @@
      * 
      * @param catalog Catalog name
      */
-    ComponentMetadata setCatalog(String catalog);
+    TypeMetadata setCatalog(String catalog);
 
     /**
      * Accessor for the catalog (ORM) for this component
@@ -149,7 +149,7 @@
      * 
      * @param schema Schema name
      */
-    ComponentMetadata setSchema(String schema);
+    TypeMetadata setSchema(String schema);
 
     /**
      * Accessor for the schema (ORM) for this component
@@ -163,7 +163,7 @@
      * 
      * @param table Table name
      */
-    ComponentMetadata setTable(String table);
+    TypeMetadata setTable(String table);
 
     /**
      * Accessor for the name of the table.