diff --git a/libs/libc/stdio/Make.defs b/libs/libc/stdio/Make.defs
index c868e30f5f..2f8c514376 100644
--- a/libs/libc/stdio/Make.defs
+++ b/libs/libc/stdio/Make.defs
@@ -54,9 +54,9 @@ endif
 
 #else
 
-CSRCS += nano_libvsprintf.c nano_ultoa_invert.c
+CSRCS += lib_libvsprintf.c lib_ultoa_invert.c
 ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-CSRCS += nano_dtoa_engine.c nano_dtoa_data.c
+CSRCS += lib_dtoa_engine.c lib_dtoa_data.c
 endif
 
 endif
diff --git a/libs/libc/stdio/nano_dtoa_data.c b/libs/libc/stdio/lib_dtoa_data.c
similarity index 98%
rename from libs/libc/stdio/nano_dtoa_data.c
rename to libs/libc/stdio/lib_dtoa_data.c
index d31ff04037..3588b6fafe 100644
--- a/libs/libc/stdio/nano_dtoa_data.c
+++ b/libs/libc/stdio/lib_dtoa_data.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nano_dtoa_data.c
+ * libs/libc/stdio/lib_dtoa_data.c
  *
  *   Copyright © 2018, Keith Packard
  *   All rights reserved.
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "nano_dtoa_engine.h"
+#include "lib_dtoa_engine.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/stdio/nano_dtoa_engine.c b/libs/libc/stdio/lib_dtoa_engine.c
similarity index 98%
rename from libs/libc/stdio/nano_dtoa_engine.c
rename to libs/libc/stdio/lib_dtoa_engine.c
index a04ce4dcce..ab6495d19e 100644
--- a/libs/libc/stdio/nano_dtoa_engine.c
+++ b/libs/libc/stdio/lib_dtoa_engine.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nanoo_dtoa_engine.c
+ * libs/libc/stdio/lib_dtoa_engine.c
  *
  *   Copyright © 2018, Keith Packard
  *   All rights reserved.
@@ -39,7 +39,7 @@
 
 #include <math.h>
 
-#include "nano_dtoa_engine.h"
+#include "lib_dtoa_engine.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/stdio/nano_dtoa_engine.h b/libs/libc/stdio/lib_dtoa_engine.h
similarity index 97%
rename from libs/libc/stdio/nano_dtoa_engine.h
rename to libs/libc/stdio/lib_dtoa_engine.h
index 9ce3f1c2d9..a60e939875 100644
--- a/libs/libc/stdio/nano_dtoa_engine.h
+++ b/libs/libc/stdio/lib_dtoa_engine.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nano_dtoa_engine.h
+ * libs/libc/stdio/lib_dtoa_engine.h
  *
  *   Copyright © 2018, Keith Packard
  *   All rights reserved.
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __LIBS_LIBC_STDIO_NANO_DTOA_ENGINE_H
-#define __LIBS_LIBC_STDIO_NANO_DTOA_ENGINE_H
+#ifndef __LIBS_LIBC_STDIO_LIB_DTOA_ENGINE_H
+#define __LIBS_LIBC_STDIO_LIB_DTOA_ENGINE_H
 
 /****************************************************************************
  * Included Files
@@ -186,4 +186,4 @@ extern const double g_dtoa_round[];
 int __dtoa_engine(double x, FAR struct dtoa_s *dtoa, int max_digits,
                   int max_decimals);
 
-#endif /* __LIBS_LIBC_STDIO_NANO_DTOA_ENGINE_H */
+#endif /* __LIBS_LIBC_STDIO_LIB_DTOA_ENGINE_H */
diff --git a/libs/libc/stdio/nano_libvsprintf.c b/libs/libc/stdio/lib_libvsprintf.c
similarity index 99%
rename from libs/libc/stdio/nano_libvsprintf.c
rename to libs/libc/stdio/lib_libvsprintf.c
index cbff2eaa96..74cfb65e07 100644
--- a/libs/libc/stdio/nano_libvsprintf.c
+++ b/libs/libc/stdio/lib_libvsprintf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nano_libvsprintf.c
+ * libs/libc/stdio/lib_libvsprintf.c
  *
  *   Copyright (c) 2002, Alexander Popov (sasho@vip.bg)
  *   Copyright (c) 2002,2004,2005 Joerg Wunsch
@@ -49,8 +49,8 @@
 
 #include <nuttx/streams.h>
 
-#include "nano_dtoa_engine.h"
-#include "nano_ultoa_invert.h"
+#include "lib_dtoa_engine.h"
+#include "lib_ultoa_invert.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/libs/libc/stdio/nano_ultoa_invert.c b/libs/libc/stdio/lib_ultoa_invert.c
similarity index 97%
rename from libs/libc/stdio/nano_ultoa_invert.c
rename to libs/libc/stdio/lib_ultoa_invert.c
index f538a5416f..91df893d41 100644
--- a/libs/libc/stdio/nano_ultoa_invert.c
+++ b/libs/libc/stdio/lib_ultoa_invert.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nano_ultoa_invert.c
+ * libs/libc/stdio/lib_ultoa_invert.c
  *
  *   Copyright © 2017, Keith Packard
  *   All rights reserved.
@@ -37,7 +37,7 @@
  * Included Files
  ****************************************************************************/
 
-#include "nano_ultoa_invert.h"
+#include "lib_ultoa_invert.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/libs/libc/stdio/nano_ultoa_invert.h b/libs/libc/stdio/lib_ultoa_invert.h
similarity index 93%
rename from libs/libc/stdio/nano_ultoa_invert.h
rename to libs/libc/stdio/lib_ultoa_invert.h
index 969ebeafd3..c7e89bdb8a 100644
--- a/libs/libc/stdio/nano_ultoa_invert.h
+++ b/libs/libc/stdio/lib_ultoa_invert.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * libs/libc/stdio/nano_ultoa_invert.h
+ * libs/libc/stdio/lib_ultoa_invert.h
  *
  *   Copyright (c) 2005, Dmitry Xmelkov
  *   All rights reserved.
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-#ifndef __LIBS_LIBC_STDIO_NANO_ULTOA_INVERT_H
-#define __LIBS_LIBC_STDIO_NANO_ULTOA_INVERT_H
+#ifndef __LIBS_LIBC_STDIO_LIB_ULTOA_INVERT_H
+#define __LIBS_LIBC_STDIO_LIB_ULTOA_INVERT_H
 
 /****************************************************************************
  * Included Files
@@ -65,4 +65,4 @@ FAR char *__ultoa_invert(unsigned long long val, FAR char *str, int base);
 FAR char *__ultoa_invert(unsigned long val, FAR char *str, int base);
 #endif
 
-#endif /* __LIBS_LIBC_STDIO_NANO_ULTOA_INVERT_H */
+#endif /* __LIBS_LIBC_STDIO_LIB_ULTOA_INVERT_H */