diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponent.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponent.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponent.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponentScan.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponentScan.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldComponentScan.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigComponentScan.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldDecoderErrorCode.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigDecoderErrorCode.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldDecoderErrorCode.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigDecoderErrorCode.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldHuffmanTree.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldHuffmanTree.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigHuffmanTree.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegPixelArea.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegPixelArea.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegPixelArea.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.ComputationData.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.ComputationData.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.ComputationData.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.DataPointers.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.DataPointers.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.DataPointers.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.DataPointers.cs
diff --git a/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OldJpegScanDecoder.cs
rename to src/ImageSharp/Formats/Jpeg/GolangPort/Components/Decoder/OrigJpegScanDecoder.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Component.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponent.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponentBlocks.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ComponentBlocks.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsComponentBlocks.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFileMarker.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FileMarker.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFileMarker.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrame.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/Frame.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrame.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/FrameComponent.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsFrameComponent.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTable.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTable.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTables.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/HuffmanTables.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsHuffmanTables.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/IDCT.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsIDCT.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJFif.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JFif.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJFif.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/JpegPixelArea.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsJpegPixelArea.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/QuantizationTables.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsQuantizationTables.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/ScanDecoder.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsScanDecoder.cs
diff --git a/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs b/src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsYCbCrToRgbTables.cs
similarity index 100%
rename from src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/YCbCrToRgbTables.cs
rename to src/ImageSharp/Formats/Jpeg/PdfJsPort/Components/PdfJsYCbCrToRgbTables.cs