--- a/ilg.gnuarmeclipse.templates.stm/templates/micro-os-plus/stm32f3.pack/src/cmsis/vectors_stm32f37x.c
+++ b/ilg.gnuarmeclipse.templates.stm/templates/micro-os-plus/stm32f3.pack/src/cmsis/vectors_stm32f37x.c
@@ -34,7 +34,7 @@
 void __attribute__ ((weak, alias ("Default_Handler")))
 EXTI1_IRQHandler(void);
 void __attribute__ ((weak, alias ("Default_Handler")))
-EXTI2_IRQHandler(void);
+EXTI2_TS_IRQHandler(void);
 void __attribute__ ((weak, alias ("Default_Handler")))
 EXTI3_IRQHandler(void);
 void __attribute__ ((weak, alias ("Default_Handler")))
@@ -190,87 +190,87 @@
 
       // ----------------------------------------------------------------------
       // Chip Level - STM32F37x
-      WWDG_IRQHandler,                          // Window WatchDog
-      PVD_IRQHandler,                           // PVD
-      TAMPER_STAMP_IRQHandler,                  // Tamper and TimeStamps
-      RTC_WKUP_IRQHandler,                      // RTC Wakeup
-      FLASH_IRQHandler,                         // FLASH
-      RCC_IRQHandler,                           // RCC
-      EXTI0_IRQHandler,                         // EXTI Line0
-      EXTI1_IRQHandler,                         // EXTI Line1
-      EXTI2_IRQHandler,                         // EXTI Line2
-      EXTI3_IRQHandler,                         // EXTI Line3
-      EXTI4_IRQHandler,                         // EXTI Line4
-      DMA1_Channel1_IRQHandler,                 // DMA1 Channel 1
-      DMA1_Channel2_IRQHandler,                 // DMA1 Channel 2
-      DMA1_Channel3_IRQHandler,                 // DMA1 Channel 3
-      DMA1_Channel4_IRQHandler,                 // DMA1 Channel 4
-      DMA1_Channel5_IRQHandler,                 // DMA1 Channel 5
-      DMA1_Channel6_IRQHandler,                 // DMA1 Channel 6
-      DMA1_Channel7_IRQHandler,                 // DMA1 Channel 7
-      ADC1_IRQHandler,                          // ADC1
-      CAN1_TX_IRQHandler,                       // CAN1 TX
-      CAN1_RX0_IRQHandler,                      // CAN1 RX0
-      CAN1_RX1_IRQHandler,                      // CAN1 RX1
-      CAN1_SCE_IRQHandler,                      // CAN1 SCE
-      EXTI9_5_IRQHandler,                       // External Line[9:5]s
-      TIM15_IRQHandler,                         // TIM15
-      TIM16_IRQHandler,                         // TIM16
-      TIM17_IRQHandler,                         // TIM17
-      TIM18_DAC2_IRQHandler,                    // TIM18
-      TIM2_IRQHandler,                          // TIM2
-      TIM3_IRQHandler,                          // TIM3
-      TIM4_IRQHandler,                          // TIM4
-      I2C1_EV_IRQHandler,                       // I2C1 Event
-      I2C1_ER_IRQHandler,                       // I2C1 Error
-      I2C2_EV_IRQHandler,                       // I2C2 Event
-      I2C2_ER_IRQHandler,                       // I2C2 Error
-      SPI1_IRQHandler,                          // SPI1
-      SPI2_IRQHandler,                          // SPI2
-      USART1_IRQHandler,                        // USART1
-      USART2_IRQHandler,                        // USART2
-      USART3_IRQHandler,                        // USART3
-      EXTI15_10_IRQHandler,                     // External Line[15:10]s
-      RTC_Alarm_IRQHandler,                     // RTC Alarm
-      CEC_IRQHandler,                           // CEC
-      TIM12_IRQHandler,                         // TIM12
-      TIM13_IRQHandler,                         // TIM13
-      TIM14_IRQHandler,                         // TIM14
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      TIM5_IRQHandler,                          // TIM5
-      SPI3_IRQHandler,                          // SPI3
-      0,                                        // Reserved
-      0,                                        // Reserved
-      TIM6_DAC1_IRQHandler,                     // TIM6 and DAC1
-      TIM7_IRQHandler,                          // TIM7
-      DMA2_Channel1_IRQHandler,                 // DMA2 Channel 1
-      DMA2_Channel2_IRQHandler,                 // DMA2 Channel 2
-      DMA2_Channel3_IRQHandler,                 // DMA2 Channel 3
-      DMA2_Channel4_IRQHandler,                 // DMA2 Channel 4
-      DMA2_Channel5_IRQHandler,                 // DMA2 Channel 5
-      SDADC1_IRQHandler,                        // SDADC1
-      SDADC2_IRQHandler,                        // SDADC2
-      SDADC3_IRQHandler,                        // SDADC3
-      COMP_IRQHandler,                          // COMP
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      0,                                        // Reserved
-      USB_HP_IRQHandler,                        // USB HP
-      USB_LP_IRQHandler,                        // USB LP
-      USBWakeUp_IRQHandler,                     // USB Wakeup through EXTI
-      0,                                        // Reserved
-      TIM19_IRQHandler,                         // TIM19
-      0,                                        // Reserved
-      FPU_IRQHandler                            // FPU
+      WWDG_IRQHandler,        // Window WatchDog
+      PVD_IRQHandler, // PVD through EXTI Line detection
+      TAMPER_STAMP_IRQHandler,        // Tamper and TimeStamps through the EXTI line
+      RTC_WKUP_IRQHandler,    // RTC Wakeup through the EXTI line
+      FLASH_IRQHandler,       // FLASH
+      RCC_IRQHandler, // RCC
+      EXTI0_IRQHandler,       // EXTI Line0
+      EXTI1_IRQHandler,       // EXTI Line1
+      EXTI2_TS_IRQHandler,    // EXTI Line2
+      EXTI3_IRQHandler,       // EXTI Line3
+      EXTI4_IRQHandler,       // EXTI Line4
+      DMA1_Channel1_IRQHandler,       // DMA1 Channel 1
+      DMA1_Channel2_IRQHandler,       // DMA1 Channel 2
+      DMA1_Channel3_IRQHandler,       // DMA1 Channel 3
+      DMA1_Channel4_IRQHandler,       // DMA1 Channel 4
+      DMA1_Channel5_IRQHandler,       // DMA1 Channel 5
+      DMA1_Channel6_IRQHandler,       // DMA1 Channel 6
+      DMA1_Channel7_IRQHandler,       // DMA1 Channel 7
+      ADC1_IRQHandler,        // ADC1
+      CAN1_TX_IRQHandler,     // CAN1 TX
+      CAN1_RX0_IRQHandler,    // CAN1 RX0
+      CAN1_RX1_IRQHandler,    // CAN1 RX1
+      CAN1_SCE_IRQHandler,    // CAN1 SCE
+      EXTI9_5_IRQHandler,     // External Line[9:5]s
+      TIM15_IRQHandler,       // TIM15
+      TIM16_IRQHandler,       // TIM16
+      TIM17_IRQHandler,       // TIM17
+      TIM18_DAC2_IRQHandler,  // TIM18 and DAC2
+      TIM2_IRQHandler,        // TIM2
+      TIM3_IRQHandler,        // TIM3
+      TIM4_IRQHandler,        // TIM4
+      I2C1_EV_IRQHandler,     // I2C1 Event
+      I2C1_ER_IRQHandler,     // I2C1 Error
+      I2C2_EV_IRQHandler,     // I2C2 Event
+      I2C2_ER_IRQHandler,     // I2C2 Error
+      SPI1_IRQHandler,        // SPI1
+      SPI2_IRQHandler,        // SPI2
+      USART1_IRQHandler,      // USART1
+      USART2_IRQHandler,      // USART2
+      USART3_IRQHandler,      // USART3
+      EXTI15_10_IRQHandler,   // External Line[15:10]s
+      RTC_Alarm_IRQHandler,   // RTC_Alarm_IRQHandler
+      CEC_IRQHandler, // CEC
+      TIM12_IRQHandler,       // TIM12
+      TIM13_IRQHandler,       // TIM13
+      TIM14_IRQHandler,       // TIM14
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      TIM5_IRQHandler,        // TIM5
+      SPI3_IRQHandler,        // SPI3
+      0,      // Reserved
+      0,      // Reserved
+      TIM6_DAC1_IRQHandler,   // TIM6 and DAC1 Channel1 & channel2
+      TIM7_IRQHandler,        // TIM7
+      DMA2_Channel1_IRQHandler,       // DMA2 Channel 1
+      DMA2_Channel2_IRQHandler,       // DMA2 Channel 2
+      DMA2_Channel3_IRQHandler,       // DMA2 Channel 3
+      DMA2_Channel4_IRQHandler,       // DMA2 Channel 4
+      DMA2_Channel5_IRQHandler,       // DMA2 Channel 5
+      SDADC1_IRQHandler,      // SDADC1
+      SDADC2_IRQHandler,      // SDADC2
+      SDADC3_IRQHandler,      // SDADC3
+      COMP_IRQHandler,        // COMP
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      0,      // Reserved
+      USB_HP_IRQHandler,      // USB High Priority
+      USB_LP_IRQHandler,      // USB Low Priority
+      USBWakeUp_IRQHandler,   // USB Wakeup
+      0,      // Resrved
+      TIM19_IRQHandler,       // TIM19
+      0,      // Resrved
+      FPU_IRQHandler // FPU
     };
 
 // ----------------------------------------------------------------------------