diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs
index cfc818193f..c6e017aafd 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/AuthorizationFilterContextBuilder.cs
@@ -15,7 +15,7 @@
 #if BUILD_PEANUTBUTTER_INTERNAL
 using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 using Imported.PeanutButter.Utils;
-namespace ImportedPeanutButter.TestUtils.AspNetCore.Builders;
+namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
 using PeanutButter.TestUtils.AspNetCore.Fakes;
 using PeanutButter.Utils;
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs
index af6171f6fe..6ee73d64b1 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/StringMapDerivativeBuilder.cs
@@ -1,8 +1,8 @@
-using PeanutButter.TestUtils.AspNetCore.Fakes;
-
-#if BUILD_PEANUTBUTTER_INTERNAL
+#if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
+using PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace PeanutButter.TestUtils.AspNetCore.Builders;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs
index cf1d2a339c..c117d4caec 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Builders/WebSocketManagerBuilder.cs
@@ -3,11 +3,12 @@
 using System.Net.WebSockets;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.TestUtils.AspNetCore.Fakes;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Builders;
 #else
+using PeanutButter.TestUtils.AspNetCore.Fakes;
 namespace PeanutButter.TestUtils.AspNetCore.Builders;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs
index bf8252634c..37e6d6be82 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeFormFile.cs
@@ -4,15 +4,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 // ReSharper disable UnusedAutoPropertyAccessor.Global
 // ReSharper disable MemberCanBePrivate.Global
 // ReSharper disable ConstantNullCoalescingCondition
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs
index 70363fdd62..9a1864b6b1 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeHttpRequest.cs
@@ -7,18 +7,20 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.TestUtils.AspNetCore.Utils;
-using PeanutButter.Utils;
 // ReSharper disable RedundantNameQualifier
-
 // ReSharper disable ConstantConditionalAccessQualifier
-
 // ReSharper disable ConstantNullCoalescingCondition
 // ReSharper disable MemberCanBePrivate.Global
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.TestUtils.AspNetCore.Utils;
+using Imported.PeanutButter.Utils;
+
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.TestUtils.AspNetCore.Utils;
+using PeanutButter.Utils;
+
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs
index 0be9e36a97..d614ffae7d 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeModelMetadata.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
-using static PeanutButter.RandomGenerators.RandomValueGen;
 
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
 // ReSharper disable HeuristicUnreachableCode
@@ -10,8 +9,10 @@
 // ReSharper disable InconsistentNaming
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using static Imported.PeanutButter.RandomGenerators.RandomValueGen;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using static PeanutButter.RandomGenerators.RandomValueGen;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs
index e85148fc88..cd11a07905 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/FakeRequestCookieCollection.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs
index 16e41c0df8..87ea39324e 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Fakes/StringValueMap.cs
@@ -2,13 +2,14 @@
 using System.Collections;
 using System.Collections.Generic;
 using Microsoft.Extensions.Primitives;
-using PeanutButter.Utils.Dictionaries;
 
 // ReSharper disable PublicConstructorInAbstractClass
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils.Dictionaries;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Fakes;
 #else
+using PeanutButter.Utils.Dictionaries;
 namespace PeanutButter.TestUtils.AspNetCore.Fakes;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs
index c482bff009..6a64195651 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/HttpResponseExtensions.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Net;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
 namespace Imported.PeanutButter.TestUtils.AspNetCore;
@@ -14,7 +11,12 @@ namespace PeanutButter.TestUtils.AspNetCore;
 /// <summary>
 /// Provides extensions for asp.net HttpResponse objects
 /// </summary>
-public static class HttpResponseExtensions
+#if BUILD_PEANUTBUTTER_INTERNAL
+internal
+#else
+public
+#endif
+    static class HttpResponseExtensions
 {
     /// <summary>
     /// ASP.NET core HttpResponse objects don't provide
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs
index abd2a54659..f8b049e943 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/FormFileExtensions.cs
@@ -1,11 +1,12 @@
 using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Utils;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Utils;
 #endif
 
diff --git a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs
index e1b8123dbd..a8982dd698 100644
--- a/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs
+++ b/source/TestUtils/PeanutButter.TestUtils.AspNetCore/Utils/UrlEncodedBodyEncoder.cs
@@ -1,11 +1,12 @@
 using System.IO;
 using System.Net;
 using Microsoft.AspNetCore.Http;
-using PeanutButter.Utils;
 
 #if BUILD_PEANUTBUTTER_INTERNAL
+using Imported.PeanutButter.Utils;
 namespace Imported.PeanutButter.TestUtils.AspNetCore.Utils;
 #else
+using PeanutButter.Utils;
 namespace PeanutButter.TestUtils.AspNetCore.Utils;
 #endif