diff --git a/tests/SbeCodeGenerator.Tests/DiagnosticsTests.cs b/tests/SbeCodeGenerator.Tests/DiagnosticsTests.cs
index 3c91c64..047aa6a 100644
--- a/tests/SbeCodeGenerator.Tests/DiagnosticsTests.cs
+++ b/tests/SbeCodeGenerator.Tests/DiagnosticsTests.cs
@@ -29,7 +29,7 @@ public void Generate_WithInvalidIntegerAttribute_EmitsDiagnostic()
             
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -55,7 +55,7 @@ public void Generate_WithInvalidEnumFlagValue_CompletesSuccessfully()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -83,7 +83,7 @@ public void Generate_WithInvalidOffset_CompletesSuccessfully()
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
diff --git a/tests/SbeCodeGenerator.Tests/EndianTests.cs b/tests/SbeCodeGenerator.Tests/EndianTests.cs
index c6acb00..4b525ff 100644
--- a/tests/SbeCodeGenerator.Tests/EndianTests.cs
+++ b/tests/SbeCodeGenerator.Tests/EndianTests.cs
@@ -10,7 +10,7 @@ public class EndianTests
         public void SchemaContext_DefaultsByteOrder_IsLittleEndian()
         {
             // Arrange & Act
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Assert
             Assert.Equal("littleEndian", context.ByteOrder);
@@ -26,7 +26,7 @@ public void ParseSchema_WithLittleEndianAttribute_SetsLittleEndian()
                                    byteOrder=""littleEndian"">
                 </sbe:messageSchema>");
 
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var messageSchemaNode = xmlDoc.DocumentElement;
@@ -53,7 +53,7 @@ public void ParseSchema_WithBigEndianAttribute_SetsBigEndian()
                                    byteOrder=""bigEndian"">
                 </sbe:messageSchema>");
 
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var messageSchemaNode = xmlDoc.DocumentElement;
@@ -79,7 +79,7 @@ public void ParseSchema_WithoutByteOrderAttribute_DefaultsToLittleEndian()
                 <sbe:messageSchema xmlns:sbe=""http://fixprotocol.io/2016/sbe"">
                 </sbe:messageSchema>");
 
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var messageSchemaNode = xmlDoc.DocumentElement;
diff --git a/tests/SbeCodeGenerator.Tests/MessagesCodeGeneratorTests.cs b/tests/SbeCodeGenerator.Tests/MessagesCodeGeneratorTests.cs
index 071431c..6d3d10b 100644
--- a/tests/SbeCodeGenerator.Tests/MessagesCodeGeneratorTests.cs
+++ b/tests/SbeCodeGenerator.Tests/MessagesCodeGeneratorTests.cs
@@ -14,7 +14,7 @@ public void Generate_WithSimpleMessage_ProducesMessageCode()
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
@@ -42,7 +42,7 @@ public void Generate_WithMessageContainingConstants_ProducesCodeWithConstants()
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
@@ -68,7 +68,7 @@ public void Generate_WithMultipleMessages_ProducesMultipleFiles()
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
@@ -95,7 +95,7 @@ public void Generate_WithDeprecatedFields_AddsObsoleteAttribute()
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
@@ -128,7 +128,7 @@ public void Generate_WithDeprecatedFieldWithSinceVersion_AddsVersionToObsoleteMe
         {
             // Arrange
             var generator = new MessagesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
diff --git a/tests/SbeCodeGenerator.Tests/ParserCodeGeneratorTests.cs b/tests/SbeCodeGenerator.Tests/ParserCodeGeneratorTests.cs
index 0179c38..49c8ebe 100644
--- a/tests/SbeCodeGenerator.Tests/ParserCodeGeneratorTests.cs
+++ b/tests/SbeCodeGenerator.Tests/ParserCodeGeneratorTests.cs
@@ -13,7 +13,7 @@ public class MessageParsingHelpersTests
         public void MessagesIncludeTryParseHelper()
         {
             // Arrange
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
@@ -37,7 +37,7 @@ public void MessagesIncludeTryParseHelper()
         public void CompositesIncludeTryParseHelper()
         {
             // Arrange
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <sbe:messageSchema xmlns:sbe='http://fixprotocol.io/2016/sbe'>
diff --git a/tests/SbeCodeGenerator.Tests/SnapshotTests.cs b/tests/SbeCodeGenerator.Tests/SnapshotTests.cs
index 9f12897..c3e7792 100644
--- a/tests/SbeCodeGenerator.Tests/SnapshotTests.cs
+++ b/tests/SbeCodeGenerator.Tests/SnapshotTests.cs
@@ -28,7 +28,7 @@ public Task TypesCodeGenerator_GeneratesConsistentEnumCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
@@ -48,7 +48,7 @@ public Task TypesCodeGenerator_GeneratesConsistentSetCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
@@ -68,7 +68,7 @@ public Task TypesCodeGenerator_GeneratesConsistentCompositeCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
@@ -87,7 +87,7 @@ public Task TypesCodeGenerator_GeneratesConsistentCompositeCode()
         public Task MessagesCodeGenerator_GeneratesConsistentTradeMessage()
         {
             // Arrange
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             
             // First run TypesCodeGenerator to populate the context
             var typesGenerator = new TypesCodeGenerator();
@@ -97,7 +97,7 @@ public Task MessagesCodeGenerator_GeneratesConsistentTradeMessage()
             var generator = new MessagesCodeGenerator();
 
             // Act
-            var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
+            var results = generator.Generate("TestNamespace.V0", _testSchema, context, default(SourceProductionContext));
 
             // Find the Trade message
             var messageResult = results.FirstOrDefault(r => r.name.Contains("Trade") && !r.name.Contains("Parser"));
@@ -113,7 +113,7 @@ public Task MessagesCodeGenerator_GeneratesConsistentTradeMessage()
         public Task MessagesCodeGenerator_GeneratesConsistentQuoteMessage()
         {
             // Arrange
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             
             // First run TypesCodeGenerator to populate the context
             var typesGenerator = new TypesCodeGenerator();
@@ -123,7 +123,7 @@ public Task MessagesCodeGenerator_GeneratesConsistentQuoteMessage()
             var generator = new MessagesCodeGenerator();
 
             // Act
-            var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
+            var results = generator.Generate("TestNamespace.V0", _testSchema, context, default(SourceProductionContext));
 
             // Find the Quote message
             var messageResult = results.FirstOrDefault(r => r.name.Contains("Quote") && !r.name.Contains("Parser"));
@@ -140,7 +140,7 @@ public Task UtilitiesCodeGenerator_GeneratesConsistentNumberExtensions()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
@@ -157,7 +157,7 @@ public Task UtilitiesCodeGenerator_GeneratesConsistentEndianHelpers()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
 
             // Act
             var results = generator.Generate("TestNamespace", _testSchema, context, default(SourceProductionContext));
diff --git a/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Quote.verified.txt b/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Quote.verified.txt
index 985654d..d91aa57 100644
--- a/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Quote.verified.txt
+++ b/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Quote.verified.txt
@@ -1,5 +1,5 @@
-using TestNamespace;
-using TestNamespace.Runtime;
+using TestNamespace.V0;
+using TestNamespace.V0.Runtime;
 using System.Runtime.InteropServices;
 namespace TestNamespace.V0;
 /// <summary>
diff --git a/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Trade.verified.txt b/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Trade.verified.txt
index 4bb4de0..26da9c9 100644
--- a/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Trade.verified.txt
+++ b/tests/SbeCodeGenerator.Tests/Snapshots/MessagesCodeGenerator.Message.Trade.verified.txt
@@ -1,5 +1,5 @@
-using TestNamespace;
-using TestNamespace.Runtime;
+using TestNamespace.V0;
+using TestNamespace.V0.Runtime;
 using System.Runtime.InteropServices;
 namespace TestNamespace.V0;
 /// <summary>
diff --git a/tests/SbeCodeGenerator.Tests/TypesCodeGeneratorTests.cs b/tests/SbeCodeGenerator.Tests/TypesCodeGeneratorTests.cs
index 719b742..f116ac6 100644
--- a/tests/SbeCodeGenerator.Tests/TypesCodeGeneratorTests.cs
+++ b/tests/SbeCodeGenerator.Tests/TypesCodeGeneratorTests.cs
@@ -13,7 +13,7 @@ public void Generate_WithSimpleEnum_ProducesEnumCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -43,7 +43,7 @@ public void Generate_WithSimpleType_ProducesTypeCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -68,7 +68,7 @@ public void Generate_WithComposite_ProducesCompositeCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -96,7 +96,7 @@ public void Generate_WithSet_ProducesSetCode()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -128,7 +128,7 @@ public void Generate_TypeDefinition_IncludesReadonlyModifier()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -153,7 +153,7 @@ public void Generate_TypeDefinition_IncludesConstructor()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -178,7 +178,7 @@ public void Generate_TypeDefinition_IncludesImplicitConversion()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -203,7 +203,7 @@ public void Generate_TypeDefinition_IncludesExplicitConversion()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -228,7 +228,7 @@ public void Generate_TypeDefinition_AllPhase1Features_IntegrationTest()
         {
             // Arrange
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -262,7 +262,7 @@ public void Generate_RefStruct_IncludesReadonlyModifier()
         {
             // Arrange - Phase 3 Option 1: readonly ref structs
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -295,7 +295,7 @@ public void Generate_RefStruct_IncludesConstructor()
         {
             // Arrange - Phase 3 Option 1: ref struct constructors
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -326,7 +326,7 @@ public void Generate_RefStruct_CreateMethodUsesConstructor()
         {
             // Arrange - Phase 3 Option 1: Create method should use constructor
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
@@ -358,7 +358,7 @@ public void Generate_BlittableComposite_RemainsUnchanged()
         {
             // Arrange - Blittable composites should NOT be readonly ref structs
             var generator = new TypesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml(@"
                 <messageSchema>
diff --git a/tests/SbeCodeGenerator.Tests/UtilitiesCodeGeneratorTests.cs b/tests/SbeCodeGenerator.Tests/UtilitiesCodeGeneratorTests.cs
index 18d7a8e..85485d5 100644
--- a/tests/SbeCodeGenerator.Tests/UtilitiesCodeGeneratorTests.cs
+++ b/tests/SbeCodeGenerator.Tests/UtilitiesCodeGeneratorTests.cs
@@ -13,7 +13,7 @@ public void Generate_ProducesNumberExtensions()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml("<messageSchema></messageSchema>");
 
@@ -32,7 +32,7 @@ public void Generate_ProducesEndianHelpers()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml("<messageSchema></messageSchema>");
 
@@ -51,7 +51,7 @@ public void Generate_UsesProvidedNamespace()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml("<messageSchema></messageSchema>");
 
@@ -69,7 +69,7 @@ public void Generate_ProducesSpanReader()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml("<messageSchema></messageSchema>");
 
@@ -88,7 +88,7 @@ public void Generate_ProducesSpanWriter()
         {
             // Arrange
             var generator = new UtilitiesCodeGenerator();
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var xmlDoc = new XmlDocument();
             xmlDoc.LoadXml("<messageSchema></messageSchema>");
 
diff --git a/tests/SbeCodeGenerator.Tests/ValidationGeneratorTests.cs b/tests/SbeCodeGenerator.Tests/ValidationGeneratorTests.cs
index 682d891..e798bb2 100644
--- a/tests/SbeCodeGenerator.Tests/ValidationGeneratorTests.cs
+++ b/tests/SbeCodeGenerator.Tests/ValidationGeneratorTests.cs
@@ -28,7 +28,7 @@ public void Generate_WithMinMaxConstraints_ProducesValidationCode()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -72,7 +72,7 @@ public void Generate_WithoutConstraints_DoesNotProduceValidationCode()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -98,7 +98,7 @@ public void Generate_WithMinValueOnly_ProducesMinValidationCode()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -127,7 +127,7 @@ public void Generate_WithMaxValueOnly_ProducesMaxValidationCode()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -158,7 +158,7 @@ public void Generate_MessageWithMultipleConstraints_ProducesValidationForAll()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -192,7 +192,7 @@ public void Generate_WithConstraints_ProducesTryValidateMethod()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act
@@ -235,7 +235,7 @@ public void Generate_WithConstraints_ProducesCreateValidatedMethod()
 
             var doc = new XmlDocument();
             doc.LoadXml(xml);
-            var context = new SchemaContext();
+            var context = new SchemaContext("test-schema");
             var generator = new ValidationGenerator();
 
             // Act