Merge pull request #5220 from ethereum/libjulia-to-libyul

Renames `libjulia` directory to `libyul` & namespace `dev::julia` to `dev::yul`

185 files changed, 243 insertions, 243 deletions

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 91a4678a..136d39b1 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Until we have a clear separation, libjulia has to be included here
-file(GLOB_RECURSE sources "*.cpp" "../libjulia/*.cpp")
-file(GLOB_RECURSE headers "*.h" "../libjulia/*.h")
+# Until we have a clear separation, libyul has to be included here
+file(GLOB_RECURSE sources "*.cpp" "../libyul/*.cpp")
+file(GLOB_RECURSE headers "*.h" "../libyul/*.h")
 
 find_package(Z3 QUIET)
 if (${Z3_FOUND})
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 81de3c43..f62d9c3b 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -269,8 +269,8 @@ bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
 	// external references.
 	ErrorList errors;
 	ErrorReporter errorsIgnored(errors);
-	julia::ExternalIdentifierAccess::Resolver resolver =
-	[&](assembly::Identifier const& _identifier, julia::IdentifierContext, bool _crossesFunctionBoundary) {
+	yul::ExternalIdentifierAccess::Resolver resolver =
+	[&](assembly::Identifier const& _identifier, yul::IdentifierContext, bool _crossesFunctionBoundary) {
 		auto declarations = m_resolver.nameFromCurrentScope(_identifier.name);
 		bool isSlot = boost::algorithm::ends_with(_identifier.name, "_slot");
 		bool isOffset = boost::algorithm::ends_with(_identifier.name, "_offset");
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 164b0b02..3830935f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -952,9 +952,9 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 {
 	// External references have already been resolved in a prior stage and stored in the annotation.
 	// We run the resolve step again regardless.
-	julia::ExternalIdentifierAccess::Resolver identifierAccess = [&](
+	yul::ExternalIdentifierAccess::Resolver identifierAccess = [&](
 		assembly::Identifier const& _identifier,
-		julia::IdentifierContext _context,
+		yul::IdentifierContext _context,
 		bool
 	)
 	{
@@ -978,7 +978,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 					m_errorReporter.typeError(_identifier.location, "The suffixes _offset and _slot can only be used on storage variables.");
 					return size_t(-1);
 				}
-				else if (_context != julia::IdentifierContext::RValue)
+				else if (_context != yul::IdentifierContext::RValue)
 				{
 					m_errorReporter.typeError(_identifier.location, "Storage variables cannot be assigned to.");
 					return size_t(-1);
@@ -1008,13 +1008,13 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 			m_errorReporter.typeError(_identifier.location, "The suffixes _offset and _slot can only be used on storage variables.");
 			return size_t(-1);
 		}
-		else if (_context == julia::IdentifierContext::LValue)
+		else if (_context == yul::IdentifierContext::LValue)
 		{
 			m_errorReporter.typeError(_identifier.location, "Only local variables can be assigned to in inline assembly.");
 			return size_t(-1);
 		}
 
-		if (_context == julia::IdentifierContext::RValue)
+		if (_context == yul::IdentifierContext::RValue)
 		{
 			solAssert(!!declaration->type(), "Type of declaration required but not yet determined.");
 			if (dynamic_cast<FunctionDefinition const*>(declaration))
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 71b615b8..089386b5 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -318,10 +318,10 @@ void CompilerContext::appendInlineAssembly(
 {
 	int startStackHeight = stackHeight();
 
-	julia::ExternalIdentifierAccess identifierAccess;
+	yul::ExternalIdentifierAccess identifierAccess;
 	identifierAccess.resolve = [&](
 		assembly::Identifier const& _identifier,
-		julia::IdentifierContext,
+		yul::IdentifierContext,
 		bool
 	)
 	{
@@ -330,15 +330,15 @@ void CompilerContext::appendInlineAssembly(
 	};
 	identifierAccess.generateCode = [&](
 		assembly::Identifier const& _identifier,
-		julia::IdentifierContext _context,
-		julia::AbstractAssembly& _assembly
+		yul::IdentifierContext _context,
+		yul::AbstractAssembly& _assembly
 	)
 	{
 		auto it = std::find(_localVariables.begin(), _localVariables.end(), _identifier.name);
 		solAssert(it != _localVariables.end(), "");
 		int stackDepth = _localVariables.end() - it;
 		int stackDiff = _assembly.stackHeight() - startStackHeight + stackDepth;
-		if (_context == julia::IdentifierContext::LValue)
+		if (_context == yul::IdentifierContext::LValue)
 			stackDiff -= 1;
 		if (stackDiff < 1 || stackDiff > 16)
 			BOOST_THROW_EXCEPTION(
@@ -346,7 +346,7 @@ void CompilerContext::appendInlineAssembly(
 				errinfo_sourceLocation(_identifier.location) <<
 				errinfo_comment("Stack too deep (" + to_string(stackDiff) + "), try removing local variables.")
 			);
-		if (_context == julia::IdentifierContext::RValue)
+		if (_context == yul::IdentifierContext::RValue)
 			_assembly.appendInstruction(dupInstruction(stackDiff));
 		else
 		{
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 3a0fccfb..c845da8f 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -494,21 +494,21 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 {
 	unsigned startStackHeight = m_context.stackHeight();
-	julia::ExternalIdentifierAccess identifierAccess;
-	identifierAccess.resolve = [&](assembly::Identifier const& _identifier, julia::IdentifierContext, bool)
+	yul::ExternalIdentifierAccess identifierAccess;
+	identifierAccess.resolve = [&](assembly::Identifier const& _identifier, yul::IdentifierContext, bool)
 	{
 		auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
 		if (ref == _inlineAssembly.annotation().externalReferences.end())
 			return size_t(-1);
 		return ref->second.valueSize;
 	};
-	identifierAccess.generateCode = [&](assembly::Identifier const& _identifier, julia::IdentifierContext _context, julia::AbstractAssembly& _assembly)
+	identifierAccess.generateCode = [&](assembly::Identifier const& _identifier, yul::IdentifierContext _context, yul::AbstractAssembly& _assembly)
 	{
 		auto ref = _inlineAssembly.annotation().externalReferences.find(&_identifier);
 		solAssert(ref != _inlineAssembly.annotation().externalReferences.end(), "");
 		Declaration const* decl = ref->second.declaration;
 		solAssert(!!decl, "");
-		if (_context == julia::IdentifierContext::RValue)
+		if (_context == yul::IdentifierContext::RValue)
 		{
 			int const depositBefore = _assembly.stackHeight();
 			solAssert(!!decl->type(), "Type of declaration required but not yet determined.");
diff --git a/libsolidity/inlineasm/AsmAnalysis.cpp b/libsolidity/inlineasm/AsmAnalysis.cpp
index 947b6d05..04b5d1a8 100644
--- a/libsolidity/inlineasm/AsmAnalysis.cpp
+++ b/libsolidity/inlineasm/AsmAnalysis.cpp
@@ -145,7 +145,7 @@ bool AsmAnalyzer::operator()(assembly::Identifier const& _identifier)
 		if (m_resolver)
 		{
 			bool insideFunction = m_currentScope->insideFunction();
-			stackSize = m_resolver(_identifier, julia::IdentifierContext::RValue, insideFunction);
+			stackSize = m_resolver(_identifier, yul::IdentifierContext::RValue, insideFunction);
 		}
 		if (stackSize == size_t(-1))
 		{
@@ -512,7 +512,7 @@ bool AsmAnalyzer::checkAssignment(assembly::Identifier const& _variable, size_t
 	else if (m_resolver)
 	{
 		bool insideFunction = m_currentScope->insideFunction();
-		variableSize = m_resolver(_variable, julia::IdentifierContext::LValue, insideFunction);
+		variableSize = m_resolver(_variable, yul::IdentifierContext::LValue, insideFunction);
 	}
 	if (variableSize == size_t(-1))
 	{
diff --git a/libsolidity/inlineasm/AsmAnalysis.h b/libsolidity/inlineasm/AsmAnalysis.h
index 8d2a71f0..a8673efa 100644
--- a/libsolidity/inlineasm/AsmAnalysis.h
+++ b/libsolidity/inlineasm/AsmAnalysis.h
@@ -25,7 +25,7 @@
 
 #include <libsolidity/inlineasm/AsmScope.h>
 
-#include <libjulia/backends/evm/AbstractAssembly.h>
+#include <libyul/backends/evm/AbstractAssembly.h>
 
 #include <libsolidity/inlineasm/AsmDataForward.h>
 
@@ -59,7 +59,7 @@ public:
 		EVMVersion _evmVersion,
 		boost::optional<Error::Type> _errorTypeForLoose,
 		AsmFlavour _flavour = AsmFlavour::Loose,
-		julia::ExternalIdentifierAccess::Resolver const& _resolver = julia::ExternalIdentifierAccess::Resolver()
+		yul::ExternalIdentifierAccess::Resolver const& _resolver = yul::ExternalIdentifierAccess::Resolver()
 	):
 		m_resolver(_resolver),
 		m_info(_analysisInfo),
@@ -106,7 +106,7 @@ private:
 	void checkLooseFeature(SourceLocation const& _location, std::string const& _description);
 
 	int m_stackHeight = 0;
-	julia::ExternalIdentifierAccess::Resolver m_resolver;
+	yul::ExternalIdentifierAccess::Resolver m_resolver;
 	Scope* m_currentScope = nullptr;
 	/// Variables that are active at the current point in assembly (as opposed to
 	/// "part of the scope but not yet declared")
diff --git a/libsolidity/inlineasm/AsmCodeGen.cpp b/libsolidity/inlineasm/AsmCodeGen.cpp
index dded9f76..3a62b232 100644
--- a/libsolidity/inlineasm/AsmCodeGen.cpp
+++ b/libsolidity/inlineasm/AsmCodeGen.cpp
@@ -32,8 +32,8 @@
 #include <libevmasm/SourceLocation.h>
 #include <libevmasm/Instruction.h>
 
-#include <libjulia/backends/evm/AbstractAssembly.h>
-#include <libjulia/backends/evm/EVMCodeTransform.h>
+#include <libyul/backends/evm/AbstractAssembly.h>
+#include <libyul/backends/evm/EVMCodeTransform.h>
 
 #include <libdevcore/CommonIO.h>
 
@@ -49,7 +49,7 @@ using namespace dev;
 using namespace dev::solidity;
 using namespace dev::solidity::assembly;
 
-class EthAssemblyAdapter: public julia::AbstractAssembly
+class EthAssemblyAdapter: public yul::AbstractAssembly
 {
 public:
 	explicit EthAssemblyAdapter(eth::Assembly& _assembly):
@@ -145,12 +145,12 @@ void assembly::CodeGenerator::assemble(
 	Block const& _parsedData,
 	AsmAnalysisInfo& _analysisInfo,
 	eth::Assembly& _assembly,
-	julia::ExternalIdentifierAccess const& _identifierAccess,
+	yul::ExternalIdentifierAccess const& _identifierAccess,
 	bool _useNamedLabelsForFunctions
 )
 {
 	EthAssemblyAdapter assemblyAdapter(_assembly);
-	julia::CodeTransform(
+	yul::CodeTransform(
 		assemblyAdapter,
 		_analysisInfo,
 		false,
diff --git a/libsolidity/inlineasm/AsmCodeGen.h b/libsolidity/inlineasm/AsmCodeGen.h
index 277e1879..bbc31397 100644
--- a/libsolidity/inlineasm/AsmCodeGen.h
+++ b/libsolidity/inlineasm/AsmCodeGen.h
@@ -46,7 +46,7 @@ public:
 		Block const& _parsedData,
 		AsmAnalysisInfo& _analysisInfo,
 		eth::Assembly& _assembly,
-		julia::ExternalIdentifierAccess const& _identifierAccess = julia::ExternalIdentifierAccess(),
+		yul::ExternalIdentifierAccess const& _identifierAccess = yul::ExternalIdentifierAccess(),
 		bool _useNamedLabelsForFunctions = false
 	);
 };
diff --git a/libsolidity/interface/AssemblyStack.cpp b/libsolidity/interface/AssemblyStack.cpp
index 46fa1d6b..26496de7 100644
--- a/libsolidity/interface/AssemblyStack.cpp
+++ b/libsolidity/interface/AssemblyStack.cpp
@@ -31,8 +31,8 @@
 
 #include <libevmasm/Assembly.h>
 
-#include <libjulia/backends/evm/EVMCodeTransform.h>
-#include <libjulia/backends/evm/EVMAssembly.h>
+#include <libyul/backends/evm/EVMCodeTransform.h>
+#include <libyul/backends/evm/EVMAssembly.h>
 
 using namespace std;
 using namespace dev;
@@ -116,8 +116,8 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
 	case Machine::EVM15:
 	{
 		MachineAssemblyObject object;
-		julia::EVMAssembly assembly(true);
-		julia::CodeTransform(assembly, *m_analysisInfo, m_language == Language::Yul, true)(*m_parserResult);
+		yul::EVMAssembly assembly(true);
+		yul::CodeTransform(assembly, *m_analysisInfo, m_language == Language::Yul, true)(*m_parserResult);
 		object.bytecode = make_shared<eth::LinkerObject>(assembly.finalize());
 		/// TODO: fill out text representation
 		return object;
diff --git a/libjulia/ASTDataForward.h b/libyul/ASTDataForward.h
index 143b9c46..7f131b5e 100644
--- a/libjulia/ASTDataForward.h
+++ b/libyul/ASTDataForward.h
@@ -25,7 +25,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 using Instruction = solidity::assembly::Instruction;
diff --git a/libjulia/Exceptions.h b/libyul/Exceptions.h
index 48624a56..c423b66f 100644
--- a/libjulia/Exceptions.h
+++ b/libyul/Exceptions.h
@@ -25,7 +25,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 struct YulException: virtual Exception {};
diff --git a/libjulia/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
index b6818923..d75058f7 100644
--- a/libjulia/backends/evm/AbstractAssembly.h
+++ b/libyul/backends/evm/AbstractAssembly.h
@@ -38,7 +38,7 @@ struct Instruction;
 struct Identifier;
 }
 }
-namespace julia
+namespace yul
 {
 
 ///
@@ -106,7 +106,7 @@ struct ExternalIdentifierAccess
 	/// Resolve an external reference given by the identifier in the given context.
 	/// @returns the size of the value (number of stack slots) or size_t(-1) if not found.
 	Resolver resolve;
-	using CodeGenerator = std::function<void(solidity::assembly::Identifier const&, IdentifierContext, julia::AbstractAssembly&)>;
+	using CodeGenerator = std::function<void(solidity::assembly::Identifier const&, IdentifierContext, yul::AbstractAssembly&)>;
 	/// Generate code for retrieving the value (rvalue context) or storing the value (lvalue context)
 	/// of an identifier. The code should be appended to the assembly. In rvalue context, the value is supposed
 	/// to be put onto the stack, in lvalue context, the value is assumed to be at the top of the stack.
diff --git a/libjulia/backends/evm/EVMAssembly.cpp b/libyul/backends/evm/EVMAssembly.cpp
index 07ad05c9..b2f0878f 100644
--- a/libjulia/backends/evm/EVMAssembly.cpp
+++ b/libyul/backends/evm/EVMAssembly.cpp
@@ -18,7 +18,7 @@
  * Assembly interface for EVM and EVM1.5.
  */
 
-#include <libjulia/backends/evm/EVMAssembly.h>
+#include <libyul/backends/evm/EVMAssembly.h>
 
 #include <libevmasm/Instruction.h>
 
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 namespace
 {
diff --git a/libjulia/backends/evm/EVMAssembly.h b/libyul/backends/evm/EVMAssembly.h
index 56ae7655..556ed5a5 100644
--- a/libjulia/backends/evm/EVMAssembly.h
+++ b/libyul/backends/evm/EVMAssembly.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/backends/evm/AbstractAssembly.h>
+#include <libyul/backends/evm/AbstractAssembly.h>
 
 #include <libevmasm/LinkerObject.h>
 
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class EVMAssembly: public AbstractAssembly
diff --git a/libjulia/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index dc536f77..89086b4e 100644
--- a/libjulia/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -18,7 +18,7 @@
  * Common code generator for translating Yul / inline assembly to EVM and EVM1.5.
  */
 
-#include <libjulia/backends/evm/EVMCodeTransform.h>
+#include <libyul/backends/evm/EVMCodeTransform.h>
 
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 #include <libsolidity/inlineasm/AsmData.h>
@@ -29,7 +29,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 using Scope = dev::solidity::assembly::Scope;
diff --git a/libjulia/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index ed0785d3..22ebbf43 100644
--- a/libjulia/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -18,9 +18,9 @@
  * Common code generator for translating Yul / inline assembly to EVM and EVM1.5.
  */
 
-#include <libjulia/backends/evm/EVMAssembly.h>
+#include <libyul/backends/evm/EVMAssembly.h>
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 #include <libsolidity/inlineasm/AsmScope.h>
 
@@ -37,7 +37,7 @@ namespace assembly
 struct AsmAnalysisInfo;
 }
 }
-namespace julia
+namespace yul
 {
 class EVMAssembly;
 
@@ -47,7 +47,7 @@ public:
 	/// Create the code transformer.
 	/// @param _identifierAccess used to resolve identifiers external to the inline assembly
 	CodeTransform(
-		julia::AbstractAssembly& _assembly,
+		yul::AbstractAssembly& _assembly,
 		solidity::assembly::AsmAnalysisInfo& _analysisInfo,
 		bool _yul = false,
 		bool _evm15 = false,
@@ -76,7 +76,7 @@ protected:
 	};
 
 	CodeTransform(
-		julia::AbstractAssembly& _assembly,
+		yul::AbstractAssembly& _assembly,
 		solidity::assembly::AsmAnalysisInfo& _analysisInfo,
 		bool _yul,
 		bool _evm15,
@@ -139,7 +139,7 @@ private:
 
 	void checkStackHeight(void const* _astElement) const;
 
-	julia::AbstractAssembly& m_assembly;
+	yul::AbstractAssembly& m_assembly;
 	solidity::assembly::AsmAnalysisInfo& m_info;
 	solidity::assembly::Scope* m_scope = nullptr;
 	bool m_yul = false;
diff --git a/libjulia/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index a8a1e30f..4b7f21f8 100644
--- a/libjulia/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -18,9 +18,9 @@
  * Creates an independent copy of an AST, renaming identifiers to be unique.
  */
 
-#include <libjulia/optimiser/ASTCopier.h>
+#include <libyul/optimiser/ASTCopier.h>
 
-#include <libjulia/Exceptions.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -28,7 +28,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 Statement ASTCopier::operator()(Instruction const&)
 {
diff --git a/libjulia/optimiser/ASTCopier.h b/libyul/optimiser/ASTCopier.h
index cb2925e3..13369cef 100644
--- a/libjulia/optimiser/ASTCopier.h
+++ b/libyul/optimiser/ASTCopier.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
@@ -31,7 +31,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class ExpressionCopier: public boost::static_visitor<Expression>
diff --git a/libjulia/optimiser/ASTWalker.cpp b/libyul/optimiser/ASTWalker.cpp
index dc94cc60..e29dda6b 100644
--- a/libjulia/optimiser/ASTWalker.cpp
+++ b/libyul/optimiser/ASTWalker.cpp
@@ -18,7 +18,7 @@
  * Generic AST walker.
  */
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -26,7 +26,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 
diff --git a/libjulia/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
index e1f0f5bd..41617d55 100644
--- a/libjulia/optimiser/ASTWalker.h
+++ b/libyul/optimiser/ASTWalker.h
@@ -20,9 +20,9 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/Exceptions.h>
+#include <libyul/Exceptions.h>
 
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
@@ -33,7 +33,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 458b3437..23d15cad 100644
--- a/libjulia/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -19,17 +19,17 @@
  * in scope by a reference to that variable.
  */
 
-#include <libjulia/optimiser/CommonSubexpressionEliminator.h>
+#include <libyul/optimiser/CommonSubexpressionEliminator.h>
 
-#include <libjulia/optimiser/Metrics.h>
-#include <libjulia/optimiser/SyntacticalEquality.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/Metrics.h>
+#include <libyul/optimiser/SyntacticalEquality.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 void CommonSubexpressionEliminator::visit(Expression& _e)
 {
diff --git a/libjulia/optimiser/CommonSubexpressionEliminator.h b/libyul/optimiser/CommonSubexpressionEliminator.h
index a8ca3abb..f8aa0ee1 100644
--- a/libjulia/optimiser/CommonSubexpressionEliminator.h
+++ b/libyul/optimiser/CommonSubexpressionEliminator.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include <libjulia/optimiser/DataFlowAnalyzer.h>
+#include <libyul/optimiser/DataFlowAnalyzer.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 0ad0eac9..ca1e5153 100644
--- a/libjulia/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -20,11 +20,11 @@
  * Common Subexpression Eliminator.
  */
 
-#include <libjulia/optimiser/DataFlowAnalyzer.h>
+#include <libyul/optimiser/DataFlowAnalyzer.h>
 
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/optimiser/Semantics.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -34,7 +34,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 void DataFlowAnalyzer::operator()(Assignment& _assignment)
 {
diff --git a/libjulia/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 66df2f48..f998eadf 100644
--- a/libjulia/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <string>
 #include <map>
@@ -30,7 +30,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index 687be9b9..af3507e1 100644
--- a/libjulia/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -18,16 +18,16 @@
  * Optimiser component that makes all identifiers unique.
  */
 
-#include <libjulia/optimiser/Disambiguator.h>
+#include <libyul/optimiser/Disambiguator.h>
 
-#include <libjulia/Exceptions.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 #include <libsolidity/inlineasm/AsmScope.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 using Scope = dev::solidity::assembly::Scope;
diff --git a/libjulia/optimiser/Disambiguator.h b/libyul/optimiser/Disambiguator.h
index 4ef43736..0829fd58 100644
--- a/libjulia/optimiser/Disambiguator.h
+++ b/libyul/optimiser/Disambiguator.h
@@ -20,10 +20,10 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTCopier.h>
-#include <libjulia/optimiser/NameDispenser.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/NameDispenser.h>
 
 #include <libsolidity/inlineasm/AsmAnalysisInfo.h>
 
@@ -34,7 +34,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
index 450769fd..9bf0a3fb 100644
--- a/libjulia/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@@ -18,11 +18,11 @@
  * Optimiser component that performs function inlining inside expressions.
  */
 
-#include <libjulia/optimiser/ExpressionInliner.h>
+#include <libyul/optimiser/ExpressionInliner.h>
 
-#include <libjulia/optimiser/InlinableExpressionFunctionFinder.h>
-#include <libjulia/optimiser/Substitution.h>
-#include <libjulia/optimiser/Semantics.h>
+#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
+#include <libyul/optimiser/Substitution.h>
+#include <libyul/optimiser/Semantics.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -30,7 +30,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void ExpressionInliner::run()
diff --git a/libjulia/optimiser/ExpressionInliner.h b/libyul/optimiser/ExpressionInliner.h
index 3d24ef5d..971a2ee0 100644
--- a/libjulia/optimiser/ExpressionInliner.h
+++ b/libyul/optimiser/ExpressionInliner.h
@@ -19,9 +19,9 @@
  */
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 #include <boost/variant.hpp>
 #include <boost/optional.hpp>
@@ -30,7 +30,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index 5b92e332..3dfab371 100644
--- a/libjulia/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -19,11 +19,11 @@
  * it more or less inlines variable declarations.
  */
 
-#include <libjulia/optimiser/ExpressionJoiner.h>
+#include <libyul/optimiser/ExpressionJoiner.h>
 
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/optimiser/Utilities.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/optimiser/Utilities.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -33,7 +33,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void ExpressionJoiner::operator()(FunctionalInstruction& _instruction)
diff --git a/libjulia/optimiser/ExpressionJoiner.h b/libyul/optimiser/ExpressionJoiner.h
index 91b45b49..df18e58f 100644
--- a/libjulia/optimiser/ExpressionJoiner.h
+++ b/libyul/optimiser/ExpressionJoiner.h
@@ -20,15 +20,15 @@
  */
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <map>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class NameCollector;
diff --git a/libjulia/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 8bd6b1c7..c95fb3d5 100644
--- a/libjulia/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -18,10 +18,10 @@
  * Optimiser component that uses the simplification rules to simplify expressions.
  */
 
-#include <libjulia/optimiser/ExpressionSimplifier.h>
+#include <libyul/optimiser/ExpressionSimplifier.h>
 
-#include <libjulia/optimiser/SimplificationRules.h>
-#include <libjulia/optimiser/Semantics.h>
+#include <libyul/optimiser/SimplificationRules.h>
+#include <libyul/optimiser/Semantics.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -29,7 +29,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 
diff --git a/libjulia/optimiser/ExpressionSimplifier.h b/libyul/optimiser/ExpressionSimplifier.h
index 8a9e0e20..1b9d6960 100644
--- a/libjulia/optimiser/ExpressionSimplifier.h
+++ b/libyul/optimiser/ExpressionSimplifier.h
@@ -20,13 +20,13 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index f189f563..dab0545f 100644
--- a/libjulia/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -19,9 +19,9 @@
  * declarations.
  */
 
-#include <libjulia/optimiser/ExpressionSplitter.h>
+#include <libyul/optimiser/ExpressionSplitter.h>
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void ExpressionSplitter::operator()(FunctionalInstruction& _instruction)
diff --git a/libjulia/optimiser/ExpressionSplitter.h b/libyul/optimiser/ExpressionSplitter.h
index 324d2b13..339acbf0 100644
--- a/libjulia/optimiser/ExpressionSplitter.h
+++ b/libyul/optimiser/ExpressionSplitter.h
@@ -20,16 +20,16 @@
  */
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTWalker.h>
-#include <libjulia/optimiser/NameDispenser.h>
+#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/optimiser/NameDispenser.h>
 
 #include <vector>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class NameCollector;
diff --git a/libjulia/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index f41dc198..4e419987 100644
--- a/libjulia/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -18,13 +18,13 @@
  * Optimiser component that performs function inlining for arbitrary functions.
  */
 
-#include <libjulia/optimiser/FullInliner.h>
+#include <libyul/optimiser/FullInliner.h>
 
-#include <libjulia/optimiser/ASTCopier.h>
-#include <libjulia/optimiser/ASTWalker.h>
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/optimiser/Semantics.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -34,7 +34,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 FullInliner::FullInliner(Block& _ast):
diff --git a/libjulia/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index ff9e6854..8112fb4b 100644
--- a/libjulia/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -19,12 +19,12 @@
  */
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTCopier.h>
-#include <libjulia/optimiser/ASTWalker.h>
-#include <libjulia/optimiser/NameDispenser.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/optimiser/NameDispenser.h>
+#include <libyul/Exceptions.h>
 
 #include <libevmasm/SourceLocation.h>
 
@@ -35,7 +35,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class NameCollector;
diff --git a/libjulia/optimiser/FunctionGrouper.cpp b/libyul/optimiser/FunctionGrouper.cpp
index f1e99e6b..3d2e5322 100644
--- a/libjulia/optimiser/FunctionGrouper.cpp
+++ b/libyul/optimiser/FunctionGrouper.cpp
@@ -19,7 +19,7 @@
  * statements are moved to a block of their own followed by all function definitions.
  */
 
-#include <libjulia/optimiser/FunctionGrouper.h>
+#include <libyul/optimiser/FunctionGrouper.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -27,7 +27,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 
diff --git a/libjulia/optimiser/FunctionGrouper.h b/libyul/optimiser/FunctionGrouper.h
index 64a71318..63cfbfb1 100644
--- a/libjulia/optimiser/FunctionGrouper.h
+++ b/libyul/optimiser/FunctionGrouper.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
index 98fc714c..c196dead 100644
--- a/libjulia/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@@ -20,8 +20,8 @@
  * anywhere else.
  */
 
-#include <libjulia/optimiser/FunctionHoister.h>
-#include <libjulia/optimiser/Utilities.h>
+#include <libyul/optimiser/FunctionHoister.h>
+#include <libyul/optimiser/Utilities.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -29,7 +29,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void FunctionHoister::operator()(Block& _block)
diff --git a/libjulia/optimiser/FunctionHoister.h b/libyul/optimiser/FunctionHoister.h
index f9f8bce0..823b9e2b 100644
--- a/libjulia/optimiser/FunctionHoister.h
+++ b/libyul/optimiser/FunctionHoister.h
@@ -21,13 +21,13 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
index e237063d..69dd2095 100644
--- a/libjulia/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@@ -18,15 +18,15 @@
  * Optimiser component that identifies functions to be inlined.
  */
 
-#include <libjulia/optimiser/InlinableExpressionFunctionFinder.h>
+#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
 
-#include <libjulia/optimiser/Utilities.h>
+#include <libyul/optimiser/Utilities.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 void InlinableExpressionFunctionFinder::operator()(Identifier const& _identifier)
 {
diff --git a/libjulia/optimiser/InlinableExpressionFunctionFinder.h b/libyul/optimiser/InlinableExpressionFunctionFinder.h
index d11160d7..3887e6e5 100644
--- a/libjulia/optimiser/InlinableExpressionFunctionFinder.h
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.h
@@ -20,14 +20,14 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/ASTDataForward.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <set>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
index bcd2f178..c8f35207 100644
--- a/libjulia/optimiser/MainFunction.cpp
+++ b/libyul/optimiser/MainFunction.cpp
@@ -19,10 +19,10 @@
  * inputs nor outputs.
  */
 
-#include <libjulia/optimiser/MainFunction.h>
+#include <libyul/optimiser/MainFunction.h>
 
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -30,7 +30,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
 void MainFunction::operator()(Block& _block)
diff --git a/libjulia/optimiser/MainFunction.h b/libyul/optimiser/MainFunction.h
index 7201d89a..4a73283a 100644
--- a/libjulia/optimiser/MainFunction.h
+++ b/libyul/optimiser/MainFunction.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index eaa1494f..eb2d39e8 100644
--- a/libjulia/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -18,12 +18,12 @@
 * Module providing metrics for the optimizer.
 */
 
-#include <libjulia/optimiser/Metrics.h>
+#include <libyul/optimiser/Metrics.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 size_t CodeSize::codeSize(Statement const& _statement)
 {
diff --git a/libjulia/optimiser/Metrics.h b/libyul/optimiser/Metrics.h
index ff058fc3..8ed73cca 100644
--- a/libjulia/optimiser/Metrics.h
+++ b/libyul/optimiser/Metrics.h
@@ -20,11 +20,11 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class CodeSize: public ASTWalker
diff --git a/libjulia/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index c0d0b707..b71fa982 100644
--- a/libjulia/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -18,13 +18,13 @@
  * Specific AST walker that collects all defined names.
  */
 
-#include <libjulia/optimiser/NameCollector.h>
+#include <libyul/optimiser/NameCollector.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 void NameCollector::operator()(VariableDeclaration const& _varDecl)
 {
diff --git a/libjulia/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
index 29856172..b8f6c1d7 100644
--- a/libjulia/optimiser/NameCollector.h
+++ b/libyul/optimiser/NameCollector.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <string>
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index cae19381..f7385471 100644
--- a/libjulia/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -18,11 +18,11 @@
  * Optimiser component that can create new unique names.
  */
 
-#include <libjulia/optimiser/NameDispenser.h>
+#include <libyul/optimiser/NameDispenser.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 string NameDispenser::newName(string const& _prefix)
 {
diff --git a/libjulia/optimiser/NameDispenser.h b/libyul/optimiser/NameDispenser.h
index 91c43d54..64ec318f 100644
--- a/libjulia/optimiser/NameDispenser.h
+++ b/libyul/optimiser/NameDispenser.h
@@ -24,7 +24,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 struct NameDispenser
diff --git a/libjulia/optimiser/README.md b/libyul/optimiser/README.md
index faef818b..faef818b 100644
--- a/libjulia/optimiser/README.md
+++ b/libyul/optimiser/README.md
diff --git a/libjulia/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 392099fb..dd6653ea 100644
--- a/libjulia/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -18,17 +18,17 @@
  * Optimisation stage that replaces variables by their most recently assigned expressions.
  */
 
-#include <libjulia/optimiser/Rematerialiser.h>
+#include <libyul/optimiser/Rematerialiser.h>
 
-#include <libjulia/optimiser/Metrics.h>
-#include <libjulia/optimiser/ASTCopier.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/Metrics.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 void Rematerialiser::visit(Expression& _e)
 {
diff --git a/libjulia/optimiser/Rematerialiser.h b/libyul/optimiser/Rematerialiser.h
index 60dbfada..afcfab3e 100644
--- a/libjulia/optimiser/Rematerialiser.h
+++ b/libyul/optimiser/Rematerialiser.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/DataFlowAnalyzer.h>
+#include <libyul/optimiser/DataFlowAnalyzer.h>
 
 #include <string>
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index f28925a4..33f3af77 100644
--- a/libjulia/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -18,9 +18,9 @@
  * Specific AST walkers that collect semantical facts.
  */
 
-#include <libjulia/optimiser/Semantics.h>
+#include <libyul/optimiser/Semantics.h>
 
-#include <libjulia/Exceptions.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -30,7 +30,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 MovableChecker::MovableChecker(Expression const& _expression)
 {
diff --git a/libjulia/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index 6df5f01a..1caa12fb 100644
--- a/libjulia/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <string>
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 56cb96ac..762473e5 100644
--- a/libjulia/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -18,12 +18,12 @@
  * Module for applying replacement rules against Expressions.
  */
 
-#include <libjulia/optimiser/SimplificationRules.h>
+#include <libyul/optimiser/SimplificationRules.h>
 
-#include <libjulia/optimiser/Utilities.h>
-#include <libjulia/optimiser/ASTCopier.h>
-#include <libjulia/optimiser/Semantics.h>
-#include <libjulia/optimiser/SyntacticalEquality.h>
+#include <libyul/optimiser/Utilities.h>
+#include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/SyntacticalEquality.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 
 SimplificationRule<Pattern> const* SimplificationRules::findFirstMatch(Expression const& _expr)
diff --git a/libjulia/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index e35e6466..25d91573 100644
--- a/libjulia/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -23,7 +23,7 @@
 #include <libevmasm/ExpressionClasses.h>
 #include <libevmasm/SimplificationRule.h>
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -34,7 +34,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 class Pattern;
diff --git a/libjulia/optimiser/Substitution.cpp b/libyul/optimiser/Substitution.cpp
index 668b6cb6..4a000a85 100644
--- a/libjulia/optimiser/Substitution.cpp
+++ b/libyul/optimiser/Substitution.cpp
@@ -18,13 +18,13 @@
  * Specific AST copier that replaces certain identifiers with expressions.
  */
 
-#include <libjulia/optimiser/Substitution.h>
+#include <libyul/optimiser/Substitution.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 Expression Substitution::translate(Expression const& _expression)
 {
diff --git a/libjulia/optimiser/Substitution.h b/libyul/optimiser/Substitution.h
index 313a08d7..b734cdca 100644
--- a/libjulia/optimiser/Substitution.h
+++ b/libyul/optimiser/Substitution.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTCopier.h>
+#include <libyul/optimiser/ASTCopier.h>
 
 #include <string>
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index c497336d..f22b5c31 100644
--- a/libjulia/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -18,9 +18,9 @@
  * Component that can compare ASTs for equality on a syntactic basis.
  */
 
-#include <libjulia/optimiser/SyntacticalEquality.h>
+#include <libyul/optimiser/SyntacticalEquality.h>
 
-#include <libjulia/Exceptions.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -28,7 +28,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 bool SyntacticalEqualityChecker::equal(Expression const& _e1, Expression const& _e2)
 {
diff --git a/libjulia/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index b7c09330..e9fbebe0 100644
--- a/libjulia/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -20,13 +20,13 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 #include <vector>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index af503712..74b6bee4 100644
--- a/libjulia/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -18,12 +18,12 @@
  * Optimisation stage that removes unused variables and functions.
  */
 
-#include <libjulia/optimiser/UnusedPruner.h>
+#include <libyul/optimiser/UnusedPruner.h>
 
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/optimiser/Semantics.h>
-#include <libjulia/optimiser/Utilities.h>
-#include <libjulia/Exceptions.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/Utilities.h>
+#include <libyul/Exceptions.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -31,7 +31,7 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
 UnusedPruner::UnusedPruner(Block& _ast)
 {
diff --git a/libjulia/optimiser/UnusedPruner.h b/libyul/optimiser/UnusedPruner.h
index 73e8de7c..327921ea 100644
--- a/libjulia/optimiser/UnusedPruner.h
+++ b/libyul/optimiser/UnusedPruner.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include <libjulia/optimiser/ASTWalker.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <string>
 #include <map>
@@ -28,7 +28,7 @@
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /**
diff --git a/libjulia/optimiser/Utilities.cpp b/libyul/optimiser/Utilities.cpp
index ff108b89..df01ed39 100644
--- a/libjulia/optimiser/Utilities.cpp
+++ b/libyul/optimiser/Utilities.cpp
@@ -18,7 +18,7 @@
  * Some useful snippets for the optimiser.
  */
 
-#include <libjulia/optimiser/Utilities.h>
+#include <libyul/optimiser/Utilities.h>
 
 #include <libsolidity/inlineasm/AsmData.h>
 
@@ -28,9 +28,9 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
+using namespace dev::yul;
 
-void dev::julia::removeEmptyBlocks(Block& _block)
+void dev::yul::removeEmptyBlocks(Block& _block)
 {
 	auto isEmptyBlock = [](Statement const& _st) -> bool {
 		return _st.type() == typeid(Block) && boost::get<Block>(_st).statements.empty();
diff --git a/libjulia/optimiser/Utilities.h b/libyul/optimiser/Utilities.h
index 88ba3f47..5b18a27c 100644
--- a/libjulia/optimiser/Utilities.h
+++ b/libyul/optimiser/Utilities.h
@@ -20,11 +20,11 @@
 
 #pragma once
 
-#include <libjulia/ASTDataForward.h>
+#include <libyul/ASTDataForward.h>
 
 namespace dev
 {
-namespace julia
+namespace yul
 {
 
 /// Removes statements that are just empty blocks (non-recursive).
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 701d53e5..91c1b200 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,8 +7,8 @@ file(GLOB libdevcore_sources "libdevcore/*.cpp")
 file(GLOB libdevcore_headers "libdevcore/*.h")
 file(GLOB libevmasm_sources "libevmasm/*.cpp")
 file(GLOB libevmasm_headers "libevmasm/*.h")
-file(GLOB libjulia_sources "libjulia/*.cpp")
-file(GLOB libjulia_headers "libjulia/*.h")
+file(GLOB libyul_sources "libyul/*.cpp")
+file(GLOB libyul_headers "libyul/*.h")
 file(GLOB liblll_sources "liblll/*.cpp")
 file(GLOB liblll_headers "liblll/*.h")
 file(GLOB libsolidity_sources "libsolidity/*.cpp")
@@ -18,7 +18,7 @@ add_executable(soltest ${sources} ${headers}
     ${contracts_sources} ${contracts_headers}
     ${libdevcore_sources} ${libdevcore_headers}
     ${libevmasm_sources} ${libevmasm_headers}
-    ${libjulia_sources} ${libjulia_headers}
+    ${libyul_sources} ${libyul_headers}
     ${liblll_sources} ${liblll_headers}
     ${libsolidity_sources} ${libsolidity_headers}
 )
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index cbbf586f..d27ba1f6 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -38,7 +38,7 @@
 #include <test/Options.h>
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/libsolidity/SyntaxTest.h>
-#include <test/libjulia/YulOptimizerTest.h>
+#include <test/libyul/YulOptimizerTest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -141,9 +141,9 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 	) > 0, "no JSON AST tests found");
 	solAssert(registerTests(
 		master,
-		dev::test::Options::get().testPath / "libjulia",
+		dev::test::Options::get().testPath / "libyul",
 		"yulOptimizerTests",
-		dev::julia::test::YulOptimizerTest::create
+		dev::yul::test::YulOptimizerTest::create
 	) > 0, "no Yul Optimizer tests found");
 	if (dev::test::Options::get().disableIPC)
 	{
diff --git a/test/libjulia/Common.cpp b/test/libyul/Common.cpp
index a0592667..4c50180a 100644
--- a/test/libjulia/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -19,11 +19,11 @@
  * Common functions the Yul tests.
  */
 
-#include <test/libjulia/Common.h>
+#include <test/libyul/Common.h>
 
 #include <test/Options.h>
 
-#include <libjulia/optimiser/Disambiguator.h>
+#include <libyul/optimiser/Disambiguator.h>
 
 #include <libsolidity/parsing/Scanner.h>
 
@@ -37,10 +37,10 @@
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
-using namespace dev::julia;
+using namespace dev::yul;
 using namespace dev::solidity;
 
-void dev::julia::test::printErrors(ErrorList const& _errors, Scanner const& _scanner)
+void dev::yul::test::printErrors(ErrorList const& _errors, Scanner const& _scanner)
 {
 	SourceReferenceFormatter formatter(cout, [&](std::string const&) -> Scanner const& { return _scanner; });
 
@@ -52,7 +52,7 @@ void dev::julia::test::printErrors(ErrorList const& _errors, Scanner const& _sca
 }
 
 
-pair<shared_ptr<Block>, shared_ptr<assembly::AsmAnalysisInfo>> dev::julia::test::parse(string const& _source, bool _yul)
+pair<shared_ptr<Block>, shared_ptr<assembly::AsmAnalysisInfo>> dev::yul::test::parse(string const& _source, bool _yul)
 {
 	auto flavour = _yul ? assembly::AsmFlavour::Yul : assembly::AsmFlavour::Strict;
 	ErrorList errors;
@@ -83,13 +83,13 @@ pair<shared_ptr<Block>, shared_ptr<assembly::AsmAnalysisInfo>> dev::julia::test:
 	return {};
 }
 
-assembly::Block dev::julia::test::disambiguate(string const& _source, bool _yul)
+assembly::Block dev::yul::test::disambiguate(string const& _source, bool _yul)
 {
 	auto result = parse(_source, _yul);
 	return boost::get<Block>(Disambiguator(*result.second)(*result.first));
 }
 
-string dev::julia::test::format(string const& _source, bool _yul)
+string dev::yul::test::format(string const& _source, bool _yul)
 {
 	return assembly::AsmPrinter(_yul)(*parse(_source, _yul).first);
 }
diff --git a/test/libjulia/Common.h b/test/libyul/Common.h
index b9c3d2fb..ee191494 100644
--- a/test/libjulia/Common.h
+++ b/test/libyul/Common.h
@@ -39,7 +39,7 @@ namespace assembly
 struct AsmAnalysisInfo;
 }
 }
-namespace julia
+namespace yul
 {
 namespace test
 {
diff --git a/test/libjulia/Inliner.cpp b/test/libyul/Inliner.cpp
index 95b61b29..44c6411a 100644
--- a/test/libjulia/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -19,13 +19,13 @@
  * Unit tests for the Yul function inliner.
  */
 
-#include <test/libjulia/Common.h>
+#include <test/libyul/Common.h>
 
-#include <libjulia/optimiser/ExpressionInliner.h>
-#include <libjulia/optimiser/InlinableExpressionFunctionFinder.h>
-#include <libjulia/optimiser/FullInliner.h>
-#include <libjulia/optimiser/FunctionHoister.h>
-#include <libjulia/optimiser/FunctionGrouper.h>
+#include <libyul/optimiser/ExpressionInliner.h>
+#include <libyul/optimiser/InlinableExpressionFunctionFinder.h>
+#include <libyul/optimiser/FullInliner.h>
+#include <libyul/optimiser/FunctionHoister.h>
+#include <libyul/optimiser/FunctionGrouper.h>
 
 #include <libsolidity/inlineasm/AsmPrinter.h>
 
@@ -36,8 +36,8 @@
 
 using namespace std;
 using namespace dev;
-using namespace dev::julia;
-using namespace dev::julia::test;
+using namespace dev::yul;
+using namespace dev::yul::test;
 using namespace dev::solidity;
 
 namespace
diff --git a/test/libjulia/Parser.cpp b/test/libyul/Parser.cpp
index 3f329d28..3f329d28 100644
--- a/test/libjulia/Parser.cpp
+++ b/test/libyul/Parser.cpp
diff --git a/test/libjulia/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 38765774..8b37830f 100644
--- a/test/libjulia/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -15,25 +15,25 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <test/libjulia/YulOptimizerTest.h>
+#include <test/libyul/YulOptimizerTest.h>
 
 #include <test/libsolidity/FormattedScope.h>
 
 #include <test/Options.h>
 
-#include <libjulia/optimiser/Disambiguator.h>
-#include <libjulia/optimiser/CommonSubexpressionEliminator.h>
-#include <libjulia/optimiser/NameCollector.h>
-#include <libjulia/optimiser/ExpressionSplitter.h>
-#include <libjulia/optimiser/FunctionGrouper.h>
-#include <libjulia/optimiser/FunctionHoister.h>
-#include <libjulia/optimiser/ExpressionInliner.h>
-#include <libjulia/optimiser/FullInliner.h>
-#include <libjulia/optimiser/MainFunction.h>
-#include <libjulia/optimiser/Rematerialiser.h>
-#include <libjulia/optimiser/ExpressionSimplifier.h>
-#include <libjulia/optimiser/UnusedPruner.h>
-#include <libjulia/optimiser/ExpressionJoiner.h>
+#include <libyul/optimiser/Disambiguator.h>
+#include <libyul/optimiser/CommonSubexpressionEliminator.h>
+#include <libyul/optimiser/NameCollector.h>
+#include <libyul/optimiser/ExpressionSplitter.h>
+#include <libyul/optimiser/FunctionGrouper.h>
+#include <libyul/optimiser/FunctionHoister.h>
+#include <libyul/optimiser/ExpressionInliner.h>
+#include <libyul/optimiser/FullInliner.h>
+#include <libyul/optimiser/MainFunction.h>
+#include <libyul/optimiser/Rematerialiser.h>
+#include <libyul/optimiser/ExpressionSimplifier.h>
+#include <libyul/optimiser/UnusedPruner.h>
+#include <libyul/optimiser/ExpressionJoiner.h>
 
 #include <libsolidity/parsing/Scanner.h>
 #include <libsolidity/inlineasm/AsmPrinter.h>
@@ -48,8 +48,8 @@
 #include <fstream>
 
 using namespace dev;
-using namespace dev::julia;
-using namespace dev::julia::test;
+using namespace dev::yul;
+using namespace dev::yul::test;
 using namespace dev::solidity;
 using namespace dev::solidity::test;
 using namespace std;
diff --git a/test/libjulia/YulOptimizerTest.h b/test/libyul/YulOptimizerTest.h
index 8f9a81f7..7db17ceb 100644
--- a/test/libjulia/YulOptimizerTest.h
+++ b/test/libyul/YulOptimizerTest.h
@@ -33,7 +33,7 @@ struct AsmAnalysisInfo;
 struct Block;
 }
 }
-namespace julia
+namespace yul
 {
 namespace test
 {
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul
index c59bced7..c59bced7 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_for.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul
index 5b8200d9..5b8200d9 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/branches_if.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul
index cb0ca38d..cb0ca38d 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul
index ebc17446..ebc17446 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/non_movable_instr2.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul
index b9457229..b9457229 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul
index 684272f5..684272f5 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/trivial.yul
diff --git a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul
index ab94afc2..ab94afc2 100644
--- a/test/libjulia/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul
+++ b/test/libyul/yulOptimizerTests/commonSubexpressionEliminator/variable_for_variable.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/for_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
index 0d2a38c5..0d2a38c5 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/for_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/funtion_call.yul b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
index f917bb68..f917bb68 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/funtion_call.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/funtion_call.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/if_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
index 14f53757..14f53757 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/if_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/if_statement.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/smoke.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke.yul
index d6cd8a61..d6cd8a61 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/smoke.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/smoke_yul.yul b/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
index e55f4cd3..e55f4cd3 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/smoke_yul.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/smoke_yul.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/switch_statement.yul b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
index 340ecccf..340ecccf 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/switch_statement.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/switch_statement.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/variables.yul b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
index 65bd4c8f..65bd4c8f 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/variables.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/variables_clash.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
index e462442a..e462442a 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/variables_clash.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_clash.yul
diff --git a/test/libjulia/yulOptimizerTests/disambiguator/variables_inside_functions.yul b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
index e80959f6..e80959f6 100644
--- a/test/libjulia/yulOptimizerTests/disambiguator/variables_inside_functions.yul
+++ b/test/libyul/yulOptimizerTests/disambiguator/variables_inside_functions.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/complex_with_evm.yul b/test/libyul/yulOptimizerTests/expressionInliner/complex_with_evm.yul
index 519a2af8..519a2af8 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/complex_with_evm.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/complex_with_evm.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/double_calls.yul b/test/libyul/yulOptimizerTests/expressionInliner/double_calls.yul
index e1da8e07..e1da8e07 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/double_calls.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/double_calls.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/double_recursive_calls.yul b/test/libyul/yulOptimizerTests/expressionInliner/double_recursive_calls.yul
index 082cb53f..082cb53f 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/double_recursive_calls.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/double_recursive_calls.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/no_inline_mload.yul b/test/libyul/yulOptimizerTests/expressionInliner/no_inline_mload.yul
index 0fb43a9d..0fb43a9d 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/no_inline_mload.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/no_inline_mload.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul b/test/libyul/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul
index 7fdad6c4..7fdad6c4 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/no_move_with_sideeffects.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/simple.yul b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
index c186eafd..c186eafd 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/simple.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionInliner/with_args.yul b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
index b5f4d515..b5f4d515 100644
--- a/test/libjulia/yulOptimizerTests/expressionInliner/with_args.yul
+++ b/test/libyul/yulOptimizerTests/expressionInliner/with_args.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/if_condition.yul b/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
index a1349511..a1349511 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/if_condition.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul b/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
index 0d407c7c..0d407c7c 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/multi.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
index fd53ca51..fd53ca51 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/multi.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_reference.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
index 078a12a5..078a12a5 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_reference.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
index 965e07e9..965e07e9 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
index c577e182..c577e182 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
index a781bb2a..a781bb2a 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
index 75218a5c..75218a5c 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
index d5f7d8fa..d5f7d8fa 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/only_assignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
index c7411211..c7411211 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/only_assignment.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/reassignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
index 1e502353..1e502353 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/reassignment.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/simple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
index b03bcf45..b03bcf45 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/single_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
index 3b433f78..3b433f78 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/smoke.yul b/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
index c0e2c6f2..c0e2c6f2 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/smoke.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/switch_expression.yul b/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
index 0e4e540e..0e4e540e 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/switch_expression.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionJoiner/triple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
index 7b722be1..7b722be1 100644
--- a/test/libjulia/yulOptimizerTests/expressionJoiner/triple.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/constant_propagation.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
index 0b55adc5..0b55adc5 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/constants.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
index bd1a5a53..bd1a5a53 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/constants.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
index f6190622..f6190622 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
index e91403cd..e91403cd 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
index d35686cd..d35686cd 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/including_function_calls.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
index c2ca504a..c2ca504a 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/inside_for.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
index 42c37826..42c37826 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/inside_for.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/invariant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
index e6d84552..e6d84552 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/invariant.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/mod_and_1.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
index 88714ce0..88714ce0 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/mod_and_2.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
index 4d52abe8..4d52abe8 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
index 53270b72..53270b72 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
index 6ab65d29..6ab65d29 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
index ab1bd128..ab1bd128 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
index fc61c3df..fc61c3df 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/reversed.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
index 6353cda9..6353cda9 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/reversed.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSimplifier/smoke.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
index 88420e92..88420e92 100644
--- a/test/libjulia/yulOptimizerTests/expressionSimplifier/smoke.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSplitter/control_flow.yul b/test/libyul/yulOptimizerTests/expressionSplitter/control_flow.yul
index d021129f..d021129f 100644
--- a/test/libjulia/yulOptimizerTests/expressionSplitter/control_flow.yul
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/control_flow.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSplitter/inside_function.yul b/test/libyul/yulOptimizerTests/expressionSplitter/inside_function.yul
index 53bbcea7..53bbcea7 100644
--- a/test/libjulia/yulOptimizerTests/expressionSplitter/inside_function.yul
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/inside_function.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSplitter/smoke.yul b/test/libyul/yulOptimizerTests/expressionSplitter/smoke.yul
index f69f60b6..f69f60b6 100644
--- a/test/libjulia/yulOptimizerTests/expressionSplitter/smoke.yul
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSplitter/switch.yul b/test/libyul/yulOptimizerTests/expressionSplitter/switch.yul
index aee7976f..aee7976f 100644
--- a/test/libjulia/yulOptimizerTests/expressionSplitter/switch.yul
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/switch.yul
diff --git a/test/libjulia/yulOptimizerTests/expressionSplitter/trivial.yul b/test/libyul/yulOptimizerTests/expressionSplitter/trivial.yul
index bff70cd8..bff70cd8 100644
--- a/test/libjulia/yulOptimizerTests/expressionSplitter/trivial.yul
+++ b/test/libyul/yulOptimizerTests/expressionSplitter/trivial.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/inside_condition.yul b/test/libyul/yulOptimizerTests/fullInliner/inside_condition.yul
index ae25e9a3..ae25e9a3 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/inside_condition.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/inside_condition.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul b/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
index e1def585..e1def585 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/multi_fun.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
index 94bbe5dc..94bbe5dc 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/multi_fun.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/multi_return.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_return.yul
index f3c5b0ee..f3c5b0ee 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/multi_return.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/multi_return.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/no_return.yul b/test/libyul/yulOptimizerTests/fullInliner/no_return.yul
index 53fe3527..53fe3527 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/no_return.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_return.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/pop_result.yul b/test/libyul/yulOptimizerTests/fullInliner/pop_result.yul
index 3883c67c..3883c67c 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/pop_result.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/pop_result.yul
diff --git a/test/libjulia/yulOptimizerTests/fullInliner/simple.yul b/test/libyul/yulOptimizerTests/fullInliner/simple.yul
index dd1a4e0a..dd1a4e0a 100644
--- a/test/libjulia/yulOptimizerTests/fullInliner/simple.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/simple.yul
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/empty_block.yul b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
index f0d49d7b..f0d49d7b 100644
--- a/test/libjulia/yulOptimizerTests/functionGrouper/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/empty_block.yul
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
index c830d5da..c830d5da 100644
--- a/test/libjulia/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/multi_fun_mixed.yul
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/nested_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
index 4a8be86a..4a8be86a 100644
--- a/test/libjulia/yulOptimizerTests/functionGrouper/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/nested_fun.yul
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/single_fun.yul b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
index 149a44eb..149a44eb 100644
--- a/test/libjulia/yulOptimizerTests/functionGrouper/single_fun.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/single_fun.yul
diff --git a/test/libjulia/yulOptimizerTests/functionGrouper/smoke.yul b/test/libyul/yulOptimizerTests/functionGrouper/smoke.yul
index 650a163e..650a163e 100644
--- a/test/libjulia/yulOptimizerTests/functionGrouper/smoke.yul
+++ b/test/libyul/yulOptimizerTests/functionGrouper/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/functionHoister/empty_block.yul b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
index 6ea9f59d..6ea9f59d 100644
--- a/test/libjulia/yulOptimizerTests/functionHoister/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/empty_block.yul
diff --git a/test/libjulia/yulOptimizerTests/functionHoister/multi_mixed.yul b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
index 1e3bc5a1..1e3bc5a1 100644
--- a/test/libjulia/yulOptimizerTests/functionHoister/multi_mixed.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/multi_mixed.yul
diff --git a/test/libjulia/yulOptimizerTests/functionHoister/nested.yul b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
index 20f094f1..20f094f1 100644
--- a/test/libjulia/yulOptimizerTests/functionHoister/nested.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/nested.yul
diff --git a/test/libjulia/yulOptimizerTests/functionHoister/single.yul b/test/libyul/yulOptimizerTests/functionHoister/single.yul
index ba922612..ba922612 100644
--- a/test/libjulia/yulOptimizerTests/functionHoister/single.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/single.yul
diff --git a/test/libjulia/yulOptimizerTests/functionHoister/smoke.yul b/test/libyul/yulOptimizerTests/functionHoister/smoke.yul
index 35c1ce5f..35c1ce5f 100644
--- a/test/libjulia/yulOptimizerTests/functionHoister/smoke.yul
+++ b/test/libyul/yulOptimizerTests/functionHoister/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/mainFunction/empty_block.yul b/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
index bae6bd48..bae6bd48 100644
--- a/test/libjulia/yulOptimizerTests/mainFunction/empty_block.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
diff --git a/test/libjulia/yulOptimizerTests/mainFunction/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
index dd5caaec..dd5caaec 100644
--- a/test/libjulia/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
diff --git a/test/libjulia/yulOptimizerTests/mainFunction/nested_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
index 309b97cc..309b97cc 100644
--- a/test/libjulia/yulOptimizerTests/mainFunction/nested_fun.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
diff --git a/test/libjulia/yulOptimizerTests/mainFunction/sigle_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/sigle_fun.yul
index fa9a8f41..fa9a8f41 100644
--- a/test/libjulia/yulOptimizerTests/mainFunction/sigle_fun.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/sigle_fun.yul
diff --git a/test/libjulia/yulOptimizerTests/mainFunction/smoke.yul b/test/libyul/yulOptimizerTests/mainFunction/smoke.yul
index 7be14746..7be14746 100644
--- a/test/libjulia/yulOptimizerTests/mainFunction/smoke.yul
+++ b/test/libyul/yulOptimizerTests/mainFunction/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for1.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for1.yul
index dbd1ee63..dbd1ee63 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for1.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_for1.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for2.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for2.yul
index 6a52e045..6a52e045 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for2.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_for2.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for_declared_in_init1.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for_declared_in_init1.yul
index fc816419..fc816419 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for_declared_in_init1.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_for_declared_in_init1.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for_declared_in_init2.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_for_declared_in_init2.yul
index 3d916890..3d916890 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_for_declared_in_init2.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_for_declared_in_init2.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_if.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_if.yul
index c148c2f2..c148c2f2 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_if.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_if.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/branches_switch.yul b/test/libyul/yulOptimizerTests/rematerialiser/branches_switch.yul
index 8f70a79d..8f70a79d 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/branches_switch.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/branches_switch.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul b/test/libyul/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul
index 891a5043..891a5043 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/do_not_move_out_of_scope.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code1.yul b/test/libyul/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code1.yul
index 016fa0d7..016fa0d7 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code1.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code1.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code2.yul b/test/libyul/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code2.yul
index d95dc1fc..d95dc1fc 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code2.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/do_not_remat_large_amounts_of_code2.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/expression.yul b/test/libyul/yulOptimizerTests/rematerialiser/expression.yul
index a801677d..a801677d 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/expression.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/expression.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/non_movable_function.yul b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul
index 9a041dfc..9a041dfc 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/non_movable_function.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_function.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/non_movable_instruction.yul b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_instruction.yul
index 8767abc9..8767abc9 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/non_movable_instruction.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/non_movable_instruction.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/reassign.yul b/test/libyul/yulOptimizerTests/rematerialiser/reassign.yul
index 47124658..47124658 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/reassign.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/reassign.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/reassignment.yul b/test/libyul/yulOptimizerTests/rematerialiser/reassignment.yul
index 13238780..13238780 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/reassignment.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/reassignment.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/smoke.yul b/test/libyul/yulOptimizerTests/rematerialiser/smoke.yul
index 2423db32..2423db32 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/smoke.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/trivial.yul b/test/libyul/yulOptimizerTests/rematerialiser/trivial.yul
index d29ea98a..d29ea98a 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/trivial.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/trivial.yul
diff --git a/test/libjulia/yulOptimizerTests/rematerialiser/update_asignment_remat.yul b/test/libyul/yulOptimizerTests/rematerialiser/update_asignment_remat.yul
index 7d35fee0..7d35fee0 100644
--- a/test/libjulia/yulOptimizerTests/rematerialiser/update_asignment_remat.yul
+++ b/test/libyul/yulOptimizerTests/rematerialiser/update_asignment_remat.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/functions.yul b/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
index ec9cdda8..ec9cdda8 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/functions.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
index 4ed6dd2c..4ed6dd2c 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
index 94d101e9..94d101e9 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
index a14dc28c..a14dc28c 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assign.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
index fe94edb8..fe94edb8 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/multi_assignments.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declarations.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
index 3cf35007..3cf35007 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declarations.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declare.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
index adabac87..adabac87 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/multi_declare.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
index 5db0ade9..5db0ade9 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/smoke.yul b/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
index ca2ed942..ca2ed942 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/smoke.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
diff --git a/test/libjulia/yulOptimizerTests/unusedPruner/trivial.yul b/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
index 9b4cf9fd..9b4cf9fd 100644
--- a/test/libjulia/yulOptimizerTests/unusedPruner/trivial.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index bb7adc13..65054fca 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -3,5 +3,5 @@ target_link_libraries(solfuzzer PRIVATE libsolc evmasm ${Boost_PROGRAM_OPTIONS_L
 
 add_executable(isoltest isoltest.cpp ../Options.cpp ../Common.cpp ../libsolidity/TestCase.cpp ../libsolidity/SyntaxTest.cpp
         ../libsolidity/AnalysisFramework.cpp ../libsolidity/SolidityExecutionFramework.cpp ../ExecutionFramework.cpp
-        ../RPCSession.cpp ../libsolidity/ASTJSONTest.cpp ../libjulia/YulOptimizerTest.cpp)
+        ../RPCSession.cpp ../libsolidity/ASTJSONTest.cpp ../libyul/YulOptimizerTest.cpp)
 target_link_libraries(isoltest PRIVATE libsolc solidity evmasm ${Boost_PROGRAM_OPTIONS_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 5134fe4f..bdc89fb3 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -21,7 +21,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 #include <test/libsolidity/SyntaxTest.h>
 #include <test/libsolidity/ASTJSONTest.h>
-#include <test/libjulia/YulOptimizerTest.h>
+#include <test/libyul/YulOptimizerTest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -386,9 +386,9 @@ Allowed options)",
 
 	if (auto stats = runTestSuite(
 		"Yul Optimizer",
-		testPath / "libjulia",
+		testPath / "libyul",
 		"yulOptimizerTests",
-		julia::test::YulOptimizerTest::create,
+		yul::test::YulOptimizerTest::create,
 		formatted
 	))
 		global_stats += *stats;