diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index eadcdbbaf..039036f90 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -22,12 +22,12 @@
 #include <libyul/AsmAnalysis.h>
 
 #include <libyul/AST.h>
-#include <libyul/AsmScopeFiller.h>
-#include <libyul/AsmScope.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/Utilities.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Object.h>
+#include <libyul/Scope.h>
+#include <libyul/ScopeFiller.h>
 
 #include <liblangutil/ErrorReporter.h>
 
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index d362c963a..dc2770500 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -24,9 +24,9 @@
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>
 
-#include <libyul/Dialect.h>
-#include <libyul/AsmScope.h>
 #include <libyul/ASTForward.h>
+#include <libyul/Dialect.h>
+#include <libyul/Scope.h>
 
 #include <libyul/backends/evm/AbstractAssembly.h>
 #include <libyul/backends/evm/EVMDialect.h>
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 8d537bd6d..df7f087e1 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -30,10 +30,6 @@ add_library(yul
 	AsmParser.h
 	AsmPrinter.cpp
 	AsmPrinter.h
-	AsmScope.cpp
-	AsmScope.h
-	AsmScopeFiller.cpp
-	AsmScopeFiller.h
 	AssemblyStack.h
 	AssemblyStack.cpp
 	CompilabilityChecker.cpp
@@ -45,6 +41,10 @@ add_library(yul
 	Object.h
 	ObjectParser.cpp
 	ObjectParser.h
+	Scope.cpp
+	Scope.h
+	ScopeFiller.cpp
+	ScopeFiller.h
 	Utilities.cpp
 	Utilities.h
 	YulString.h
diff --git a/libyul/AsmScope.cpp b/libyul/Scope.cpp
similarity index 98%
rename from libyul/AsmScope.cpp
rename to libyul/Scope.cpp
index 1237cba8d..3425e81ae 100644
--- a/libyul/AsmScope.cpp
+++ b/libyul/Scope.cpp
@@ -19,7 +19,7 @@
  * Scopes for identifiers.
  */
 
-#include <libyul/AsmScope.h>
+#include <libyul/Scope.h>
 
 using namespace std;
 using namespace solidity;
diff --git a/libyul/AsmScope.h b/libyul/Scope.h
similarity index 100%
rename from libyul/AsmScope.h
rename to libyul/Scope.h
diff --git a/libyul/AsmScopeFiller.cpp b/libyul/ScopeFiller.cpp
similarity index 98%
rename from libyul/AsmScopeFiller.cpp
rename to libyul/ScopeFiller.cpp
index 287c0caea..691bdc981 100644
--- a/libyul/AsmScopeFiller.cpp
+++ b/libyul/ScopeFiller.cpp
@@ -19,10 +19,10 @@
  * Module responsible for registering identifiers inside their scopes.
  */
 
-#include <libyul/AsmScopeFiller.h>
+#include <libyul/ScopeFiller.h>
 
 #include <libyul/AST.h>
-#include <libyul/AsmScope.h>
+#include <libyul/Scope.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/Exceptions.h>
 
diff --git a/libyul/AsmScopeFiller.h b/libyul/ScopeFiller.h
similarity index 100%
rename from libyul/AsmScopeFiller.h
rename to libyul/ScopeFiller.h
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index 5eea25e9c..08f7a3967 100644
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -26,7 +26,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/ASTForward.h>
-#include <libyul/AsmScope.h>
+#include <libyul/Scope.h>
 
 #include <optional>
 #include <stack>
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index 8bcc07d2b..6fa4b5522 100644
--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -21,10 +21,10 @@
 
 #include <libyul/optimiser/Disambiguator.h>
 
-#include <libyul/Exceptions.h>
 #include <libyul/AST.h>
-#include <libyul/AsmScope.h>
 #include <libyul/Dialect.h>
+#include <libyul/Exceptions.h>
+#include <libyul/Scope.h>
 
 using namespace std;
 using namespace solidity;