diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java
index 78782c3b22..b58679d7f2 100644
--- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java
+++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDPattern.java
@@ -364,9 +364,9 @@ public interface LEDPattern {
 
             writer.setRGB(
                 i,
-                Color.unpackRGB(output, Color.RGBChannel.kRed),
-                Color.unpackRGB(output, Color.RGBChannel.kGreen),
-                Color.unpackRGB(output, Color.RGBChannel.kBlue));
+                Color.unpackRGB(output, Color.RGBChannel.RED),
+                Color.unpackRGB(output, Color.RGBChannel.GREEN),
+                Color.unpackRGB(output, Color.RGBChannel.BLUE));
           });
     };
   }
@@ -420,9 +420,9 @@ public interface LEDPattern {
 
             writer.setRGB(
                 i,
-                Color.unpackRGB(blendedRGB, Color.RGBChannel.kRed),
-                Color.unpackRGB(blendedRGB, Color.RGBChannel.kGreen),
-                Color.unpackRGB(blendedRGB, Color.RGBChannel.kBlue));
+                Color.unpackRGB(blendedRGB, Color.RGBChannel.RED),
+                Color.unpackRGB(blendedRGB, Color.RGBChannel.GREEN),
+                Color.unpackRGB(blendedRGB, Color.RGBChannel.BLUE));
           });
     };
   }
@@ -677,9 +677,9 @@ public interface LEDPattern {
 
         writer.setRGB(
             led,
-            Color.unpackRGB(gradientColor, Color.RGBChannel.kRed),
-            Color.unpackRGB(gradientColor, Color.RGBChannel.kGreen),
-            Color.unpackRGB(gradientColor, Color.RGBChannel.kBlue));
+            Color.unpackRGB(gradientColor, Color.RGBChannel.RED),
+            Color.unpackRGB(gradientColor, Color.RGBChannel.GREEN),
+            Color.unpackRGB(gradientColor, Color.RGBChannel.BLUE));
       }
     };
   }
diff --git a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java
index 49a155a8cf..51633c7bf0 100644
--- a/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java
+++ b/wpilibj/src/main/java/org/wpilib/hardware/led/LEDWriter.java
@@ -38,9 +38,9 @@ public interface LEDWriter {
 
     setRGB(
         index,
-        Color.unpackRGB(packedRGB, Color.RGBChannel.kRed),
-        Color.unpackRGB(packedRGB, Color.RGBChannel.kGreen),
-        Color.unpackRGB(packedRGB, Color.RGBChannel.kBlue));
+        Color.unpackRGB(packedRGB, Color.RGBChannel.RED),
+        Color.unpackRGB(packedRGB, Color.RGBChannel.GREEN),
+        Color.unpackRGB(packedRGB, Color.RGBChannel.BLUE));
   }
 
   /**
diff --git a/wpiutil/src/main/java/org/wpilib/util/Color.java b/wpiutil/src/main/java/org/wpilib/util/Color.java
index 392e7fea88..90a79afb6f 100644
--- a/wpiutil/src/main/java/org/wpilib/util/Color.java
+++ b/wpiutil/src/main/java/org/wpilib/util/Color.java
@@ -147,9 +147,9 @@ public class Color {
   public static Color fromHSV(int h, int s, int v) {
     int rgb = hsvToRgb(h, s, v);
     return new Color(
-        unpackRGB(rgb, RGBChannel.kRed),
-        unpackRGB(rgb, RGBChannel.kGreen),
-        unpackRGB(rgb, RGBChannel.kBlue));
+        unpackRGB(rgb, RGBChannel.RED),
+        unpackRGB(rgb, RGBChannel.GREEN),
+        unpackRGB(rgb, RGBChannel.BLUE));
   }
 
   @Override
@@ -273,11 +273,11 @@ public class Color {
   /** Represents a color channel in an RGB color. */
   public enum RGBChannel {
     /** The red channel of an RGB color. */
-    kRed,
+    RED,
     /** The green channel of an RGB color. */
-    kGreen,
+    GREEN,
     /** The blue channel of an RGB color. */
-    kBlue
+    BLUE
   }
 
   /**
@@ -305,9 +305,9 @@ public class Color {
    */
   public static int unpackRGB(int packedColor, RGBChannel channel) {
     return switch (channel) {
-      case kRed -> (packedColor >> 16) & 0xFF;
-      case kGreen -> (packedColor >> 8) & 0xFF;
-      case kBlue -> packedColor & 0xFF;
+      case RED -> (packedColor >> 16) & 0xFF;
+      case GREEN -> (packedColor >> 8) & 0xFF;
+      case BLUE -> packedColor & 0xFF;
     };
   }
 
@@ -323,9 +323,9 @@ public class Color {
     int packedRGB = lerpRGB(a.red, a.green, a.blue, b.red, b.green, b.blue, t);
 
     return new Color(
-        unpackRGB(packedRGB, RGBChannel.kRed),
-        unpackRGB(packedRGB, RGBChannel.kGreen),
-        unpackRGB(packedRGB, RGBChannel.kBlue));
+        unpackRGB(packedRGB, RGBChannel.RED),
+        unpackRGB(packedRGB, RGBChannel.GREEN),
+        unpackRGB(packedRGB, RGBChannel.BLUE));
   }
 
   /**
diff --git a/wpiutil/src/test/java/org/wpilib/util/ColorTest.java b/wpiutil/src/test/java/org/wpilib/util/ColorTest.java
index 1b8812fd4a..39424b0834 100644
--- a/wpiutil/src/test/java/org/wpilib/util/ColorTest.java
+++ b/wpiutil/src/test/java/org/wpilib/util/ColorTest.java
@@ -127,9 +127,9 @@ class ColorTest {
   @MethodSource("hsvToRgbProvider")
   void hsvToRgb(int h, int s, int v, int r, int g, int b) {
     int rgb = Color.hsvToRgb(h, s, v);
-    int R = Color.unpackRGB(rgb, Color.RGBChannel.kRed);
-    int G = Color.unpackRGB(rgb, Color.RGBChannel.kGreen);
-    int B = Color.unpackRGB(rgb, Color.RGBChannel.kBlue);
+    int R = Color.unpackRGB(rgb, Color.RGBChannel.RED);
+    int G = Color.unpackRGB(rgb, Color.RGBChannel.GREEN);
+    int B = Color.unpackRGB(rgb, Color.RGBChannel.BLUE);
 
     assertAll(
         () -> assertEquals(r, R, "R value didn't match"),