diff --git a/Kconfig b/Kconfig
index 79415b4457..55d73d2a7c 100644
--- a/Kconfig
+++ b/Kconfig
@@ -230,7 +230,7 @@ mainmenu "Espressif IoT Development Framework Configuration"
 
                     CONFIG_APP_BUILD_TYPE_RAM=y
                     CONFIG_VFS_SUPPORT_TERMIOS=
-                    CONFIG_NEWLIB_NANO_FORMAT=y
+                    CONFIG_LIBC_NEWLIB_NANO_FORMAT=y
                     CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
                     CONFIG_ESP_DEBUG_STUBS_ENABLE=
                     CONFIG_ESP_ERR_TO_NAME_LOOKUP=
diff --git a/components/esp_rom/CMakeLists.txt b/components/esp_rom/CMakeLists.txt
index c1fb9041d9..aa575b9256 100644
--- a/components/esp_rom/CMakeLists.txt
+++ b/components/esp_rom/CMakeLists.txt
@@ -344,7 +344,7 @@ else() # Regular app build
             endif()
         endif()
 
-        if(CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT AND CONFIG_LIBC_NEWLIB AND CONFIG_NEWLIB_NANO_FORMAT)
+        if(CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT AND CONFIG_LIBC_NEWLIB AND CONFIG_LIBC_NEWLIB_NANO_FORMAT)
             if(NOT CONFIG_ESP_ROM_HAS_NEWLIB_32BIT_TIME AND NOT CONFIG_ESP_ROM_HAS_NEWLIB_NANO_PRINTF_FLOAT_BUG)
                 # Newlib-nano functions contains time_t related functions
                 # and cannot be used if they were compiled with 32 bit time_t
@@ -352,7 +352,7 @@ else() # Regular app build
             endif()
         endif()
 
-        if(CONFIG_ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT AND CONFIG_LIBC_NEWLIB AND NOT CONFIG_NEWLIB_NANO_FORMAT)
+        if(CONFIG_ESP_ROM_HAS_NEWLIB_NORMAL_FORMAT AND CONFIG_LIBC_NEWLIB AND NOT CONFIG_LIBC_NEWLIB_NANO_FORMAT)
             rom_linker_script("newlib-normal")
         endif()
     endif()
diff --git a/components/newlib/CMakeLists.txt b/components/newlib/CMakeLists.txt
index 3d4769ca67..02d92fdc5d 100644
--- a/components/newlib/CMakeLists.txt
+++ b/components/newlib/CMakeLists.txt
@@ -107,7 +107,7 @@ list(APPEND EXTRA_LINK_FLAGS "-u esp_libc_include_init_funcs")
 list(APPEND EXTRA_LINK_FLAGS "-u esp_libc_init_funcs")
 target_link_libraries(${COMPONENT_LIB} INTERFACE "${EXTRA_LINK_FLAGS}")
 
-if(CONFIG_NEWLIB_NANO_FORMAT)
+if(CONFIG_LIBC_NEWLIB_NANO_FORMAT)
     if(CMAKE_C_COMPILER_ID MATCHES "Clang")
         set(libc_dir_cmd ${CMAKE_C_COMPILER})
         string(REPLACE " " ";" cflags_list ${CMAKE_C_FLAGS})
diff --git a/components/newlib/src/libc.lf b/components/newlib/src/libc.lf
index 1f31f191c1..de0776283d 100644
--- a/components/newlib/src/libc.lf
+++ b/components/newlib/src/libc.lf
@@ -6,7 +6,7 @@
 
 [mapping:libc]
 archive:
-  if NEWLIB_NANO_FORMAT = y:
+  if LIBC_NEWLIB_NANO_FORMAT = y:
     libc_nano.a
   else:
     libc.a