diff --git a/libraries/mbed/api/InterruptManager.h b/libraries/mbed/api/InterruptManager.h
index c7a5e4d128..02712b3e09 100644
--- a/libraries/mbed/api/InterruptManager.h
+++ b/libraries/mbed/api/InterruptManager.h
@@ -1,7 +1,7 @@
 #ifndef MBED_INTERRUPTMANAGER_H
 #define MBED_INTERRUPTMANAGER_H
 
-#include "cmsis_nvic.h"
+#include "cmsis.h"
 #include "CallChain.h"
 #include <string.h>
 
diff --git a/libraries/mbed/common/InterruptManager.cpp b/libraries/mbed/common/InterruptManager.cpp
index 476bd89176..7bf41d15b5 100644
--- a/libraries/mbed/common/InterruptManager.cpp
+++ b/libraries/mbed/common/InterruptManager.cpp
@@ -74,7 +74,7 @@ bool InterruptManager::remove_handler(pFunctionPointer_t handler, IRQn_Type irq)
 }
 
 void InterruptManager::irq_helper() {
-    _chains[get_irq_index(NVIC_GetActiveInterrupt())]->call();
+    _chains[__get_IPSR()]->call();
 }
 
 int InterruptManager::get_irq_index(IRQn_Type irq) {
diff --git a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.c
index 44a875438b..0a09890433 100644
--- a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS (16 + 32)            // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS (0x1FFFFC00)  // Vectors positioned at start of RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.h
index 299d3879be..4e0ddede09 100644
--- a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL05Z/cmsis_nvic.h
@@ -9,6 +9,9 @@
 
 #include "cmsis.h"
 
+#define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.c
index 2137980b28..a15284bf92 100644
--- a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS (16 + 32)            // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS (0x1FFFF000)  // Vectors positioned at start of RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.h
index 299d3879be..6acdca9efd 100644
--- a/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_Freescale/TARGET_KL25Z/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.c
index bdbe5263bd..790104064e 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.c
@@ -27,7 +27,6 @@
  * Option 2 is the one to go for, as RAM is the most valuable resource
  */
 
-#define NVIC_NUM_VECTORS (16 + 32)            // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS (0x10000000)  // Vectors positioned at start of RAM
 
 void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector) {
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.h
index 299d3879be..4e0ddede09 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC11UXX/cmsis_nvic.h
@@ -9,6 +9,9 @@
 
 #include "cmsis.h"
 
+#define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.c
index 4e024bd8d4..9ae560da9a 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS          (16 + 32)     // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS   (0x10000000)  // Location of vectors in RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.h
index 299d3879be..4e0ddede09 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC13XX/cmsis_nvic.h
@@ -9,6 +9,9 @@
 
 #include "cmsis.h"
 
+#define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.c
index aa04feacdc..9e08052795 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.c
@@ -29,6 +29,3 @@ uint32_t NVIC_GetVector(IRQn_Type IRQn) {
     return vectors[IRQn + NVIC_USER_IRQ_OFFSET];
 }
 
-IRQn_Type NVIC_GetActiveInterrupt(void) {
-    return (IRQn_Type)((SCB->ICSR & 0x1FF) - NVIC_USER_IRQ_OFFSET);
-}
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.h
index 2864079edd..2193af13be 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC176X/cmsis_nvic.h
@@ -18,7 +18,6 @@ extern "C" {
 
 void NVIC_SetVector(IRQn_Type IRQn, uint32_t vector);
 uint32_t NVIC_GetVector(IRQn_Type IRQn);
-IRQn_Type NVIC_GetActiveInterrupt(void);
 
 #ifdef __cplusplus
 }
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/cmsis_nvic.h
index 299d3879be..cae3714099 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      32
+#define NVIC_USER_IRQ_OFFSET  0
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/core_arm7.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/core_arm7.h
index dbd21b426b..9655813058 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/core_arm7.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/core_arm7.h
@@ -8,6 +8,8 @@
 #ifndef __ARM7_CORE_H__
 #define __ARM7_CORE_H__
 
+#include "vector_defns.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif 
@@ -255,6 +257,15 @@ static __INLINE void NVIC_DisableIRQ(IRQn_Type IRQn)
  NVIC->IntEnClr = 1 << (uint32_t)IRQn;
 }
 
+static __INLINE uint32_t __get_IPSR(void)
+{
+ unsigned i;
+
+ for(i = 0; i < 32; i ++)
+   if(NVIC->Address == NVIC->VectAddr[i])
+     return i;
+ return 1; // 1 is an invalid entry in the interrupt table on LPC2368
+}
 
 #ifdef __cplusplus
 }
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/vector_defns.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/vector_defns.h
index cb563d4e59..10b0b6a056 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/vector_defns.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC23XX/vector_defns.h
@@ -37,8 +37,10 @@
 // VIC register addresses
 #define VIC_Base 0xfffff000
 #define VICAddress_Offset 0xf00
+#define VICVectAddr0_Offset 0x100
 #define VICVectAddr2_Offset 0x108
 #define VICVectAddr3_Offset 0x10c
+#define VICVectAddr31_Offset 0x17c
 #define VICIntEnClr_Offset 0x014
 #define VICIntEnClr    (*(volatile unsigned long *)(VIC_Base + 0x014))
 #define VICVectAddr2   (*(volatile unsigned long *)(VIC_Base + 0x108))
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.c
index 045462a550..56e857ab09 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS          (16 + 41)     // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS   (0x10000000)  // Location of vectors in RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.h
index 299d3879be..b46f61ce6a 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC408X/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      (16 + 41)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.c
index c2098ca7d2..f787f4a402 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS          (16 + 53)     // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS   (0x10000000)  // Location of vectors in RAM
 
 // The LPC43xx can boot from multiple memories (internal Flash, external NOR,
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.h
index 299d3879be..2a74a028d6 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC43XX/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      (16 + 53)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.c
index c145ec3dfc..6b8912505b 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS (16 + 32)            // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS (0x10000000)  // Vectors positioned at start of RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)       // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.h
index 299d3879be..6acdca9efd 100644
--- a/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_NXP/TARGET_LPC81X/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      (16 + 32)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c
index 7ec951703e..18f98617de 100644
--- a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c
+++ b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.c
@@ -5,7 +5,6 @@
  */ 
 #include "cmsis_nvic.h"
 
