diff --git a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
index 9058138550..48dd87a3b3 100644
--- a/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
+++ b/src/ImageSharp/Processing/Dithering/DitherExtensions.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext<TPixel> Dither<TPixel>(this IImageProcessingContext<TPixel> source)
             where TPixel : struct, IPixel<TPixel>
-            => Dither(source, KnownDitherMatrices.BayerDither4x4);
+            => Dither(source, KnownDitherers.BayerDither4x4);
 
         /// <summary>
         /// Dithers the image reducing it to a web-safe palette using ordered dithering.
diff --git a/src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs
similarity index 96%
rename from src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs
rename to src/ImageSharp/Processing/Dithering/KnownDitherers.cs
index 8e32584798..b268ae12c0 100644
--- a/src/ImageSharp/Processing/Dithering/KnownDitherMatrices.cs
+++ b/src/ImageSharp/Processing/Dithering/KnownDitherers.cs
@@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Dithering
     /// <summary>
     /// Contains reusable static instances of known ordered dither matrices
     /// </summary>
-    public class KnownDitherMatrices
+    public class KnownDitherers
     {
         /// <summary>
         /// Gets the order ditherer using the 2x2 Bayer dithering matrix
diff --git a/src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
similarity index 99%
rename from src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs
rename to src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
index 2b3c0a9a39..9da4aaa65f 100644
--- a/src/ImageSharp/Processing/Filters/KnownMatrixFilters.cs
+++ b/src/ImageSharp/Processing/Filters/KnownFilterMatrices.cs
@@ -9,7 +9,7 @@ namespace SixLabors.ImageSharp.Processing.Filters
     /// <summary>
     /// A collection of known <see cref="Matrix4x4"/> values for composing filters
     /// </summary>
-    public static class KnownMatrixFilters
+    public static class KnownFilterMatrices
     {
         /// <summary>
         /// Gets a filter recreating Achromatomaly (Color desensitivity) color blindness
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
index e1f11c094f..e7238c68c8 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/AchromatomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="AchromatomalyProcessor{TPixel}"/> class.
         /// </summary>
         public AchromatomalyProcessor()
-            : base(KnownMatrixFilters.AchromatomalyFilter)
+            : base(KnownFilterMatrices.AchromatomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
index e9ff6177c7..b581f8925f 100644
--- a/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/AchromatopsiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="AchromatopsiaProcessor{TPixel}"/> class.
         /// </summary>
         public AchromatopsiaProcessor()
-            : base(KnownMatrixFilters.AchromatopsiaFilter)
+            : base(KnownFilterMatrices.AchromatopsiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
index 0b1f4dab5c..428b9d4dda 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/BlackWhiteProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="BlackWhiteProcessor{TPixel}"/> class.
         /// </summary>
         public BlackWhiteProcessor()
-            : base(KnownMatrixFilters.BlackWhiteFilter)
+            : base(KnownFilterMatrices.BlackWhiteFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
index d4a51ed04a..e5c43bd8a1 100644
--- a/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/BrightnessProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public BrightnessProcessor(float amount)
-            : base(KnownMatrixFilters.CreateBrightnessFilter(amount))
+            : base(KnownFilterMatrices.CreateBrightnessFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
index 9c8e717f2f..51f8ba6b16 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ContrastProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public ContrastProcessor(float amount)
-            : base(KnownMatrixFilters.CreateContrastFilter(amount))
+            : base(KnownFilterMatrices.CreateContrastFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
index afb5bbd531..d93068c8cd 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="DeuteranomalyProcessor{TPixel}"/> class.
         /// </summary>
         public DeuteranomalyProcessor()
-            : base(KnownMatrixFilters.DeuteranomalyFilter)
+            : base(KnownFilterMatrices.DeuteranomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
index 2cbfcf4674..4b57a1fa46 100644
--- a/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/DeuteranopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="DeuteranopiaProcessor{TPixel}"/> class.
         /// </summary>
         public DeuteranopiaProcessor()
-            : base(KnownMatrixFilters.DeuteranopiaFilter)
+            : base(KnownFilterMatrices.DeuteranopiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
index 2fe4bf31b6..b4ea8ac6bd 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt601Processor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public GrayscaleBt601Processor(float amount)
-            : base(KnownMatrixFilters.CreateGrayscaleBt601Filter(amount))
+            : base(KnownFilterMatrices.CreateGrayscaleBt601Filter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
index 5e26849984..480b134d3f 100644
--- a/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/GrayscaleBt709Processor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public GrayscaleBt709Processor(float amount)
-            : base(KnownMatrixFilters.CreateGrayscaleBt709Filter(amount))
+            : base(KnownFilterMatrices.CreateGrayscaleBt709Filter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
index 8bd7d3278a..95ae98e784 100644
--- a/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/HueProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="degrees">The angle of rotation in degrees</param>
         public HueProcessor(float degrees)
-            : base(KnownMatrixFilters.CreateHueFilter(degrees))
+            : base(KnownFilterMatrices.CreateHueFilter(degrees))
         {
             this.Degrees = degrees;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
index fc408912d0..7b8ed2a036 100644
--- a/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/InvertProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public InvertProcessor(float amount)
-            : base(KnownMatrixFilters.CreateInvertFilter(amount))
+            : base(KnownFilterMatrices.CreateInvertFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
index ea9b86d1b7..cc3fa42f66 100644
--- a/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/KodachromeProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="KodachromeProcessor{TPixel}"/> class.
         /// </summary>
         public KodachromeProcessor()
-            : base(KnownMatrixFilters.KodachromeFilter)
+            : base(KnownFilterMatrices.KodachromeFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
index 7196bc2dde..d97bf57dda 100644
--- a/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/LomographProcessor.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="LomographProcessor{TPixel}" /> class.
         /// </summary>
         public LomographProcessor()
-            : base(KnownMatrixFilters.LomographFilter)
+            : base(KnownFilterMatrices.LomographFilter)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
index 9e2e549b2c..f50d27ae09 100644
--- a/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/OpacityProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public OpacityProcessor(float amount)
-            : base(KnownMatrixFilters.CreateOpacityFilter(amount))
+            : base(KnownFilterMatrices.CreateOpacityFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
index b9c555c9f6..b6aa562231 100644
--- a/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/PolaroidProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="PolaroidProcessor{TPixel}" /> class.
         /// </summary>
         public PolaroidProcessor()
-            : base(KnownMatrixFilters.PolaroidFilter)
+            : base(KnownFilterMatrices.PolaroidFilter)
         {
         }
 
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
index 24cdd75c25..88e2ee3c3f 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ProtanomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="ProtanomalyProcessor{TPixel}"/> class.
         /// </summary>
         public ProtanomalyProcessor()
-            : base(KnownMatrixFilters.ProtanomalyFilter)
+            : base(KnownFilterMatrices.ProtanomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
index 441d083107..17020bbe24 100644
--- a/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/ProtanopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="ProtanopiaProcessor{TPixel}"/> class.
         /// </summary>
         public ProtanopiaProcessor()
-            : base(KnownMatrixFilters.ProtanopiaFilter)
+            : base(KnownFilterMatrices.ProtanopiaFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
index 645052eab5..d4b28a8945 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/SaturateProcessor.cs
@@ -21,7 +21,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </remarks>
         /// <param name="amount">The proportion of the conversion. Must be greater than or equal to 0.</param>
         public SaturateProcessor(float amount)
-            : base(KnownMatrixFilters.CreateSaturateFilter(amount))
+            : base(KnownFilterMatrices.CreateSaturateFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
index 641540f61a..7295cee99b 100644
--- a/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/SepiaProcessor.cs
@@ -17,7 +17,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// </summary>
         /// <param name="amount">The proportion of the conversion. Must be between 0 and 1.</param>
         public SepiaProcessor(float amount)
-            : base(KnownMatrixFilters.CreateSepiaFilter(amount))
+            : base(KnownFilterMatrices.CreateSepiaFilter(amount))
         {
             this.Amount = amount;
         }
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
index 2da3fd5fbd..6991506e6e 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/TritanomalyProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="TritanomalyProcessor{TPixel}"/> class.
         /// </summary>
         public TritanomalyProcessor()
-            : base(KnownMatrixFilters.TritanomalyFilter)
+            : base(KnownFilterMatrices.TritanomalyFilter)
         {
         }
     }
diff --git a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
index a496f6f62c..95c6cb5427 100644
--- a/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
+++ b/src/ImageSharp/Processing/Filters/Processors/TritanopiaProcessor.cs
@@ -16,7 +16,7 @@ namespace SixLabors.ImageSharp.Processing.Filters.Processors
         /// Initializes a new instance of the <see cref="TritanopiaProcessor{TPixel}"/> class.
         /// </summary>
         public TritanopiaProcessor()
-            : base(KnownMatrixFilters.TritanopiaFilter)
+            : base(KnownFilterMatrices.TritanopiaFilter)
         {
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
index d88491638d..324225a064 100644
--- a/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Binarization/BinaryDitherTest.cs
@@ -20,7 +20,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization
 
         public BinaryDitherTest()
         {
-            this.orderedDither = KnownDitherMatrices.BayerDither4x4;
+            this.orderedDither = KnownDitherers.BayerDither4x4;
             this.errorDiffuser = KnownDiffusers.FloydSteinberg;
         }
 
diff --git a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
index 1526644bbe..a29fc28c96 100644
--- a/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Dithering/DitherTest.cs
@@ -25,7 +25,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Binarization
 
         public DitherTest()
         {
-            this.orderedDither = KnownDitherMatrices.BayerDither4x4;
+            this.orderedDither = KnownDitherers.BayerDither4x4;
             this.errorDiffuser = KnownDiffusers.FloydSteinberg;
         }
 
diff --git a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
index eb6d7c38c5..cac1d7057c 100644
--- a/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Filters/FilterTest.cs
@@ -16,14 +16,14 @@ namespace SixLabors.ImageSharp.Tests.Processing.Filters
         [Fact]
         public void Filter_CorrectProcessor()
         {
-            this.operations.Filter(KnownMatrixFilters.AchromatomalyFilter * KnownMatrixFilters.CreateHueFilter(90F));
+            this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F));
             FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>();
         }
 
         [Fact]
         public void Filter_rect_CorrectProcessor()
         {
-            this.operations.Filter(KnownMatrixFilters.AchromatomalyFilter * KnownMatrixFilters.CreateHueFilter(90F), this.rect);
+            this.operations.Filter(KnownFilterMatrices.AchromatomalyFilter * KnownFilterMatrices.CreateHueFilter(90F), this.rect);
             FilterProcessor<Rgba32> p = this.Verify<FilterProcessor<Rgba32>>(this.rect);
         }
     }
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
index b75087bc4a..f99fe0c2a8 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Binarization/BinaryDitherTests.cs
@@ -25,10 +25,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
 
         public static readonly TheoryData<string, IOrderedDither> OrderedDitherers = new TheoryData<string, IOrderedDither>
         {
-            { "Bayer8x8", KnownDitherMatrices.BayerDither8x8 },
-            { "Bayer4x4", KnownDitherMatrices.BayerDither4x4 },
-            { "Ordered3x3", KnownDitherMatrices.OrderedDither3x3 },
-            { "Bayer2x2", KnownDitherMatrices.BayerDither2x2 }
+            { "Bayer8x8", KnownDitherers.BayerDither8x8 },
+            { "Bayer4x4", KnownDitherers.BayerDither4x4 },
+            { "Ordered3x3", KnownDitherers.OrderedDither3x3 },
+            { "Bayer2x2", KnownDitherers.BayerDither2x2 }
         };
 
         public static readonly TheoryData<string, IErrorDiffuser> ErrorDiffusers = new TheoryData<string, IErrorDiffuser>
@@ -45,7 +45,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
         };
 
 
-        private static IOrderedDither DefaultDitherer => KnownDitherMatrices.BayerDither4x4;
+        private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4;
 
         private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
index 64e62fb2a4..de2eff2eed 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs
@@ -24,10 +24,10 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
 
         public static readonly TheoryData<string, IOrderedDither> OrderedDitherers = new TheoryData<string, IOrderedDither>
         {
-            { "Bayer8x8", KnownDitherMatrices.BayerDither8x8 },
-            { "Bayer4x4", KnownDitherMatrices.BayerDither4x4 },
-            { "Ordered3x3", KnownDitherMatrices.OrderedDither3x3 },
-            { "Bayer2x2", KnownDitherMatrices.BayerDither2x2 }
+            { "Bayer8x8", KnownDitherers.BayerDither8x8 },
+            { "Bayer4x4", KnownDitherers.BayerDither4x4 },
+            { "Ordered3x3", KnownDitherers.OrderedDither3x3 },
+            { "Bayer2x2", KnownDitherers.BayerDither2x2 }
         };
 
         public static readonly TheoryData<string, IErrorDiffuser> ErrorDiffusers = new TheoryData<string, IErrorDiffuser>
@@ -44,7 +44,7 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Binarization
         };
 
 
-        private static IOrderedDither DefaultDitherer => KnownDitherMatrices.BayerDither4x4;
+        private static IOrderedDither DefaultDitherer => KnownDitherers.BayerDither4x4;
 
         private static IErrorDiffuser DefaultErrorDiffuser => KnownDiffusers.Atkinson;
 
diff --git a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
index 226ebd6732..190e117b3a 100644
--- a/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
+++ b/tests/ImageSharp.Tests/Processing/Processors/Filters/FilterTest.cs
@@ -40,9 +40,9 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Filters
 
         private static Matrix4x4 CreateCombinedTestFilterMatrix()
         {
-            Matrix4x4 brightness = KnownMatrixFilters.CreateBrightnessFilter(0.9F);
-            Matrix4x4 hue = KnownMatrixFilters.CreateHueFilter(180F);
-            Matrix4x4 saturation = KnownMatrixFilters.CreateSaturateFilter(1.5F);
+            Matrix4x4 brightness = KnownFilterMatrices.CreateBrightnessFilter(0.9F);
+            Matrix4x4 hue = KnownFilterMatrices.CreateHueFilter(180F);
+            Matrix4x4 saturation = KnownFilterMatrices.CreateSaturateFilter(1.5F);
             Matrix4x4 m = brightness * hue * saturation;
             return m;
         }