diff --git a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Adapt.cs b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Adapt.cs
similarity index 90%
rename from src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Adapt.cs
rename to src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Adapt.cs
index e564cabb3..daea45efe 100644
--- a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Adapt.cs
+++ b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Adapt.cs
@@ -1,4 +1,4 @@
-// <copyright file="ColorConverter.cs" company="James Jackson-South">
+// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
     /// <summary>
     /// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
     /// </summary>
-    public partial class ColorConverter
+    public partial class ColorSpaceConverter
     {
         /// <summary>
         /// Performs chromatic adaptation of given XYZ color.
diff --git a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieLab.cs b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieLab.cs
similarity index 90%
rename from src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieLab.cs
rename to src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieLab.cs
index 8ccefc532..e8cb6f643 100644
--- a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieLab.cs
+++ b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieLab.cs
@@ -1,4 +1,4 @@
-// <copyright file="ColorConverter.cs" company="James Jackson-South">
+// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
     /// <summary>
     /// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
     /// </summary>
-    public partial class ColorConverter
+    public partial class ColorSpaceConverter
     {
         /// <summary>
         /// Converts a <see cref="CieXyz"/> into a <see cref="CieLab"/>
diff --git a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieXyz.cs b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieXyz.cs
similarity index 92%
rename from src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieXyz.cs
rename to src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieXyz.cs
index c5b103116..77a90bd0e 100644
--- a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.CieXyz.cs
+++ b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.CieXyz.cs
@@ -1,4 +1,4 @@
-// <copyright file="ColorConverter.cs" company="James Jackson-South">
+// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
     /// <summary>
     /// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
     /// </summary>
-    public partial class ColorConverter
+    public partial class ColorSpaceConverter
     {
         private static readonly CieLabToCieXyzConverter CieLabToCieXyzConverter = new CieLabToCieXyzConverter();
 
diff --git a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Lms.cs b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Lms.cs
similarity index 86%
rename from src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Lms.cs
rename to src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Lms.cs
index 12d4ca943..7af17ef2e 100644
--- a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.Lms.cs
+++ b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.Lms.cs
@@ -1,4 +1,4 @@
-// <copyright file="ColorConverter.cs" company="James Jackson-South">
+// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -11,7 +11,7 @@ namespace ImageSharp.Colors.Conversion
     /// <summary>
     /// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
     /// </summary>
-    public partial class ColorConverter
+    public partial class ColorSpaceConverter
     {
         /// <summary>
         /// Converts a <see cref="CieXyz"/> into a <see cref="Lms"/>
diff --git a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.cs b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.cs
similarity index 92%
rename from src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.cs
rename to src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.cs
index d02e924d1..9cc3e0f93 100644
--- a/src/ImageSharp/Colors/Spaces/Conversion/ColorConverter.cs
+++ b/src/ImageSharp/Colors/Spaces/Conversion/ColorSpaceConverter.cs
@@ -1,4 +1,4 @@
-// <copyright file="ColorConverter.cs" company="James Jackson-South">
+// <copyright file="ColorSpaceConverter.cs" company="James Jackson-South">
 // Copyright (c) James Jackson-South and contributors.
 // Licensed under the Apache License, Version 2.0.
 // </copyright>
@@ -12,7 +12,7 @@ namespace ImageSharp.Colors.Conversion
     /// <summary>
     /// Converts between color spaces ensuring that the color is adapted using chromatic adaptation.
     /// </summary>
-    public partial class ColorConverter
+    public partial class ColorSpaceConverter
     {
         /// <summary>
         /// The default whitepoint used for converting to CieLab
@@ -23,9 +23,9 @@ namespace ImageSharp.Colors.Conversion
         private CieXyzAndLmsConverter cachedCieXyzAndLmsConverter;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="ColorConverter"/> class.
+        /// Initializes a new instance of the <see cref="ColorSpaceConverter"/> class.
         /// </summary>
-        public ColorConverter()
+        public ColorSpaceConverter()
         {
             // Note the order here this is important.
             this.WhitePoint = DefaultWhitePoint;
diff --git a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs
index 5be2f27ac..958470f8a 100644
--- a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndCieLabConversionTest.cs
@@ -33,7 +33,7 @@
         {
             // Arrange
             CieLab input = new CieLab(l, a, b, Illuminants.D65);
-            ColorConverter converter = new ColorConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
+            ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
 
             // Act
             CieXyz output = converter.ToCieXyz(input);
@@ -58,7 +58,7 @@
         {
             // Arrange
             CieXyz input = new CieXyz(x, y, z);
-            ColorConverter converter = new ColorConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
+            ColorSpaceConverter converter = new ColorSpaceConverter { WhitePoint = Illuminants.D65, TargetLabWhitePoint = Illuminants.D65 };
 
             // Act
             CieLab output = converter.ToCieLab(input);
diff --git a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs
index d60b72c6d..c0dbdf30e 100644
--- a/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs
+++ b/tests/ImageSharp.Tests/Colors/Colorspaces/CieXyzAndLmsConversionTest.cs
@@ -29,7 +29,7 @@
         {
             // Arrange
             Lms input = new Lms(x, y, z);
-            ColorConverter converter = new ColorConverter();
+            ColorSpaceConverter converter = new ColorSpaceConverter();
 
             // Act
             CieXyz output = converter.ToCieXyz(input);
@@ -54,7 +54,7 @@
         {
             // Arrange
             CieXyz input = new CieXyz(x, y, z);
-            ColorConverter converter = new ColorConverter();
+            ColorSpaceConverter converter = new ColorSpaceConverter();
 
             // Act
             Lms output = converter.ToLms(input);
diff --git a/tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs b/tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs
index b9476ce29..b63374ce4 100644
--- a/tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs
+++ b/tests/ImageSharp.Tests/Colors/Colorspaces/ColorConverterAdaptTest.cs
@@ -19,7 +19,7 @@ namespace ImageSharp.Tests
             // Arrange
             CieXyz input = new CieXyz(x1, y1, z1);
             CieXyz expectedOutput = new CieXyz(x2, y2, z2);
-            ColorConverter converter = new ColorConverter
+            ColorSpaceConverter converter = new ColorSpaceConverter
             {
                 ChromaticAdaptation = new VonKriesChromaticAdaptation(LmsAdaptationMatrix.XYZScaling),
                 WhitePoint = Illuminants.D50