diff --git a/tests/ImageSharp.Tests/Formats/Bmp/BmpMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Bmp/BmpMetadataTests.cs
index a91441279..4eac33730 100644
--- a/tests/ImageSharp.Tests/Formats/Bmp/BmpMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Bmp/BmpMetadataTests.cs
@@ -12,7 +12,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
 {
     using static TestImages.Bmp;
 
-    public class BmpMetaDataTests
+    public class BmpMetadataTests
     {
         [Fact]
         public void CloneIsDeep()
@@ -41,9 +41,9 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
             {
                 IImageInfo imageInfo = Image.Identify(stream);
                 Assert.NotNull(imageInfo);
-                BmpMetadata bitmapMetaData = imageInfo.Metadata.GetBmpMetadata();
-                Assert.NotNull(bitmapMetaData);
-                Assert.Equal(expectedInfoHeaderType, bitmapMetaData.InfoHeaderType);
+                BmpMetadata bitmapMetadata = imageInfo.Metadata.GetBmpMetadata();
+                Assert.NotNull(bitmapMetadata);
+                Assert.Equal(expectedInfoHeaderType, bitmapMetadata.InfoHeaderType);
             }
         }
     }
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
index 8f513c5e1..eb39c2847 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifEncoderTests.cs
@@ -136,12 +136,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
 
                 var image = Image.Load<Rgba32>(inStream);
                 GifMetadata metaData = image.Metadata.GetGifMetadata();
-                GifFrameMetadata frameMetaData = image.Frames.RootFrame.Metadata.GetGifMetadata();
+                GifFrameMetadata frameMetadata = image.Frames.RootFrame.Metadata.GetGifMetadata();
                 GifColorTableMode colorMode = metaData.ColorTableMode;
                 var encoder = new GifEncoder
                 {
                     ColorTableMode = colorMode,
-                    Quantizer = new OctreeQuantizer(frameMetaData.ColorTableLength)
+                    Quantizer = new OctreeQuantizer(frameMetadata.ColorTableLength)
                 };
 
                 image.Save(outStream, encoder);
@@ -150,11 +150,11 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
                 outStream.Position = 0;
                 var clone = Image.Load<Rgba32>(outStream);
 
-                GifMetadata cloneMetaData = clone.Metadata.GetGifMetadata();
-                Assert.Equal(metaData.ColorTableMode, cloneMetaData.ColorTableMode);
+                GifMetadata cloneMetadata = clone.Metadata.GetGifMetadata();
+                Assert.Equal(metaData.ColorTableMode, cloneMetadata.ColorTableMode);
 
                 // Gifiddle and Cyotek GifInfo say this image has 64 colors.
