diff --git a/firmware/export/pp5002.h b/firmware/export/pp5002.h
index bbd7003c63..03bab42fb5 100644
--- a/firmware/export/pp5002.h
+++ b/firmware/export/pp5002.h
@@ -105,12 +105,12 @@
 
 #define CPU_INT_EN_STAT  (*(volatile unsigned long *)(0xcf001020))
 #define CPU_INT_EN       (*(volatile unsigned long *)(0xcf001024))
-#define CPU_INT_CLR      (*(volatile unsigned long *)(0xcf001028))
+#define CPU_INT_DIS      (*(volatile unsigned long *)(0xcf001028))
 #define CPU_INT_PRIORITY (*(volatile unsigned long *)(0xcf00102c))
 
 #define COP_INT_EN_STAT  (*(volatile unsigned long *)(0xcf001030))
 #define COP_INT_EN       (*(volatile unsigned long *)(0xcf001034))
-#define COP_INT_CLR      (*(volatile unsigned long *)(0xcf001038))
+#define COP_INT_DIS      (*(volatile unsigned long *)(0xcf001038))
 #define COP_INT_PRIORITY (*(volatile unsigned long *)(0xcf00103c))
 
 #define IDE_IRQ          1
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 52acb2f21b..caae5a7e00 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -62,12 +62,12 @@
 
 #define CPU_INT_EN_STAT     (*(volatile unsigned long*)(0x60004020))
 #define CPU_INT_EN          (*(volatile unsigned long*)(0x60004024))
-#define CPU_INT_CLR         (*(volatile unsigned long*)(0x60004028))
+#define CPU_INT_DIS         (*(volatile unsigned long*)(0x60004028))
 #define CPU_INT_PRIORITY    (*(volatile unsigned long*)(0x6000402c))
 
 #define COP_INT_EN_STAT     (*(volatile unsigned long*)(0x60004030))
 #define COP_INT_EN          (*(volatile unsigned long*)(0x60004034))
-#define COP_INT_CLR         (*(volatile unsigned long*)(0x60004038))
+#define COP_INT_DIS         (*(volatile unsigned long*)(0x60004038))
 #define COP_INT_PRIORITY    (*(volatile unsigned long*)(0x6000403c))
 
 #define CPU_HI_INT_STAT     (*(volatile unsigned long*)(0x60004100))
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 06ae9e1380..6bb0bb13a1 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -142,7 +142,7 @@ void rolo_restart(const unsigned char* source, unsigned char* dest,
         : : "a"(dest)
     );
 #elif defined(CPU_PP502x)
-    CPU_INT_CLR = -1;
+    CPU_INT_DIS = -1;
 
     /* Flush cache */
     flush_icache();
diff --git a/firmware/target/arm/ipod/button-1g-3g.c b/firmware/target/arm/ipod/button-1g-3g.c
index c91051e78b..c869f6f271 100644
--- a/firmware/target/arm/ipod/button-1g-3g.c
+++ b/firmware/target/arm/ipod/button-1g-3g.c
@@ -167,7 +167,7 @@ static int ipod_3g_button_read(void)
 
 void ipod_3g_button_int(void)
 {
-    CPU_INT_CLR = GPIO_MASK;
+    CPU_INT_DIS = GPIO_MASK;
     int_btn = ipod_3g_button_read();
     CPU_INT_EN = GPIO_MASK;
 }
diff --git a/firmware/target/arm/olympus/mrobe-100/power-mr100.c b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
index c6f7d65844..dff8bb97f2 100644
--- a/firmware/target/arm/olympus/mrobe-100/power-mr100.c
+++ b/firmware/target/arm/olympus/mrobe-100/power-mr100.c
@@ -63,8 +63,8 @@ void power_off(void)
     disable_interrupt(IRQ_FIQ_STATUS);
 
     /* Mask them on both cores */
-    CPU_INT_CLR = -1;
-    COP_INT_CLR = -1;
+    CPU_INT_DIS = -1;
+    COP_INT_DIS = -1;
 
     while (1)
         GPIOB_OUTPUT_VAL |= 0x80;
