diff --git a/src/ImageSharp/Configuration.cs b/src/ImageSharp/Configuration.cs
index 7a2374fb6a..6e431ba31b 100644
--- a/src/ImageSharp/Configuration.cs
+++ b/src/ImageSharp/Configuration.cs
@@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Formats.Cur;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Ico;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.OpenExr;
+using SixLabors.ImageSharp.Formats.Exr;
 using SixLabors.ImageSharp.Formats.Pbm;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Formats.Qoi;
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/B44Compression.cs b/src/ImageSharp/Formats/Exr/Compression/Decompressors/B44Compression.cs
similarity index 98%
rename from src/ImageSharp/Formats/OpenExr/Compression/Decompressors/B44Compression.cs
rename to src/ImageSharp/Formats/Exr/Compression/Decompressors/B44Compression.cs
index 55e9003bc1..b8cb468142 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/B44Compression.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/Decompressors/B44Compression.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression.Decompressors;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression.Decompressors;
 
 internal class B44Compression : ExrBaseDecompressor
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/NoneExrCompression.cs b/src/ImageSharp/Formats/Exr/Compression/Decompressors/NoneExrCompression.cs
similarity index 89%
rename from src/ImageSharp/Formats/OpenExr/Compression/Decompressors/NoneExrCompression.cs
rename to src/ImageSharp/Formats/Exr/Compression/Decompressors/NoneExrCompression.cs
index f5f16a0fd4..6b36dffa2b 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/NoneExrCompression.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/Decompressors/NoneExrCompression.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression.Decompressors;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression.Decompressors;
 
 internal class NoneExrCompression : ExrBaseDecompressor
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/RunLengthCompression.cs b/src/ImageSharp/Formats/Exr/Compression/Decompressors/RunLengthCompression.cs
similarity index 96%
rename from src/ImageSharp/Formats/OpenExr/Compression/Decompressors/RunLengthCompression.cs
rename to src/ImageSharp/Formats/Exr/Compression/Decompressors/RunLengthCompression.cs
index 0838dc1dcf..f1c7bb759b 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/RunLengthCompression.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/Decompressors/RunLengthCompression.cs
@@ -5,7 +5,7 @@ using System.Buffers;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression.Decompressors;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression.Decompressors;
 
 internal class RunLengthCompression : ExrBaseDecompressor
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/ZipExrCompression.cs b/src/ImageSharp/Formats/Exr/Compression/Decompressors/ZipExrCompression.cs
similarity index 96%
rename from src/ImageSharp/Formats/OpenExr/Compression/Decompressors/ZipExrCompression.cs
rename to src/ImageSharp/Formats/Exr/Compression/Decompressors/ZipExrCompression.cs
index 1797bd44b3..4d9b42732f 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/Decompressors/ZipExrCompression.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/Decompressors/ZipExrCompression.cs
@@ -7,7 +7,7 @@ using SixLabors.ImageSharp.Compression.Zlib;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression.Decompressors;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression.Decompressors;
 
 internal class ZipExrCompression : ExrBaseDecompressor
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/ExrBaseCompression.cs b/src/ImageSharp/Formats/Exr/Compression/ExrBaseCompression.cs
similarity index 93%
rename from src/ImageSharp/Formats/OpenExr/Compression/ExrBaseCompression.cs
rename to src/ImageSharp/Formats/Exr/Compression/ExrBaseCompression.cs
index 4fd5778cb6..3dab1006ed 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/ExrBaseCompression.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/ExrBaseCompression.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression;
 
 internal abstract class ExrBaseCompression : IDisposable
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/ExrBaseDecompressor.cs b/src/ImageSharp/Formats/Exr/Compression/ExrBaseDecompressor.cs
similarity index 95%
rename from src/ImageSharp/Formats/OpenExr/Compression/ExrBaseDecompressor.cs
rename to src/ImageSharp/Formats/Exr/Compression/ExrBaseDecompressor.cs
index 2af814eb12..12edcc1046 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/ExrBaseDecompressor.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/ExrBaseDecompressor.cs
@@ -4,7 +4,7 @@
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression;
 
 internal abstract class ExrBaseDecompressor : ExrBaseCompression
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/ExrCompressionType.cs b/src/ImageSharp/Formats/Exr/Compression/ExrCompressionType.cs
similarity index 97%
rename from src/ImageSharp/Formats/OpenExr/Compression/ExrCompressionType.cs
rename to src/ImageSharp/Formats/Exr/Compression/ExrCompressionType.cs
index 53fc2e2dc9..a7b584ed4c 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/ExrCompressionType.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/ExrCompressionType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression;
 
 internal enum ExrCompressionType
 {
diff --git a/src/ImageSharp/Formats/OpenExr/Compression/ExrDecompressorFactory.cs b/src/ImageSharp/Formats/Exr/Compression/ExrDecompressorFactory.cs
similarity index 90%
rename from src/ImageSharp/Formats/OpenExr/Compression/ExrDecompressorFactory.cs
rename to src/ImageSharp/Formats/Exr/Compression/ExrDecompressorFactory.cs
index 538231548c..a293787fad 100644
--- a/src/ImageSharp/Formats/OpenExr/Compression/ExrDecompressorFactory.cs
+++ b/src/ImageSharp/Formats/Exr/Compression/ExrDecompressorFactory.cs
@@ -1,10 +1,10 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.OpenExr.Compression.Decompressors;
+using SixLabors.ImageSharp.Formats.Exr.Compression.Decompressors;
 using SixLabors.ImageSharp.Memory;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr.Compression;
+namespace SixLabors.ImageSharp.Formats.Exr.Compression;
 
 internal static class ExrDecompressorFactory
 {
diff --git a/src/ImageSharp/Formats/OpenExr/ExrAttribute.cs b/src/ImageSharp/Formats/Exr/ExrAttribute.cs
similarity index 92%
rename from src/ImageSharp/Formats/OpenExr/ExrAttribute.cs
rename to src/ImageSharp/Formats/Exr/ExrAttribute.cs
index 0d6ca86cc9..b4e95f1d47 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrAttribute.cs
+++ b/src/ImageSharp/Formats/Exr/ExrAttribute.cs
@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 [DebuggerDisplay("Name: {Name}, Type: {Type}, Length: {Length}")]
 internal class ExrAttribute
diff --git a/src/ImageSharp/Formats/OpenExr/ExrBox2i.cs b/src/ImageSharp/Formats/Exr/ExrBox2i.cs
similarity index 91%
rename from src/ImageSharp/Formats/OpenExr/ExrBox2i.cs
rename to src/ImageSharp/Formats/Exr/ExrBox2i.cs
index 1f5b0c0df8..61da9b36dc 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrBox2i.cs
+++ b/src/ImageSharp/Formats/Exr/ExrBox2i.cs
@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 [DebuggerDisplay("xMin: {XMin}, yMin: {YMin}, xMax: {XMax}, yMax: {YMax}")]
 internal struct ExrBox2i
diff --git a/src/ImageSharp/Formats/OpenExr/ExrChannelInfo.cs b/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
similarity index 94%
rename from src/ImageSharp/Formats/OpenExr/ExrChannelInfo.cs
rename to src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
index d39bc08a5a..915b8201d9 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrChannelInfo.cs
+++ b/src/ImageSharp/Formats/Exr/ExrChannelInfo.cs
@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 [DebuggerDisplay("Name: {ChannelName}, PixelType: {PixelType}")]
 [StructLayout(LayoutKind.Sequential, Pack = 1)]
diff --git a/src/ImageSharp/Formats/OpenExr/ExrConfigurationModule.cs b/src/ImageSharp/Formats/Exr/ExrConfigurationModule.cs
similarity index 93%
rename from src/ImageSharp/Formats/OpenExr/ExrConfigurationModule.cs
rename to src/ImageSharp/Formats/Exr/ExrConfigurationModule.cs
index c0322728aa..a2f1b8c7ab 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Exr/ExrConfigurationModule.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the OpenExr format.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrConstants.cs b/src/ImageSharp/Formats/Exr/ExrConstants.cs
similarity index 97%
rename from src/ImageSharp/Formats/OpenExr/ExrConstants.cs
rename to src/ImageSharp/Formats/Exr/ExrConstants.cs
index 42ccf27fbd..214dbd8321 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrConstants.cs
+++ b/src/ImageSharp/Formats/Exr/ExrConstants.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Defines constants relating to OpenExr images.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrDecoder.cs b/src/ImageSharp/Formats/Exr/ExrDecoder.cs
similarity index 96%
rename from src/ImageSharp/Formats/OpenExr/ExrDecoder.cs
rename to src/ImageSharp/Formats/Exr/ExrDecoder.cs
index 84d441eb72..11937eed4f 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrDecoder.cs
+++ b/src/ImageSharp/Formats/Exr/ExrDecoder.cs
@@ -3,7 +3,7 @@
 
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Image decoder for generating an image out of a OpenExr stream.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrDecoderCore.cs b/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
similarity index 99%
rename from src/ImageSharp/Formats/OpenExr/ExrDecoderCore.cs
rename to src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
index 6eaf56fde3..732b4ff4a7 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrDecoderCore.cs
+++ b/src/ImageSharp/Formats/Exr/ExrDecoderCore.cs
@@ -6,13 +6,13 @@ using System.Buffers;
 using System.Buffers.Binary;
 using System.Runtime.CompilerServices;
 using System.Text;
-using SixLabors.ImageSharp.Formats.OpenExr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Compression;
 using SixLabors.ImageSharp.IO;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Performs the OpenExr decoding operation.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrDecoderOptions.cs b/src/ImageSharp/Formats/Exr/ExrDecoderOptions.cs
similarity index 87%
rename from src/ImageSharp/Formats/OpenExr/ExrDecoderOptions.cs
rename to src/ImageSharp/Formats/Exr/ExrDecoderOptions.cs
index c0b419b937..a8cda0b357 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrDecoderOptions.cs
+++ b/src/ImageSharp/Formats/Exr/ExrDecoderOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Image decoder options for decoding OpenExr streams.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrEncoder.cs b/src/ImageSharp/Formats/Exr/ExrEncoder.cs
similarity index 93%
rename from src/ImageSharp/Formats/OpenExr/ExrEncoder.cs
rename to src/ImageSharp/Formats/Exr/ExrEncoder.cs
index 9960efd686..95913f2beb 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrEncoder.cs
+++ b/src/ImageSharp/Formats/Exr/ExrEncoder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Image encoder for writing an image to a stream in the OpenExr Format.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrEncoderCore.cs b/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
similarity index 99%
rename from src/ImageSharp/Formats/OpenExr/ExrEncoderCore.cs
rename to src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
index 740b71e12b..98f43f6e27 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrEncoderCore.cs
+++ b/src/ImageSharp/Formats/Exr/ExrEncoderCore.cs
@@ -6,12 +6,12 @@ using System.Buffers.Binary;
 using System.Numerics;
 using System.Runtime.CompilerServices;
 using System.Threading.Channels;
-using SixLabors.ImageSharp.Formats.OpenExr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Compression;
 using SixLabors.ImageSharp.Memory;
 using SixLabors.ImageSharp.Metadata;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Image encoder for writing an image to a stream in the OpenExr format.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrFormat.cs b/src/ImageSharp/Formats/Exr/ExrFormat.cs
similarity index 94%
rename from src/ImageSharp/Formats/OpenExr/ExrFormat.cs
rename to src/ImageSharp/Formats/Exr/ExrFormat.cs
index d367977fc6..4415c15b06 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrFormat.cs
+++ b/src/ImageSharp/Formats/Exr/ExrFormat.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Registers the image encoders, decoders and mime type detectors for the OpenExr format.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrHeaderAttributes.cs b/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
similarity index 93%
rename from src/ImageSharp/Formats/OpenExr/ExrHeaderAttributes.cs
rename to src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
index 4cec4fbc58..29c30e7935 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrHeaderAttributes.cs
+++ b/src/ImageSharp/Formats/Exr/ExrHeaderAttributes.cs
@@ -1,9 +1,9 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.OpenExr.Compression;
+using SixLabors.ImageSharp.Formats.Exr.Compression;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 internal class ExrHeaderAttributes
 {
diff --git a/src/ImageSharp/Formats/OpenExr/ExrImageDataType.cs b/src/ImageSharp/Formats/Exr/ExrImageDataType.cs
similarity index 78%
rename from src/ImageSharp/Formats/OpenExr/ExrImageDataType.cs
rename to src/ImageSharp/Formats/Exr/ExrImageDataType.cs
index 4c3e19af81..92ca0f771b 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrImageDataType.cs
+++ b/src/ImageSharp/Formats/Exr/ExrImageDataType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 internal enum ExrImageDataType
 {
diff --git a/src/ImageSharp/Formats/OpenExr/ExrImageFormatDetector.cs b/src/ImageSharp/Formats/Exr/ExrImageFormatDetector.cs
similarity index 95%
rename from src/ImageSharp/Formats/OpenExr/ExrImageFormatDetector.cs
rename to src/ImageSharp/Formats/Exr/ExrImageFormatDetector.cs
index 2f97e74048..29548d52ef 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrImageFormatDetector.cs
+++ b/src/ImageSharp/Formats/Exr/ExrImageFormatDetector.cs
@@ -5,7 +5,7 @@ using System.Buffers.Binary;
 using System.Diagnostics.CodeAnalysis;
 using SixLabors.ImageSharp.Formats.Qoi;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Detects OpenExr file headers.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrImageType.cs b/src/ImageSharp/Formats/Exr/ExrImageType.cs
similarity index 74%
rename from src/ImageSharp/Formats/OpenExr/ExrImageType.cs
rename to src/ImageSharp/Formats/Exr/ExrImageType.cs
index a59aadbd62..bae5e21777 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrImageType.cs
+++ b/src/ImageSharp/Formats/Exr/ExrImageType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 internal enum ExrImageType
 {
diff --git a/src/ImageSharp/Formats/OpenExr/ExrLineOrder.cs b/src/ImageSharp/Formats/Exr/ExrLineOrder.cs
similarity index 78%
rename from src/ImageSharp/Formats/OpenExr/ExrLineOrder.cs
rename to src/ImageSharp/Formats/Exr/ExrLineOrder.cs
index dcf1c37c9e..8b9a6d7722 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrLineOrder.cs
+++ b/src/ImageSharp/Formats/Exr/ExrLineOrder.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 internal enum ExrLineOrder : byte
 {
diff --git a/src/ImageSharp/Formats/OpenExr/ExrMetadata.cs b/src/ImageSharp/Formats/Exr/ExrMetadata.cs
similarity index 96%
rename from src/ImageSharp/Formats/OpenExr/ExrMetadata.cs
rename to src/ImageSharp/Formats/Exr/ExrMetadata.cs
index 9cb58e9e67..2e83826c96 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrMetadata.cs
+++ b/src/ImageSharp/Formats/Exr/ExrMetadata.cs
@@ -4,7 +4,7 @@
 using System.Numerics;
 using SixLabors.ImageSharp.PixelFormats;
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Provides OpenExr specific metadata information for the image.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrPixelType.cs b/src/ImageSharp/Formats/Exr/ExrPixelType.cs
similarity index 90%
rename from src/ImageSharp/Formats/OpenExr/ExrPixelType.cs
rename to src/ImageSharp/Formats/Exr/ExrPixelType.cs
index 0dd49eaf8f..7016063ecc 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrPixelType.cs
+++ b/src/ImageSharp/Formats/Exr/ExrPixelType.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// The different pixel formats for a OpenEXR image.
diff --git a/src/ImageSharp/Formats/OpenExr/ExrThrowHelper.cs b/src/ImageSharp/Formats/Exr/ExrThrowHelper.cs
similarity index 95%
rename from src/ImageSharp/Formats/OpenExr/ExrThrowHelper.cs
rename to src/ImageSharp/Formats/Exr/ExrThrowHelper.cs
index b609d0038c..f668dcfefd 100644
--- a/src/ImageSharp/Formats/OpenExr/ExrThrowHelper.cs
+++ b/src/ImageSharp/Formats/Exr/ExrThrowHelper.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Cold path optimizations for throwing exr format based exceptions.
diff --git a/src/ImageSharp/Formats/OpenExr/IExrEncoderOptions.cs b/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
similarity index 87%
rename from src/ImageSharp/Formats/OpenExr/IExrEncoderOptions.cs
rename to src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
index ba2db62a00..0d90514e9c 100644
--- a/src/ImageSharp/Formats/OpenExr/IExrEncoderOptions.cs
+++ b/src/ImageSharp/Formats/Exr/IExrEncoderOptions.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-namespace SixLabors.ImageSharp.Formats.OpenExr;
+namespace SixLabors.ImageSharp.Formats.Exr;
 
 /// <summary>
 /// Configuration options for use during OpenExr encoding.
diff --git a/src/ImageSharp/Formats/OpenExr/README.md b/src/ImageSharp/Formats/Exr/README.md
similarity index 100%
rename from src/ImageSharp/Formats/OpenExr/README.md
rename to src/ImageSharp/Formats/Exr/README.md
diff --git a/src/ImageSharp/Formats/_Generated/ImageExtensions.Save.cs b/src/ImageSharp/Formats/_Generated/ImageExtensions.Save.cs
index ca4ad0e06c..fa6eaa722d 100644
--- a/src/ImageSharp/Formats/_Generated/ImageExtensions.Save.cs
+++ b/src/ImageSharp/Formats/_Generated/ImageExtensions.Save.cs
@@ -13,7 +13,7 @@ using SixLabors.ImageSharp.Formats.Qoi;
 using SixLabors.ImageSharp.Formats.Tga;
 using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.Formats.Webp;
-using SixLabors.ImageSharp.Formats.OpenExr;
+using SixLabors.ImageSharp.Formats.Exr;
 
 namespace SixLabors.ImageSharp;
 
diff --git a/src/ImageSharp/Formats/_Generated/ImageMetadataExtensions.cs b/src/ImageSharp/Formats/_Generated/ImageMetadataExtensions.cs
index 31a25fcede..0dcbaed808 100644
--- a/src/ImageSharp/Formats/_Generated/ImageMetadataExtensions.cs
+++ b/src/ImageSharp/Formats/_Generated/ImageMetadataExtensions.cs
@@ -14,7 +14,7 @@ using SixLabors.ImageSharp.Formats.Qoi;
 using SixLabors.ImageSharp.Formats.Tga;
 using SixLabors.ImageSharp.Formats.Tiff;
 using SixLabors.ImageSharp.Formats.Webp;
-using SixLabors.ImageSharp.Formats.OpenExr;
+using SixLabors.ImageSharp.Formats.Exr;
 
 namespace SixLabors.ImageSharp;
 
diff --git a/tests/ImageSharp.Tests/Formats/Exr/ExrDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Exr/ExrDecoderTests.cs
index 0391ab7c8c..846dd42ca9 100644
--- a/tests/ImageSharp.Tests/Formats/Exr/ExrDecoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Exr/ExrDecoderTests.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Six Labors.
 // Licensed under the Six Labors Split License.
 
-using SixLabors.ImageSharp.Formats.OpenExr;
+using SixLabors.ImageSharp.Formats.Exr;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Exr;
diff --git a/tests/ImageSharp.Tests/Formats/Exr/ImageExtensionsTest.cs b/tests/ImageSharp.Tests/Formats/Exr/ImageExtensionsTest.cs
index 78ce845d36..a093ef4c5b 100644
--- a/tests/ImageSharp.Tests/Formats/Exr/ImageExtensionsTest.cs
+++ b/tests/ImageSharp.Tests/Formats/Exr/ImageExtensionsTest.cs
@@ -2,7 +2,7 @@
 // Licensed under the Six Labors Split License.
 
 using SixLabors.ImageSharp.Formats;
-using SixLabors.ImageSharp.Formats.OpenExr;
+using SixLabors.ImageSharp.Formats.Exr;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Exr;
@@ -109,7 +109,7 @@ public class ImageExtensionsTest
 
         using (Image<Rgba32> image = new(10, 10))
         {
-            image.SaveAsTiff(memoryStream, new ExrEncoder());
+            image.SaveAsExr(memoryStream, new ExrEncoder());
         }
 
         memoryStream.Position = 0;
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
index 9ced51608b..8a40bd6720 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.Formats.cs
@@ -3,9 +3,9 @@
 
 using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
+using SixLabors.ImageSharp.Formats.Exr;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
-using SixLabors.ImageSharp.Formats.OpenExr;
 using SixLabors.ImageSharp.Formats.Pbm;
 using SixLabors.ImageSharp.Formats.Png;
 using SixLabors.ImageSharp.Formats.Qoi;