-                Assert.Equal(64, frameMetaData.ColorTableLength);
+                Assert.Equal(64, frameMetadata.ColorTableLength);
 
                 for (int i = 0; i < image.Frames.Count; i++)
                 {
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetadataTests.cs
index b891c8ed2..a3bc5d45c 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifFrameMetadataTests.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
-    public class GifFrameMetaDataTests
+    public class GifFrameMetadataTests
     {
         [Fact]
         public void CloneIsDeep()
diff --git a/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs
index cbafc32cd..7f1acf71e 100644
--- a/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Gif/GifMetadataTests.cs
@@ -13,7 +13,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Gif
 {
-    public class GifMetaDataTests
+    public class GifMetadataTests
     {
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
             new TheoryData<string, int, int, PixelResolutionUnit>
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
index 1e728df86..4b845c2cb 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Metadata.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
     {
         // TODO: A JPEGsnoop & metadata expert should review if the Exif/Icc expectations are correct.
         // I'm seeing several entries with Exif-related names in images where we do not decode an exif profile. (- Anton)
-        public static readonly TheoryData<bool, string, int, bool, bool> MetaDataTestData =
+        public static readonly TheoryData<bool, string, int, bool, bool> MetadataTestData =
         new TheoryData<bool, string, int, bool, bool>
         {
             { false, TestImages.Jpeg.Progressive.Progress, 24, false, false },
@@ -58,15 +58,15 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         };
 
         [Theory]
-        [MemberData(nameof(MetaDataTestData))]
-        public void MetaDataIsParsedCorrectly(
+        [MemberData(nameof(MetadataTestData))]
+        public void MetadataIsParsedCorrectly(
             bool useIdentify,
             string imagePath,
             int expectedPixelSize,
             bool exifProfilePresent,
             bool iccProfilePresent)
         {
-            TestMetaDataImpl(
+            TestMetadataImpl(
                 useIdentify,
                 JpegDecoder,
                 imagePath,
@@ -152,7 +152,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             }
         }
 
-        private static void TestMetaDataImpl(
+        private static void TestMetadataImpl(
             bool useIdentify,
             IImageDecoder decoder,
             string imagePath,
@@ -209,16 +209,16 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [Theory]
         [InlineData(false)]
         [InlineData(true)]
-        public void IgnoreMetaData_ControlsWhetherMetaDataIsParsed(bool ignoreMetaData)
+        public void IgnoreMetadata_ControlsWhetherMetadataIsParsed(bool ignoreMetadata)
         {
-            var decoder = new JpegDecoder { IgnoreMetadata = ignoreMetaData };
+            var decoder = new JpegDecoder { IgnoreMetadata = ignoreMetadata };
 
             // Snake.jpg has both Exif and ICC profiles defined:
             var testFile = TestFile.Create(TestImages.Jpeg.Baseline.Snake);
 
             using (Image<Rgba32> image = testFile.CreateRgba32Image(decoder))
             {
-                if (ignoreMetaData)
+                if (ignoreMetadata)
                 {
                     Assert.Null(image.Metadata.ExifProfile);
                     Assert.Null(image.Metadata.IccProfile);
diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
index 59ad571f4..50a2a4416 100644
--- a/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegMetadataTests.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Jpg
 {
-    public class JpegMetaDataTests
+    public class JpegMetadataTests
     {
         [Fact]
         public void CloneIsDeep()
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngMetadataTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngMetadataTests.cs
index dfa7fd292..4b11ad3e2 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngMetadataTests.cs
@@ -11,7 +11,7 @@ using Xunit;
 
 namespace SixLabors.ImageSharp.Tests.Formats.Png
 {
-    public class PngMetaDataTests
+    public class PngMetadataTests
     {
         public static readonly TheoryData<string, int, int, PixelResolutionUnit> RatioFiles =
             new TheoryData<string, int, int, PixelResolutionUnit>
@@ -49,7 +49,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFile(TestImages.Png.PngWithMetaData, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PngWithMetadata, PixelTypes.Rgba32)]
         public void Decoder_CanReadTextData<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
@@ -71,7 +71,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFile(TestImages.Png.PngWithMetaData, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PngWithMetadata, PixelTypes.Rgba32)]
         public void Encoder_PreservesTextData<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
@@ -118,7 +118,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         }
 
         [Theory]
-        [WithFile(TestImages.Png.PngWithMetaData, PixelTypes.Rgba32)]
+        [WithFile(TestImages.Png.PngWithMetadata, PixelTypes.Rgba32)]
         public void Encode_UseCompression_WhenTextIsGreaterThenThreshold_Works<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : struct, IPixel<TPixel>
         {
diff --git a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
index e26aaf8e6..1f8147ea9 100644
--- a/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
+++ b/tests/ImageSharp.Tests/Formats/Png/PngSmokeTests.cs
@@ -65,7 +65,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         //    using (Image<TPixel> source = provider.GetImage())
         //    using (MemoryStream ms = new MemoryStream())
         //    {
-        //        source.MetaData.Quality = 256;
+        //        source.Metadata.Quality = 256;
         //        source.Save(ms, new PngEncoder(), new PngEncoderOptions {
         //            Threshold = 200
         //        });
diff --git a/tests/ImageSharp.Tests/Metadata/ImageFrameMetadataTests.cs b/tests/ImageSharp.Tests/Metadata/ImageFrameMetadataTests.cs
index 4889264b8..746c0f3c7 100644
--- a/tests/ImageSharp.Tests/Metadata/ImageFrameMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/ImageFrameMetadataTests.cs
@@ -8,29 +8,29 @@ using Xunit;
 namespace SixLabors.ImageSharp.Tests
 {
     /// <summary>
-    /// Tests the <see cref="ImageFrameMetaDataTests"/> class.
+    /// Tests the <see cref="ImageFrameMetadataTests"/> class.
     /// </summary>
-    public class ImageFrameMetaDataTests
+    public class ImageFrameMetadataTests
     {
         [Fact]
-        public void ConstructorImageFrameMetaData()
+        public void ConstructorImageFrameMetadata()
         {
             const int frameDelay = 42;
             const int colorTableLength = 128;
             const GifDisposalMethod disposalMethod = GifDisposalMethod.RestoreToBackground;
 
             var metaData = new ImageFrameMetadata();
-            GifFrameMetadata gifFrameMetaData = metaData.GetGifMetadata();
-            gifFrameMetaData.FrameDelay = frameDelay;
-            gifFrameMetaData.ColorTableLength = colorTableLength;
-            gifFrameMetaData.DisposalMethod = disposalMethod;
+            GifFrameMetadata gifFrameMetadata = metaData.GetGifMetadata();
+            gifFrameMetadata.FrameDelay = frameDelay;
+            gifFrameMetadata.ColorTableLength = colorTableLength;
+            gifFrameMetadata.DisposalMethod = disposalMethod;
 
             var clone = new ImageFrameMetadata(metaData);
-            GifFrameMetadata cloneGifFrameMetaData = clone.GetGifMetadata();
+            GifFrameMetadata cloneGifFrameMetadata = clone.GetGifMetadata();
 
-            Assert.Equal(frameDelay, cloneGifFrameMetaData.FrameDelay);
-            Assert.Equal(colorTableLength, cloneGifFrameMetaData.ColorTableLength);
-            Assert.Equal(disposalMethod, cloneGifFrameMetaData.DisposalMethod);
+            Assert.Equal(frameDelay, cloneGifFrameMetadata.FrameDelay);
+            Assert.Equal(colorTableLength, cloneGifFrameMetadata.ColorTableLength);
+            Assert.Equal(disposalMethod, cloneGifFrameMetadata.DisposalMethod);
         }
 
         [Fact]
diff --git a/tests/ImageSharp.Tests/Metadata/ImageMetadataTests.cs b/tests/ImageSharp.Tests/Metadata/ImageMetadataTests.cs
index 39135d003..bdca87ef7 100644
--- a/tests/ImageSharp.Tests/Metadata/ImageMetadataTests.cs
+++ b/tests/ImageSharp.Tests/Metadata/ImageMetadataTests.cs
@@ -8,15 +8,15 @@ using SixLabors.ImageSharp.Primitives;
 
 using Xunit;
 
-namespace SixLabors.ImageSharp.Tests.MetaData
+namespace SixLabors.ImageSharp.Tests.Metadata
 {
     /// <summary>
     /// Tests the <see cref="ImageMetadata"/> class.
     /// </summary>
-    public class ImageMetaDataTests
+    public class ImageMetadataTests
     {
         [Fact]
-        public void ConstructorImageMetaData()
+        public void ConstructorImageMetadata()
         {
             var metaData = new ImageMetadata();
 
diff --git a/tests/ImageSharp.Tests/TestImages.cs b/tests/ImageSharp.Tests/TestImages.cs
index b48b9b690..8389d8535 100644
--- a/tests/ImageSharp.Tests/TestImages.cs
+++ b/tests/ImageSharp.Tests/TestImages.cs
@@ -54,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests
             public const string Gray4BitTrans = "Png/gray-4-tRNS.png";
             public const string L8BitTrans = "Png/gray-8-tRNS.png";
             public const string LowColorVariance = "Png/low-variance.png";
-            public const string PngWithMetaData = "Png/PngWithMetaData.png";
+            public const string PngWithMetadata = "Png/PngWithMetaData.png";
             public const string InvalidTextData = "Png/InvalidTextData.png";
 
             // Filtered test images from http://www.schaik.com/pngsuite/pngsuite_fil_png.html