diff --git a/arch/arm/include/armv6-m/irq.h b/arch/arm/include/armv6-m/irq.h
index c04d5cae768..1d3da28e95a 100644
--- a/arch/arm/include/armv6-m/irq.h
+++ b/arch/arm/include/armv6-m/irq.h
@@ -251,8 +251,8 @@ static inline void setprimask(uint32_t primask)
 
 /* Disable IRQs */
 
-static inline void irqdisable(void) inline_function;
-static inline void irqdisable(void)
+static inline void up_irq_disable(void) inline_function;
+static inline void up_irq_disable(void)
 {
   __asm__ __volatile__ ("\tcpsid  i\n");
 }
@@ -281,8 +281,8 @@ static inline irqstate_t up_irq_save(void)
 
 /* Enable IRQs */
 
-static inline void irqenable(void) inline_function;
-static inline void irqenable(void)
+static inline void up_irq_enable(void) inline_function;
+static inline void up_irq_enable(void)
 {
   __asm__ __volatile__ ("\tcpsie  i\n");
 }
diff --git a/arch/arm/include/armv7-a/irq.h b/arch/arm/include/armv7-a/irq.h
index 8a9d2be89a6..f14785df930 100644
--- a/arch/arm/include/armv7-a/irq.h
+++ b/arch/arm/include/armv7-a/irq.h
@@ -361,7 +361,7 @@ static inline irqstate_t up_irq_save(void)
 
 /* Enable IRQs and return the previous IRQ state */
 
