diff --git a/Kconfig b/Kconfig
index b428f059fc..7bdd6edffd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -134,7 +134,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
                     CONFIG_VFS_SUPPORT_TERMIOS=
                     CONFIG_NEWLIB_NANO_FORMAT=y
                     CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-                    CONFIG_ESP32_DEBUG_STUBS_ENABLE=
+                    CONFIG_ESP_DEBUG_STUBS_ENABLE=
                     CONFIG_ESP_ERR_TO_NAME_LOOKUP=
 
 
diff --git a/components/esp_common/sdkconfig.rename b/components/esp_common/sdkconfig.rename
index c7f23dde57..be65c9dcde 100644
--- a/components/esp_common/sdkconfig.rename
+++ b/components/esp_common/sdkconfig.rename
@@ -25,4 +25,4 @@ CONFIG_TASK_WDT_PANIC                                   CONFIG_ESP_TASK_WDT_PANI
 CONFIG_TASK_WDT_TIMEOUT_S                               CONFIG_ESP_TASK_WDT_TIMEOUT_S
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0                    CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1                    CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1
-CONFIG_ESP32_DEBUG_STUBS_ENABLE							CONFIG_ESP_DEBUG_STUBS_ENABLE
\ No newline at end of file
+CONFIG_ESP32_DEBUG_STUBS_ENABLE                         CONFIG_ESP_DEBUG_STUBS_ENABLE
diff --git a/tools/ci/check_deprecated_kconfigs.py b/tools/ci/check_deprecated_kconfigs.py
index 91599b5d46..8fd4ba2996 100755
--- a/tools/ci/check_deprecated_kconfigs.py
+++ b/tools/ci/check_deprecated_kconfigs.py
@@ -31,7 +31,7 @@ IGNORE_DIRS = (
 )
 
 
-def _parse_path(path, sep=' '):
+def _parse_path(path, sep=None):
     ret = set()
     with open(path, 'r', encoding='utf-8') as f:
         for line in f:
diff --git a/tools/test_apps/system/gdb_loadable_elf/sdkconfig.ci.default b/tools/test_apps/system/gdb_loadable_elf/sdkconfig.ci.default
index fbc92b16d5..331e8d5ef6 100644
--- a/tools/test_apps/system/gdb_loadable_elf/sdkconfig.ci.default
+++ b/tools/test_apps/system/gdb_loadable_elf/sdkconfig.ci.default
@@ -2,5 +2,5 @@ CONFIG_APP_BUILD_TYPE_ELF_RAM=y
 CONFIG_VFS_SUPPORT_TERMIOS=n
 CONFIG_NEWLIB_NANO_FORMAT=y
 CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
-CONFIG_ESP32_DEBUG_STUBS_ENABLE=n
+CONFIG_ESP_DEBUG_STUBS_ENABLE=n
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=n