diff --git a/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs b/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
index 7477cfdb8..b091467bf 100644
--- a/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpConfigurationModule.cs
@@ -11,8 +11,8 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         /// <inheritdoc/>
         public void Configure(Configuration config)
         {
-            config.SetEncoder(ImageFormats.Bitmap, new BmpEncoder());
-            config.SetDecoder(ImageFormats.Bitmap, new BmpDecoder());
+            config.SetEncoder(ImageFormats.Bmp, new BmpEncoder());
+            config.SetDecoder(ImageFormats.Bmp, new BmpDecoder());
             config.AddImageFormatDetector(new BmpImageFormatDetector());
         }
     }
diff --git a/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs b/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
index 39bbc4d67..9c9786e0a 100644
--- a/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
+++ b/src/ImageSharp/Formats/Bmp/BmpImageFormatDetector.cs
@@ -18,7 +18,7 @@ namespace SixLabors.ImageSharp.Formats.Bmp
         {
             if (this.IsSupportedFileFormat(header))
             {
-                return ImageFormats.Bitmap;
+                return ImageFormats.Bmp;
             }
 
             return null;
diff --git a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
index 43cb94c3f..558ce69c5 100644
--- a/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
+++ b/src/ImageSharp/Formats/Bmp/ImageExtensions.cs
@@ -35,6 +35,6 @@ namespace SixLabors.ImageSharp
         /// <exception cref="System.ArgumentNullException">Thrown if the stream is null.</exception>
         public static void SaveAsBmp<TPixel>(this Image<TPixel> source, Stream stream, BmpEncoder encoder)
             where TPixel : struct, IPixel<TPixel>
-                        => source.Save(stream, encoder ?? source.Configuration.FindEncoder(ImageFormats.Bitmap));
+                        => source.Save(stream, encoder ?? source.Configuration.FindEncoder(ImageFormats.Bmp));
     }
 }
diff --git a/src/ImageSharp/ImageFormats.cs b/src/ImageSharp/ImageFormats.cs
index a866e1fa5..bc437e5a5 100644
--- a/src/ImageSharp/ImageFormats.cs
+++ b/src/ImageSharp/ImageFormats.cs
@@ -32,6 +32,6 @@ namespace SixLabors.ImageSharp
         /// <summary>
         /// The format details for the bitmaps.
         /// </summary>
-        public static readonly IImageFormat Bitmap = new BmpFormat();
+        public static readonly IImageFormat Bmp = new BmpFormat();
     }
 }
\ No newline at end of file
diff --git a/tests/ImageSharp.Tests/ConfigurationTests.cs b/tests/ImageSharp.Tests/ConfigurationTests.cs
index ad631863f..c1c938e43 100644
--- a/tests/ImageSharp.Tests/ConfigurationTests.cs
+++ b/tests/ImageSharp.Tests/ConfigurationTests.cs
@@ -87,7 +87,7 @@ namespace SixLabors.ImageSharp.Tests
             });
             Assert.Throws<ArgumentNullException>(() =>
             {
-                DefaultConfiguration.SetEncoder(ImageFormats.Bitmap, null);
+                DefaultConfiguration.SetEncoder(ImageFormats.Bmp, null);
             });
             Assert.Throws<ArgumentNullException>(() =>
             {
@@ -104,7 +104,7 @@ namespace SixLabors.ImageSharp.Tests
             });
             Assert.Throws<ArgumentNullException>(() =>
             {
-                DefaultConfiguration.SetDecoder(ImageFormats.Bitmap, null);
+                DefaultConfiguration.SetDecoder(ImageFormats.Bmp, null);
             });
             Assert.Throws<ArgumentNullException>(() =>
             {
diff --git a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
index 2bbc7d4ea..1bd0f77d2 100644
--- a/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
+++ b/tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs
@@ -77,7 +77,7 @@ namespace SixLabors.ImageSharp.Tests
                     new PngImageFormatDetector());
 
                 configuration.ConfigureCodecs(
-                    ImageFormats.Bitmap,
+                    ImageFormats.Bmp,
                     SystemDrawingReferenceDecoder.Instance,
                     SystemDrawingReferenceEncoder.Png,
                     new PngImageFormatDetector());