5 files changed, 9 insertions, 16 deletions
diff --git a/tools/slang-capability-generator/capability-generator-main.cpp b/tools/slang-capability-generator/capability-generator-main.cpp
index f6202607a..56b615330 100644
--- a/tools/slang-capability-generator/capability-generator-main.cpp
+++ b/tools/slang-capability-generator/capability-generator-main.cpp
@@ -1326,8 +1326,6 @@ SlangResult parseDefFile(
     SourceView* sourceView = sourceManager->createSourceView(sourceFile, nullptr, SourceLoc());
     Lexer lexer;
     NamePool namePool;
-    RootNamePool rootPool;
-    namePool.setRootNamePool(&rootPool);
     lexer.initialize(sourceView, sink, &namePool, sourceManager->getMemoryArena());
 
     CapabilityDefParser parser(&lexer, sink, capabilitySharedContext);
diff --git a/tools/slang-cpp-parser/unit-test.cpp b/tools/slang-cpp-parser/unit-test.cpp
index 70851fd7c..41420578e 100644
--- a/tools/slang-cpp-parser/unit-test.cpp
+++ b/tools/slang-cpp-parser/unit-test.cpp
@@ -25,13 +25,10 @@ struct TestState
 
         m_sink.init(&m_sourceManager, Lexer::sourceLocationLexer);
 
-        m_namePool.setRootNamePool(&m_rootNamePool);
-
         // We don't require marker
         m_options.m_requireMark = false;
     }
 
-    RootNamePool m_rootNamePool;
     Options m_options;
     SourceManager m_sourceManager;
     DiagnosticSink m_sink;
diff --git a/tools/slang-fiddle/slang-fiddle-main.cpp b/tools/slang-fiddle/slang-fiddle-main.cpp
index b85412454..cf8407995 100644
--- a/tools/slang-fiddle/slang-fiddle-main.cpp
+++ b/tools/slang-fiddle/slang-fiddle-main.cpp
@@ -42,12 +42,12 @@ public:
 struct App
 {
 public:
-    App(SourceManager& sourceManager, DiagnosticSink& sink, RootNamePool& rootNamePool)
-        : sourceManager(sourceManager), sink(sink), rootNamePool(rootNamePool)
+    App(SourceManager& sourceManager, DiagnosticSink& sink, NamePool& namePool)
+        : sourceManager(sourceManager), sink(sink), namePool(namePool)
     {
     }
 
-    RootNamePool& rootNamePool;
+    NamePool& namePool;
     SourceManager& sourceManager;
     DiagnosticSink& sink;
 
@@ -61,7 +61,7 @@ public:
         return fiddle::parseSourceUnit(
             inputSourceView,
             logicalModule,
-            &rootNamePool,
+            &namePool,
             &sink,
             &sourceManager,
             outputFileName);
@@ -409,7 +409,7 @@ int main(int argc, char const* const* argv)
 
     ComPtr<ISlangWriter> writer(new FileWriter(stderr, WriterFlag::AutoFlush));
 
-    RootNamePool rootNamePool;
+    NamePool namePool;
 
     SourceManager sourceManager;
     sourceManager.initialize(nullptr, nullptr);
@@ -433,7 +433,7 @@ int main(int argc, char const* const* argv)
 
     try
     {
-        App app(sourceManager, sink, rootNamePool);
+        App app(sourceManager, sink, namePool);
         app.execute(argc, argv);
     }
     catch (...)
diff --git a/tools/slang-fiddle/slang-fiddle-scrape.cpp b/tools/slang-fiddle/slang-fiddle-scrape.cpp
index a96183130..c3b83527c 100644
--- a/tools/slang-fiddle/slang-fiddle-scrape.cpp
+++ b/tools/slang-fiddle/slang-fiddle-scrape.cpp
@@ -1602,20 +1602,18 @@ bool findOutputFileIncludeDirective(List<TokenWithTrivia> tokens, String outputF
 RefPtr<SourceUnit> parseSourceUnit(
     SourceView* inputSourceView,
     LogicalModule* logicalModule,
-    RootNamePool* rootNamePool,
+    NamePool* namePool,
     DiagnosticSink* sink,
     SourceManager* sourceManager,
     String outputFileName)
 {
     Lexer lexer;
-    NamePool namePool;
-    namePool.setRootNamePool(rootNamePool);
 
     // We suppress any diagnostics that might get emitted during lexing,
     // so that we can ignore any files we don't understand.
     //
     DiagnosticSink lexerSink;
-    lexer.initialize(inputSourceView, &lexerSink, &namePool, sourceManager->getMemoryArena());
+    lexer.initialize(inputSourceView, &lexerSink, namePool, sourceManager->getMemoryArena());
 
     auto inputTokens = lexer.lexAllTokens();
     auto tokensWithTrivia = collectTokensWithTrivia(inputTokens);
diff --git a/tools/slang-fiddle/slang-fiddle-scrape.h b/tools/slang-fiddle/slang-fiddle-scrape.h
index 050576674..098c11aad 100644
--- a/tools/slang-fiddle/slang-fiddle-scrape.h
+++ b/tools/slang-fiddle/slang-fiddle-scrape.h
@@ -350,7 +350,7 @@ T* findDecl(ContainerDecl* outerDecl, UnownedStringSlice const& name)
 RefPtr<SourceUnit> parseSourceUnit(
     SourceView* inputSourceView,
     LogicalModule* logicalModule,
-    RootNamePool* rootNamePool,
+    NamePool* namePool,
     DiagnosticSink* sink,
     SourceManager* sourceManager,
     String outputFileName);