1 files changed, 2 insertions, 22 deletions
diff --git a/source/slang/decl-defs.h b/source/slang/decl-defs.h
index f30d4af82..f27ab9ba6 100644
--- a/source/slang/decl-defs.h
+++ b/source/slang/decl-defs.h
@@ -21,7 +21,7 @@ ABSTRACT_SYNTAX_CLASS(ContainerDecl, Decl)
 
     // Dictionary for looking up members by name.
     // This is built on demand before performing lookup.
-    Dictionary<String, Decl*> memberDictionary;
+    Dictionary<Name*, Decl*> memberDictionary;
 
     // Whether the `memberDictionary` is valid.
     // Should be set to `false` if any members get added/remoed.
@@ -80,26 +80,6 @@ RAW(
     {
         return getMembersOfType<StructField>();
     }
-    StructField* FindField(String name)
-    {
-        for (auto field : GetFields())
-        {
-            if (field->Name.Content == name)
-                return field.Ptr();
-        }
-        return nullptr;
-    }
-    int FindFieldIndex(String name)
-    {
-        int index = 0;
-        for (auto field : GetFields())
-        {
-            if (field->Name.Content == name)
-                return index;
-            index++;
-        }
-        return -1;
-    }
     )
 END_SYNTAX_CLASS()
 
@@ -176,7 +156,7 @@ SIMPLE_SYNTAX_CLASS(ModuleDecl, ContainerDecl)
 
 SYNTAX_CLASS(ImportDecl, Decl)
     // The name of the module we are trying to import
-    FIELD(Token, nameToken)
+    FIELD(NameLoc, moduleNameAndLoc)
 
     // The scope that we want to import into
     FIELD(RefPtr<Scope>, scope)