diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs
index 0cdda28b9c..cd2decf0a7 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs
+++ b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorHelpers.cs
@@ -28,7 +28,7 @@ namespace Avalonia.Controls.Primitives
 
         public static Hsv IncrementColorChannel(
             Hsv originalHsv,
-            ColorPickerHsvChannel channel,
+            HsvChannel channel,
             IncrementDirection direction,
             IncrementAmount amount,
             bool shouldWrap,
@@ -54,23 +54,23 @@ namespace Avalonia.Controls.Primitives
                 // for saturation and value, this is every increment of 10.
                 switch (channel)
                 {
-                    case ColorPickerHsvChannel.Hue:
+                    case HsvChannel.Hue:
                         valueToIncrement = ref newHsv.H;
                         incrementAmount = amount == IncrementAmount.Small ? 1 : 30;
                         break;
 
-                    case ColorPickerHsvChannel.Saturation:
+                    case HsvChannel.Saturation:
                         valueToIncrement = ref newHsv.S;
                         incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
                         break;
 
-                    case ColorPickerHsvChannel.Value:
+                    case HsvChannel.Value:
                         valueToIncrement = ref newHsv.V;
                         incrementAmount = amount == IncrementAmount.Small ? 1 : 10;
                         break;
 
                     default:
-                        throw new InvalidOperationException("Invalid ColorPickerHsvChannel.");
+                        throw new InvalidOperationException("Invalid HsvChannel.");
                 }
 
                 double previousValue = valueToIncrement;
@@ -99,8 +99,8 @@ namespace Avalonia.Controls.Primitives
                 // While working with named colors, we're going to need to be working in actual HSV units,
                 // so we'll divide the min bound and max bound by 100 in the case of saturation or value,
                 // since we'll have received units between 0-100 and we need them within 0-1.
-                if (channel == ColorPickerHsvChannel.Saturation ||
-                    channel == ColorPickerHsvChannel.Value)
+                if (channel == HsvChannel.Saturation ||
+                    channel == HsvChannel.Value)
                 {
                     minBound /= 100;
                     maxBound /= 100;
@@ -114,7 +114,7 @@ namespace Avalonia.Controls.Primitives
 
         public static Hsv FindNextNamedColor(
             Hsv originalHsv,
-            ColorPickerHsvChannel channel,
+            HsvChannel channel,
             IncrementDirection direction,
             bool shouldWrap,
             double minBound,
@@ -138,26 +138,26 @@ namespace Avalonia.Controls.Primitives
 
             switch (channel)
             {
-                case ColorPickerHsvChannel.Hue:
+                case HsvChannel.Hue:
                     originalValue = originalHsv.H;
                     newValue = ref newHsv.H;
                     incrementAmount = 1;
                     break;
 
-                case ColorPickerHsvChannel.Saturation:
+                case HsvChannel.Saturation:
                     originalValue = originalHsv.S;
                     newValue = ref newHsv.S;
                     incrementAmount = 0.01;
                     break;
 
-                case ColorPickerHsvChannel.Value:
+                case HsvChannel.Value:
                     originalValue = originalHsv.V;
                     newValue = ref newHsv.V;
                     incrementAmount = 0.01;
                     break;
 
                 default:
-                    throw new InvalidOperationException("Invalid ColorPickerHsvChannel.");
+                    throw new InvalidOperationException("Invalid HsvChannel.");
             }
 
             bool shouldFindMidPoint = true;
@@ -230,26 +230,26 @@ namespace Avalonia.Controls.Primitives
 
                 switch (channel)
                 {
-                    case ColorPickerHsvChannel.Hue:
+                    case HsvChannel.Hue:
                         startValue = ref startHsv.H;
                         currentValue = ref currentHsv.H;
                         wrapIncrement = 360.0;
                         break;
 
-                    case ColorPickerHsvChannel.Saturation:
+                    case HsvChannel.Saturation:
                         startValue = ref startHsv.S;
                         currentValue = ref currentHsv.S;
                         wrapIncrement = 1.0;
                         break;
 
-                    case ColorPickerHsvChannel.Value:
+                    case HsvChannel.Value:
                         startValue = ref startHsv.V;
                         currentValue = ref currentHsv.V;
                         wrapIncrement = 1.0;
                         break;
 
                     default:
-                        throw new InvalidOperationException("Invalid ColorPickerHsvChannel.");
+                        throw new InvalidOperationException("Invalid HsvChannel.");
                 }
 
                 while (newColorName == currentColorName)
diff --git a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
index e95f911235..3d06541a11 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
+++ b/src/Avalonia.Controls/ColorPicker/ColorSpectrum/ColorSpectrum.cs
@@ -190,7 +190,7 @@ namespace Avalonia.Controls.Primitives
 
             bool isControlDown = e.KeyModifiers.HasFlag(KeyModifiers.Control);
 
-            ColorPickerHsvChannel incrementChannel = ColorPickerHsvChannel.Hue;
+            HsvChannel incrementChannel = HsvChannel.Hue;
 
             if (key == Key.Left ||
                 key == Key.Right)
@@ -199,17 +199,17 @@ namespace Avalonia.Controls.Primitives
                 {
                     case ColorSpectrumChannels.HueSaturation:
                     case ColorSpectrumChannels.HueValue:
-                        incrementChannel = ColorPickerHsvChannel.Hue;
+                        incrementChannel = HsvChannel.Hue;
                         break;
 
                     case ColorSpectrumChannels.SaturationHue:
                     case ColorSpectrumChannels.SaturationValue:
-                        incrementChannel = ColorPickerHsvChannel.Saturation;
+                        incrementChannel = HsvChannel.Saturation;
                         break;
 
                     case ColorSpectrumChannels.ValueHue:
                     case ColorSpectrumChannels.ValueSaturation:
-                        incrementChannel = ColorPickerHsvChannel.Value;
+                        incrementChannel = HsvChannel.Value;
                         break;
                 }
             }
@@ -220,17 +220,17 @@ namespace Avalonia.Controls.Primitives
                 {
                     case ColorSpectrumChannels.SaturationHue:
                     case ColorSpectrumChannels.ValueHue:
-                        incrementChannel = ColorPickerHsvChannel.Hue;
+                        incrementChannel = HsvChannel.Hue;
                         break;
 
                     case ColorSpectrumChannels.HueSaturation:
                     case ColorSpectrumChannels.ValueSaturation:
-                        incrementChannel = ColorPickerHsvChannel.Saturation;
+                        incrementChannel = HsvChannel.Saturation;
                         break;
 
                     case ColorSpectrumChannels.HueValue:
                     case ColorSpectrumChannels.SaturationValue:
-                        incrementChannel = ColorPickerHsvChannel.Value;
+                        incrementChannel = HsvChannel.Value;
                         break;
                 }
             }
@@ -240,17 +240,17 @@ namespace Avalonia.Controls.Primitives
 
             switch (incrementChannel)
             {
-                case ColorPickerHsvChannel.Hue:
+                case HsvChannel.Hue:
                     minBound = MinHue;
                     maxBound = MaxHue;
                     break;
 
-                case ColorPickerHsvChannel.Saturation:
+                case HsvChannel.Saturation:
                     minBound = MinSaturation;
                     maxBound = MaxSaturation;
                     break;
 
-                case ColorPickerHsvChannel.Value:
+                case HsvChannel.Value:
                     minBound = MinValue;
                     maxBound = MaxValue;
                     break;
@@ -260,8 +260,8 @@ namespace Avalonia.Controls.Primitives
             // so we want left and up to be lower for hue, but higher for saturation and value.
             // This will ensure that the icon always moves in the direction of the key press.
             IncrementDirection direction =
-                (incrementChannel == ColorPickerHsvChannel.Hue && (key == Key.Left || key == Key.Up)) ||
-                (incrementChannel != ColorPickerHsvChannel.Hue && (key == Key.Right || key == Key.Down)) ?
+                (incrementChannel == HsvChannel.Hue && (key == Key.Left || key == Key.Up)) ||
+                (incrementChannel != HsvChannel.Hue && (key == Key.Right || key == Key.Down)) ?
                 IncrementDirection.Lower :
                 IncrementDirection.Higher;
 
diff --git a/src/Avalonia.Controls/ColorPicker/ColorPickerHsvChannel.cs b/src/Avalonia.Controls/ColorPicker/HsvChannel.cs
similarity index 94%
rename from src/Avalonia.Controls/ColorPicker/ColorPickerHsvChannel.cs
rename to src/Avalonia.Controls/ColorPicker/HsvChannel.cs
index 9e6e7cb89e..18f96fe70b 100644
--- a/src/Avalonia.Controls/ColorPicker/ColorPickerHsvChannel.cs
+++ b/src/Avalonia.Controls/ColorPicker/HsvChannel.cs
@@ -8,7 +8,7 @@ namespace Avalonia.Controls
     /// <summary>
     /// Defines a specific HSV color model channel.
     /// </summary>
-    public enum ColorPickerHsvChannel
+    public enum HsvChannel
     {
         /// <summary>
         /// The Hue channel.