diff --git a/lib/metamodelutil.js b/lib/metamodelutil.js
index e735146..7885867 100644
--- a/lib/metamodelutil.js
+++ b/lib/metamodelutil.js
@@ -59,11 +59,11 @@ function findDeclaration(thisModel, name) {
 function createNameTable(priorModels, metaModel) {
     const concertoNs = 'concerto@1.0.0';
     const table = {
-        'Concept': concertoNs,
-        'Asset': concertoNs,
-        'Participant': concertoNs,
-        'Transaction ': concertoNs,
-        'Event': concertoNs
+        'Concept': {namespace: concertoNs, name: 'Concept'},
+        'Asset': {namespace: concertoNs, name: 'Asset'},
+        'Participant': {namespace: concertoNs, name: 'Participant'},
+        'Transaction': {namespace: concertoNs, name: 'Transaction'},
+        'Event': {namespace: concertoNs, name: 'Event'}
     };
 
     // First list the imported names in order (overriding as we go along)
@@ -74,7 +74,7 @@ function createNameTable(priorModels, metaModel) {
             if (!findDeclaration(modelFile, imp.name)) {
                 throw new Error(`Declaration ${imp.name} in namespace ${namespace} not found`);
             }
-            table[imp.name] = namespace;
+            table[imp.name] = {namespace, name: imp.name};
         } else if (imp.$class === `${MetaModelNamespace}.ImportTypes`) {
             // Create a map of aliased types if they exist, otherwise initialize an empty map.
             const aliasedMap = imp.aliasedTypes
@@ -89,18 +89,18 @@ function createNameTable(priorModels, metaModel) {
                 if (!findDeclaration(modelFile, type)) {
                     throw new Error(`Declaration ${type} in namespace ${namespace} not found`);
                 }
-                table[localName] = namespace;
+                table[localName] = {namespace, name: type};
             });
         } else {
             (modelFile.declarations || []).forEach((decl) => {
-                table[decl.name] = namespace;
+                table[decl.name] = {namespace, name: decl.name};
             });
         }
     });
 
     // Then add the names local to this metaModel (overriding as we go along)
     (metaModel.declarations || []).forEach((decl) => {
-        table[decl.name] = metaModel.namespace;
+        table[decl.name] = {namespace: metaModel.namespace, name: decl.name};
     });
 
     return table;
@@ -116,7 +116,7 @@ function resolveName(name, table) {
     if (!table[name]) {
         throw new Error(`Name ${name} not found`);
     }
-    return table[name];
+    return table[name].namespace;
 }
 
 /**
@@ -146,6 +146,7 @@ function resolveTypeNames(metaModel, table) {
         if (metaModel.superType) {
             const name = metaModel.superType.name;
             metaModel.superType.namespace = resolveName(name, table);
+            metaModel.superType.name = table[name].name;
         }
         (metaModel.properties || []).forEach((property) => {
             resolveTypeNames(property, table);
@@ -170,6 +171,7 @@ function resolveTypeNames(metaModel, table) {
     case `${MetaModelNamespace}.ObjectMapKeyType`:
     case `${MetaModelNamespace}.ObjectMapValueType`: {
         metaModel.type.namespace = resolveName(metaModel.type.name, table);
+        metaModel.type.name = table[metaModel.type.name].name;
     }
         break;
     case `${MetaModelNamespace}.StringScalar`:
@@ -179,6 +181,7 @@ function resolveTypeNames(metaModel, table) {
     case `${MetaModelNamespace}.LongScalar`:
     case `${MetaModelNamespace}.IntegerScalar`: {
         metaModel.namespace = resolveName(metaModel.name, table);
+        metaModel.name = table[metaModel.name].name;
     }
         break;
     }
diff --git a/test/cto/aliasedImport.json b/test/cto/aliasedImport.json
index aa28b3f..35f2217 100644
--- a/test/cto/aliasedImport.json
+++ b/test/cto/aliasedImport.json
@@ -16,39 +16,9 @@
                             "$class": "concerto.metamodel@1.0.0.StringProperty",
                             "name": "name",
                             "isArray": false,
-                            "isOptional": false,
-                            "location": {
-                                "$class": "concerto.metamodel@1.0.0.Range",
-                                "start": {
-                                    "offset": 35,
-                                    "line": 4,
-                                    "column": 2,
-                                    "$class": "concerto.metamodel@1.0.0.Position"
-                                },
-                                "end": {
-                                    "offset": 49,
-                                    "line": 5,
-                                    "column": 1,
-                                    "$class": "concerto.metamodel@1.0.0.Position"
-                                }
-                            }
+                            "isOptional": false
                         }
-                    ],
-                    "location": {
-                        "$class": "concerto.metamodel@1.0.0.Range",
-                        "start": {
-                            "offset": 22,
-                            "line": 3,
-                            "column": 1,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        },
-                        "end": {
-                            "offset": 50,
-                            "line": 5,
-                            "column": 2,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        }
-                    }
+                    ]
                 }
             ]
         },
@@ -78,21 +48,6 @@
                     "name": "file",
                     "isAbstract": false,
                     "properties": [],
-                    "location": {
-                        "$class": "concerto.metamodel@1.0.0.Range",
-                        "start": {
-                            "offset": 50,
-                            "line": 5,
-                            "column": 1,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        },
-                        "end": {
-                            "offset": 75,
-                            "line": 6,
-                            "column": 2,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        }
-                    },
                     "superType": {
                         "$class": "concerto.metamodel@1.0.0.TypeIdentifier",
                         "name": "d"
diff --git a/test/cto/aliasedImportResolved.json b/test/cto/aliasedImportResolved.json
index f2e11cb..4feb000 100644
--- a/test/cto/aliasedImportResolved.json
+++ b/test/cto/aliasedImportResolved.json
@@ -16,39 +16,9 @@
                             "$class": "concerto.metamodel@1.0.0.StringProperty",
                             "name": "name",
                             "isArray": false,
-                            "isOptional": false,
-                            "location": {
-                                "$class": "concerto.metamodel@1.0.0.Range",
-                                "start": {
-                                    "offset": 35,
-                                    "line": 4,
-                                    "column": 2,
-                                    "$class": "concerto.metamodel@1.0.0.Position"
-                                },
-                                "end": {
-                                    "offset": 49,
-                                    "line": 5,
-                                    "column": 1,
-                                    "$class": "concerto.metamodel@1.0.0.Position"
-                                }
-                            }
+                            "isOptional": false
                         }
-                    ],
-                    "location": {
-                        "$class": "concerto.metamodel@1.0.0.Range",
-                        "start": {
-                            "offset": 22,
-                            "line": 3,
-                            "column": 1,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        },
-                        "end": {
-                            "offset": 50,
-                            "line": 5,
-                            "column": 2,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        }
-                    }
+                    ]
                 }
             ]
         },
@@ -78,24 +48,9 @@
                     "name": "file",
                     "isAbstract": false,
                     "properties": [],
-                    "location": {
-                        "$class": "concerto.metamodel@1.0.0.Range",
-                        "start": {
-                            "offset": 50,
-                            "line": 5,
-                            "column": 1,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        },
-                        "end": {
-                            "offset": 75,
-                            "line": 6,
-                            "column": 2,
-                            "$class": "concerto.metamodel@1.0.0.Position"
-                        }
-                    },
                     "superType": {
                         "$class": "concerto.metamodel@1.0.0.TypeIdentifier",
-                        "name": "d",
+                        "name": "doc",
                         "namespace": "org.saluja"
                     }
                 }