diff --git a/src/main/cli/cli.c b/src/main/cli/cli.c
index 5cec3f53fc..bdfb9eb82b 100644
--- a/src/main/cli/cli.c
+++ b/src/main/cli/cli.c
@@ -5323,7 +5323,7 @@ static void showDma(void)
     cliPrintLine("Currently active DMA:");
     cliRepeat('-', 20);
 #endif
-    for (int i = 1; i <= DMA_LAST_HANDLER; i++) {
+    for (int i = DMA_FIRST_HANDLER; i <= DMA_LAST_HANDLER; i++) {
         const resourceOwner_t *owner = dmaGetOwner(i);
 
         cliPrintf(DMA_OUTPUT_STRING, DMA_DEVICE_NO(i), DMA_DEVICE_INDEX(i));
diff --git a/src/main/drivers/dma.h b/src/main/drivers/dma.h
index 39ce91552c..688f93e858 100644
--- a/src/main/drivers/dma.h
+++ b/src/main/drivers/dma.h
@@ -58,7 +58,7 @@ typedef struct dmaChannelDescriptor_s {
 #endif
 } dmaChannelDescriptor_t;
 
-#define DMA_IDENTIFIER_TO_INDEX(x) ((x) - 1)
+#define DMA_IDENTIFIER_TO_INDEX(x) ((x) - DMA_FIRST_HANDLER)
 
 void dmaMuxEnable(dmaIdentifier_e identifier, uint32_t dmaMuxId);
 
diff --git a/src/platform/APM32/include/platform/dma.h b/src/platform/APM32/include/platform/dma.h
index 0b20062250..727a0d5741 100644
--- a/src/platform/APM32/include/platform/dma.h
+++ b/src/platform/APM32/include/platform/dma.h
@@ -32,7 +32,8 @@
 
 typedef enum {
     DMA_NONE = 0,
-    DMA1_ST0_HANDLER = 1,
+    DMA_FIRST_HANDLER = 1,
+    DMA1_ST0_HANDLER = DMA_FIRST_HANDLER,
     DMA1_ST1_HANDLER,
     DMA1_ST2_HANDLER,
     DMA1_ST3_HANDLER,
@@ -55,7 +56,6 @@ typedef enum {
 #define DMA_DEVICE_INDEX(x) ((((x)-1) % 8))
 #define DMA_OUTPUT_INDEX    0
 #define DMA_OUTPUT_STRING   "DMA%d Stream %d:"
-#define DMA_INPUT_STRING    "DMA%d_ST%d"
 
 #define DEFINE_DMA_CHANNEL(d, s, f) { \
     .dma = d, \
diff --git a/src/platform/AT32/include/platform/dma.h b/src/platform/AT32/include/platform/dma.h
index adb08d3843..a19cffbf00 100644
--- a/src/platform/AT32/include/platform/dma.h
+++ b/src/platform/AT32/include/platform/dma.h
@@ -32,7 +32,8 @@
 
 typedef enum {
     DMA_NONE = 0,
-    DMA1_CH1_HANDLER = 1,
+    DMA_FIRST_HANDLER = 1,
+    DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
     DMA1_CH2_HANDLER,
     DMA1_CH3_HANDLER,
     DMA1_CH4_HANDLER,
@@ -56,7 +57,6 @@ uint32_t dmaGetChannel(const uint8_t channel);
 
 #define DMA_OUTPUT_INDEX    0
 #define DMA_OUTPUT_STRING   "DMA%d Channel %d:"
-#define DMA_INPUT_STRING    "DMA%d_CH%d"
 
 #define DEFINE_DMA_CHANNEL(d, c, f) { \
     .dma = d, \
diff --git a/src/platform/SIMULATOR/include/platform/dma.h b/src/platform/SIMULATOR/include/platform/dma.h
index f199deeed6..5767ef5514 100644
--- a/src/platform/SIMULATOR/include/platform/dma.h
+++ b/src/platform/SIMULATOR/include/platform/dma.h
@@ -23,5 +23,6 @@
 
  typedef enum {
     DMA_NONE = 0,
+    DMA_FIRST_HANDLER = DMA_NONE,
     DMA_LAST_HANDLER = DMA_NONE
 } dmaIdentifier_e;
diff --git a/src/platform/STM32/include/platform/dma.h b/src/platform/STM32/include/platform/dma.h
index fbd9f5f1cb..37b026b2a4 100644
--- a/src/platform/STM32/include/platform/dma.h
+++ b/src/platform/STM32/include/platform/dma.h
@@ -40,7 +40,8 @@
 
 typedef enum {
     DMA_NONE = 0,
-    DMA1_ST0_HANDLER = 1,
+    DMA_FIRST_HANDLER = 1,
+    DMA1_ST0_HANDLER = DMA_FIRST_HANDLER,
     DMA1_ST1_HANDLER,
     DMA1_ST2_HANDLER,
     DMA1_ST3_HANDLER,
@@ -63,7 +64,6 @@ typedef enum {
 #define DMA_DEVICE_INDEX(x) ((((x)-1) % 8))
 #define DMA_OUTPUT_INDEX    0
 #define DMA_OUTPUT_STRING   "DMA%d Stream %d:"
-#define DMA_INPUT_STRING    "DMA%d_ST%d"
 
 #define DEFINE_DMA_CHANNEL(d, s, f) { \
     .dma = d, \
@@ -101,7 +101,8 @@ void dmaMuxEnable(dmaIdentifier_e identifier, uint32_t dmaMuxId);
 
 typedef enum {
     DMA_NONE = 0,
-    DMA1_CH1_HANDLER = 1,
+    DMA_FIRST_HANDLER = 1,
+    DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
     DMA1_CH2_HANDLER,
     DMA1_CH3_HANDLER,
     DMA1_CH4_HANDLER,
@@ -129,7 +130,8 @@ uint32_t dmaGetChannel(const uint8_t channel);
 
 typedef enum {
     DMA_NONE = 0,
-    DMA1_CH1_HANDLER = 1,
+    DMA_FIRST_HANDLER = 1,
+    DMA1_CH1_HANDLER = DMA_FIRST_HANDLER,
     DMA1_CH2_HANDLER,
     DMA1_CH3_HANDLER,
     DMA1_CH4_HANDLER,
@@ -146,7 +148,6 @@ typedef enum {
 
 #define DMA_OUTPUT_INDEX    0
 #define DMA_OUTPUT_STRING   "DMA%d Channel %d:"
-#define DMA_INPUT_STRING    "DMA%d_CH%d"
 
 #define DEFINE_DMA_CHANNEL(d, c, f) { \
     .dma = d, \