diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 05d28c74a4c..63fa4b18ec7 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -157,7 +157,7 @@ static void efm32_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: efm32_nmi, efm32_busfault, efm32_usagefault, efm32_pendsv,
- *       efm32_errmonitor, efm32_pendsv, efm32_reserved
+ *       efm32_dbgmonitor, efm32_pendsv, efm32_reserved
  *
  * Description:
  *   Handlers for various exceptions.  None are handled and all are fatal
@@ -199,7 +199,7 @@ static int efm32_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int efm32_errmonitor(int irq, FAR void *context)
+static int efm32_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -458,7 +458,7 @@ void up_irqinitialize(void)
   irq_attach(EFM32_IRQ_BUSFAULT, efm32_busfault);
   irq_attach(EFM32_IRQ_USAGEFAULT, efm32_usagefault);
   irq_attach(EFM32_IRQ_PENDSV, efm32_pendsv);
-  irq_attach(EFM32_IRQ_DBGMONITOR, efm32_errmonitor);
+  irq_attach(EFM32_IRQ_DBGMONITOR, efm32_dbgmonitor);
   irq_attach(EFM32_IRQ_RESERVED, efm32_reserved);
 #endif
 
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index 2ce3d373a9c..d2a04de3ae6 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -160,7 +160,7 @@ static void kinetis_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: kinetis_nmi, kinetis_busfault, kinetis_usagefault, kinetis_pendsv,
- *       kinetis_errmonitor, kinetis_pendsv, kinetis_reserved
+ *       kinetis_dbgmonitor, kinetis_pendsv, kinetis_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -202,7 +202,7 @@ static int kinetis_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int kinetis_errmonitor(int irq, FAR void *context)
+static int kinetis_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -429,7 +429,7 @@ void up_irqinitialize(void)
   irq_attach(KINETIS_IRQ_BUSFAULT, kinetis_busfault);
   irq_attach(KINETIS_IRQ_USAGEFAULT, kinetis_usagefault);
   irq_attach(KINETIS_IRQ_PENDSV, kinetis_pendsv);
-  irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_errmonitor);
+  irq_attach(KINETIS_IRQ_DBGMONITOR, kinetis_dbgmonitor);
   irq_attach(KINETIS_IRQ_RESERVED, kinetis_reserved);
 #endif
 
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index c76a07ed25c..b37f7afe1c9 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -128,7 +128,7 @@ static void kl_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: kl_nmi, kl_busfault, kl_usagefault, kl_pendsv,
- *       kl_errmonitor, kl_pendsv, kl_reserved
+ *       kl_dbgmonitor, kl_pendsv, kl_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index d907b7d4aec..f861943bc0a 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -124,7 +124,7 @@ static void lpc11_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc11_nmi, lpc11_busfault, lpc11_usagefault, lpc11_pendsv,
- *       lpc11_errmonitor, lpc11_pendsv, lpc11_reserved
+ *       lpc11_dbgmonitor, lpc11_pendsv, lpc11_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index a3ada9cbe8e..44d149c7342 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -139,7 +139,7 @@ static void lpc17_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc17_nmi, lpc17_busfault, lpc17_usagefault, lpc17_pendsv,
- *       lpc17_errmonitor, lpc17_pendsv, lpc17_reserved
+ *       lpc17_dbgmonitor, lpc17_pendsv, lpc17_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -181,7 +181,7 @@ static int lpc17_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int lpc17_errmonitor(int irq, FAR void *context)
+static int lpc17_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -402,7 +402,7 @@ void up_irqinitialize(void)
   irq_attach(LPC17_IRQ_BUSFAULT, lpc17_busfault);
   irq_attach(LPC17_IRQ_USAGEFAULT, lpc17_usagefault);
   irq_attach(LPC17_IRQ_PENDSV, lpc17_pendsv);
