diff --git a/src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs b/src/ImageSharp.Drawing/Processing/ColorStop.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/ColorStop{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/ColorStop.cs
diff --git a/src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/EllipticGradientBrush.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/EllipticGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/EllipticGradientBrush.cs
diff --git a/src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs b/src/ImageSharp.Drawing/Processing/GradientBrushBase.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/GradientBrushBase{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/GradientBrushBase.cs
diff --git a/src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/ImageBrush.cs
similarity index 97%
rename from src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/ImageBrush.cs
index d5ec1123d7..983c09adbf 100644
--- a/src/ImageSharp.Drawing/Processing/ImageBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/ImageBrush.cs
@@ -14,8 +14,7 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides an implementation of an image brush for painting images within areas.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
-    public class ImageBrush<TPixel> : IBrush
+    public class ImageBrush : IBrush
     {
         /// <summary>
         /// The image to paint.
@@ -23,7 +22,7 @@ namespace SixLabors.ImageSharp.Processing
         private readonly Image image;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ImageBrush{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="ImageBrush"/> class.
         /// </summary>
         /// <param name="image">The image.</param>
         public ImageBrush(Image image)
@@ -74,7 +73,7 @@ namespace SixLabors.ImageSharp.Processing
             private readonly int offsetX;
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="ImageBrushApplicator"/> class.
+            /// Initializes a new instance of the <see cref="ImageBrushApplicator{TPixel}"/> class.
             /// </summary>
             /// <param name="target">The target image.</param>
             /// <param name="image">The image.</param>
diff --git a/src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs
similarity index 98%
rename from src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs
index 1a6f8d79ab..fac43ad634 100644
--- a/src/ImageSharp.Drawing/Processing/LinearGradientBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/LinearGradientBrush.cs
@@ -13,7 +13,6 @@ namespace SixLabors.ImageSharp.Processing
     /// Supported right now:
     /// - a set of colors in relative distances to each other.
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format</typeparam>
     public sealed class LinearGradientBrush : GradientBrushBase
         
     {
diff --git a/src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/PatternBrush.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/PatternBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/PatternBrush.cs
diff --git a/src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs b/src/ImageSharp.Drawing/Processing/Pen.cs
similarity index 88%
rename from src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/Pen.cs
index 922394946a..c9d60a50e2 100644
--- a/src/ImageSharp.Drawing/Processing/Pen{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/Pen.cs
@@ -22,7 +22,7 @@ namespace SixLabors.ImageSharp.Processing
         private readonly float[] pattern;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -33,7 +33,7 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
@@ -46,7 +46,7 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="color">The color.</param>
         /// <param name="width">The width.</param>
@@ -56,7 +56,7 @@ namespace SixLabors.ImageSharp.Processing
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Pen{TPixel}"/> class.
+        /// Initializes a new instance of the <see cref="Pen"/> class.
         /// </summary>
         /// <param name="brush">The brush.</param>
         /// <param name="width">The width.</param>
diff --git a/src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/RadialGradientBrush.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/RadialGradientBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/RadialGradientBrush.cs
diff --git a/src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/RecolorBrush.cs
similarity index 99%
rename from src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/RecolorBrush.cs
index ff098dce7c..fca95be327 100644
--- a/src/ImageSharp.Drawing/Processing/RecolorBrush{TPixel}.cs
+++ b/src/ImageSharp.Drawing/Processing/RecolorBrush.cs
@@ -15,7 +15,6 @@ namespace SixLabors.ImageSharp.Processing
     /// <summary>
     /// Provides an implementation of a brush that can recolor an image
     /// </summary>
-    /// <typeparam name="TPixel">The pixel format.</typeparam>
     public class RecolorBrush : IBrush
     {
         /// <summary>
diff --git a/src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs b/src/ImageSharp.Drawing/Processing/SolidBrush.cs
similarity index 100%
rename from src/ImageSharp.Drawing/Processing/SolidBrush{TPixel}.cs
rename to src/ImageSharp.Drawing/Processing/SolidBrush.cs
diff --git a/tests/ImageSharp.Tests/Drawing/FillImageBrushTests.cs b/tests/ImageSharp.Tests/Drawing/FillImageBrushTests.cs
index 772f62d5cc..e1fc7c30c1 100644
--- a/tests/ImageSharp.Tests/Drawing/FillImageBrushTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillImageBrushTests.cs
@@ -24,7 +24,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing
         {
             using (var src = new Image<Rgba32>(5, 5))
             {
-                var brush = new ImageBrush<Rgba32>(src);
+                var brush = new ImageBrush(src);
                 using (var dest = new Image<Rgba32>(10, 10))
                 {
                     dest.Mutate(c => c.Fill(brush, new Rectangle(0, 0, 10, 10)));
diff --git a/tests/ImageSharp.Tests/Drawing/FillPolygonTests.cs b/tests/ImageSharp.Tests/Drawing/FillPolygonTests.cs
index f84d2b31c9..5393e9954f 100644
--- a/tests/ImageSharp.Tests/Drawing/FillPolygonTests.cs
+++ b/tests/ImageSharp.Tests/Drawing/FillPolygonTests.cs
@@ -95,7 +95,7 @@ namespace SixLabors.ImageSharp.Tests.Drawing
 
             using (Image<TPixel> brushImage = Image.Load<TPixel>(TestFile.Create(brushImageName).Bytes))
             {
-                var brush = new ImageBrush<TPixel>(brushImage);
+                var brush = new ImageBrush(brushImage);
                 
                 provider.RunValidatingProcessorTest(
                     c => c.FillPolygon(brush, simplePath),