Index: src/main/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java
===================================================================
--- src/main/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java	(revision 555095)
+++ src/main/java/org/apache/juddi/datastore/jdbc/JDBCDataStore.java	(working copy)
@@ -1404,7 +1404,7 @@
         TModel tModel = TModelTable.select(tModelKey,connection);
         info = new TModelInfo();
         info.setTModelKey(tModelKey);
-        info.setNameValue(tModel.getName());
+        info.setName(tModel.getName());
       }
       catch(java.sql.SQLException sqlex)
       {
Index: src/main/java/org/apache/juddi/datastore/jdbc/TModelTable.java
===================================================================
--- src/main/java/org/apache/juddi/datastore/jdbc/TModelTable.java	(revision 555095)
+++ src/main/java/org/apache/juddi/datastore/jdbc/TModelTable.java	(working copy)
@@ -23,6 +23,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.datatype.Name;
 import org.apache.juddi.datatype.OverviewDoc;
 import org.apache.juddi.datatype.tmodel.TModel;
 
@@ -54,9 +55,10 @@
     sql.append("PUBLISHER_ID,");
     sql.append("OPERATOR,");
     sql.append("NAME,");
+    sql.append("LANG_CODE,");
     sql.append("OVERVIEW_URL,");
     sql.append("LAST_UPDATE) ");
-    sql.append("VALUES (?,?,?,?,?,?,?)");
+    sql.append("VALUES (?,?,?,?,?,?,?,?)");
     insertSQL = sql.toString();
 
     // build deleteSQL
@@ -78,6 +80,7 @@
     sql.append("AUTHORIZED_NAME,");
     sql.append("OPERATOR,");
     sql.append("NAME,");
+    sql.append("LANG_CODE,");
     sql.append("OVERVIEW_URL,");
     sql.append("DELETED ");
     sql.append("FROM TMODEL ");
@@ -130,16 +133,18 @@
       statement.setString(2,tModel.getAuthorizedName());
       statement.setString(3,publisherID);
       statement.setString(4,tModel.getOperator());
-      statement.setString(5,tModel.getName());
-      statement.setString(6,overviewURL);
-      statement.setTimestamp(7,timeStamp);
+      statement.setString(5,tModel.getName().getValue());
+      statement.setString(6,tModel.getName().getLanguageCode());
+      statement.setString(7,overviewURL);
+      statement.setTimestamp(8,timeStamp);
 
       log.debug(insertSQL +
         "\n\t TMODEL_KEY=" + tModel.getTModelKey().toString() +
         "\n\t AUTHORIZED_NAME=" + tModel.getAuthorizedName() +
         "\n\t PUBLISHER_ID=" + publisherID +
         "\n\t OPERATOR=" + tModel.getOperator() +
-        "\n\t NAME=" + tModel.getName() +
+        "\n\t NAME=" + tModel.getName().getValue() +
+        "\n\t LANG_CODE=" + tModel.getName().getLanguageCode() +
         "\n\t OVERVIEW_URL=" + overviewURL +
         "\n\t LAST_UPDATE=" + timeStamp.getTime() + "\n");
 
@@ -250,10 +255,15 @@
         tModel.setTModelKey(tModelKey);
         tModel.setAuthorizedName(resultSet.getString(1));//("AUTHORIZED_NAME"));
         tModel.setOperator(resultSet.getString(2));//("OPERATOR"));
-        tModel.setName(resultSet.getString(3));//("NAME"));
 
+        Name name = new Name();
+        name.setValue(resultSet.getString(3));//("NAME"));
+        name.setLanguageCode(resultSet.getString(4));//("LANG_CODE"));
+
+        tModel.setName(name);
+
         OverviewDoc overviewDoc = new OverviewDoc();
-        overviewDoc.setOverviewURL(resultSet.getString(4));//("OVERVIEW_URL"));
+        overviewDoc.setOverviewURL(resultSet.getString(5));//("OVERVIEW_URL"));
         tModel.setOverviewDoc(overviewDoc);
       }
 
Index: src/main/java/org/apache/juddi/datatype/tmodel/TModel.java
===================================================================
--- src/main/java/org/apache/juddi/datatype/tmodel/TModel.java	(revision 555095)
+++ src/main/java/org/apache/juddi/datatype/tmodel/TModel.java	(working copy)
@@ -179,7 +179,7 @@
   String tModelKey;
   String authorizedName;
   String operator;
-  String nameValue;
+  Name name;
   Vector descVector;
   OverviewDoc overviewDoc;
   IdentifierBag identifierBag;
@@ -201,7 +201,7 @@
    */
   public TModel(String name)
   {
-    this.nameValue = name;
+    setName(name);
   }
 
   /**
@@ -212,7 +212,7 @@
    */
   public TModel(String name,String key)
   {
-    this.nameValue = name;
+    setName(name);
     this.tModelKey = key;
   }
 
