diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
index 7e0b704c1a01..31434cb98eef 100644
--- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache
@@ -42,7 +42,7 @@ namespace {{packageName}}.Test.{{apiPackage}}
             {{#dataType}}
             var response = await _instance.{{operationId}}Async({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
             var model = response.{{vendorExtensions.x-http-status}}();
-            Assert.IsType<{{{.}}}>(model);
+            Assert.IsType<{{#isModel}}{{packageName}}.{{modelPackage}}.{{/isModel}}{{{.}}}>(model);
             {{/dataType}}
             {{^dataType}}
             await _instance.{{operationId}}Async({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
diff --git a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b29a0d658a38..ad9e4908f556 100644
--- a/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/InlineEnumAnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task IconsAsyncTest()
             Client.Option<IconsSizeParameter> size = default!;
             var response = await _instance.IconsAsync(size);
             var model = response.Default();
-            Assert.IsType<IconsDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.IconsDefaultResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 777103c55256..0b26ed0e2960 100644
--- a/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task GetWidgetAsyncTest()
             long id = default!;
             var response = await _instance.GetWidgetAsync(id);
             var model = response.Ok();
-            Assert.IsType<Widget>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Widget>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 707d722cd331..99ea9ea22942 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 6151cce5b8b5..d9a1fc96d482 100644
--- a/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task ListAsyncTest()
             string personId = default!;
             var response = await _instance.ListAsync(personId);
             var model = response.Ok();
-            Assert.IsType<Person>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Person>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 1924842cdbef..b62a09be656c 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index a4aa8f3e245d..a5379191f22d 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index fed093fb206f..d17ef9106e5f 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 05dc933c03b1..d9a244441978 100644
--- a/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net10/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task NowGetAsyncTest()
         {
             var response = await _instance.NowGetAsync();
             var model = response.Ok();
-            Assert.IsType<NowGet200Response>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NowGet200Response>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 8181a987b5ff..f347fd25666e 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task ListAsyncTest()
             string personId = default;
             var response = await _instance.ListAsync(personId);
             var model = response.Ok();
-            Assert.IsType<Person>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Person>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 62c158ea45da..89c6a3e87810 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index a4aa8f3e245d..a5379191f22d 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 6420b47bc8b4..c50e8145ec81 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 05dc933c03b1..d9a244441978 100644
--- a/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task NowGetAsyncTest()
         {
             var response = await _instance.NowGetAsync();
             var model = response.Ok();
-            Assert.IsType<NowGet200Response>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NowGet200Response>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 8181a987b5ff..f347fd25666e 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task ListAsyncTest()
             string personId = default;
             var response = await _instance.ListAsync(personId);
             var model = response.Ok();
-            Assert.IsType<Person>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Person>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 62c158ea45da..89c6a3e87810 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index a4aa8f3e245d..a5379191f22d 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 6420b47bc8b4..c50e8145ec81 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 05dc933c03b1..d9a244441978 100644
--- a/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task NowGetAsyncTest()
         {
             var response = await _instance.NowGetAsync();
             var model = response.Ok();
-            Assert.IsType<NowGet200Response>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NowGet200Response>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 6151cce5b8b5..d9a1fc96d482 100644
--- a/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task ListAsyncTest()
             string personId = default!;
             var response = await _instance.ListAsync(personId);
             var model = response.Ok();
-            Assert.IsType<Person>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Person>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 1924842cdbef..b62a09be656c 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index a4aa8f3e245d..a5379191f22d 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index fed093fb206f..d17ef9106e5f 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 05dc933c03b1..d9a244441978 100644
--- a/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task NowGetAsyncTest()
         {
             var response = await _instance.NowGetAsync();
             var model = response.Ok();
-            Assert.IsType<NowGet200Response>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NowGet200Response>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 6151cce5b8b5..d9a1fc96d482 100644
--- a/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AllOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -59,7 +59,7 @@ public async Task ListAsyncTest()
             string personId = default!;
             var response = await _instance.ListAsync(personId);
             var model = response.Ok();
-            Assert.IsType<Person>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Person>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/AnyOfNoCompare/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 1924842cdbef..b62a09be656c 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index a4aa8f3e245d..a5379191f22d 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/FormModels/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index b7bcc281037a..37ae5c5318e6 100644
--- a/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/OneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task RootGetAsyncTest()
         {
             var response = await _instance.RootGetAsync();
             var model = response.Ok();
-            Assert.IsType<Fruit>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Fruit>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index fed093fb206f..d17ef9106e5f 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index 53d2c74655f3..0851a071d67d 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 36d00e054b5b..93d79f4a6cdb 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index d207bb93dc69..b4958873603e 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default!;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 626331ef9b7f..92636f5f82c2 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default!;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 6bb1f953987c..c84a480f27f5 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default!;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default!;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default!;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default!;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index b2a25a3e6f07..1ee2c01fba11 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default!;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default!;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index bc750295c346..c11951c37805 100644
--- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default!;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 05dc933c03b1..d9a244441978 100644
--- a/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/net9/UseDateTimeForDate/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task NowGetAsyncTest()
         {
             var response = await _instance.NowGetAsync();
             var model = response.Ok();
-            Assert.IsType<NowGet200Response>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NowGet200Response>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
index cf82a3e39bd6..c51cb1fad01a 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs
@@ -59,7 +59,7 @@ public async Task Call123TestSpecialTagsAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.Call123TestSpecialTagsAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
index 9b72a928dedf..01c98a4ed9d0 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs
@@ -58,7 +58,7 @@ public async Task FooGetAsyncTest()
         {
             var response = await _instance.FooGetAsync();
             var model = response.Default();
-            Assert.IsType<FooGetDefaultResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.FooGetDefaultResponse>(model);
         }
 
         /// <summary>
@@ -110,7 +110,7 @@ public async Task TestAsyncTest()
         {
             var response = await _instance.TestAsync();
             var model = response.Ok();
-            Assert.IsType<NotificationtestGetElementsV1ResponseMPayload>(model);
+            Assert.IsType<Org.OpenAPITools.Model.NotificationtestGetElementsV1ResponseMPayload>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
index 6420b47bc8b4..c50e8145ec81 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs
@@ -58,7 +58,7 @@ public async Task FakeHealthGetAsyncTest()
         {
             var response = await _instance.FakeHealthGetAsync();
             var model = response.Ok();
-            Assert.IsType<HealthCheckResult>(model);
+            Assert.IsType<Org.OpenAPITools.Model.HealthCheckResult>(model);
         }
 
         /// <summary>
@@ -82,7 +82,7 @@ public async Task FakeOuterCompositeSerializeAsyncTest()
             Client.Option<OuterComposite> outerComposite = default;
             var response = await _instance.FakeOuterCompositeSerializeAsync(outerComposite);
             var model = response.Ok();
-            Assert.IsType<OuterComposite>(model);
+            Assert.IsType<Org.OpenAPITools.Model.OuterComposite>(model);
         }
 
         /// <summary>
@@ -129,7 +129,7 @@ public async Task GetMixedAnyOfAsyncTest()
         {
             var response = await _instance.GetMixedAnyOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedAnyOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedAnyOf>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task GetMixedOneOfAsyncTest()
         {
             var response = await _instance.GetMixedOneOfAsync();
             var model = response.Ok();
-            Assert.IsType<MixedOneOf>(model);
+            Assert.IsType<Org.OpenAPITools.Model.MixedOneOf>(model);
         }
 
         /// <summary>
@@ -183,7 +183,7 @@ public async Task TestClientModelAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClientModelAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
index 5964bf6e51d6..715acb9c15c6 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs
@@ -59,7 +59,7 @@ public async Task TestClassnameAsyncTest()
             ModelClient modelClient = default;
             var response = await _instance.TestClassnameAsync(modelClient);
             var model = response.Ok();
-            Assert.IsType<ModelClient>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ModelClient>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index e9b05337bb59..cc83f78eae43 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -104,7 +104,7 @@ public async Task GetPetByIdAsyncTest()
             long petId = default;
             var response = await _instance.GetPetByIdAsync(petId);
             var model = response.Ok();
-            Assert.IsType<Pet>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Pet>(model);
         }
 
         /// <summary>
@@ -140,7 +140,7 @@ public async Task UploadFileAsyncTest()
             Client.Option<Org.OpenAPITools.Client.FileParameter> file = default;
             var response = await _instance.UploadFileAsync(petId, additionalMetadata, file);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -154,7 +154,7 @@ public async Task UploadFileWithRequiredFileAsyncTest()
             Client.Option<string> additionalMetadata = default;
             var response = await _instance.UploadFileWithRequiredFileAsync(petId, requiredFile, additionalMetadata);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ public async Task UploadFilesAsyncTest()
             long petId = default;
             var response = await _instance.UploadFilesAsync(files, petId);
             var model = response.Ok();
-            Assert.IsType<ApiResponse>(model);
+            Assert.IsType<Org.OpenAPITools.Model.ApiResponse>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
index 1b75e3417005..9dd460e46659 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs
@@ -68,7 +68,7 @@ public async Task GetInventoryAsyncTest()
         {
             var response = await _instance.GetInventoryAsync();
             var model = response.Ok();
-            Assert.IsType<Dictionary<string, int>>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Dictionary<string, int>>(model);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public async Task GetOrderByIdAsyncTest()
             long orderId = default;
             var response = await _instance.GetOrderByIdAsync(orderId);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
 
         /// <summary>
@@ -92,7 +92,7 @@ public async Task PlaceOrderAsyncTest()
             Order order = default;
             var response = await _instance.PlaceOrderAsync(order);
             var model = response.Ok();
-            Assert.IsType<Order>(model);
+            Assert.IsType<Org.OpenAPITools.Model.Order>(model);
         }
     }
 }
diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
index 5a655797609e..7360721f99c5 100644
--- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
+++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/UserApiTests.cs
@@ -99,7 +99,7 @@ public async Task GetUserByNameAsyncTest()
             string username = default;
             var response = await _instance.GetUserByNameAsync(username);
             var model = response.Ok();
-            Assert.IsType<User>(model);
+            Assert.IsType<Org.OpenAPITools.Model.User>(model);
         }
 
         /// <summary>