-  irq_attach(LPC17_IRQ_DBGMONITOR, lpc17_errmonitor);
+  irq_attach(LPC17_IRQ_DBGMONITOR, lpc17_dbgmonitor);
   irq_attach(LPC17_IRQ_RESERVED, lpc17_reserved);
 #endif
 
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index ea87cec8fe0..345f63b5c24 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -148,7 +148,7 @@ static void lpc43_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: lpc43_nmi, lpc43_busfault, lpc43_usagefault, lpc43_pendsv,
- *       lpc43_errmonitor, lpc43_pendsv, lpc43_reserved
+ *       lpc43_dbgmonitor, lpc43_pendsv, lpc43_reserved
  *
  * Description:
  *   Handlers for various exceptions.  None are handled and all are fatal
@@ -190,7 +190,7 @@ static int lpc43_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int lpc43_errmonitor(int irq, FAR void *context)
+static int lpc43_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -437,7 +437,7 @@ void up_irqinitialize(void)
   irq_attach(LPC43_IRQ_BUSFAULT, lpc43_busfault);
   irq_attach(LPC43_IRQ_USAGEFAULT, lpc43_usagefault);
   irq_attach(LPC43_IRQ_PENDSV, lpc43_pendsv);
-  irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_errmonitor);
+  irq_attach(LPC43_IRQ_DBGMONITOR, lpc43_dbgmonitor);
   irq_attach(LPC43_IRQ_RESERVED, lpc43_reserved);
 #endif
 
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index ec045c3734e..66f6d78044d 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -128,7 +128,7 @@ static void nuc_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: nuc_nmi, nuc_busfault, nuc_usagefault, nuc_pendsv,
- *       nuc_errmonitor, nuc_pendsv, nuc_reserved
+ *       nuc_dbgmonitor, nuc_pendsv, nuc_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 7e002224fb3..68f17774347 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -163,7 +163,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_errmonitor,
+ * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
  *       sam_pendsv, sam_reserved
  *
  * Description:
@@ -206,7 +206,7 @@ static int sam_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int sam_errmonitor(int irq, FAR void *context)
+static int sam_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -466,7 +466,7 @@ void up_irqinitialize(void)
   irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);
   irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault);
   irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