@@ -263,9 +263,13 @@
    *
    * @param name The new name of this tModel.
    */
-  public void setName(String name)
+  public void setName(String nameValue)
   {
-    this.nameValue = name;
+      if (nameValue == null) {
+          this.name = null;
+      } else {
+          this.name = new Name(nameValue);
+      }
   }
 
   /**
@@ -273,9 +277,9 @@
    *
    * @return The name of this tModel.
    */
-  public String getName()
+  public Name getName()
   {
-    return this.nameValue;
+      return this.name;
   }
 
   /**
@@ -285,10 +289,7 @@
     */
   public void setName(Name name)
   {
-    if (name != null)
-      this.nameValue = name.getValue();
-    else
-      this.nameValue = null;
+      this.name = name;
   }
 
   /**
@@ -436,4 +437,4 @@
   {
     this.categoryBag = bag;
   }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/juddi/datatype/response/TModelInfo.java
===================================================================
--- src/main/java/org/apache/juddi/datatype/response/TModelInfo.java	(revision 555095)
+++ src/main/java/org/apache/juddi/datatype/response/TModelInfo.java	(working copy)
@@ -26,7 +26,7 @@
 public class TModelInfo implements RegistryObject
 {
   String tModelKey;
-  String nameValue;
+  Name name;
 
   /**
    * default constructor
@@ -41,7 +41,7 @@
   public TModelInfo(String key,String name)
   {
     this.tModelKey = key;
-    this.nameValue = name;
+    setNameValue(name);
   }
 
   /**
@@ -57,7 +57,11 @@
    */
   public void setNameValue(String nameValue)
   {
-    this.nameValue = nameValue;
+      if (nameValue == null) {
+          this.name = null;
+      } else {
+          this.name = new Name(nameValue);
+      }
   }
 
   /**
@@ -67,10 +71,7 @@
     */
   public void setName(Name name)
   {
-    if (name != null)
-      this.nameValue = name.getValue();
-    else
-      this.nameValue = null;
+      this.name = name;
   }
 
   /**
@@ -86,7 +87,11 @@
    */
   public String getNameValue()
   {
-    return nameValue;
+      if (this.name == null) {
+          return null;
+      } else {
+          return this.name.getValue();
+      }
   }
 
   /**
@@ -94,9 +99,6 @@
    */
   public Name getName()
   {
-    if (this.nameValue != null)
-      return new Name(nameValue);
-    else
-      return null;
+      return this.name;
   }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/juddi/handler/TModelHandler.java
===================================================================
--- src/main/java/org/apache/juddi/handler/TModelHandler.java	(revision 555095)
+++ src/main/java/org/apache/juddi/handler/TModelHandler.java	(working copy)
@@ -124,11 +124,11 @@
     if (authName != null)
       element.setAttribute("authorizedName",authName);
 
-    String name = tModel.getName();
+    Name name = tModel.getName();
     if (name != null)
     {
       handler = maker.lookup(NameHandler.TAG_NAME);
-      handler.marshal(new Name(name),element);
+      handler.marshal(name,element);
     }
 
     Vector descrVector = tModel.getDescriptionVector();
@@ -218,4 +218,4 @@
     parent.removeChild(child);
     XMLUtils.writeXML(child,System.out);
   }
-}
\ No newline at end of file
+}
Index: src/main/resources/sql/jdatastore/create_database.sql
===================================================================
--- src/main/resources/sql/jdatastore/create_database.sql	(revision 555095)
+++ src/main/resources/sql/jdatastore/create_database.sql	(working copy)
@@ -306,6 +306,7 @@
   PUBLISHER_ID VARCHAR(20) NULL,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) NULL,
   OVERVIEW_URL VARCHAR(255) NULL,
   DELETED VARCHAR(5) NULL,
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/postgresql/create_database.sql
===================================================================
--- src/main/resources/sql/postgresql/create_database.sql	(revision 555095)
+++ src/main/resources/sql/postgresql/create_database.sql	(working copy)
@@ -329,6 +329,7 @@
 	PUBLISHER_ID VARCHAR(20) NULL,
 	OPERATOR VARCHAR(255) NOT NULL,
 	NAME VARCHAR(255) NOT NULL,
+        LANG_CODE VARCHAR(5) NULL,
 	OVERVIEW_URL VARCHAR(255) NULL,
     DELETED VARCHAR(5) NULL,
 	LAST_UPDATE TIMESTAMP NOT NULL DEFAULT NOW(),
