diff --git a/include/config.h b/include/config.h
index 39be68b..f73564f 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5533,7 +5533,7 @@
 /* Support VCONN swap */
 #undef CONFIG_USBC_VCONN_SWAP
 
-#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
+#undef CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE
 #undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS
 
 /*
diff --git a/include/usb_pd.h b/include/usb_pd.h
index b107b47..eaf32e6 100644
--- a/include/usb_pd.h
+++ b/include/usb_pd.h
@@ -275,8 +275,8 @@
  */
 /* TODO(b/442730096):Debug pujjoga ErrorRecovery latency and remove this config
  */
-#ifdef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
-#define PD3_T_SENDER_RESPONSE CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS
+#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_OVERRIDE
+#define PD3_T_SENDER_RESPONSE CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS
 #else
 #define PD3_T_SENDER_RESPONSE (28 * MSEC)
 #endif
diff --git a/zephyr/Kconfig.pd b/zephyr/Kconfig.pd
index 3226612..55b5847 100644
--- a/zephyr/Kconfig.pd
+++ b/zephyr/Kconfig.pd
@@ -473,7 +473,7 @@
 	help
 	  enable PD3_T_SENDER_RESPONSE value override.
 
-config PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS
+config PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS
 	int "Value for PD3_T_SENDER_RESPONSE"
 	depends on PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
 	default 29000
diff --git a/zephyr/program/nissa/pujjoga/project.conf b/zephyr/program/nissa/pujjoga/project.conf
index e3ebb7d..12d6e18 100644
--- a/zephyr/program/nissa/pujjoga/project.conf
+++ b/zephyr/program/nissa/pujjoga/project.conf
@@ -67,4 +67,4 @@
 
 #Modifying PD3_T_SENDER_RESPONSE for pujjoga
 CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE=y
-CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS=28000
+CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS=28000
diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h
index a08b0f8..33bd11f 100644
--- a/zephyr/shim/include/config_chip.h
+++ b/zephyr/shim/include/config_chip.h
@@ -3846,15 +3846,15 @@
 #define CONFIG_USB_PD_EVENT_DRIVEN_CC_STATE
 #endif
 
-#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
-#ifdef CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
-#define CONFIG_USBC_PD3_T_SENDER_RESPONSE_OVERRIDE
+#undef CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE
+#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_OVERRIDE
+#define CONFIG_USBC_PD3_SENDER_RESPONSE_OVERRIDE
 #endif
 
-#undef CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS
-#ifdef CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS
-#define CONFIG_USBC_PD3_T_SENDER_RESPONSE_MS \
-	CONFIG_PLATFORM_EC_USBC_PD3_T_SENDER_RESPONSE_MS
+#undef CONFIG_USBC_PD3_SENDER_RESPONSE_MS
+#ifdef CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS
+#define CONFIG_USBC_PD3_SENDER_RESPONSE_MS \
+	CONFIG_PLATFORM_EC_USBC_PD3_SENDER_RESPONSE_MS
 #endif
 
 #ifdef __cplusplus