-#define NVIC_NUM_VECTORS          (16 + 81)     // CORE + MCU Peripherals
 #define NVIC_RAM_VECTOR_ADDRESS   (0x20000000)  // Location of vectors in RAM
 #define NVIC_FLASH_VECTOR_ADDRESS (0x0)         // Initial vector position in flash
 
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.h b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.h
index 5fa4eb52e0..c259328d4e 100644
--- a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.h
+++ b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4XX/cmsis_nvic.h
@@ -7,6 +7,9 @@
 #ifndef MBED_CMSIS_NVIC_H
 #define MBED_CMSIS_NVIC_H
 
+#define NVIC_NUM_VECTORS      (16 + 81)   // CORE + MCU Peripherals
+#define NVIC_USER_IRQ_OFFSET  16
+
 #include "cmsis.h"
 
 #ifdef __cplusplus
diff --git a/libraries/tests/mbed/interrupt_chaining/interruptin/main.cpp b/libraries/tests/mbed/interrupt_chaining/interruptin/main.cpp
index 8278e019f7..275f3f7b2a 100644
--- a/libraries/tests/mbed/interrupt_chaining/interruptin/main.cpp
+++ b/libraries/tests/mbed/interrupt_chaining/interruptin/main.cpp
@@ -12,8 +12,8 @@ void in_handler() {
 }
 
 #if defined(TARGET_KL25Z)
-#define PIN_OUT     PTC7
-#define PIN_IN      PTA1
+#define PIN_OUT     PTC6
+#define PIN_IN      PTA5
 
 #elif defined(TARGET_KL05Z)
 #define PIN_OUT     PTB11
diff --git a/libraries/tests/mbed/interrupt_chaining/ticker/main.cpp b/libraries/tests/mbed/interrupt_chaining/ticker/main.cpp
index e1f4a5919c..21536a7d74 100644
--- a/libraries/tests/mbed/interrupt_chaining/ticker/main.cpp
+++ b/libraries/tests/mbed/interrupt_chaining/ticker/main.cpp
@@ -3,6 +3,18 @@
 #include "cmsis.h"
 #include "test_env.h"
 
+#if defined(TARGET_LPC1768)
+#define TIMER_IRQ       TIMER3_IRQn
+#elif defined(TARGET_LPC11U24)
+#define TIMER_IRQ       TIMER_32_1_IRQn
+#elif defined(TARGET_KL25Z)
+#define TIMER_IRQ       LPTimer_IRQn
+#elif defined(TARGET_LPC2368)
+#define TIMER_IRQ       TIMER3_IRQn
+#else
+#error This test can't run on this target.
+#endif
+
 Serial pc(USBTX, USBRX);
 
 Ticker flipper_1;
@@ -28,7 +40,7 @@ Ticker flipper_2;
 Sender s1(pc, '1');
 Sender s2(pc, '2');
 
-#if defined(TARGET_LPC1768) || defined(TARGET_LPC11U24) || defined(TARGET_LPC4088)
+#if defined(TARGET_LPC1768) || defined(TARGET_LPC11U24) || defined(TARGET_LPC4088) || defined(TARGET_LPC2368)
 #   define LED_NAME LED2
 #elif defined(TARGET_KL05Z)
 #   define LED_NAME LED2
@@ -77,20 +89,20 @@ int main() {
     flipper_2.add_function(&s2, &Sender::send);
 
     // Test global chaining (InterruptManager)
-    printf("Handler initially: %08X\n", initial_handler = NVIC_GetVector(TIMER3_IRQn));
+    printf("Handler initially: %08X\n", initial_handler = NVIC_GetVector(TIMER_IRQ));
     InterruptManager *pManager = InterruptManager::get();
-    pFunctionPointer_t ptm = pManager->add_handler(testme, TIMER3_IRQn);
-    pFunctionPointer_t pinc = pManager->add_handler_front(&c, &Counter::inc, TIMER3_IRQn);
-    printf("Handler after calling InterruptManager: %08X\n", NVIC_GetVector(TIMER3_IRQn));
+    pFunctionPointer_t ptm = pManager->add_handler(testme, TIMER_IRQ);
+    pFunctionPointer_t pinc = pManager->add_handler_front(&c, &Counter::inc, TIMER_IRQ);
+    printf("Handler after calling InterruptManager: %08X\n", NVIC_GetVector(TIMER_IRQ));
 
     wait(4.0);
 
-    if (!pManager->remove_handler(ptm, TIMER3_IRQn) || !pManager->remove_handler(pinc, TIMER3_IRQn)) {
+    if (!pManager->remove_handler(ptm, TIMER_IRQ) || !pManager->remove_handler(pinc, TIMER_IRQ)) {
         printf ("remove handler failed.\n");
         notify_completion(false);
     }
     printf("Interrupt handler calls: %d\n", c.get_count());
-    printf("Handler after removing previously added functions: %08X\n", final_handler = NVIC_GetVector(TIMER3_IRQn));
+    printf("Handler after removing previously added functions: %08X\n", final_handler = NVIC_GetVector(TIMER_IRQ));
 
     if (initial_handler != final_handler) {
         printf( "InteruptManager test failed.\n");