-static inline irqstate_t irqenable(void)
+static inline irqstate_t up_irq_enable(void)
 {
   unsigned int cpsr;
 
diff --git a/arch/arm/include/armv7-m/irq.h b/arch/arm/include/armv7-m/irq.h
index d4faeaa4e11..658c13ba0a8 100644
--- a/arch/arm/include/armv7-m/irq.h
+++ b/arch/arm/include/armv7-m/irq.h
@@ -246,8 +246,8 @@ static inline void setbasepri(uint32_t basepri)
 
 /* Disable IRQs */
 
-static inline void irqdisable(void) inline_function;
-static inline void irqdisable(void)
+static inline void up_irq_disable(void) inline_function;
+static inline void up_irq_disable(void)
 {
 #ifdef CONFIG_ARMV7M_USEBASEPRI
   setbasepri(NVIC_SYSH_DISABLE_PRIORITY);
@@ -289,8 +289,8 @@ static inline irqstate_t up_irq_save(void)
 
 /* Enable IRQs */
 
-static inline void irqenable(void) inline_function;
-static inline void irqenable(void)
+static inline void up_irq_enable(void) inline_function;
+static inline void up_irq_enable(void)
 {
   setbasepri(0);
   __asm__ __volatile__ ("\tcpsie  i\n");
diff --git a/arch/arm/include/armv7-r/irq.h b/arch/arm/include/armv7-r/irq.h
index 551979e7195..5269ac6f6d0 100644
--- a/arch/arm/include/armv7-r/irq.h
+++ b/arch/arm/include/armv7-r/irq.h
@@ -361,7 +361,7 @@ static inline irqstate_t up_irq_save(void)
 
 /* Enable IRQs and return the previous IRQ state */
 
-static inline irqstate_t irqenable(void)
+static inline irqstate_t up_irq_enable(void)
 {
   unsigned int cpsr;
 
diff --git a/arch/arm/src/a1x/a1x_irq.c b/arch/arm/src/a1x/a1x_irq.c
index 9d2ae9a56ea..46535946b79 100644
--- a/arch/arm/src/a1x/a1x_irq.c
+++ b/arch/arm/src/a1x/a1x_irq.c
@@ -180,7 +180,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  (void)irqenable();
+  (void)up_irq_enable();
 #endif
 
   a1x_dumpintc("initial", 0);
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index 9409e71c10f..62686ca722b 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -471,7 +471,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index f482a2c0ca5..d6d24cfa4f6 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -443,7 +443,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index 1fd9f81e79e..633b631ac59 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -250,7 +250,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/lpc11xx/lpc11_irq.c b/arch/arm/src/lpc11xx/lpc11_irq.c
index fe9eccadc2c..f912ed9018f 100644
--- a/arch/arm/src/lpc11xx/lpc11_irq.c
+++ b/arch/arm/src/lpc11xx/lpc11_irq.c
@@ -246,7 +246,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index f4034d29146..5f16c61c171 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -415,7 +415,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 6d6941c5128..752f1408143 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -421,7 +421,7 @@ void up_irqinitialize(void)
   /* And finally, enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c
index 62610622e3f..48b08676d06 100644
--- a/arch/arm/src/nuc1xx/nuc_irq.c
+++ b/arch/arm/src/nuc1xx/nuc_irq.c
@@ -242,7 +242,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 57913ef58fc..e9af84d1cda 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -490,7 +490,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c
index d09dc52c0bc..831fd8137c2 100644
--- a/arch/arm/src/sama5/sam_irq.c
+++ b/arch/arm/src/sama5/sam_irq.c
@@ -566,7 +566,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  (void)irqenable();
+  (void)up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/samdl/sam_irq.c b/arch/arm/src/samdl/sam_irq.c
index 844ac21ce63..4a34e999cc4 100644
--- a/arch/arm/src/samdl/sam_irq.c
+++ b/arch/arm/src/samdl/sam_irq.c
@@ -198,7 +198,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index bac8885e80c..4cb9f439a83 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -490,7 +490,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index b1fa3662319..c61b516b146 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -414,7 +414,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index f175a6d9d78..6a645beaed6 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -524,7 +524,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index d5229a4d09b..9b0a711b9e7 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -490,7 +490,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c
index cd7b1552381..2b5adba9d9a 100644
--- a/arch/arm/src/tms570/tms570_irq.c
+++ b/arch/arm/src/tms570/tms570_irq.c
@@ -190,7 +190,7 @@ void up_irqinitialize(void)
 
   /* And finally, enable interrupts globally */
 
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/avr/include/avr/irq.h b/arch/avr/include/avr/irq.h
index 2bafcd58bbe..e2592875101 100644
--- a/arch/avr/include/avr/irq.h
+++ b/arch/avr/include/avr/irq.h
@@ -160,12 +160,12 @@ static inline void putsreg(irqstate_t sreg)
 
 /* Interrupt enable/disable */
 
-static inline void irqenable()
+static inline void up_irq_enable()
 {
   asm volatile ("sei" ::);
 }
 
-static inline void irqdisable()
+static inline void up_irq_disabled()
 {
   asm volatile ("cli" ::);
 }
diff --git a/arch/sh/include/sh1/irq.h b/arch/sh/include/sh1/irq.h
index 515c0c07eda..b4af921bdbb 100644
--- a/arch/sh/include/sh1/irq.h
+++ b/arch/sh/include/sh1/irq.h
@@ -525,14 +525,14 @@ static inline irqstate_t up_irq_save(void)
 
 /* Disable IRQs */
 
-static inline void irqdisable(void)
+static inline void up_irq_disable(void)
 {
   uint32_t flags = __getsr();
   __setsr(flags | 0x000000f0);
 }
 /* Enable IRQs */
 
-static inline void irqenable(void)
+static inline void up_irq_enable(void)
 {
   uint32_t flags = __getsr();
   __setsr(flags & ~0x000000f0);
@@ -544,11 +544,11 @@ static inline void up_irq_restore(irqstate_t flags)
 {
   if ((flags & 0x000000f0) != 0x000000f0)
     {
-      irqenable();
+      up_irq_enable();
     }
   else
     {
-      irqdisable();
+      up_irq_disable();
     }
 }
 #endif
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/sh/src/sh1/sh1_irq.c
index 28c302edf4c..036ecaec245 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/sh/src/sh1/sh1_irq.c
@@ -72,7 +72,7 @@ void up_irqinitialize(void)
   /* Enable interrupts */
 
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
-  irqenable();
+  up_irq_enable();
 #endif
 }
 
diff --git a/arch/x86/include/i486/irq.h b/arch/x86/include/i486/irq.h
index 1918fe60e8a..53b0f7e14df 100644
--- a/arch/x86/include/i486/irq.h
+++ b/arch/x86/include/i486/irq.h
@@ -222,26 +222,26 @@ static inline irqstate_t irqflags()
  * if the X86_FLAGS_IF is set by sti, then interrupts are enable.
  */
 
-static inline bool irqdisabled(irqstate_t flags)
+static inline bool up_irq_disabled(irqstate_t flags)
 {
   return ((flags & X86_FLAGS_IF) == 0);
 }
 
-static inline bool irqenabled(irqstate_t flags)
+static inline bool up_irq_enabled(irqstate_t flags)
 {
   return ((flags & X86_FLAGS_IF) != 0);
 }
 
 /* Disable interrupts unconditionally */
 
-static inline void irqdisable(void)
+static inline void up_irq_disable(void)
 {
   asm volatile("cli": : :"memory");
 }
 
 /* Enable interrupts unconditionally */
 
-static inline void irqenable(void)
+static inline void up_irq_enable(void)
 {
   asm volatile("sti": : :"memory");
 }
@@ -251,7 +251,7 @@ static inline void irqenable(void)
 static inline irqstate_t up_irq_save(void)
 {
   irqstate_t flags = irqflags();
-  irqdisable();
+  up_irq_disable();
   return flags;
 }
 
@@ -259,9 +259,9 @@ static inline irqstate_t up_irq_save(void)
 
 static inline void up_irq_restore(irqstate_t flags)
 {
-  if (irqenabled(flags))
+  if (up_irq_enabled(flags))
     {
-      irqenable();
+      up_irq_enable();
     }
 }