diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs
index f84dc977f1..c768eea2f4 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.cs
@@ -5,7 +5,7 @@
 // ReSharper disable InconsistentNaming
 // <auto-generated />
 #pragma warning disable
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
 	using System.Numerics;
 	using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt
index 03566acbbc..e5d5cbe156 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.Generated.tt
@@ -14,7 +14,7 @@
 <#
 char[] coordz = {'X', 'Y', 'Z', 'W'};
 #>
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
 	using System.Numerics;
 	using System.Runtime.CompilerServices;
diff --git a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
index 2b8cb0f721..e977645847 100644
--- a/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
+++ b/src/ImageSharp/Formats/Jpeg/Common/Block8x8F.cs
@@ -3,10 +3,9 @@
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
 // ReSharper disable InconsistentNaming
-namespace ImageSharp.Formats.Jpg
+namespace ImageSharp.Formats.Jpeg.Common
 {
     using System;
-    using System.Buffers;
     using System.Numerics;
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
index 1bb66d6a9d..955f06e54a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/BlockQuad.cs
@@ -4,16 +4,18 @@
 // </copyright>
 namespace ImageSharp.Formats.Jpeg.GolangPort.Components
 {
-    using ImageSharp.Formats.Jpg;
+    using ImageSharp.Formats.Jpeg.Common;
+
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
     /// <summary>
-    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
+    /// Poor man's stackalloc: Contains a value-type <see cref="float"/> buffer sized for 4 <see cref="Common.Block8x8F"/> instances.
     /// Useful for decoder/encoder operations allocating a block for each Jpeg component.
     /// </summary>
     internal unsafe struct BlockQuad
     {
         /// <summary>
-        /// The value-type <see cref="float"/> buffer sized for 4 <see cref="Block8x8F"/> instances.
+        /// The value-type <see cref="float"/> buffer sized for 4 <see cref="Common.Block8x8F"/> instances.
         /// </summary>
         public fixed float Data[4 * Block8x8F.ScalarCount];
     }
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
index de90ea999c..61cfa8a1fb 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/DCT.cs
@@ -9,7 +9,7 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components
     using System.Numerics;
     using System.Runtime.CompilerServices;
 
-    using ImageSharp.Formats.Jpg;
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
     /// <summary>
     /// Contains forward and inverse DCT implementations
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
index 2a9fe6f0ea..0178d996b7 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/DecodedBlock.cs
@@ -5,7 +5,7 @@
 
 namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
-    using ImageSharp.Formats.Jpg;
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
     /// <summary>
     /// A structure to store unprocessed <see cref="Block8x8F"/> instances and their coordinates while scanning the image.
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
index 0204dea6fd..1018fab54f 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegBlockProcessor.cs
@@ -6,10 +6,10 @@
 namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.InteropServices;
-
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Encapsulates the implementation of processing "raw" <see cref="Buffer{T}"/>-s into Jpeg image channels.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
index 2cc1e5916c..db492c549a 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegPixelArea.cs
@@ -7,9 +7,10 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
     using System.Runtime.CompilerServices;
 
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Represents an area of a Jpeg subimage (channel)
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
index a6b3ddc3b7..41aa8d93ce 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.ComputationData.cs
@@ -6,8 +6,7 @@
 namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.InteropServices;
-
-    using ImageSharp.Formats.Jpg;
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
     /// <content>
     /// Conains the definition of <see cref="ComputationData"/>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
index 44f743501e..bc9222222b 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.DataPointers.cs
@@ -5,7 +5,7 @@
 
 namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
-    using ImageSharp.Formats.Jpg;
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
 
     /// <content>
     /// Conains the definition of <see cref="DataPointers"/>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
index 68ebe64bce..081c524133 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/JpegScanDecoder.cs
@@ -7,10 +7,10 @@ namespace ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder
 {
     using System.Runtime.CompilerServices;
     using System.Runtime.InteropServices;
-
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Encapsulates the impementation of Jpeg SOS Huffman decoding. See JpegScanDecoder.md!
     ///
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
index 028d079b0f..3422130f73 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegDecoderCore.cs
@@ -11,10 +11,11 @@ namespace ImageSharp.Formats.Jpeg.GolangPort
     using System.Threading.Tasks;
 
     using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.Memory;
     using ImageSharp.PixelFormats;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Performs the jpeg decoding operation.
     /// </summary>
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
index 92a4be52fc..585d972b86 100644
--- a/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
+++ b/src/ImageSharp/Formats/Jpeg/GolangPort/JpegEncoderCore.cs
@@ -12,9 +12,10 @@ namespace ImageSharp.Formats.Jpeg.GolangPort
     using ImageSharp.Formats.Jpeg.GolangPort.Components;
     using ImageSharp.Formats.Jpeg.GolangPort.Components.Encoder;
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.PixelFormats;
 
+    using Block8x8F = ImageSharp.Formats.Jpeg.Common.Block8x8F;
+
     /// <summary>
     /// Image encoder for writing an image to a stream as a jpeg.
     /// </summary>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
index 05f12e6111..d3f80e7b24 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/BadEofJpegTests.cs
@@ -14,11 +14,7 @@ using Xunit.Abstractions;
 
 namespace ImageSharp.Tests
 {
-    using System.Numerics;
-
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.PixelFormats;
-    using ImageSharp.Processing;
 
     public class BadEOFJpegTests : MeasureFixture
     {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
index 1d96043c96..7aeaf18dd4 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs
@@ -14,9 +14,9 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats;
+    using ImageSharp.Formats.Jpeg.Common;
     using ImageSharp.Formats.Jpeg.GolangPort.Components;
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
 
     using Xunit;
     using Xunit.Abstractions;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
index 49802a8d23..e515f7bb24 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegEncoderTests.cs
@@ -14,7 +14,6 @@ using Xunit.Abstractions;
 
 namespace ImageSharp.Tests
 {
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.PixelFormats;
     using ImageSharp.Processing;
     using SixLabors.Primitives;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
index 7956462ab5..914e5be2f2 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilityTestFixture.cs
@@ -14,7 +14,6 @@ namespace ImageSharp.Tests
     using System.Diagnostics;
 
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
 
     public class JpegUtilityTestFixture : MeasureFixture
     {
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
index f79b689d14..22b1f13f76 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegUtilsTests.cs
@@ -10,7 +10,6 @@ namespace ImageSharp.Tests
     using System.Numerics;
 
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
     using ImageSharp.PixelFormats;
 
     using Xunit;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
index d3d6e4e703..f5126727f1 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementations.cs
@@ -12,8 +12,8 @@ namespace ImageSharp.Tests
     using System.Runtime.CompilerServices;
 
     using ImageSharp.Formats;
+    using ImageSharp.Formats.Jpeg.Common;
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
 
     /// <summary>
     /// This class contains simplified (unefficient) reference implementations to produce verification data for unit tests
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
index 67f9a1182c..9c28437700 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs
@@ -7,7 +7,6 @@
 namespace ImageSharp.Tests.Formats.Jpg
 {
     using ImageSharp.Formats.Jpeg.GolangPort.Utils;
-    using ImageSharp.Formats.Jpg;
 
     using Xunit;
     using Xunit.Abstractions;
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
index c23836143d..690b65ff9d 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/YCbCrImageTests.cs
@@ -6,7 +6,6 @@
 namespace ImageSharp.Tests
 {
     using ImageSharp.Formats.Jpeg.GolangPort.Components.Decoder;
-    using ImageSharp.Formats.Jpg;
     using SixLabors.Primitives;
     using Xunit;
     using Xunit.Abstractions;