Index: src/main/resources/sql/totalxml/create_database.sql
===================================================================
--- src/main/resources/sql/totalxml/create_database.sql	(revision 555095)
+++ src/main/resources/sql/totalxml/create_database.sql	(working copy)
@@ -306,6 +306,7 @@
   PUBLISHER_ID VARCHAR(20) NULL,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) NULL,
   OVERVIEW_URL VARCHAR(255) NULL,
   DELETED VARCHAR(5) NULL,
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/derby/create_database.sql
===================================================================
--- src/main/resources/sql/derby/create_database.sql	(revision 555095)
+++ src/main/resources/sql/derby/create_database.sql	(working copy)
@@ -275,6 +275,7 @@
   PUBLISHER_ID VARCHAR(20) ,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5),
   OVERVIEW_URL VARCHAR(255) ,
   DELETED VARCHAR(5),
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/mysql/create_database.sql
===================================================================
--- src/main/resources/sql/mysql/create_database.sql	(revision 555095)
+++ src/main/resources/sql/mysql/create_database.sql	(working copy)
@@ -275,6 +275,7 @@
   PUBLISHER_ID VARCHAR(20) NULL,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) NULL,
   OVERVIEW_URL VARCHAR(255) NULL,
   DELETED VARCHAR(5) NULL,
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/oracle/create_database.sql
===================================================================
--- src/main/resources/sql/oracle/create_database.sql	(revision 555095)
+++ src/main/resources/sql/oracle/create_database.sql	(working copy)
@@ -296,6 +296,7 @@
   PUBLISHER_ID VARCHAR2(20) NULL,
   OPERATOR VARCHAR2(255) NOT NULL,
   NAME VARCHAR2(255) NOT NULL,
+  LANG_CODE VARCHAR2(5) NULL,
   OVERVIEW_URL VARCHAR2(255) NULL,
   DELETED VARCHAR2(5) NULL,
   LAST_UPDATE DATE NOT NULL
Index: src/main/resources/sql/firebird/create_database.sql
===================================================================
--- src/main/resources/sql/firebird/create_database.sql	(revision 555095)
+++ src/main/resources/sql/firebird/create_database.sql	(working copy)
@@ -231,6 +231,7 @@
     PUBLISHER_ID     VARCHAR(20),
     OPERATOR         VARCHAR(255) NOT NULL,
     NAME             VARCHAR(255) NOT NULL,
+    LANG_CODE        VARCHAR(5),
     OVERVIEW_URL     VARCHAR(255),
     DELETED          VARCHAR(5),
     LAST_UPDATE      TIMESTAMP NOT NULL
Index: src/main/resources/sql/sybase/create_database.sql
===================================================================
--- src/main/resources/sql/sybase/create_database.sql	(revision 555095)
+++ src/main/resources/sql/sybase/create_database.sql	(working copy)
@@ -306,6 +306,7 @@
   PUBLISHER_ID VARCHAR(20) NULL,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) NULL,
   OVERVIEW_URL VARCHAR(255) NULL,
   DELETED VARCHAR(5) NULL,
   LAST_UPDATE DATETIME NOT NULL,
Index: src/main/resources/sql/db2/create_database.sql
===================================================================
--- src/main/resources/sql/db2/create_database.sql	(revision 555095)
+++ src/main/resources/sql/db2/create_database.sql	(working copy)
@@ -307,6 +307,7 @@
   PUBLISHER_ID VARCHAR(20) ,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5),
   OVERVIEW_URL VARCHAR(255) ,
   DELETED VARCHAR(5),
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/informix/create_database.sql
===================================================================
--- src/main/resources/sql/informix/create_database.sql	(revision 555095)
+++ src/main/resources/sql/informix/create_database.sql	(working copy)
@@ -309,6 +309,7 @@
   PUBLISHER_ID VARCHAR(20) ,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5),
   OVERVIEW_URL VARCHAR(255) ,
   DELETED VARCHAR(5),
   LAST_UPDATE DATETIME YEAR TO FRACTION DEFAULT CURRENT NOT NULL,
Index: src/main/resources/sql/hsqldb/create_database.sql
===================================================================
--- src/main/resources/sql/hsqldb/create_database.sql	(revision 555095)
+++ src/main/resources/sql/hsqldb/create_database.sql	(working copy)
@@ -306,6 +306,7 @@
   PUBLISHER_ID VARCHAR(20) NULL,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) NULL,
   OVERVIEW_URL VARCHAR(255) NULL,
   DELETED VARCHAR(5) NULL,
   LAST_UPDATE TIMESTAMP NOT NULL,
Index: src/main/resources/sql/daffodildb/create_database.sql
===================================================================
--- src/main/resources/sql/daffodildb/create_database.sql	(revision 555095)
+++ src/main/resources/sql/daffodildb/create_database.sql	(working copy)
@@ -279,6 +279,7 @@
   PUBLISHER_ID VARCHAR(20) ,
   OPERATOR VARCHAR(255) NOT NULL,
   NAME VARCHAR(255) NOT NULL,
+  LANG_CODE VARCHAR(5) ,
   OVERVIEW_URL VARCHAR(255) ,
   DELETED VARCHAR(5) ,
   LAST_UPDATE TIMESTAMP NOT NULL,