diff --git a/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PeripheralNames.h b/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PeripheralNames.h
index 17f5400299..7988f18af5 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PeripheralNames.h
+++ b/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PeripheralNames.h
@@ -23,95 +23,101 @@
 extern "C" {
 #endif
 
-// NOTE: TIMER0_BASE=(APBPERIPH_BASE + 0x10000)
-//       TIMER1_BASE=(APBPERIPH_BASE + 0x10020)
-#define NU_MODNAME(MODBASE, SUBINDEX)   ((MODBASE) | (SUBINDEX))
-#define NU_MODBASE(MODNAME)             ((MODNAME) & 0xFFFFFFE0)
-#define NU_MODSUBINDEX(MODNAME)         ((MODNAME) & 0x0000001F)
+// NOTE: Check all module base addresses (XXX_BASE in BSP) for free bit fields to define module name 
+//       which encodes module base address and module index/subindex.
+#define NU_MODSUBINDEX_Pos              0
+#define NU_MODSUBINDEX_Msk              (0x1Ful << NU_MODSUBINDEX_Pos)
+#define NU_MODINDEX_Pos                 20
+#define NU_MODINDEX_Msk                 (0xFul << NU_MODINDEX_Pos)
+
+#define NU_MODNAME(MODBASE, INDEX, SUBINDEX)    ((MODBASE) | ((INDEX) << NU_MODINDEX_Pos) | ((SUBINDEX) << NU_MODSUBINDEX_Pos))
+#define NU_MODBASE(MODNAME)                     ((MODNAME) & ~(NU_MODINDEX_Msk | NU_MODSUBINDEX_Msk))
+#define NU_MODINDEX(MODNAME)                    (((MODNAME) & NU_MODINDEX_Msk) >> NU_MODINDEX_Pos)
+#define NU_MODSUBINDEX(MODNAME)                 (((MODNAME) & NU_MODSUBINDEX_Msk) >> NU_MODSUBINDEX_Pos)
 
 #if 0
 typedef enum {
-    GPIO_A = (int) NU_MODNAME(GPIOA_BASE, 0),
-    GPIO_B = (int) NU_MODNAME(GPIOB_BASE, 0),
-    GPIO_C = (int) NU_MODNAME(GPIOC_BASE, 0),
-    GPIO_D = (int) NU_MODNAME(GPIOD_BASE, 0),
-    GPIO_E = (int) NU_MODNAME(GPIOE_BASE, 0),
-    GPIO_F = (int) NU_MODNAME(GPIOF_BASE, 0)
+    GPIO_A = (int) NU_MODNAME(GPIOA_BASE, 0, 0),
+    GPIO_B = (int) NU_MODNAME(GPIOB_BASE, 1, 0),
+    GPIO_C = (int) NU_MODNAME(GPIOC_BASE, 2, 0),
+    GPIO_D = (int) NU_MODNAME(GPIOD_BASE, 3, 0),
+    GPIO_E = (int) NU_MODNAME(GPIOE_BASE, 4, 0),
+    GPIO_F = (int) NU_MODNAME(GPIOF_BASE, 5, 0)
 } GPIOName;
 #endif
 
 typedef enum {
-    ADC_0_0 = (int) NU_MODNAME(EADC0_BASE, 0),
-    ADC_0_1 = (int) NU_MODNAME(EADC0_BASE, 1),
-    ADC_0_2 = (int) NU_MODNAME(EADC0_BASE, 2),
-    ADC_0_3 = (int) NU_MODNAME(EADC0_BASE, 3),
-    ADC_0_4 = (int) NU_MODNAME(EADC0_BASE, 4),
-    ADC_0_5 = (int) NU_MODNAME(EADC0_BASE, 5),
-    ADC_0_6 = (int) NU_MODNAME(EADC0_BASE, 6),
-    ADC_0_7 = (int) NU_MODNAME(EADC0_BASE, 7),
-    ADC_0_8 = (int) NU_MODNAME(EADC0_BASE, 8),
-    ADC_0_9 = (int) NU_MODNAME(EADC0_BASE, 9),
-    ADC_0_10 = (int) NU_MODNAME(EADC0_BASE, 10),
-    ADC_0_11 = (int) NU_MODNAME(EADC0_BASE, 11),
-    ADC_0_12 = (int) NU_MODNAME(EADC0_BASE, 12),
-    ADC_0_13 = (int) NU_MODNAME(EADC0_BASE, 13),
-    ADC_0_14 = (int) NU_MODNAME(EADC0_BASE, 14),
-    ADC_0_15 = (int) NU_MODNAME(EADC0_BASE, 15)
+    ADC_0_0 = (int) NU_MODNAME(EADC0_BASE, 0, 0),
+    ADC_0_1 = (int) NU_MODNAME(EADC0_BASE, 0, 1),
+    ADC_0_2 = (int) NU_MODNAME(EADC0_BASE, 0, 2),
+    ADC_0_3 = (int) NU_MODNAME(EADC0_BASE, 0, 3),
+    ADC_0_4 = (int) NU_MODNAME(EADC0_BASE, 0, 4),
+    ADC_0_5 = (int) NU_MODNAME(EADC0_BASE, 0, 5),
+    ADC_0_6 = (int) NU_MODNAME(EADC0_BASE, 0, 6),
+    ADC_0_7 = (int) NU_MODNAME(EADC0_BASE, 0, 7),
+    ADC_0_8 = (int) NU_MODNAME(EADC0_BASE, 0, 8),
+    ADC_0_9 = (int) NU_MODNAME(EADC0_BASE, 0, 9),
+    ADC_0_10 = (int) NU_MODNAME(EADC0_BASE, 0, 10),
+    ADC_0_11 = (int) NU_MODNAME(EADC0_BASE, 0, 11),
+    ADC_0_12 = (int) NU_MODNAME(EADC0_BASE, 0, 12),
+    ADC_0_13 = (int) NU_MODNAME(EADC0_BASE, 0, 13),
+    ADC_0_14 = (int) NU_MODNAME(EADC0_BASE, 0, 14),
+    ADC_0_15 = (int) NU_MODNAME(EADC0_BASE, 0, 15)
 } ADCName;
 
 typedef enum {
-    UART_0 = (int) NU_MODNAME(UART0_BASE, 0),
-    UART_1 = (int) NU_MODNAME(UART1_BASE, 0),
-    UART_2 = (int) NU_MODNAME(UART2_BASE, 0),
-    UART_3 = (int) NU_MODNAME(UART3_BASE, 0),
+    UART_0 = (int) NU_MODNAME(UART0_BASE, 0, 0),
+    UART_1 = (int) NU_MODNAME(UART1_BASE, 1, 0),
+    UART_2 = (int) NU_MODNAME(UART2_BASE, 2, 0),
+    UART_3 = (int) NU_MODNAME(UART3_BASE, 3, 0),
     // FIXME: board-specific
     STDIO_UART  = UART_3
 } UARTName;
 
 typedef enum {
-    SPI_0 = (int) NU_MODNAME(SPI0_BASE, 0),
-    SPI_1 = (int) NU_MODNAME(SPI1_BASE, 0),
-    SPI_2 = (int) NU_MODNAME(SPI2_BASE, 0)
+    SPI_0 = (int) NU_MODNAME(SPI0_BASE, 0, 0),
+    SPI_1 = (int) NU_MODNAME(SPI1_BASE, 1, 0),
+    SPI_2 = (int) NU_MODNAME(SPI2_BASE, 2, 0)
 } SPIName;
 
 typedef enum {
-    I2C_0 = (int) NU_MODNAME(I2C0_BASE, 0),
-    I2C_1 = (int) NU_MODNAME(I2C1_BASE, 0)
+    I2C_0 = (int) NU_MODNAME(I2C0_BASE, 0, 0),
+    I2C_1 = (int) NU_MODNAME(I2C1_BASE, 1, 0)
 } I2CName;
 
 typedef enum {
-    PWM_0_0 = (int) NU_MODNAME(PWM0_BASE, 0),
-    PWM_0_1 = (int) NU_MODNAME(PWM0_BASE, 1),
-    PWM_0_2 = (int) NU_MODNAME(PWM0_BASE, 2),
-    PWM_0_3 = (int) NU_MODNAME(PWM0_BASE, 3),
-    PWM_0_4 = (int) NU_MODNAME(PWM0_BASE, 4),
-    PWM_0_5 = (int) NU_MODNAME(PWM0_BASE, 5),
+    PWM_0_0 = (int) NU_MODNAME(PWM0_BASE, 0, 0),
+    PWM_0_1 = (int) NU_MODNAME(PWM0_BASE, 0, 1),
+    PWM_0_2 = (int) NU_MODNAME(PWM0_BASE, 0, 2),
+    PWM_0_3 = (int) NU_MODNAME(PWM0_BASE, 0, 3),
+    PWM_0_4 = (int) NU_MODNAME(PWM0_BASE, 0, 4),
+    PWM_0_5 = (int) NU_MODNAME(PWM0_BASE, 0, 5),
     
-    PWM_1_0 = (int) NU_MODNAME(PWM1_BASE, 0),
-    PWM_1_1 = (int) NU_MODNAME(PWM1_BASE, 1),
-    PWM_1_2 = (int) NU_MODNAME(PWM1_BASE, 2),
-    PWM_1_3 = (int) NU_MODNAME(PWM1_BASE, 3),
-    PWM_1_4 = (int) NU_MODNAME(PWM1_BASE, 4),
-    PWM_1_5 = (int) NU_MODNAME(PWM1_BASE, 5)
+    PWM_1_0 = (int) NU_MODNAME(PWM1_BASE, 1, 0),
+    PWM_1_1 = (int) NU_MODNAME(PWM1_BASE, 1, 1),
+    PWM_1_2 = (int) NU_MODNAME(PWM1_BASE, 1, 2),
+    PWM_1_3 = (int) NU_MODNAME(PWM1_BASE, 1, 3),
+    PWM_1_4 = (int) NU_MODNAME(PWM1_BASE, 1, 4),
+    PWM_1_5 = (int) NU_MODNAME(PWM1_BASE, 1, 5)
 } PWMName;
 
 typedef enum {
-    TIMER_0  = (int) NU_MODNAME(TMR01_BASE, 0),
-    TIMER_1  = (int) NU_MODNAME(TMR01_BASE + 0x20, 0),
-    TIMER_2  = (int) NU_MODNAME(TMR23_BASE, 0),
-    TIMER_3  = (int) NU_MODNAME(TMR23_BASE + 0x20, 0),
+    TIMER_0  = (int) NU_MODNAME(TMR01_BASE, 0, 0),
+    TIMER_1  = (int) NU_MODNAME(TMR01_BASE + 0x20, 1, 0),
+    TIMER_2  = (int) NU_MODNAME(TMR23_BASE, 2, 0),
+    TIMER_3  = (int) NU_MODNAME(TMR23_BASE + 0x20, 3, 0),
 } TIMERName;
 
 typedef enum {
-    RTC_0 = (int) NU_MODNAME(RTC_BASE, 0)
+    RTC_0 = (int) NU_MODNAME(RTC_BASE, 0, 0)
 } RTCName;
 
 typedef enum {
-    DMA_0 = (int) NU_MODNAME(PDMA_BASE, 0)
+    DMA_0 = (int) NU_MODNAME(PDMA_BASE, 0, 0)
 } DMAName;
 
 typedef enum {
-    CAN_0 = (int) NU_MODNAME(CAN0_BASE, 0)
+    CAN_0 = (int) NU_MODNAME(CAN0_BASE, 0, 0)
 } CANName;
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PinNames.h b/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PinNames.h
index a9964c135c..dd10d034cf 100644
--- a/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PinNames.h
+++ b/targets/TARGET_NUVOTON/TARGET_M451/TARGET_NUMAKER_PFM_M453/PinNames.h
@@ -22,13 +22,32 @@
 extern "C" {
 #endif
 
-#define NU_PORT_SHIFT  12
-#define NU_PINNAME_TO_PORT(name)            ((unsigned int)(name) >> NU_PORT_SHIFT)
-#define NU_PINNAME_TO_PIN(name)             ((unsigned int)(name) & ~(0xFFFFFFFF << NU_PORT_SHIFT))
-#define NU_PORT_N_PIN_TO_PINNAME(port, pin) ((((unsigned int) (port)) << (NU_PORT_SHIFT)) | ((unsigned int) (pin)))
-#define NU_PORT_BASE(port)                  ((GPIO_T *)(((uint32_t) GPIOA_BASE) + 0x40 * port))
-#define NU_MFP_POS(pin)                     ((pin % 8) * 4)
-#define NU_MFP_MSK(pin)                     (0xful << NU_MFP_POS(pin))
+#define NU_PININDEX_Pos                             0
+#define NU_PININDEX_Msk                             (0xFFul << NU_PININDEX_Pos)
+#define NU_PINPORT_Pos                              8
+#define NU_PINPORT_Msk                              (0xFul << NU_PINPORT_Pos)
+#define NU_PIN_MODINDEX_Pos                         12
+#define NU_PIN_MODINDEX_Msk                         (0xFul << NU_PIN_MODINDEX_Pos)
+#define NU_PIN_BIND_Pos                             16
+#define NU_PIN_BIND_Msk                             (0x1ul << NU_PIN_BIND_Pos)
+
+#define NU_PININDEX(PINNAME)                        (((unsigned int)(PINNAME) & NU_PININDEX_Msk) >> NU_PININDEX_Pos)
+#define NU_PINPORT(PINNAME)                         (((unsigned int)(PINNAME) & NU_PINPORT_Msk) >> NU_PINPORT_Pos)
+#define NU_PIN_BIND(PINNAME)                        (((unsigned int)(PINNAME) & NU_PIN_BIND_Msk) >> NU_PIN_BIND_Pos)
+#define NU_PIN_MODINDEX(PINNAME)                    (((unsigned int)(PINNAME) & NU_PIN_MODINDEX_Msk) >> NU_PIN_MODINDEX_Pos)
+#define NU_PINNAME(PORT, PIN)                       ((((unsigned int) (PORT)) << (NU_PINPORT_Pos)) | (((unsigned int) (PIN)) << NU_PININDEX_Pos))
+#define NU_PINNAME_BIND(PINNAME, modname)           NU_PINNAME_BIND_(NU_PINPORT(PINNAME), NU_PININDEX(PINNAME), modname)
+#define NU_PINNAME_BIND_(PORT, PIN, modname)        ((((unsigned int)(PORT)) << NU_PINPORT_Pos) | (((unsigned int)(PIN)) << NU_PININDEX_Pos) | (NU_MODINDEX(modname) << NU_PIN_MODINDEX_Pos) | NU_PIN_BIND_Msk)
+
+#define NU_PORT_BASE(port)                          ((GPIO_T *)(((uint32_t) GPIOA_BASE) + 0x40 * port))
+#define NU_MFP_POS(pin)                             ((pin % 8) * 4)
+#define NU_MFP_MSK(pin)                             (0xful << NU_MFP_POS(pin))
+
+// LEGACY
+#define NU_PINNAME_TO_PIN(PINNAME)                  NU_PININDEX(PINNAME)
+#define NU_PINNAME_TO_PORT(PINNAME)                 NU_PINPORT(PINNAME)
+#define NU_PINNAME_TO_MODSUBINDEX(PINNAME)          NU_PIN_MODINDEX(PINNAME)
+#define NU_PORT_N_PIN_TO_PINNAME(PORT, PIN)         NU_PINNAME((PORT), (PIN))
 
 typedef enum {
     PIN_INPUT,
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PeripheralNames.h b/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PeripheralNames.h
index 217d66d901..475bd62678 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PeripheralNames.h
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PeripheralNames.h
@@ -23,111 +23,117 @@
 extern "C" {
 #endif
 
-// NOTE: TIMER0_BASE=(APBPERIPH_BASE + 0x10000)
-//       TIMER1_BASE=(APBPERIPH_BASE + 0x10020)
-#define NU_MODNAME(MODBASE, SUBINDEX)   ((MODBASE) | (SUBINDEX))
-#define NU_MODBASE(MODNAME)             ((MODNAME) & 0xFFFFFFE0)
-#define NU_MODSUBINDEX(MODNAME)         ((MODNAME) & 0x0000001F)
+// NOTE: Check all module base addresses (XXX_BASE in BSP) for free bit fields to define module name 
+//       which encodes module base address and module index/subindex.
+#define NU_MODSUBINDEX_Pos              0
+#define NU_MODSUBINDEX_Msk              (0x1Ful << NU_MODSUBINDEX_Pos)
+#define NU_MODINDEX_Pos                 20
+#define NU_MODINDEX_Msk                 (0xFul << NU_MODINDEX_Pos)
+
+#define NU_MODNAME(MODBASE, INDEX, SUBINDEX)    ((MODBASE) | ((INDEX) << NU_MODINDEX_Pos) | ((SUBINDEX) << NU_MODSUBINDEX_Pos))
+#define NU_MODBASE(MODNAME)                     ((MODNAME) & ~(NU_MODINDEX_Msk | NU_MODSUBINDEX_Msk))
+#define NU_MODINDEX(MODNAME)                    (((MODNAME) & NU_MODINDEX_Msk) >> NU_MODINDEX_Pos)
+#define NU_MODSUBINDEX(MODNAME)                 (((MODNAME) & NU_MODSUBINDEX_Msk) >> NU_MODSUBINDEX_Pos)
 
 #if 0
 typedef enum {
-    GPIO_A = (int) NU_MODNAME(GPIOA_BASE, 0),
-    GPIO_B = (int) NU_MODNAME(GPIOB_BASE, 0),
-    GPIO_C = (int) NU_MODNAME(GPIOC_BASE, 0),
-    GPIO_D = (int) NU_MODNAME(GPIOD_BASE, 0),
-    GPIO_E = (int) NU_MODNAME(GPIOE_BASE, 0),
-    GPIO_F = (int) NU_MODNAME(GPIOF_BASE, 0),
-    GPIO_G = (int) NU_MODNAME(GPIOG_BASE, 0),
-    GPIO_H = (int) NU_MODNAME(GPIOH_BASE, 0),
-    GPIO_I = (int) NU_MODNAME(GPIOI_BASE, 0)
+    GPIO_A = (int) NU_MODNAME(GPIOA_BASE, 0, 0),
+    GPIO_B = (int) NU_MODNAME(GPIOB_BASE, 1, 0),
+    GPIO_C = (int) NU_MODNAME(GPIOC_BASE, 2, 0),
+    GPIO_D = (int) NU_MODNAME(GPIOD_BASE, 3, 0),
+    GPIO_E = (int) NU_MODNAME(GPIOE_BASE, 4, 0),
+    GPIO_F = (int) NU_MODNAME(GPIOF_BASE, 5, 0),
+    GPIO_G = (int) NU_MODNAME(GPIOG_BASE, 6, 0),
+    GPIO_H = (int) NU_MODNAME(GPIOH_BASE, 7, 0),
+    GPIO_I = (int) NU_MODNAME(GPIOI_BASE, 8, 0)
 } GPIOName;
 #endif
 
 typedef enum {
-    ADC_0_0 = (int) NU_MODNAME(EADC_BASE, 0),
-    ADC_0_1 = (int) NU_MODNAME(EADC_BASE, 1),
-    ADC_0_2 = (int) NU_MODNAME(EADC_BASE, 2),
-    ADC_0_3 = (int) NU_MODNAME(EADC_BASE, 3),
-    ADC_0_4 = (int) NU_MODNAME(EADC_BASE, 4),
-    ADC_0_5 = (int) NU_MODNAME(EADC_BASE, 5),
-    ADC_0_6 = (int) NU_MODNAME(EADC_BASE, 6),
-    ADC_0_7 = (int) NU_MODNAME(EADC_BASE, 7),
+    ADC_0_0 = (int) NU_MODNAME(EADC_BASE, 0, 0),
+    ADC_0_1 = (int) NU_MODNAME(EADC_BASE, 0, 1),
+    ADC_0_2 = (int) NU_MODNAME(EADC_BASE, 0, 2),
+    ADC_0_3 = (int) NU_MODNAME(EADC_BASE, 0, 3),
+    ADC_0_4 = (int) NU_MODNAME(EADC_BASE, 0, 4),
+    ADC_0_5 = (int) NU_MODNAME(EADC_BASE, 0, 5),
+    ADC_0_6 = (int) NU_MODNAME(EADC_BASE, 0, 6),
+    ADC_0_7 = (int) NU_MODNAME(EADC_BASE, 0, 7),
     
-    ADC_1_0 = (int) NU_MODNAME(EADC_BASE, 8),
-    ADC_1_1 = (int) NU_MODNAME(EADC_BASE, 9),
-    ADC_1_2 = (int) NU_MODNAME(EADC_BASE, 10),
-    ADC_1_3 = (int) NU_MODNAME(EADC_BASE, 11),
-    ADC_1_4 = (int) NU_MODNAME(EADC_BASE, 12),
-    ADC_1_5 = (int) NU_MODNAME(EADC_BASE, 13),
-    ADC_1_6 = (int) NU_MODNAME(EADC_BASE, 14),
-    ADC_1_7 = (int) NU_MODNAME(EADC_BASE, 15),
+    ADC_1_0 = (int) NU_MODNAME(EADC_BASE, 1, 0),
+    ADC_1_1 = (int) NU_MODNAME(EADC_BASE, 1, 1),
+    ADC_1_2 = (int) NU_MODNAME(EADC_BASE, 1, 2),
+    ADC_1_3 = (int) NU_MODNAME(EADC_BASE, 1, 3),
+    ADC_1_4 = (int) NU_MODNAME(EADC_BASE, 1, 4),
+    ADC_1_5 = (int) NU_MODNAME(EADC_BASE, 1, 5),
+    ADC_1_6 = (int) NU_MODNAME(EADC_BASE, 1, 6),
+    ADC_1_7 = (int) NU_MODNAME(EADC_BASE, 1, 7),
 } ADCName;
 
 typedef enum {
-    UART_0 = (int) NU_MODNAME(UART0_BASE, 0),
-    UART_1 = (int) NU_MODNAME(UART1_BASE, 0),
-    UART_2 = (int) NU_MODNAME(UART2_BASE, 0),
-    UART_3 = (int) NU_MODNAME(UART3_BASE, 0),
-    UART_4 = (int) NU_MODNAME(UART4_BASE, 0),
-    UART_5 = (int) NU_MODNAME(UART5_BASE, 0),
+    UART_0 = (int) NU_MODNAME(UART0_BASE, 0, 0),
+    UART_1 = (int) NU_MODNAME(UART1_BASE, 1, 0),
+    UART_2 = (int) NU_MODNAME(UART2_BASE, 2, 0),
+    UART_3 = (int) NU_MODNAME(UART3_BASE, 3, 0),
+    UART_4 = (int) NU_MODNAME(UART4_BASE, 4, 0),
+    UART_5 = (int) NU_MODNAME(UART5_BASE, 5, 0),
     // FIXME: board-specific
     STDIO_UART  = UART_3
 } UARTName;
 
 typedef enum {
-    SPI_0 = (int) NU_MODNAME(SPI0_BASE, 0),
-    SPI_1 = (int) NU_MODNAME(SPI1_BASE, 0),
-    SPI_2 = (int) NU_MODNAME(SPI2_BASE, 0),
-    SPI_3 = (int) NU_MODNAME(SPI3_BASE, 0)
+    SPI_0 = (int) NU_MODNAME(SPI0_BASE, 0, 0),
+    SPI_1 = (int) NU_MODNAME(SPI1_BASE, 1, 0),
+    SPI_2 = (int) NU_MODNAME(SPI2_BASE, 2, 0),
+    SPI_3 = (int) NU_MODNAME(SPI3_BASE, 3, 0)
 } SPIName;
 
 typedef enum {
-    I2C_0 = (int) NU_MODNAME(I2C0_BASE, 0),
-    I2C_1 = (int) NU_MODNAME(I2C1_BASE, 0),
-    I2C_2 = (int) NU_MODNAME(I2C2_BASE, 0),
-    I2C_3 = (int) NU_MODNAME(I2C3_BASE, 0),
-    I2C_4 = (int) NU_MODNAME(I2C4_BASE, 0)
+    I2C_0 = (int) NU_MODNAME(I2C0_BASE, 0, 0),
+    I2C_1 = (int) NU_MODNAME(I2C1_BASE, 1, 0),
+    I2C_2 = (int) NU_MODNAME(I2C2_BASE, 2, 0),
+    I2C_3 = (int) NU_MODNAME(I2C3_BASE, 3, 0),
+    I2C_4 = (int) NU_MODNAME(I2C4_BASE, 4, 0)
 } I2CName;
 
 typedef enum {
-    PWM_0_0 = (int) NU_MODNAME(PWM0_BASE, 0),
-    PWM_0_1 = (int) NU_MODNAME(PWM0_BASE, 1),
-    PWM_0_2 = (int) NU_MODNAME(PWM0_BASE, 2),
-    PWM_0_3 = (int) NU_MODNAME(PWM0_BASE, 3),
-    PWM_0_4 = (int) NU_MODNAME(PWM0_BASE, 4),
-    PWM_0_5 = (int) NU_MODNAME(PWM0_BASE, 5),
+    PWM_0_0 = (int) NU_MODNAME(PWM0_BASE, 0, 0),
+    PWM_0_1 = (int) NU_MODNAME(PWM0_BASE, 0, 1),
+    PWM_0_2 = (int) NU_MODNAME(PWM0_BASE, 0, 2),
+    PWM_0_3 = (int) NU_MODNAME(PWM0_BASE, 0, 3),
+    PWM_0_4 = (int) NU_MODNAME(PWM0_BASE, 0, 4),
+    PWM_0_5 = (int) NU_MODNAME(PWM0_BASE, 0, 5),
     
-    PWM_1_0 = (int) NU_MODNAME(PWM1_BASE, 0),
-    PWM_1_1 = (int) NU_MODNAME(PWM1_BASE, 1),
-    PWM_1_2 = (int) NU_MODNAME(PWM1_BASE, 2),
-    PWM_1_3 = (int) NU_MODNAME(PWM1_BASE, 3),
-    PWM_1_4 = (int) NU_MODNAME(PWM1_BASE, 4),
-    PWM_1_5 = (int) NU_MODNAME(PWM1_BASE, 5)
+    PWM_1_0 = (int) NU_MODNAME(PWM1_BASE, 1, 0),
+    PWM_1_1 = (int) NU_MODNAME(PWM1_BASE, 1, 1),
+    PWM_1_2 = (int) NU_MODNAME(PWM1_BASE, 1, 2),
+    PWM_1_3 = (int) NU_MODNAME(PWM1_BASE, 1, 3),
+    PWM_1_4 = (int) NU_MODNAME(PWM1_BASE, 1, 4),
+    PWM_1_5 = (int) NU_MODNAME(PWM1_BASE, 1, 5)
 } PWMName;
 
 typedef enum {
-    TIMER_0  = (int) NU_MODNAME(TIMER0_BASE, 0),
-    TIMER_1  = (int) NU_MODNAME(TIMER1_BASE, 0),
-    TIMER_2  = (int) NU_MODNAME(TIMER2_BASE, 0),
-    TIMER_3  = (int) NU_MODNAME(TIMER3_BASE, 0)
+    TIMER_0  = (int) NU_MODNAME(TIMER0_BASE, 0, 0),
+    TIMER_1  = (int) NU_MODNAME(TIMER1_BASE, 1, 0),
+    TIMER_2  = (int) NU_MODNAME(TIMER2_BASE, 2, 0),
+    TIMER_3  = (int) NU_MODNAME(TIMER3_BASE, 3, 0)
 } TIMERName;
 
 typedef enum {
-    RTC_0 = (int) NU_MODNAME(RTC_BASE, 0)
+    RTC_0 = (int) NU_MODNAME(RTC_BASE, 0, 0)
 } RTCName;
 
 typedef enum {
-    DMA_0 = (int) NU_MODNAME(PDMA_BASE, 0)
+    DMA_0 = (int) NU_MODNAME(PDMA_BASE, 0, 0)
 } DMAName;
 
 typedef enum {
-    SD_0_0 = (int) NU_MODNAME(SD_BASE, 0),
-    SD_0_1 = (int) NU_MODNAME(SD_BASE, 1)
+    SD_0_0 = (int) NU_MODNAME(SD_BASE, 0, 0),
+    SD_0_1 = (int) NU_MODNAME(SD_BASE, 0, 1)
 } SDName;
 
 typedef enum {
-    CAN_0 = (int) NU_MODNAME(CAN0_BASE, 0),
-    CAN_1 = (int) NU_MODNAME(CAN1_BASE, 0)
+    CAN_0 = (int) NU_MODNAME(CAN0_BASE, 0, 0),
+    CAN_1 = (int) NU_MODNAME(CAN1_BASE, 1, 0)
 } CANName;
 
 #ifdef __cplusplus
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PinNames.h b/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PinNames.h
index 6bba3511ce..7e874f327b 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PinNames.h
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/TARGET_NUMAKER_PFM_NUC472/PinNames.h
@@ -22,13 +22,32 @@
 extern "C" {
 #endif
 
-#define NU_PORT_SHIFT  12
-#define NU_PINNAME_TO_PORT(name)            ((unsigned int)(name) >> NU_PORT_SHIFT)
-#define NU_PINNAME_TO_PIN(name)             ((unsigned int)(name) & ~(0xFFFFFFFF << NU_PORT_SHIFT))
-#define NU_PORT_N_PIN_TO_PINNAME(port, pin) ((((unsigned int) (port)) << (NU_PORT_SHIFT)) | ((unsigned int) (pin)))
-#define NU_PORT_BASE(port)                  ((GPIO_T *)(((uint32_t) GPIOA_BASE) + 0x40 * port))
-#define NU_MFP_POS(pin)                     ((pin % 8) * 4)
-#define NU_MFP_MSK(pin)                     (0xful << NU_MFP_POS(pin))
+#define NU_PININDEX_Pos                             0
+#define NU_PININDEX_Msk                             (0xFFul << NU_PININDEX_Pos)
+#define NU_PINPORT_Pos                              8
+#define NU_PINPORT_Msk                              (0xFul << NU_PINPORT_Pos)
+#define NU_PIN_MODINDEX_Pos                         12
+#define NU_PIN_MODINDEX_Msk                         (0xFul << NU_PIN_MODINDEX_Pos)
+#define NU_PIN_BIND_Pos                             16
+#define NU_PIN_BIND_Msk                             (0x1ul << NU_PIN_BIND_Pos)
+
+#define NU_PININDEX(PINNAME)                        (((unsigned int)(PINNAME) & NU_PININDEX_Msk) >> NU_PININDEX_Pos)
+#define NU_PINPORT(PINNAME)                         (((unsigned int)(PINNAME) & NU_PINPORT_Msk) >> NU_PINPORT_Pos)
+#define NU_PIN_BIND(PINNAME)                        (((unsigned int)(PINNAME) & NU_PIN_BIND_Msk) >> NU_PIN_BIND_Pos)
+#define NU_PIN_MODINDEX(PINNAME)                    (((unsigned int)(PINNAME) & NU_PIN_MODINDEX_Msk) >> NU_PIN_MODINDEX_Pos)
+#define NU_PINNAME(PORT, PIN)                       ((((unsigned int) (PORT)) << (NU_PINPORT_Pos)) | (((unsigned int) (PIN)) << NU_PININDEX_Pos))
+#define NU_PINNAME_BIND(PINNAME, modname)           NU_PINNAME_BIND_(NU_PINPORT(PINNAME), NU_PININDEX(PINNAME), modname)
+#define NU_PINNAME_BIND_(PORT, PIN, modname)        ((((unsigned int)(PORT)) << NU_PINPORT_Pos) | (((unsigned int)(PIN)) << NU_PININDEX_Pos) | (NU_MODINDEX(modname) << NU_PIN_MODINDEX_Pos) | NU_PIN_BIND_Msk)
+
+#define NU_PORT_BASE(port)                          ((GPIO_T *)(((uint32_t) GPIOA_BASE) + 0x40 * port))
+#define NU_MFP_POS(pin)                             ((pin % 8) * 4)
+#define NU_MFP_MSK(pin)                             (0xful << NU_MFP_POS(pin))
+
+// LEGACY
+#define NU_PINNAME_TO_PIN(PINNAME)                  NU_PININDEX(PINNAME)
+#define NU_PINNAME_TO_PORT(PINNAME)                 NU_PINPORT(PINNAME)
+#define NU_PINNAME_TO_MODSUBINDEX(PINNAME)          NU_PIN_MODINDEX(PINNAME)
+#define NU_PORT_N_PIN_TO_PINNAME(PORT, PIN)         NU_PINNAME((PORT), (PIN))
 
 typedef enum {
     PIN_INPUT,
diff --git a/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c b/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
index a3039cb150..73ac4fa437 100644
--- a/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
+++ b/targets/TARGET_NUVOTON/TARGET_NUC472/analogin_api.c
@@ -70,25 +70,27 @@ void analogin_init(analogin_t *obj, PinName pin)
         EADC_Open(eadc_base, 0);
     }
     
-    uint32_t chn =  NU_MODSUBINDEX(obj->adc);
+    uint32_t smp_chn =  NU_MODSUBINDEX(obj->adc);
+    uint32_t smp_mod =  NU_MODINDEX(obj->adc) * 8 + smp_chn;
     
     // Wire pinout
     pinmap_pinout(pin, PinMap_ADC);
     
     // Configure the sample module Nmod for analog input channel Nch and software trigger source
-    EADC_ConfigSampleModule(eadc_base, chn, EADC_SOFTWARE_TRIGGER, chn % 8);
+    EADC_ConfigSampleModule(eadc_base, smp_mod, EADC_SOFTWARE_TRIGGER, smp_chn);
     
-    eadc_modinit_mask |= 1 << chn;
+    eadc_modinit_mask |= 1 << smp_mod;
 }
 
 uint16_t analogin_read_u16(analogin_t *obj)
 {
     EADC_T *eadc_base = (EADC_T *) NU_MODBASE(obj->adc);
-    uint32_t chn =  NU_MODSUBINDEX(obj->adc);
+    uint32_t smp_chn =  NU_MODSUBINDEX(obj->adc);
+    uint32_t smp_mod =  NU_MODINDEX(obj->adc) * 8 + smp_chn;
     
-    EADC_START_CONV(eadc_base, 1 << chn);
-    while (EADC_GET_DATA_VALID_FLAG(eadc_base, 1 << chn) != (1 << chn));
-    uint16_t conv_res_12 = EADC_GET_CONV_DATA(eadc_base, chn);
+    EADC_START_CONV(eadc_base, 1 << smp_mod);
+    while (EADC_GET_DATA_VALID_FLAG(eadc_base, 1 << smp_mod) != (1 << smp_mod));
+    uint16_t conv_res_12 = EADC_GET_CONV_DATA(eadc_base, smp_mod);
     // Just 12 bits are effective. Convert to 16 bits.
     // conv_res_12: 0000 b11b10b9b8 b7b6b5b4 b3b2b1b0
     // conv_res_16: b11b10b9b8 b7b6b5b4 b3b2b1b0 b11b10b9b8