diff --git a/src/main/build/debug.c b/src/main/build/debug.c
index e79c9e5c7..02e8a5892 100644
--- a/src/main/build/debug.c
+++ b/src/main/build/debug.c
@@ -30,6 +30,7 @@ uint8_t debugMode;
 uint32_t sectionTimes[2][4];
 #endif
 
+// Please ensure that these names are aligned with the enum values defined in 'debug.h'
 const char * const debugModeNames[DEBUG_COUNT] = {
     "NONE",
     "CYCLETIME",
@@ -78,7 +79,7 @@ const char * const debugModeNames[DEBUG_COUNT] = {
     "ANTI_GRAVITY",
     "DYN_LPF",
     "RX_SPEKTRUM_SPI",
-    "DSHOT_TELEMETRY",
+    "DSHOT_RPM_TELEMETRY",
     "RPM_FILTER",
     "D_CUT",
 };
diff --git a/src/main/build/debug.h b/src/main/build/debug.h
index 92470fd0a..ed2c5101c 100644
--- a/src/main/build/debug.h
+++ b/src/main/build/debug.h
@@ -84,7 +84,7 @@ typedef enum {
     DEBUG_ADC_INTERNAL,
     DEBUG_RUNAWAY_TAKEOFF,
     DEBUG_SDIO,
-    DEBUG_CURRENT,
+    DEBUG_CURRENT_SENSOR,
     DEBUG_USB,
     DEBUG_SMARTAUDIO,
     DEBUG_RTH,
@@ -96,7 +96,7 @@ typedef enum {
     DEBUG_ANTI_GRAVITY,
     DEBUG_DYN_LPF,
     DEBUG_RX_SPEKTRUM_SPI,
-    DEBUG_RPM_TELEMETRY,
+    DEBUG_DSHOT_RPM_TELEMETRY,
     DEBUG_RPM_FILTER,
     DEBUG_D_CUT,
     DEBUG_COUNT
diff --git a/src/main/drivers/pwm_output_dshot.c b/src/main/drivers/pwm_output_dshot.c
index 883149eb5..2f594cb2a 100644
--- a/src/main/drivers/pwm_output_dshot.c
+++ b/src/main/drivers/pwm_output_dshot.c
@@ -267,7 +267,7 @@ void pwmStartDshotMotorUpdate(uint8_t motorCount)
                 if (value != 0xffff) {
                     dmaMotors[i].dshotTelemetryValue = value;
                     if (i < 4) {
-                        DEBUG_SET(DEBUG_RPM_TELEMETRY, i, value);
+                        DEBUG_SET(DEBUG_DSHOT_RPM_TELEMETRY, i, value);
                     }
                 } else {
                     dshotInvalidPacketCount++;
diff --git a/src/main/sensors/current.c b/src/main/sensors/current.c
index 158c29d0e..ae4c245b9 100644
--- a/src/main/sensors/current.c
+++ b/src/main/sensors/current.c
@@ -118,8 +118,8 @@ static int32_t currentMeterADCToCentiamps(const uint16_t src)
     // y=x/m+b m is scale in (mV/10A) and b is offset in (mA)
     int32_t centiAmps = (millivolts * 10000 / (int32_t)config->scale + (int32_t)config->offset) / 10;
 
-    DEBUG_SET(DEBUG_CURRENT, 0, millivolts);
-    DEBUG_SET(DEBUG_CURRENT, 1, centiAmps);
+    DEBUG_SET(DEBUG_CURRENT_SENSOR, 0, millivolts);
+    DEBUG_SET(DEBUG_CURRENT_SENSOR, 1, centiAmps);
 
     return centiAmps; // Returns Centiamps to maintain compatability with the rest of the code
 }
@@ -167,8 +167,8 @@ void currentMeterADCRead(currentMeter_t *meter)
     meter->amperage = currentMeterADCState.amperage;
     meter->mAhDrawn = currentMeterADCState.mahDrawnState.mAhDrawn;
 
-    DEBUG_SET(DEBUG_CURRENT, 2, meter->amperageLatest);
-    DEBUG_SET(DEBUG_CURRENT, 3, meter->mAhDrawn);
+    DEBUG_SET(DEBUG_CURRENT_SENSOR, 2, meter->amperageLatest);
+    DEBUG_SET(DEBUG_CURRENT_SENSOR, 3, meter->mAhDrawn);
 }
 
 //