Index: src/com/metamatrix/metamodels/builder/ModelRecord.java
===================================================================
RCS file: /cvs/dev/com.metamatrix.metamodels.builder/src/com/metamatrix/metamodels/builder/Attic/ModelRecord.java,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 ModelRecord.java
--- src/com/metamatrix/metamodels/builder/ModelRecord.java	10 Jul 2006 18:55:19 -0000	1.1.6.1
+++ src/com/metamatrix/metamodels/builder/ModelRecord.java	9 Apr 2007 20:41:36 -0000
@@ -12,6 +12,7 @@
 	private String modelType;
 	private String modelSubType;
 	private String modelName;
+    private String modelNameInSource;
 	private String modelDescription;
     private String extensionPackage;
 	
@@ -29,17 +30,19 @@
 	 * Constructor
 	 * @param type the type of model (eg 'Relational', 'Extension', 'Relationship', etc)
 	 * @param subType the model subType (eg 'Physical', 'Virtual', etc)
-	 * @param name the model name
+     * @param name the model name
+     * @param nameInSource the model nameInSource
 	 * @param description the model description
 	 * @param extPackage the extension package for this model
 	 */
-	public ModelRecord(String type, String subType, String name, String description, String extPackage) {
+	public ModelRecord(String type, String subType, String name, String nameInSource, String description, String extPackage) {
 		super();
         ArgCheck.isNotNull(type);
         ArgCheck.isNotNull(name);
 		this.modelType = type;
 		this.modelSubType = subType;
 		this.modelName = name;
+        this.modelNameInSource = nameInSource;
 		this.modelDescription = description;
 		this.extensionPackage = extPackage;
 	}
@@ -72,16 +75,33 @@
 		return modelName;
 	}
 	
-	/**
-	 * Set the Model Name
-	 * @param modelName the model name
-	 */
-	public void setModelName(String modelName) {
+    /**
+     * Set the Model Name
+     * @param modelName the model name
+     */
+    public void setModelName(String modelName) {
         ArgCheck.isNotNull(modelName);
-		this.modelName = modelName;
-	}
+        this.modelName = modelName;
+    }
 	
-	/**
+    /**
+     * Get the Model Name In Source
+     * @return the model NameInSource
+     */
+    public String getModelNameInSource() {
+        return modelNameInSource;
+    }
+    
+    /**
+     * Set the Model NameInSource
+     * @param modelNameInSource the model name
+     */
+    public void setModelNameInSource(String modelNameInSource) {
+        ArgCheck.isNotNull(modelNameInSource);
+        this.modelNameInSource = modelNameInSource;
+    }
+
+    /**
 	 * Get the Model subType
 	 * @return the model subType
 	 */
Index: src/com/metamatrix/metamodels/builder/translator/RecordGenerator.java
===================================================================
RCS file: /cvs/dev/com.metamatrix.metamodels.builder/src/com/metamatrix/metamodels/builder/translator/Attic/RecordGenerator.java,v
retrieving revision 1.1.6.1
diff -u -r1.1.6.1 RecordGenerator.java
--- src/com/metamatrix/metamodels/builder/translator/RecordGenerator.java	10 Jul 2006 18:55:19 -0000	1.1.6.1
+++ src/com/metamatrix/metamodels/builder/translator/RecordGenerator.java	9 Apr 2007 20:41:36 -0000
@@ -27,7 +27,8 @@
 	
 	private static final String MODEL_TYPE = "ModelType";  //$NON-NLS-1$
 	private static final String MODEL_SUBTYPE = "SubType";  //$NON-NLS-1$
-	private static final String MODEL_NAME = "Name";  //$NON-NLS-1$
+    private static final String MODEL_NAME = "Name";  //$NON-NLS-1$
+    private static final String MODEL_NAME_IN_SOURCE = "NameInSource";  //$NON-NLS-1$
 	private static final String MODEL_DESC = "Description";  //$NON-NLS-1$
 	private static final String MODEL_EXT_PACKAGE = "ExtPackage";  //$NON-NLS-1$
 	private static final String METACLASS_URI = "MetaClassUri";  //$NON-NLS-1$
@@ -67,7 +68,8 @@
 			Map recordMap = (Map)iter.next();
 			String modelType = (String)recordMap.get(MODEL_TYPE);
 			String subType = (String)recordMap.get(MODEL_SUBTYPE);
-			String name = (String)recordMap.get(MODEL_NAME);
+            String name = (String)recordMap.get(MODEL_NAME);
+            String nameInSource = (String)recordMap.get(MODEL_NAME_IN_SOURCE);
 			String desc = (String)recordMap.get(MODEL_DESC);
 			String extPackage = (String)recordMap.get(MODEL_EXT_PACKAGE);
 			ModelRecord record = null;
@@ -80,7 +82,7 @@
 	            }
 			} else {
 				try {
-					record = new ModelRecord(modelType,subType,name,desc,extPackage);
+					record = new ModelRecord(modelType,subType,name,nameInSource,desc,extPackage);
 				} catch (IllegalArgumentException ex) {
 		            final String msg = getString("unableToCreateModelRecord"); //$NON-NLS-1$
 		            BuilderUtil.addStatus(status, IStatus.WARNING, msg, ex);