diff --git a/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java b/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java
index 4a7a290c99..17d41698e2 100644
--- a/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java
+++ b/hal/src/main/java/edu/wpi/first/hal/PortsJNI.java
@@ -34,22 +34,6 @@ public class PortsJNI extends JNIWrapper {
    */
   public static native int getNumCounters();
 
-  /**
-   * Gets the number of digital headers in the current system.
-   *
-   * @return the number of digital headers
-   * @see "HAL_GetNumDigitalHeaders"
-   */
-  public static native int getNumDigitalHeaders();
-
-  /**
-   * Gets the number of PWM headers in the current system.
-   *
-   * @return the number of PWM headers
-   * @see "HAL_GetNumPWMHeaders"
-   */
-  public static native int getNumPWMHeaders();
-
   /**
    * Gets the number of digital channels in the current system.
    *
diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp
index 4b588d7b4b..2b65b1f660 100644
--- a/hal/src/main/native/cpp/jni/PortsJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp
@@ -52,32 +52,6 @@ Java_edu_wpi_first_hal_PortsJNI_getNumCounters
   return value;
 }
 
-/*
- * Class:     edu_wpi_first_hal_PortsJNI
- * Method:    getNumDigitalHeaders
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_PortsJNI_getNumDigitalHeaders
-  (JNIEnv* env, jclass)
-{
-  jint value = HAL_GetNumDigitalHeaders();
-  return value;
-}
-
-/*
- * Class:     edu_wpi_first_hal_PortsJNI
- * Method:    getNumPWMHeaders
- * Signature: ()I
- */
-JNIEXPORT jint JNICALL
-Java_edu_wpi_first_hal_PortsJNI_getNumPWMHeaders
-  (JNIEnv* env, jclass)
-{
-  jint value = HAL_GetNumPWMHeaders();
-  return value;
-}
-
 /*
  * Class:     edu_wpi_first_hal_PortsJNI
  * Method:    getNumDigitalChannels
diff --git a/hal/src/main/native/include/hal/Ports.h b/hal/src/main/native/include/hal/Ports.h
index fb5fb021fd..bb5aa318ef 100644
--- a/hal/src/main/native/include/hal/Ports.h
+++ b/hal/src/main/native/include/hal/Ports.h
@@ -37,20 +37,6 @@ int32_t HAL_GetNumAnalogInputs(void);
  */
 int32_t HAL_GetNumCounters(void);
 
-/**
- * Gets the number of digital headers in the current system.
- *
- * @return the number of digital headers
- */
-int32_t HAL_GetNumDigitalHeaders(void);
-
-/**
- * Gets the number of PWM headers in the current system.
- *
- * @return the number of PWM headers
- */
-int32_t HAL_GetNumPWMHeaders(void);
-
 /**
  * Gets the number of digital channels in the current system.
  *
diff --git a/hal/src/main/native/systemcore/Ports.cpp b/hal/src/main/native/systemcore/Ports.cpp
index 55176c60dc..465b3e89b8 100644
--- a/hal/src/main/native/systemcore/Ports.cpp
+++ b/hal/src/main/native/systemcore/Ports.cpp
@@ -22,12 +22,6 @@ int32_t HAL_GetNumAnalogInputs(void) {
 int32_t HAL_GetNumCounters(void) {
   return kNumCounters;
 }
-int32_t HAL_GetNumDigitalHeaders(void) {
-  return kNumDigitalHeaders;
-}
-int32_t HAL_GetNumPWMHeaders(void) {
-  return kNumPWMHeaders;
-}
 int32_t HAL_GetNumDigitalChannels(void) {
   return kNumDigitalChannels;
 }
diff --git a/hal/src/main/native/systemcore/PortsInternal.h b/hal/src/main/native/systemcore/PortsInternal.h
index 6656cbcf85..6c56740d46 100644
--- a/hal/src/main/native/systemcore/PortsInternal.h
+++ b/hal/src/main/native/systemcore/PortsInternal.h
@@ -12,21 +12,16 @@ constexpr int32_t kNumCanBuses = 5;
 constexpr int32_t kNumSmartIo = 6;
 constexpr int32_t kNumI2cBuses = 2;
 constexpr int32_t kNumAccumulators = 0;
-constexpr int32_t kNumAnalogInputs = 8;
+constexpr int32_t kNumAnalogInputs = kNumSmartIo;
 constexpr int32_t kNumAnalogOutputs = 0;
 constexpr int32_t kNumCounters = 0;
-constexpr int32_t kNumDigitalHeaders = 10;
-constexpr int32_t kNumDigitalMXPChannels = 16;
-constexpr int32_t kNumDigitalSPIPortChannels = 5;
-constexpr int32_t kNumPWMHeaders = 0;
-constexpr int32_t kNumDigitalChannels =
-    kNumDigitalHeaders + kNumDigitalMXPChannels + kNumDigitalSPIPortChannels;
-constexpr int32_t kNumPWMChannels = 0 + kNumPWMHeaders;
+constexpr int32_t kNumDigitalSPIPortChannels = 0;
+constexpr int32_t kNumDigitalChannels = kNumSmartIo;
+constexpr int32_t kNumPWMChannels = kNumSmartIo;
 constexpr int32_t kNumDigitalPWMOutputs = 0;
 constexpr int32_t kNumEncoders = 0;
 constexpr int32_t kNumInterrupts = 0;
-constexpr int32_t kNumRelayChannels = 8;
-constexpr int32_t kNumRelayHeaders = kNumRelayChannels / 2;
+constexpr int32_t kNumRelayChannels = 0;
 constexpr int32_t kNumCTREPCMModules = 63;
 constexpr int32_t kNumCTRESolenoidChannels = 8;
 constexpr int32_t kNumCTREPDPModules = 63;
diff --git a/wpilibc/src/main/native/include/frc/SensorUtil.h b/wpilibc/src/main/native/include/frc/SensorUtil.h
index bae794a4a4..30d067cb3b 100644
--- a/wpilibc/src/main/native/include/frc/SensorUtil.h
+++ b/wpilibc/src/main/native/include/frc/SensorUtil.h
@@ -39,7 +39,7 @@ class SensorUtil final {
   static bool CheckDigitalChannel(int channel);
 
   /**
-   * Check that the digital channel number is valid.
+   * Check that the PWM channel number is valid.
    *
    * Verify that the channel number is one of the legal channel numbers. Channel
    * numbers are 0-based.
diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java
index 0e6086306e..1e3df9fa1d 100644
--- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java
+++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/SensorUtil.java
@@ -19,16 +19,16 @@ public final class SensorUtil {
   public static final int kSystemClockTicksPerMicrosecond =
       ConstantsJNI.getSystemClockTicksPerMicrosecond();
 
-  /** Number of digital channels per roboRIO. */
+  /** Number of digital channels per Systemcore. */
   public static final int kDigitalChannels = PortsJNI.getNumDigitalChannels();
 
-  /** Number of analog input channels per roboRIO. */
+  /** Number of analog input channels per Systemcore. */
   public static final int kAnalogInputChannels = PortsJNI.getNumAnalogInputs();
 
   /** Number of solenoid channels per module. */
   public static final int kCTRESolenoidChannels = PortsJNI.getNumCTRESolenoidChannels();
 
-  /** Number of PWM channels per roboRIO. */
+  /** Number of PWM channels per Systemcore. */
   public static final int kPwmChannels = PortsJNI.getNumPWMChannels();
 
   /** Number of power distribution channels per PDP. */
@@ -64,8 +64,8 @@ public final class SensorUtil {
   }
 
   /**
-   * Check that the digital channel number is valid. Verify that the channel number is one of the
-   * legal channel numbers. Channel numbers are 0-based.
+   * Check that the PWM channel number is valid. Verify that the channel number is one of the legal
+   * channel numbers. Channel numbers are 0-based.
    *
    * @param channel The channel number to check.
    */