diff --git a/firmware/target/arm/philips/sa9200/power-sa9200.c b/firmware/target/arm/philips/sa9200/power-sa9200.c
index 8c8214a7ce..ddb782e107 100644
--- a/firmware/target/arm/philips/sa9200/power-sa9200.c
+++ b/firmware/target/arm/philips/sa9200/power-sa9200.c
@@ -40,8 +40,8 @@ void power_off(void)
 
     /* Stop interrupts on both cores */
     disable_interrupt(IRQ_FIQ_STATUS);
-    COP_INT_CLR = -1;
-    CPU_INT_CLR = -1;
+    COP_INT_DIS = -1;
+    CPU_INT_DIS = -1;
 
     /* Halt everything and wait for device to power off */
     while (1)
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index 8c8214a7ce..ddb782e107 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -40,8 +40,8 @@ void power_off(void)
 
     /* Stop interrupts on both cores */
     disable_interrupt(IRQ_FIQ_STATUS);
-    COP_INT_CLR = -1;
-    CPU_INT_CLR = -1;
+    COP_INT_DIS = -1;
+    CPU_INT_DIS = -1;
 
     /* Halt everything and wait for device to power off */
     while (1)
diff --git a/firmware/target/arm/system-pp5002.c b/firmware/target/arm/system-pp5002.c
index 164913f0f6..e4d3913651 100644
--- a/firmware/target/arm/system-pp5002.c
+++ b/firmware/target/arm/system-pp5002.c
@@ -177,8 +177,8 @@ void system_init(void)
 #endif
 
         INT_FORCED_CLR = -1;
-        CPU_INT_CLR    = -1;
-        COP_INT_CLR    = -1;
+        CPU_INT_DIS    = -1;
+        COP_INT_DIS    = -1;
 
         GPIOA_INT_EN   = 0;
         GPIOB_INT_EN   = 0;
diff --git a/firmware/target/arm/system-pp502x.c b/firmware/target/arm/system-pp502x.c
index f74b0484ab..fb292b5edf 100644
--- a/firmware/target/arm/system-pp502x.c
+++ b/firmware/target/arm/system-pp502x.c
@@ -384,12 +384,12 @@ void system_init(void)
 #endif
 
         /* disable all irqs */
-        COP_HI_INT_CLR      = -1;
-        CPU_HI_INT_CLR      = -1;
+        COP_HI_INT_DIS      = -1;
+        CPU_HI_INT_DIS      = -1;
         HI_INT_FORCED_CLR   = -1;
         
-        COP_INT_CLR         = -1;
-        CPU_INT_CLR         = -1;
+        COP_INT_DIS         = -1;
+        CPU_INT_DIS         = -1;
         INT_FORCED_CLR      = -1;
 
         GPIOA_INT_EN        = 0;
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index f785535100..31a6acb71b 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -475,7 +475,7 @@ void usb_drv_exit(void)
 #if CONFIG_CPU == IMX31L
     avic_disable_int(USB_OTG);
 #else
-    CPU_INT_CLR = USB_MASK;
+    CPU_INT_DIS = USB_MASK;
 #endif
 
     cancel_cpu_boost();
diff --git a/firmware/timer.c b/firmware/timer.c
index bd9050f872..eefebb38f8 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -201,8 +201,8 @@ static bool timer_set(long cycles, bool start)
             pfn_unregister();
             pfn_unregister = NULL;
         }
-        CPU_INT_CLR = TIMER2_MASK;
-        COP_INT_CLR = TIMER2_MASK;
+        CPU_INT_DIS = TIMER2_MASK;
+        COP_INT_DIS = TIMER2_MASK;
     }
     if (start || (cycles_new == -1))  /* within isr, cycles_new is "locked" */
         TIMER2_CFG = 0xc0000000 | (cycles - 1);    /* enable timer */
@@ -311,8 +311,8 @@ void timer_unregister(void)
     or_l((1<<10), &IMR);    /* disable interrupt */
 #elif defined(CPU_PP)
     TIMER2_CFG = 0;         /* stop timer 2 */
-    CPU_INT_CLR = TIMER2_MASK;
-    COP_INT_CLR = TIMER2_MASK;
+    CPU_INT_DIS = TIMER2_MASK;
+    COP_INT_DIS = TIMER2_MASK;
 #elif CONFIG_CPU == PNX0101
     TIMER1.ctrl &= ~0x80;  /* disable timer 1 */
     irq_disable_int(IRQ_TIMER1);