-  irq_attach(SAM_IRQ_DBGMONITOR, sam_errmonitor);
+  irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor);
   irq_attach(SAM_IRQ_RESERVED, sam_reserved);
 #endif
 
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index ea20c689bf2..025c2008182 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -84,7 +84,7 @@ volatile uint32_t *g_current_regs[1];
 
 /****************************************************************************
  * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv,
- *       sam_errmonitor, sam_pendsv, sam_reserved
+ *       sam_dbgmonitor, sam_pendsv, sam_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index faf021fa47b..08537f65970 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -163,7 +163,7 @@ static void sam_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_errmonitor,
+ * Name: sam_nmi, sam_busfault, sam_usagefault, sam_pendsv, sam_dbgmonitor,
  *       sam_pendsv, sam_reserved
  *
  * Description:
@@ -206,7 +206,7 @@ static int sam_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int sam_errmonitor(int irq, FAR void *context)
+static int sam_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -466,7 +466,7 @@ void up_irqinitialize(void)
   irq_attach(SAM_IRQ_BUSFAULT, sam_busfault);
   irq_attach(SAM_IRQ_USAGEFAULT, sam_usagefault);
   irq_attach(SAM_IRQ_PENDSV, sam_pendsv);
-  irq_attach(SAM_IRQ_DBGMONITOR, sam_errmonitor);
+  irq_attach(SAM_IRQ_DBGMONITOR, sam_dbgmonitor);
   irq_attach(SAM_IRQ_RESERVED, sam_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 1e9570cc90a..062d63fb749 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -151,7 +151,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv,
- *       stm32_errmonitor, stm32_pendsv, stm32_reserved
+ *       stm32_dbgmonitor, stm32_pendsv, stm32_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -193,7 +193,7 @@ static int stm32_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int stm32_errmonitor(int irq, FAR void *context)
+static int stm32_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -418,7 +418,7 @@ void up_irqinitialize(void)
   irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);
   irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault);
   irq_attach(STM32_IRQ_PENDSV, stm32_pendsv);
-  irq_attach(STM32_IRQ_DBGMONITOR, stm32_errmonitor);
+  irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor);
   irq_attach(STM32_IRQ_RESERVED, stm32_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index 62c4aee7aa7..eb7a8e1b868 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -175,7 +175,7 @@ static void stm32_dumpnvic(const char *msg, int irq)
 #endif
 
 /****************************************************************************
- * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, stm32_errmonitor,
+ * Name: stm32_nmi, stm32_busfault, stm32_usagefault, stm32_pendsv, stm32_dbgmonitor,
  *       stm32_pendsv, stm32_reserved
  *
  * Description:
@@ -218,7 +218,7 @@ static int stm32_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int stm32_errmonitor(int irq, FAR void *context)
+static int stm32_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -500,7 +500,7 @@ void up_irqinitialize(void)
   irq_attach(STM32_IRQ_BUSFAULT, stm32_busfault);
   irq_attach(STM32_IRQ_USAGEFAULT, stm32_usagefault);
   irq_attach(STM32_IRQ_PENDSV, stm32_pendsv);
-  irq_attach(STM32_IRQ_DBGMONITOR, stm32_errmonitor);
+  irq_attach(STM32_IRQ_DBGMONITOR, stm32_dbgmonitor);
   irq_attach(STM32_IRQ_RESERVED, stm32_reserved);
 #endif
 
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index 7d5f948c81c..4742d5c95b5 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -150,7 +150,7 @@ static void stm32l4_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: stm32l4_nmi, stm32l4_busfault, stm32l4_usagefault, stm32l4_pendsv,
- *       stm32l4_errmonitor, stm32l4_pendsv, stm32l4_reserved
+ *       stm32l4_dbgmonitor, stm32l4_pendsv, stm32l4_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -192,7 +192,7 @@ static int stm32l4_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int stm32l4_errmonitor(int irq, FAR void *context)
+static int stm32l4_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -413,7 +413,7 @@ void up_irqinitialize(void)
   irq_attach(STM32L4_IRQ_BUSFAULT, stm32l4_busfault);
   irq_attach(STM32L4_IRQ_USAGEFAULT, stm32l4_usagefault);
   irq_attach(STM32L4_IRQ_PENDSV, stm32l4_pendsv);
-  irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_errmonitor);
+  irq_attach(STM32L4_IRQ_DBGMONITOR, stm32l4_dbgmonitor);
   irq_attach(STM32L4_IRQ_RESERVED, stm32l4_reserved);
 #endif
 
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index 8f95e071d9e..6771007d59e 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -186,7 +186,7 @@ static void tiva_dumpnvic(const char *msg, int irq)
 
 /****************************************************************************
  * Name: tiva_nmi, tiva_busfault, tiva_usagefault, tiva_pendsv,
- *       tiva_errmonitor, tiva_pendsv, tiva_reserved
+ *       tiva_dbgmonitor, tiva_pendsv, tiva_reserved
  *
  * Description:
  *   Handlers for various execptions.  None are handled and all are fatal
@@ -228,7 +228,7 @@ static int tiva_pendsv(int irq, FAR void *context)
   return 0;
 }
 
-static int tiva_errmonitor(int irq, FAR void *context)
+static int tiva_dbgmonitor(int irq, FAR void *context)
 {
   (void)up_irq_save();
   _err("PANIC!!! Debug Monitor received\n");
@@ -482,7 +482,7 @@ void up_irqinitialize(void)
   irq_attach(TIVA_IRQ_BUSFAULT, tiva_busfault);
   irq_attach(TIVA_IRQ_USAGEFAULT, tiva_usagefault);
   irq_attach(TIVA_IRQ_PENDSV, tiva_pendsv);
-  irq_attach(TIVA_IRQ_DBGMONITOR, tiva_errmonitor);
+  irq_attach(TIVA_IRQ_DBGMONITOR, tiva_dbgmonitor);
   irq_attach(TIVA_IRQ_RESERVED, tiva_reserved);
 #endif