diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c b/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c
index af7afbde11bf..b0e6b9651105 100644
--- a/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c
+++ b/bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c
@@ -75,7 +75,7 @@ static struct ifx_pwm ifx_pwm_obj[] =
     PWM0_CH7_PORT12_CONFIG,
 #endif
 
-#ifdef BSP_USING_PWM0_CH7_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     PWM0_CH3_PORT13_CONFIG,
 #endif
 };
diff --git a/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig b/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig
index a8530c34dece..12042f859b55 100644
--- a/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig
+++ b/bsp/Infineon/libraries/templates/PSOC62/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
diff --git a/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c b/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c
index 829094f5f257..944114e47301 100644
--- a/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c
+++ b/bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c
@@ -127,7 +127,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
index b5e70669498f..6d268136a89f 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
diff --git a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c
index 829094f5f257..944114e47301 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c
@@ -127,7 +127,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
index d2331656df90..2398aa9f3a4f 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
diff --git a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c
index 829094f5f257..944114e47301 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c
@@ -127,7 +127,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
index e39798ab56db..f6ba3eb1bdd8 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
@@ -270,7 +270,7 @@ menu "Board extended module Drivers"
             select BSP_USING_PWM
             select BSP_USING_PWM0
             select BSP_USING_PWM0_CH3
-            select BSP_USING_PWM0_PORT13
+            select BSP_USING_PWM0_CH3_PORT13
             default n
     endif
 
diff --git a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c
index a4599ceaa70e..3e0059e8553e 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c
@@ -128,7 +128,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig b/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
index 67de175efda2..7c83b2a75629 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
diff --git a/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c
index 829094f5f257..944114e47301 100644
--- a/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c
@@ -127,7 +127,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
index 2ce35dc70406..7b6f79b46f3d 100644
--- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
+++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
@@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
                     bool "Enable PWM0 channel3"
                     default n
                     if BSP_USING_PWM0_CH3
-                        config BSP_USING_PWM0_PORT13
-                        bool "Enable PWM0-PORT13 output pwm"
+                        config BSP_USING_PWM0_CH3_PORT13
+                        bool "Enable PWM0-CH3-PORT13 output pwm"
                         default n
                     endif
                 menuconfig BSP_USING_PWM0_CH7
@@ -270,7 +270,7 @@ menu "Board extended module Drivers"
             select BSP_USING_PWM
             select BSP_USING_PWM0
             select BSP_USING_PWM0_CH3
-            select BSP_USING_PWM0_PORT13
+            select BSP_USING_PWM0_CH3_PORT13
             default n
     endif
 
diff --git a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c
index a4599ceaa70e..3e0059e8553e 100644
--- a/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c
@@ -128,7 +128,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT13
+#ifdef BSP_USING_PWM0_CH3_PORT13
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);
 
diff --git a/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c b/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c
index cc7931fa5757..8453c646a95d 100644
--- a/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c
+++ b/bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c
@@ -128,7 +128,7 @@ void Slider_Init(void)
         return;
     }
 
-#ifdef BSP_USING_PWM0_PORT0
+#ifdef BSP_USING_PWM0_CH0_PORT0
     /* Initiate PWM*/
     pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);