diff --git a/include/nuttx/nx/nxfonts.h b/include/nuttx/nx/nxfonts.h
index 5a5d81e04bc..5d5dcf0d368 100644
--- a/include/nuttx/nx/nxfonts.h
+++ b/include/nuttx/nx/nxfonts.h
@@ -124,70 +124,70 @@
 /* X11 misc fixed fonts */
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_4X6)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_4X6
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_4X6
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X7)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X7
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_5X7
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_5X8)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_5X8
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_5X8
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X9)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X9
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X9
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X10)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X10
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X10
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X12)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X12
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X12
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_6X13O)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_6X13O
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_6X13O
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X13O)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X13O
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X13O
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X14
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_7X14B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_7X14B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_7X14B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_8X13O)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_8X13O
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_8X13O
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X15
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X15B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X15B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X15B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X18
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_9X18B)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_9X18B
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_9X18B
 
 #elif defined(CONFIG_NXFONT_X11_MISC_FIXED_10X20)
-# define NXFONT_DEFAULT CONFIG_NXFONT_X11_MISC_FIXED_10X20
+# define NXFONT_DEFAULT FONTID_X11_MISC_FIXED_10X20
 
 /* Mono-space fonts */