diff --git a/examples/README.md b/examples/README.md
index 6256857b3..369c4a6b0 100644
--- a/examples/README.md
+++ b/examples/README.md
@@ -2031,7 +2031,7 @@ specific watchdog hardware settings might require additional settings).
 - `CONFIG_WATCHDOG` – Enables watchdog timer support.
 - `CONFIG_NSH_BUILTIN_APPS` – Build this example an NSH built-in
   function.
-- `CONFIG_DRIVER_NOTE` and `CONFIG_SCHED_INSTRUMENTATION` – Allows the watcher
+- `CONFIG_DRIVERS_NOTE` and `CONFIG_SCHED_INSTRUMENTATION` – Allows the watcher
   to get the tasks' names.   
 - `CONFIG_FS_FAT` – Allows the creation of a FAT filesystem on the ramdisk
   to create a file with all the necessary info for the watched tasks. 
diff --git a/system/trace/Makefile b/system/trace/Makefile
index c5698d63f..685c92d1f 100644
--- a/system/trace/Makefile
+++ b/system/trace/Makefile
@@ -27,7 +27,7 @@ PRIORITY = $(CONFIG_SYSTEM_TRACE_PRIORITY)
 STACKSIZE = $(CONFIG_SYSTEM_TRACE_STACKSIZE)
 MODULE = $(CONFIG_SYSTEM_TRACE)
 
-ifeq ($(CONFIG_DRIVER_NOTERAM),y)
+ifeq ($(CONFIG_DRIVERS_NOTERAM),y)
   CSRCS = trace_dump.c
 endif
 
diff --git a/system/trace/trace.c b/system/trace/trace.c
index 7075dfb46..672f42e51 100644
--- a/system/trace/trace.c
+++ b/system/trace/trace.c
@@ -138,7 +138,7 @@ static int trace_cmd_start(int index, int argc, FAR char **argv,
  * Name: trace_cmd_dump
  ****************************************************************************/
 
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
 static int trace_cmd_dump(int index, int argc, FAR char **argv,
                           int notectlfd)
 {
@@ -335,7 +335,7 @@ static int trace_cmd_mode(int index, int argc, FAR char **argv,
 
       switch (argv[index][1])
         {
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
           case 'o':   /* Overwrite mode */
             owmode = enable;
             break;
@@ -431,7 +431,7 @@ static int trace_cmd_mode(int index, int argc, FAR char **argv,
          (mode.flag & NOTE_FILTER_MODE_FLAG_ENABLE) ?
           "enabled" : "disabled");
 
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
   printf(" Overwrite               : %s\n",
          owmode ? "on  (+o)" : "off (-o)");
 #endif
@@ -799,7 +799,7 @@ static void show_usage(void)
           " cmd     [-c] <command> [<args>...]  :"
                                 " Get the trace while running <command>\n"
 #endif
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
           " dump    [-a][-c][<filename>]        :"
                                 " Output the trace result\n"
           "                                       [-a] <Android SysTrace>\n"
@@ -869,7 +869,7 @@ int main(int argc, FAR char *argv[])
           i++;
           notectl_enable(false, notectlfd);
         }
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
       else if (strcmp(argv[i], "dump") == 0)
         {
           i = trace_cmd_dump(i + 1, argc, argv, notectlfd);
diff --git a/system/trace/trace.h b/system/trace/trace.h
index 63cff3e72..5d445c9ab 100644
--- a/system/trace/trace.h
+++ b/system/trace/trace.h
@@ -55,7 +55,7 @@ typedef enum
  * Public Function Prototypes
  ****************************************************************************/
 
-#ifdef CONFIG_DRIVER_NOTERAM
+#ifdef CONFIG_DRIVERS_NOTERAM
 
 /****************************************************************************
  * Name: trace_dump
@@ -97,14 +97,14 @@ bool trace_dump_get_overwrite(void);
 
 void trace_dump_set_overwrite(bool mode);
 
-#else /* CONFIG_DRIVER_NOTERAM */
+#else /* CONFIG_DRIVERS_NOTERAM */
 
 #define trace_dump(type,out)
 #define trace_dump_clear()
 #define trace_dump_get_overwrite()      0
 #define trace_dump_set_overwrite(mode)  (void)(mode)
 
-#endif /* CONFIG_DRIVER_NOTERAM */
+#endif /* CONFIG_DRIVERS_NOTERAM */
 
 #undef EXTERN
 #ifdef __cplusplus