From 344c92e2a419e96d55accc3eaea756837ba37de4 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 11 Jun 2016 11:55:38 -0600
Subject: [PATCH] Replace all occurrences of vdbg with vinfo

---
 examples/cc3000/telnetd_daemon.c              |   8 +-
 examples/cc3000/telnetd_driver.c              |  14 +--
 examples/chat/chat_main.c                     |  16 +--
 examples/helloxx/helloxx_main.cxx             |  12 +--
 examples/nxhello/nxhello_bkgd.c               |   8 +-
 examples/nximage/nximage_bkgd.c               |   8 +-
 examples/nxlines/nxlines_bkgd.c               |   8 +-
 examples/nxterm/nxterm_server.c               |   2 +-
 examples/nxterm/nxterm_toolbar.c              |   8 +-
 examples/nxterm/nxterm_wndo.c                 |  10 +-
 examples/nxtext/nxtext_bkgd.c                 |   8 +-
 examples/nxtext/nxtext_popup.c                |  10 +-
 examples/nxtext/nxtext_putc.c                 |   2 +-
 examples/nxtext/nxtext_server.c               |   2 +-
 examples/touchscreen/tc_main.c                |   8 +-
 fsutils/inifile/inifile.c                     |  30 +++---
 netutils/chat/chat.c                          |  34 +++---
 netutils/dhcpc/dhcpc.c                        |   6 +-
 netutils/dhcpd/dhcpd.c                        |  40 +++----
 netutils/discover/discover.c                  |   4 +-
 netutils/esp8266/esp8266.c                    |  52 ++++-----
 netutils/ftpc/ftpc_config.h                   |   2 +-
 netutils/ftpc/ftpc_getreply.c                 |   8 +-
 netutils/ftpc/ftpc_listdir.c                  |   4 +-
 netutils/ftpc/ftpc_login.c                    |   2 +-
 netutils/ftpc/ftpc_putfile.c                  |   2 +-
 netutils/ftpc/ftpc_transfer.c                 |  12 +--
 netutils/ftpd/ftpd.c                          |  14 +--
 netutils/netlib/netlib_ipmsfilter.c           |   2 +-
 netutils/netlib/netlib_listenon.c             |   2 +-
 netutils/netlib/netlib_server.c               |   2 +-
 netutils/ntpclient/ntpclient.c                |   8 +-
 netutils/ping/icmpv6_ping.c                   |   2 +-
 netutils/telnetd/telnetd_daemon.c             |   8 +-
 netutils/tftpc/tftpc_get.c                    |  14 +--
 netutils/tftpc/tftpc_internal.h               |   2 +-
 netutils/tftpc/tftpc_put.c                    |   8 +-
 netutils/thttpd/fdwatch.c                     |  48 ++++-----
 netutils/thttpd/libhttpd.c                    |  28 ++---
 netutils/thttpd/libhttpd.h                    |   6 +-
 netutils/thttpd/tdate_parse.c                 |   2 +-
 netutils/thttpd/thttpd.c                      |  22 ++--
 netutils/thttpd/thttpd_alloc.c                |   8 +-
 netutils/thttpd/thttpd_cgi.c                  |  44 ++++----
 netutils/webclient/webclient.c                |   6 +-
 netutils/webserver/httpd.c                    |  30 +++---
 nshlib/nsh_netinit.c                          |  20 ++--
 nshlib/nsh_romfsetc.c                         |   2 +-
 nshlib/nsh_telnetd.c                          |   2 +-
 platform/arduino-due/sam_cxxinitialize.c      |  12 +--
 platform/cloudctrl/stm32_cxxinitialize.c      |  12 +--
 platform/fire-stm32v2/stm32_cxxinitialize.c   |  12 +--
 platform/mikroe-stm32f4/stm32_cxxinitialize.c |  12 +--
 platform/nucleo-144/stm32_cxxinitialize.c     |  12 +--
 platform/nucleo-f303re/stm32_cxxinitialize.c  |  12 +--
 platform/nucleo-f4x1re/stm32_cxxinitialize.c  |  12 +--
 platform/nucleo-l476rg/stm32_cxxinitialize.c  |  12 +--
 .../olimex-stm32-h405/stm32_cxxinitialize.c   |  12 +--
 .../olimex-stm32-h407/stm32_cxxinitialize.c   |  12 +--
 .../olimex-stm32-p207/stm32_cxxinitialize.c   |  12 +--
 .../olimexino-stm32/stm32_cxxinitialize.c     |  12 +--
 platform/pcduino-a10/a1x_cxxinitialize.c      |  12 +--
 platform/sabre-6quad/imx_cxxinitialize.c      |  12 +--
 platform/sam3u-ek/sam_cxxinitialized.c        |  12 +--
 platform/sam4e-ek/sam_cxxinitialize.c         |  12 +--
 platform/sam4l-xplained/sam_cxxinitialize.c   |  12 +--
 .../sam4s-xplained-pro/sam_cxxinitialize.c    |  12 +--
 platform/sam4s-xplained/sam_cxxinitialize.c   |  12 +--
 platform/sama5d2-xult/sam_cxxinitialize.c     |  12 +--
 platform/sama5d3-xplained/sam_cxxinitialize.c |  12 +--
 platform/sama5d3x-ek/sam_cxxinitialize.c      |  12 +--
 platform/sama5d4-ek/sam_cxxinitialize.c       |  12 +--
 platform/samd20-xplained/sam_cxxinitialize.c  |  12 +--
 platform/samd21-xplained/sam_cxxinitialize.c  |  12 +--
 platform/same70-xplained/sam_cxxinitialize.c  |  12 +--
 platform/saml21-xplained/sam_cxxinitialize.c  |  12 +--
 platform/samv71-xult/sam_cxxinitialize.c      |  12 +--
 platform/shenzhou/stm32_cxxinitialize.c       |  12 +--
 platform/spark/stm32_cxxinitialize.c          |  12 +--
 platform/stm3220g-eval/stm32_cxxinitialize.c  |  12 +--
 platform/stm3240g-eval/stm32_cxxinitialize.c  |  12 +--
 .../stm32f3discovery/stm32_cxxinitialize.c    |  12 +--
 .../stm32f429i-disco/stm32_cxxinitialize.c    |  12 +--
 .../stm32f4discovery/stm32_cxxinitialize.c    |  12 +--
 .../stm32f746g-disco/stm32_cxxinitialize.c    |  12 +--
 .../stm32l476vg-disco/stm32_cxxinitialize.c   |  12 +--
 .../stm32ldiscovery/stm32_cxxinitialize.c     |  12 +--
 platform/teensy-lc/kl_cxxinitialize.c         |  12 +--
 .../viewtool-stm32f107/stm32_cxxinitialize.c  |  12 +--
 system/cle/cle.c                              |  24 ++---
 system/nxplayer/nxplayer.c                    |  26 ++---
 system/prun/prun.c                            |   4 +-
 system/ubloxmodem/ubloxmodem_main.c           |  20 ++--
 system/vi/vi.c                                | 100 +++++++++---------
 94 files changed, 627 insertions(+), 627 deletions(-)

diff --git a/examples/cc3000/telnetd_daemon.c b/examples/cc3000/telnetd_daemon.c
index 4045bb38c..5b9ed2ab9 100644
--- a/examples/cc3000/telnetd_daemon.c
+++ b/examples/cc3000/telnetd_daemon.c
@@ -175,7 +175,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
   for (;;)
     {
-      nllvdbg("Accepting connections on port %d\n", ntohs(daemon->port));
+      nllinfo("Accepting connections on port %d\n", ntohs(daemon->port));
 
       addrlen = sizeof(struct sockaddr_in);
       acceptsd = accept(listensd, (struct sockaddr*)&myaddr, &addrlen);
@@ -199,7 +199,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
       /* Create a character device to "wrap" the accepted socket descriptor */
 
-      nllvdbg("Creating the telnet driver\n");
+      nllinfo("Creating the telnet driver\n");
       devpath = telnetd_driver(acceptsd, daemon);
       if (devpath == NULL)
         {
@@ -209,7 +209,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
       /* Open the driver */
 
-      nllvdbg("Opening the telnet driver\n");
+      nllinfo("Opening the telnet driver\n");
       drvrfd = open(devpath, O_RDWR);
       if (drvrfd < 0)
         {
@@ -238,7 +238,7 @@ static int telnetd_daemon(int argc, char *argv[])
        * will inherit the new stdin, stdout, and stderr.
        */
 
-      nllvdbg("Starting the telnet session\n");
+      nllinfo("Starting the telnet session\n");
       pid = task_create("Telnet session", daemon->priority, daemon->stacksize,
                          daemon->entry, NULL);
       if (pid < 0)
diff --git a/examples/cc3000/telnetd_driver.c b/examples/cc3000/telnetd_driver.c
index 863270983..c890ae418 100644
--- a/examples/cc3000/telnetd_driver.c
+++ b/examples/cc3000/telnetd_driver.c
@@ -184,7 +184,7 @@ static inline void telnetd_dumpbuffer(FAR const char *msg,
   * defined or the following does nothing.
   */
 
-  nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
+  ninfodumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
 }
 #endif
 
@@ -227,12 +227,12 @@ static ssize_t telnetd_receive(FAR struct telnetd_dev_s *priv, FAR const char *s
   int nread;
   uint8_t ch;
 
-  nllvdbg("srclen: %d destlen: %d\n", srclen, destlen);
+  nllinfo("srclen: %d destlen: %d\n", srclen, destlen);
 
   for (nread = 0; srclen > 0 && nread < destlen; srclen--)
     {
       ch = *src++;
-      nllvdbg("ch=%02x state=%d\n", ch, priv->td_state);
+      nllinfo("ch=%02x state=%d\n", ch, priv->td_state);
 
       switch (priv->td_state)
         {
@@ -412,7 +412,7 @@ static int telnetd_open(FAR struct file *filep)
   int tmp;
   int ret;
 
-  nllvdbg("td_crefs: %d\n", priv->td_crefs);
+  nllinfo("td_crefs: %d\n", priv->td_crefs);
 
   /* O_NONBLOCK is not supported */
 
@@ -468,7 +468,7 @@ static int telnetd_close(FAR struct file *filep)
   FAR char *devpath;
   int ret;
 
-  nllvdbg("td_crefs: %d\n", priv->td_crefs);
+  nllinfo("td_crefs: %d\n", priv->td_crefs);
 
   /* Get exclusive access to the device structures */
 
@@ -547,7 +547,7 @@ static ssize_t telnetd_read(FAR struct file *filep, FAR char *buffer, size_t len
   FAR struct telnetd_dev_s *priv = inode->i_private;
   ssize_t ret;
 
-  nllvdbg("len: %d\n", len);
+  nllinfo("len: %d\n", len);
 
   /* First, handle the case where there are still valid bytes left in the
    * I/O buffer from the last time that read was called.  NOTE:  Much of
@@ -620,7 +620,7 @@ static ssize_t telnetd_write(FAR struct file *filep, FAR const char *buffer, siz
   char ch;
   bool eol;
 
-  nllvdbg("len: %d\n", len);
+  nllinfo("len: %d\n", len);
 
   /* Process each character from the user buffer */
 
diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c
index 4293dc555..a6799db73 100644
--- a/examples/chat/chat_main.c
+++ b/examples/chat/chat_main.c
@@ -128,7 +128,7 @@ static int chat_script_preset(FAR struct chat_app* priv, int script_number)
 {
   int ret = 0;
 
-  vdbg("preset script %d\n", script_number);
+  info("preset script %d\n", script_number);
 
   switch (script_number)
     {
@@ -340,11 +340,11 @@ int chat_main(int argc, FAR char** argv)
   priv.script_dynalloc = false;
   strncpy(priv.tty, CONFIG_EXAMPLES_CHAT_TTY_DEVNODE, CHAT_TTYNAME_SIZE-1);
 
-  vdbg("parsing the arguments\n");
+  info("parsing the arguments\n");
   ret = chat_parse_args((FAR struct chat_app*) &priv);
   if (ret < 0)
     {
-      vdbg("Command line parsing failed: code %d, errno %d\n", ret, errno);
+      info("Command line parsing failed: code %d, errno %d\n", ret, errno);
       chat_show_usage();
       exit_code = EXIT_FAILURE;
       goto with_script;
@@ -357,20 +357,20 @@ int chat_main(int argc, FAR char** argv)
       goto no_script;
     }
 
-  vdbg("opening %s\n", priv.tty);
+  info("opening %s\n", priv.tty);
   priv.ctl.fd = open(priv.tty, O_RDWR);
   if (priv.ctl.fd < 0)
     {
-      vdbg("Failed to open %s: %d\n", priv.tty, errno);
+      info("Failed to open %s: %d\n", priv.tty, errno);
       exit_code = EXIT_FAILURE;
       goto with_script;
     }
 
-  vdbg("setting up character device\n");
+  info("setting up character device\n");
   ret = chat_chardev(&priv);
   if (ret < 0)
     {
-      vdbg("Failed to open %s: %d\n", priv.tty, errno);
+      info("Failed to open %s: %d\n", priv.tty, errno);
       exit_code = EXIT_FAILURE;
       goto with_tty_dev;
     }
@@ -390,6 +390,6 @@ no_script:
   fflush(stderr);
   fflush(stdout);
 
-  vdbg("Exit code %d\n", exit_code);
+  info("Exit code %d\n", exit_code);
   return exit_code;
 }
diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx
index 9e0da72fd..909e8b31d 100644
--- a/examples/helloxx/helloxx_main.cxx
+++ b/examples/helloxx/helloxx_main.cxx
@@ -66,17 +66,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 //***************************************************************************
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index 4be77d61b..a4bff513a 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -139,7 +139,7 @@ const struct nx_callback_s g_nxhellocb =
 static void nxhello_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool more, FAR void *arg)
 {
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 }
@@ -155,7 +155,7 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 {
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -174,7 +174,7 @@ static void nxhello_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       g_nxhello.havepos = true;
       sem_post(&g_nxhello.sem);
-      gvdbg("Have xres=%d yres=%d\n", g_nxhello.xres, g_nxhello.yres);
+      ginfo("Have xres=%d yres=%d\n", g_nxhello.xres, g_nxhello.yres);
     }
 }
 
@@ -199,7 +199,7 @@ static void nxhello_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxhello_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                        FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 
    /* In this example, there is no keyboard so a keyboard event is not
     * expected.
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index 9ea5e3ace..f54e55e5e 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -180,7 +180,7 @@ const struct nx_callback_s g_nximagecb =
 static void nximage_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool more, FAR void *arg)
 {
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 }
@@ -200,7 +200,7 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 {
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -219,7 +219,7 @@ static void nximage_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       g_nximage.havepos = true;
       sem_post(&g_nximage.sem);
-      gvdbg("Have xres=%d yres=%d\n", g_nximage.xres, g_nximage.yres);
+      ginfo("Have xres=%d yres=%d\n", g_nximage.xres, g_nximage.yres);
     }
 }
 
@@ -252,7 +252,7 @@ static void nximage_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nximage_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                        FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 
    /* In this example, there is no keyboard so a keyboard event is not
     * expected.
diff --git a/examples/nxlines/nxlines_bkgd.c b/examples/nxlines/nxlines_bkgd.c
index 4cfe94b1a..fdd1f4fcb 100644
--- a/examples/nxlines/nxlines_bkgd.c
+++ b/examples/nxlines/nxlines_bkgd.c
@@ -127,7 +127,7 @@ const struct nx_callback_s g_nxlinescb =
 static void nxlines_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool more, FAR void *arg)
 {
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 }
@@ -143,7 +143,7 @@ static void nxlines_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 {
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -162,7 +162,7 @@ static void nxlines_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       g_nxlines.havepos = true;
       sem_post(&g_nxlines.sem);
-      gvdbg("Have xres=%d yres=%d\n", g_nxlines.xres, g_nxlines.yres);
+      ginfo("Have xres=%d yres=%d\n", g_nxlines.xres, g_nxlines.yres);
     }
 }
 
@@ -187,7 +187,7 @@ static void nxlines_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxlines_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                        FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 
    /* In this example, there is no keyboard so a keyboard event is not
     * expected.
diff --git a/examples/nxterm/nxterm_server.c b/examples/nxterm/nxterm_server.c
index fdb93a4b5..a3108ed65 100644
--- a/examples/nxterm/nxterm_server.c
+++ b/examples/nxterm/nxterm_server.c
@@ -157,7 +157,7 @@ int nxterm_server(int argc, char *argv[])
   /* Then start the server */
 
   ret = nx_run(dev);
-  gvdbg("nx_run returned: %d\n", errno);
+  ginfo("nx_run returned: %d\n", errno);
   return 3;
 }
 
diff --git a/examples/nxterm/nxterm_toolbar.c b/examples/nxterm/nxterm_toolbar.c
index 2182fa98c..cfa9a6706 100644
--- a/examples/nxterm/nxterm_toolbar.c
+++ b/examples/nxterm/nxterm_toolbar.c
@@ -117,7 +117,7 @@ static void nxtool_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
   nxgl_mxpixel_t color[CONFIG_NX_NPLANES];
   int ret;
 
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 
@@ -138,7 +138,7 @@ static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
                             FAR const struct nxgl_rect_s *bounds,
                             FAR void *arg)
 {
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 }
@@ -151,7 +151,7 @@ static void nxtool_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                            uint8_t buttons, FAR void *arg)
 {
-  gvdbg("hwnd=%p pos=(%d,%d) button=%02x\n", hwnd,  pos->x, pos->y, buttons);
+  ginfo("hwnd=%p pos=(%d,%d) button=%02x\n", hwnd,  pos->x, pos->y, buttons);
 }
 #endif
 
@@ -163,7 +163,7 @@ static void nxtool_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxtool_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                          FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
 }
 #endif
 
diff --git a/examples/nxterm/nxterm_wndo.c b/examples/nxterm/nxterm_wndo.c
index 8f5b09cf7..4f5c7513a 100644
--- a/examples/nxterm/nxterm_wndo.c
+++ b/examples/nxterm/nxterm_wndo.c
@@ -117,7 +117,7 @@ static void nxwndo_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
 {
   nxgl_mxpixel_t wcolor[CONFIG_NX_NPLANES];
 
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 
@@ -149,7 +149,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 {
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -173,7 +173,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       g_nxterm_vars.haveres = true;
       sem_post(&g_nxterm_vars.eventsem);
-      gvdbg("Have xres=%d yres=%d\n", g_nxterm_vars.xres, g_nxterm_vars.yres);
+      ginfo("Have xres=%d yres=%d\n", g_nxterm_vars.xres, g_nxterm_vars.yres);
     }
 }
 
@@ -185,7 +185,7 @@ static void nxwndo_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
                            uint8_t buttons, FAR void *arg)
 {
-  gvdbg("hwnd=%p pos=(%d,%d) button=%02x\n",
+  ginfo("hwnd=%p pos=(%d,%d) button=%02x\n",
         hwnd,  pos->x, pos->y, buttons);
 }
 #endif
@@ -198,7 +198,7 @@ static void nxwndo_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxwndo_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                          FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
   (void)write(1, ch, nch);
 }
 #endif
diff --git a/examples/nxtext/nxtext_bkgd.c b/examples/nxtext/nxtext_bkgd.c
index df0f70d6e..78baded2f 100644
--- a/examples/nxtext/nxtext_bkgd.c
+++ b/examples/nxtext/nxtext_bkgd.c
@@ -147,7 +147,7 @@ static void nxbg_redrawrect(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect)
 static void nxbg_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool more, FAR void *arg)
 {
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
          hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
          more ? "true" : "false");
 
@@ -167,7 +167,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -191,7 +191,7 @@ static void nxbg_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
       b_haveresolution = true;
       sem_post(&g_semevent);
-      gvdbg("Have xres=%d yres=%d\n", g_xres, g_yres);
+      ginfo("Have xres=%d yres=%d\n", g_xres, g_yres);
     }
 }
 
@@ -216,7 +216,7 @@ static void nxbg_mousein(NXWINDOW hwnd, FAR const struct nxgl_point_s *pos,
 static void nxbg_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                        FAR void *arg)
 {
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
   nxbg_write(hwnd, ch, nch);
 }
 #endif
diff --git a/examples/nxtext/nxtext_popup.c b/examples/nxtext/nxtext_popup.c
index 78e331089..3f2d85ef4 100644
--- a/examples/nxtext/nxtext_popup.c
+++ b/examples/nxtext/nxtext_popup.c
@@ -211,7 +211,7 @@ static void nxpu_redraw(NXWINDOW hwnd, FAR const struct nxgl_rect_s *rect,
                         bool more, FAR void *arg)
 {
   FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg;
-  gvdbg("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
+  ginfo("hwnd=%p rect={(%d,%d),(%d,%d)} more=%s\n",
           hwnd, rect->pt1.x, rect->pt1.y, rect->pt2.x, rect->pt2.y,
           more ? "true" : "false");
 
@@ -231,7 +231,7 @@ static void nxpu_position(NXWINDOW hwnd, FAR const struct nxgl_size_s *size,
 
   /* Report the position */
 
-  gvdbg("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
+  ginfo("hwnd=%p size=(%d,%d) pos=(%d,%d) bounds={(%d,%d),(%d,%d)}\n",
         hwnd, size->w, size->h, pos->x, pos->y,
         bounds->pt1.x, bounds->pt1.y, bounds->pt2.x, bounds->pt2.y);
 
@@ -280,7 +280,7 @@ static void nxpu_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
                        FAR void *arg)
 {
   FAR struct nxtext_state_s *st = (FAR struct nxtext_state_s *)arg;
-  gvdbg("hwnd=%p nch=%d\n", hwnd, nch);
+  ginfo("hwnd=%p nch=%d\n", hwnd, nch);
   nxpu_puts(hwnd, st, nch, ch);
 }
 #endif
@@ -345,7 +345,7 @@ NXWINDOW nxpu_open(void)
   nxpu_initstate();
 
   hwnd = nx_openwindow(g_hnx, &g_pucb, (FAR void *)&g_pustate);
-  gvdbg("hwnd=%p\n", hwnd);
+  ginfo("hwnd=%p\n", hwnd);
 
   if (!hwnd)
     {
@@ -375,7 +375,7 @@ NXWINDOW nxpu_open(void)
 
   /* Set the size of the pop-up window */
 
-  gvdbg("Set pop-up size to (%d,%d)\n", size.w, size.h);
+  ginfo("Set pop-up size to (%d,%d)\n", size.w, size.h);
   ret = nxpu_setsize(hwnd, &size);
   if (ret < 0)
     {
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index 80a8fcc18..26f7e9cdc 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -233,7 +233,7 @@ nxtext_renderglyph(FAR struct nxtext_state_s *st,
 
   /* Make sure that there is room for another glyph */
 
-  gvdbg("ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch);
+  ginfo("ch=%c [%02x]\n", isprint(ch) ? ch : '.', ch);
 
   /* Allocate the glyph (always succeeds) */
 
diff --git a/examples/nxtext/nxtext_server.c b/examples/nxtext/nxtext_server.c
index 0514b61b5..042abd6f0 100644
--- a/examples/nxtext/nxtext_server.c
+++ b/examples/nxtext/nxtext_server.c
@@ -160,7 +160,7 @@ int nxtext_server(int argc, char *argv[])
   /* Then start the server */
 
   ret = nx_run(dev);
-  gvdbg("nx_run returned: %d\n", errno);
+  ginfo("nx_run returned: %d\n", errno);
   return 3;
 }
 
diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c
index 74d08e790..fa0713c1a 100644
--- a/examples/touchscreen/tc_main.c
+++ b/examples/touchscreen/tc_main.c
@@ -173,9 +173,9 @@ int tc_main(int argc, char *argv[])
 #ifdef CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE
     /* Read one sample */
 
-    ivdbg("Reading...\n");
+    iinfo("Reading...\n");
     nbytes = read(fd, &sample, sizeof(struct mouse_report_s));
-    ivdbg("Bytes read: %d\n", nbytes);
+    iinfo("Bytes read: %d\n", nbytes);
 
     /* Handle unexpected return values */
 
@@ -213,9 +213,9 @@ int tc_main(int argc, char *argv[])
 #else
     /* Read one sample */
 
-    ivdbg("Reading...\n");
+    iinfo("Reading...\n");
     nbytes = read(fd, &sample, sizeof(struct touch_sample_s));
-    ivdbg("Bytes read: %d\n", nbytes);
+    iinfo("Bytes read: %d\n", nbytes);
 
     /* Handle unexpected return values */
 
diff --git a/fsutils/inifile/inifile.c b/fsutils/inifile/inifile.c
index d62eee9db..1dce982ff 100644
--- a/fsutils/inifile/inifile.c
+++ b/fsutils/inifile/inifile.c
@@ -69,10 +69,10 @@
 #  endif
 
 #  if CONFIG_FSUTILS_INIFILE_DEBUGLEVEL > 1
-#    define inivdbg(format, ...) \
+#    define iniinfo(format, ...) \
        printf(EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
-#    define inivdbg(x...)
+#    define iniinfo(x...)
 #  endif
 #else
 #  if CONFIG_FSUTILS_INIFILE_DEBUGLEVEL > 0
@@ -82,9 +82,9 @@
 #  endif
 
 #  if CONFIG_FSUTILS_INIFILE_DEBUGLEVEL > 1
-#    define inivdbg printf
+#    define iniinfo printf
 #  else
-#    define inivdbg (void)
+#    define iniinfo (void)
 #  endif
 #endif
 
@@ -416,7 +416,7 @@ static FAR char *
    * for/
    */
 
-  inivdbg("variable=\"%s\"\n", variable);
+  iniinfo("variable=\"%s\"\n", variable);
 
   for (;;)
     {
@@ -429,11 +429,11 @@ static FAR char *
 
       if (!found)
         {
-          inivdbg("Returning NULL\n");
+          iniinfo("Returning NULL\n");
           return NULL;
         }
 
-      inivdbg("varinfo.variable=\"%s\"\n", varinfo.variable);
+      iniinfo("varinfo.variable=\"%s\"\n", varinfo.variable);
 
       /* Does the the variable name match the one we are looking for? */
 
@@ -441,7 +441,7 @@ static FAR char *
         {
           /* Yes... then we have it! */
 
-          inivdbg("Returning \"%s\"\n", varinfo.value);
+          iniinfo("Returning \"%s\"\n", varinfo.value);
           return varinfo.value;
         }
     }
@@ -462,7 +462,7 @@ static FAR char *inifile_find_variable(FAR struct inifile_state_s *priv,
 {
   FAR char *ret = NULL;
 
-  inivdbg("section=\"%s\" variable=\"%s\"\n", section, variable);
+  iniinfo("section=\"%s\" variable=\"%s\"\n", section, variable);
 
   /* Seek to the first variable in the specified section of the INI file */
 
@@ -473,18 +473,18 @@ static FAR char *inifile_find_variable(FAR struct inifile_state_s *priv,
        */
 
       FAR char *value = inifile_find_section_variable(priv, variable);
-      inivdbg("variable_value=0x%p\n", value);
+      iniinfo("variable_value=0x%p\n", value);
 
       if (value && *value)
         {
-          inivdbg("variable_value=\"%s\"\n", value);
+          iniinfo("variable_value=\"%s\"\n", value);
           ret = value;
         }
     }
 
   /* Return the string that we found. */
 
-  inivdbg("Returning 0x%p\n", ret);
+  iniinfo("Returning 0x%p\n", ret);
   return ret;
 }
 
@@ -626,7 +626,7 @@ long inifile_read_integer(INIHANDLE handle,
 
   /* Assume failure to find the requested value */
 
-  inivdbg("section=\"%s\" variable=\"%s\" defvalue=%d\n",
+  iniinfo("section=\"%s\" variable=\"%s\" defvalue=%d\n",
           section, variable, defvalue);
 
   /* Get the value as a string first */
@@ -641,13 +641,13 @@ long inifile_read_integer(INIHANDLE handle,
        * ignore all conversion errors.
        */
 
-      inivdbg("%s=\"%s\"\n", variable, value);
+      iniinfo("%s=\"%s\"\n", variable, value);
       ret = strtol(value, NULL, 0);
     }
 
   /* Return the value that we found. */
 
-  inivdbg("Returning %d\n", ret);
+  iniinfo("Returning %d\n", ret);
   return ret;
 }
 
diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c
index 62038172b..c10873d78 100644
--- a/netutils/chat/chat.c
+++ b/netutils/chat/chat.c
@@ -155,14 +155,14 @@ static int chat_tokenise(FAR struct chat* priv,
 
     tok_pos = 0;
 
-    vdbg("%s (%d)\n", tok->string, tok->no_termin);
+    info("%s (%d)\n", tok->string, tok->no_termin);
     return 0;
   }
 
   /* Tokenizer start */
 
   DEBUGASSERT(script != NULL);
-  vdbg("%s\n", script);
+  info("%s\n", script);
 
   while (!ret && *cursor != '\0')
     {
@@ -279,7 +279,7 @@ static int chat_tokenise(FAR struct chat* priv,
       ret = tok_on_delimiter();
     }
 
-  vdbg("result %d\n", ret);
+  info("result %d\n", ret);
   return ret;
 }
 
@@ -297,7 +297,7 @@ static int chat_internalise(FAR struct chat* priv,
   while (tok && !ret)
     {
       DEBUGASSERT(tok->string);
-      vdbg("(%c) %s\n", rhs ? 'R' : 'L', tok->string);
+      info("(%c) %s\n", rhs ? 'R' : 'L', tok->string);
 
       if (!rhs)
         {
@@ -406,7 +406,7 @@ static int chat_internalise(FAR struct chat* priv,
       ret = -ENODATA;
     }
 
-  vdbg("result %d, rhs %d\n", ret, rhs);
+  info("result %d, rhs %d\n", ret, rhs);
   return ret;
 }
 
@@ -426,7 +426,7 @@ static void chat_tokens_free(FAR struct chat_token* first_tok)
       first_tok = next_tok;
     }
 
-  vdbg("tokens freed\n");
+  info("tokens freed\n");
 }
 
 /* Main parsing function. */
@@ -463,14 +463,14 @@ static int chat_readb(FAR struct chat* priv, FAR char* c, int timeout_ms)
   ret = poll(&fds, 1, timeout_ms);
   if (ret <= 0)
     {
-      vdbg("poll timed out\n");
+      info("poll timed out\n");
       return -ETIMEDOUT;
     }
 
   ret = read(priv->ctl.fd, c, 1);
   if (ret != 1)
     {
-      vdbg("read failed\n");
+      info("read failed\n");
       return -EPERM;
     }
 
@@ -479,7 +479,7 @@ static int chat_readb(FAR struct chat* priv, FAR char* c, int timeout_ms)
       fputc(*c, stderr);
     }
 
-  vdbg("read \'%c\' (0x%02X)\n", *c, *c);
+  info("read \'%c\' (0x%02X)\n", *c, *c);
   return 0;
 }
 
@@ -487,9 +487,9 @@ static void chat_flush(FAR struct chat* priv)
 {
   char c;
 
-  vdbg("starting\n");
+  info("starting\n");
   while (chat_readb(priv, (FAR char*) &c, 0) == 0);
-  vdbg("done\n");
+  info("done\n");
 }
 
 static int chat_expect(FAR struct chat* priv, FAR const char* s)
@@ -541,7 +541,7 @@ static int chat_expect(FAR struct chat* priv, FAR const char* s)
         }
     }
 
-  vdbg("result %d\n", ret);
+  info("result %d\n", ret);
   return ret;
 }
 
@@ -553,7 +553,7 @@ static int chat_send(FAR struct chat* priv, FAR const char* s)
   /* 'write' returns the number of successfully written characters */
 
   ret = write(priv->ctl.fd, s, len);
-  vdbg("wrote %d out of %d bytes of \'%s\'\n", ret, len, s);
+  info("wrote %d out of %d bytes of \'%s\'\n", ret, len, s);
   if (ret > 0)
     {
       /* Just SUCCESS */
@@ -570,7 +570,7 @@ static int chat_line_run(FAR struct chat* priv,
   int ret = 0;
   int numarg;
 
-  vdbg("type %d, rhs %s\n", line->type, line->rhs);
+  info("type %d, rhs %s\n", line->type, line->rhs);
 
   switch (line->type)
     {
@@ -617,11 +617,11 @@ static int chat_line_run(FAR struct chat* priv,
           numarg = atoi(line->rhs);
           if (numarg < 0)
             {
-              vdbg("invalid timeout string %s\n", line->rhs);
+              info("invalid timeout string %s\n", line->rhs);
             }
           else
             {
-              vdbg("timeout is %d s\n", numarg);
+              info("timeout is %d s\n", numarg);
               priv->ctl.timeout = numarg;
             }
 
@@ -678,7 +678,7 @@ static int chat_script_run(FAR struct chat* priv)
         }
     }
 
-  vdbg("Script result %d, exited on line %d\n", ret, line_num);
+  info("Script result %d, exited on line %d\n", ret, line_num);
   return ret;
 }
 
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index 4cbead2a9..5ce8c0209 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -373,7 +373,7 @@ void *dhcpc_open(const void *macaddr, int maclen)
       pdhcpc->sockfd = socket(PF_INET, SOCK_DGRAM, 0);
       if (pdhcpc->sockfd < 0)
         {
-          nvdbg("socket handle %d\n",ret);
+          ninfo("socket handle %d\n",ret);
           free(pdhcpc);
           return NULL;
         }
@@ -387,7 +387,7 @@ void *dhcpc_open(const void *macaddr, int maclen)
       ret = bind(pdhcpc->sockfd, (struct sockaddr*)&addr, sizeof(struct sockaddr_in));
       if (ret < 0)
         {
-          nvdbg("bind status %d\n",ret);
+          ninfo("bind status %d\n",ret);
           close(pdhcpc->sockfd);
           free(pdhcpc);
           return NULL;
@@ -401,7 +401,7 @@ void *dhcpc_open(const void *macaddr, int maclen)
       ret = setsockopt(pdhcpc->sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval));
       if (ret < 0)
         {
-          nvdbg("setsockopt status %d\n",ret);
+          ninfo("setsockopt status %d\n",ret);
           close(pdhcpc->sockfd);
           free(pdhcpc);
           return NULL;
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index 372528898..ab9dc631d 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -47,13 +47,13 @@
 #  define FAR
 
 #  define ndbg(...) printf(__VA_ARGS__)
-#  define nvdbg(...) printf(__VA_ARGS__)
+#  define ninfo(...) printf(__VA_ARGS__)
 
 #  define ERROR (-1)
 #  define OK    (0)
 #else
 #  include <nuttx/config.h>          /* NuttX configuration */
-#  include <debug.h>                 /* For ndbg, vdbg */
+#  include <debug.h>                 /* For ndbg, info */
 #  include <nuttx/compiler.h>        /* For CONFIG_CPP_HAVE_WARNING */
 #  include <apps/netutils/dhcpd.h>   /* Advertised DHCPD APIs */
 #endif
@@ -363,7 +363,7 @@ struct lease_s *dhcpd_setlease(const uint8_t *mac, in_addr_t ipaddr, time_t expi
   int ndx = ipaddr - CONFIG_NETUTILS_DHCPD_STARTIP;
   struct lease_s *ret = NULL;
 
-  nvdbg("ipaddr: %08x ipaddr: %08x ndx: %d MAX: %d\n",
+  ninfo("ipaddr: %08x ipaddr: %08x ndx: %d MAX: %d\n",
         ipaddr, CONFIG_NETUTILS_DHCPD_STARTIP, ndx,
         CONFIG_NETUTILS_DHCPD_MAXLEASES);
 
@@ -840,7 +840,7 @@ static inline int dhcpd_openresponder(void)
   int sockfd;
   int ret;
 
-  nvdbg("Responder: %08lx\n", ntohl(g_state.ds_serverip));
+  ninfo("Responder: %08lx\n", ntohl(g_state.ds_serverip));
 
   /* Create a socket to listen for requests from DHCP clients */
 
@@ -980,7 +980,7 @@ static int dhcpd_sendpacket(int bbroadcast)
       /* Send the minimum sized packet that includes the END option */
 
       len = (g_state.ds_optend - (uint8_t*)&g_state.ds_outpacket) + 1;
-      nvdbg("sendto %08lx:%04x len=%d\n",
+      ninfo("sendto %08lx:%04x len=%d\n",
             (long)ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port), len);
 
       ret = sendto(sockfd, &g_state.ds_outpacket, len, 0,
@@ -1004,7 +1004,7 @@ static inline int dhcpd_sendoffer(in_addr_t ipaddr, uint32_t leasetime)
 #endif
   /* IP address is in host order */
 
-  nvdbg("Sending offer: %08lx\n", (long)ipaddr);
+  ninfo("Sending offer: %08lx\n", (long)ipaddr);
 
   /* Initialize the outgoing packet */
 
@@ -1133,7 +1133,7 @@ static inline int dhcpd_discover(void)
       /* Get the IP address associated with the lease (host order) */
 
       ipaddr = dhcp_leaseipaddr(lease);
-      nvdbg("Already have lease for IP %08lx\n", (long)ipaddr);
+      ninfo("Already have lease for IP %08lx\n", (long)ipaddr);
     }
 
   /* Check if the client has requested a specific IP address */
@@ -1143,14 +1143,14 @@ static inline int dhcpd_discover(void)
       /* Use the requested IP address (host order) */
 
       ipaddr = g_state.ds_optreqip;
-      nvdbg("User requested IP %08lx\n", (long)ipaddr);
+      ninfo("User requested IP %08lx\n", (long)ipaddr);
     }
   else
     {
       /* No... allocate a new IP address (host order)*/
 
       ipaddr = dhcpd_allocipaddr();
-      nvdbg("Allocated IP %08lx\n", (long)ipaddr);
+      ninfo("Allocated IP %08lx\n", (long)ipaddr);
     }
 
   /* Did we get any IP address? */
@@ -1203,7 +1203,7 @@ static inline int dhcpd_request(void)
        */
 
       ipaddr = dhcp_leaseipaddr(lease);
-      nvdbg("Lease ipaddr: %08x Server IP: %08x Requested IP: %08x\n",
+      ninfo("Lease ipaddr: %08x Server IP: %08x Requested IP: %08x\n",
             ipaddr, g_state.ds_optserverip, g_state.ds_optreqip);
 
       if (g_state.ds_optserverip)
@@ -1270,7 +1270,7 @@ static inline int dhcpd_request(void)
 
   else if (g_state.ds_optreqip && !g_state.ds_optserverip)
     {
-      nvdbg("Server IP: %08x Requested IP: %08x\n",
+      ninfo("Server IP: %08x Requested IP: %08x\n",
             g_state.ds_optserverip, g_state.ds_optreqip);
 
       /* Is this IP address already assigned? */
@@ -1305,17 +1305,17 @@ static inline int dhcpd_request(void)
 
   if (response == DHCPACK)
     {
-      nvdbg("ACK IP %08lx\n", (long)ipaddr);
+      ninfo("ACK IP %08lx\n", (long)ipaddr);
       dhcpd_sendack(ipaddr);
     }
   else if (response == DHCPNAK)
     {
-      nvdbg("NAK IP %08lx\n", (long)ipaddr);
+      ninfo("NAK IP %08lx\n", (long)ipaddr);
       dhcpd_sendnak();
     }
   else
     {
-      nvdbg("Remaining silent IP %08lx\n", (long)ipaddr);
+      ninfo("Remaining silent IP %08lx\n", (long)ipaddr);
     }
 
   return OK;
@@ -1396,7 +1396,7 @@ static inline int dhcpd_openlistener(void)
     }
 
   g_state.ds_serverip = ((struct sockaddr_in*)&req.ifr_addr)->sin_addr.s_addr;
-  nvdbg("serverip: %08lx\n", ntohl(g_state.ds_serverip));
+  ninfo("serverip: %08lx\n", ntohl(g_state.ds_serverip));
 
   /* Bind the socket to a local port. We have to bind to INADDRY_ANY to
    * receive broadcast messages.
@@ -1431,7 +1431,7 @@ int dhcpd_run(void)
   int sockfd;
   int nbytes;
 
-  nvdbg("Started\n");
+  ninfo("Started\n");
 
   /* Initialize everything to zero */
 
@@ -1491,22 +1491,22 @@ int dhcpd_run(void)
       switch (g_state.ds_optmsgtype)
         {
           case DHCPDISCOVER:
-            nvdbg("DHCPDISCOVER\n");
+            ninfo("DHCPDISCOVER\n");
             dhcpd_discover();
             break;
 
           case DHCPREQUEST:
-            nvdbg("DHCPREQUEST\n");
+            ninfo("DHCPREQUEST\n");
             dhcpd_request();
             break;
 
           case DHCPDECLINE:
-            nvdbg("DHCPDECLINE\n");
+            ninfo("DHCPDECLINE\n");
             dhcpd_decline();
             break;
 
           case DHCPRELEASE:
-            nvdbg("DHCPRELEASE\n");
+            ninfo("DHCPRELEASE\n");
             dhcpd_release();
             break;
 
diff --git a/netutils/discover/discover.c b/netutils/discover/discover.c
index 41e7ecd1e..4ccd43ae3 100644
--- a/netutils/discover/discover.c
+++ b/netutils/discover/discover.c
@@ -185,7 +185,7 @@ static int discover_daemon(int argc, char *argv[])
   /* memset(&g_state, 0, sizeof(struct discover_state_s)); */
   discover_initresponse();
 
-  nvdbg("Started\n");
+  ninfo("Started\n");
 
   for (;;)
     {
@@ -369,7 +369,7 @@ static inline int discover_openlistener()
       return ERROR;
     }
   g_state.serverip = ((struct sockaddr_in*)&req.ifr_addr)->sin_addr.s_addr;
-  nvdbg("serverip: %08lx\n", ntohl(g_state.serverip));
+  ninfo("serverip: %08lx\n", ntohl(g_state.serverip));
 
   /* Bind the socket to a local port. We have to bind to INADDRY_ANY to
    * receive broadcast messages.
diff --git a/netutils/esp8266/esp8266.c b/netutils/esp8266/esp8266.c
index 08ccb9f7d..0e996edc6 100644
--- a/netutils/esp8266/esp8266.c
+++ b/netutils/esp8266/esp8266.c
@@ -221,13 +221,13 @@ static lesp_socket_t *get_sock(int sockfd)
 {
   if (!g_lesp_state.is_initialized)
     {
-      nvdbg("Esp8266 not initialized; can't list access points\n");
+      ninfo("Esp8266 not initialized; can't list access points\n");
       return NULL;
     }
 
   if (((unsigned int)sockfd) >= SOCKET_NBR)
     {
-      nvdbg("Esp8266 invalid sockfd\n", sockfd);
+      ninfo("Esp8266 invalid sockfd\n", sockfd);
       return NULL;
     }
 
@@ -348,7 +348,7 @@ static inline int lesp_read_ipd(void)
       return -1;
     }
 
-  nvdbg("Read %d bytes for socket %d \n", len, sockfd);
+  ninfo("Read %d bytes for socket %d \n", len, sockfd);
 
   while(len)
     {
@@ -404,7 +404,7 @@ static inline int lesp_read_ipd(void)
             {
               /* No.. the we have lost data */
 
-              nvdbg("overflow socket 0x%02X\n", b);
+              ninfo("overflow socket 0x%02X\n", b);
             }
         }
 
@@ -442,11 +442,11 @@ int lesp_vsend_cmd(FAR const IPTR char *format, va_list ap)
   if (ret >= BUF_CMD_LEN)
     {
       g_lesp_state.bufcmd[BUF_CMD_LEN-1]='\0';
-      nvdbg("Buffer too small for '%s'...\n", g_lesp_state.bufcmd);
+      ninfo("Buffer too small for '%s'...\n", g_lesp_state.bufcmd);
       ret = -1;
     }
 
-  nvdbg("Write:%s\n", g_lesp_state.bufcmd);
+  ninfo("Write:%s\n", g_lesp_state.bufcmd);
 
   ret = write(g_lesp_state.fd,g_lesp_state.bufcmd,ret);
   if (ret < 0)
@@ -508,7 +508,7 @@ static int lesp_read(int timeout_ms)
 
   if (! g_lesp_state.is_initialized)
     {
-      nvdbg("Esp8266 not initialized; can't list access points\n");
+      ninfo("Esp8266 not initialized; can't list access points\n");
       return -1;
     }
 
@@ -541,7 +541,7 @@ static int lesp_read(int timeout_ms)
     }
   while (ret <= 0);
 
-  nvdbg("read %d=>%s\n", ret, g_lesp_state.bufans);
+  ninfo("read %d=>%s\n", ret, g_lesp_state.bufans);
 
   return ret;
 }
@@ -607,7 +607,7 @@ int lesp_read_ans_ok(int timeout_ms)
           return -1;
         }
 
-      nvdbg("Got:%s\n", g_lesp_state.bufans);
+      ninfo("Got:%s\n", g_lesp_state.bufans);
 
       /* Ro quit in case of message flooding */
     }
@@ -778,7 +778,7 @@ static void *lesp_worker(void *args)
   UNUSED(args);
 
   pthread_mutex_lock(&g_lesp_state.mutex);
-  nvdbg("worker Started \n");
+  ninfo("worker Started \n");
   p->bufsize = 0;
   pthread_mutex_unlock(&g_lesp_state.mutex);
 
@@ -794,7 +794,7 @@ static void *lesp_worker(void *args)
         }
       else if (ret > 0)
         {
-          //nvdbg("c:0x%02X (%c)\n", c);
+          //ninfo("c:0x%02X (%c)\n", c);
 
           pthread_mutex_lock(&g_lesp_state.mutex);
           if (c == '\n')
@@ -808,7 +808,7 @@ static void *lesp_worker(void *args)
                 {
                   p->buf[p->bufsize] = '\0';
                   memcpy(g_lesp_state.buf,p->buf,p->bufsize+1);
-                  nvdbg("Read data:%s\n", g_lesp_state.buf);
+                  ninfo("Read data:%s\n", g_lesp_state.buf);
                   sem_post(&g_lesp_state.sem);
                   p->bufsize = 0;
                 }
@@ -819,7 +819,7 @@ static void *lesp_worker(void *args)
             }
           else
             {
-              nvdbg("Read char overflow:%c\n", c);
+              ninfo("Read char overflow:%c\n", c);
             }
 
           pthread_mutex_unlock(&g_lesp_state.mutex);
@@ -896,18 +896,18 @@ int lesp_initialize(void)
 
   if (g_lesp_state.is_initialized)
     {
-      nvdbg("Esp8266 already initialized\n");
+      ninfo("Esp8266 already initialized\n");
       pthread_mutex_unlock(&g_lesp_state.mutex);
       return 0;
     }
 
-  nvdbg("Initializing Esp8266...\n");
+  ninfo("Initializing Esp8266...\n");
 
   memset(g_lesp_state.sockets, 0, SOCKET_NBR * sizeof(lesp_socket_t));
 
   if (sem_init(&g_lesp_state.sem, 0, 0) < 0)
     {
-      nvdbg("Cannot create semaphore\n");
+      ninfo("Cannot create semaphore\n");
       pthread_mutex_unlock(&g_lesp_state.mutex);
       return -1;
     }
@@ -940,12 +940,12 @@ int lesp_initialize(void)
 
   if (ret < 0)
     {
-      nvdbg("Esp8266 initialisation failed!\n");
+      ninfo("Esp8266 initialisation failed!\n");
       return -1;
     }
 
   g_lesp_state.is_initialized = true;
-  nvdbg("Esp8266 initialized\n");
+  ninfo("Esp8266 initialized\n");
 
   return 0;
 }
@@ -1016,7 +1016,7 @@ int lesp_ap_connect(const char* ssid_name, const char* ap_key, int timeout_s)
 {
   int ret = 0;
 
-  nvdbg("Starting manual connect...\n");
+  ninfo("Starting manual connect...\n");
 
   if (! g_lesp_state.is_initialized)
     {
@@ -1035,7 +1035,7 @@ int lesp_ap_connect(const char* ssid_name, const char* ap_key, int timeout_s)
       return -1;
     }
 
-  nvdbg("Wifi connected\n");
+  ninfo("Wifi connected\n");
   return 0;
 }
 
@@ -1157,7 +1157,7 @@ int lesp_list_access_points(lesp_cb_t cb)
           continue;
         }
 
-      nvdbg("Read:%s\n", g_lesp_state.bufans);
+      ninfo("Read:%s\n", g_lesp_state.bufans);
 
       if (strcmp(g_lesp_state.bufans,"OK") == 0)
         {
@@ -1179,7 +1179,7 @@ int lesp_list_access_points(lesp_cb_t cb)
       return -1;
     }
 
-  nvdbg("Access Point list finished with %d ap founds\n", number);
+  ninfo("Access Point list finished with %d ap founds\n", number);
 
   return number;
 }
@@ -1219,7 +1219,7 @@ int lesp_socket(int domain, int type, int protocol)
   ret = -1;
   if (!g_lesp_state.is_initialized)
     {
-      nvdbg("Esp8266 not initialized; can't list access points\n");
+      ninfo("Esp8266 not initialized; can't list access points\n");
     }
   else
     {
@@ -1352,7 +1352,7 @@ ssize_t lesp_send(int sockfd, FAR const uint8_t *buf, size_t len, int flags)
 
   if (ret >= 0)
     {
-      nvdbg("Sending in socket %d, %d bytes\n", sockfd,len);
+      ninfo("Sending in socket %d, %d bytes\n", sockfd,len);
       ret = write(g_lesp_state.fd,buf,len);
     }
 
@@ -1380,7 +1380,7 @@ ssize_t lesp_send(int sockfd, FAR const uint8_t *buf, size_t len, int flags)
 
   if (ret >= 0)
     {
-      nvdbg("Sent\n");
+      ninfo("Sent\n");
     }
 
   if (ret < 0)
@@ -1400,7 +1400,7 @@ ssize_t lesp_recv(int sockfd, FAR uint8_t *buf, size_t len, int flags)
 
   if (sem_init(&sem, 0, 0) < 0)
     {
-      nvdbg("Cannot create semaphore\n");
+      ninfo("Cannot create semaphore\n");
       return -1;
     }
 
diff --git a/netutils/ftpc/ftpc_config.h b/netutils/ftpc/ftpc_config.h
index 8e8fbd2d9..59590a7b5 100644
--- a/netutils/ftpc/ftpc_config.h
+++ b/netutils/ftpc/ftpc_config.h
@@ -51,7 +51,7 @@
  * this file is to muck with some of the settings to support some debug
  * features.
  *
- * The FPT client uses common networking debug macros (ndbg and nvdbg).
+ * The FPT client uses common networking debug macros (ndbg and ninfo).
  * This can be overwhelming if there is a lot of networking debug output
  * as well.  But by defining CONFIG_DEBUG_FTPC, this file will force
  * networking debug ON only for the files within this directory.
diff --git a/netutils/ftpc/ftpc_getreply.c b/netutils/ftpc/ftpc_getreply.c
index f07f83f60..fc0f0bce5 100644
--- a/netutils/ftpc/ftpc_getreply.c
+++ b/netutils/ftpc/ftpc_getreply.c
@@ -229,7 +229,7 @@ int fptc_getreply(struct ftpc_session_s *session)
       /* No.. cancel the timer and return an error */
 
       wd_cancel(session->wdog);
-      nvdbg("Lost connection\n");
+      ninfo("Lost connection\n");
       return ERROR;
     }
 
@@ -240,11 +240,11 @@ int fptc_getreply(struct ftpc_session_s *session)
       /* No.. cancel the timer and return an error */
 
       wd_cancel(session->wdog);
-      nvdbg("ftpc_gets failed\n");
+      ninfo("ftpc_gets failed\n");
       return ERROR;
     }
 
-  nvdbg("Reply: %s\n", session->reply);
+  ninfo("Reply: %s\n", session->reply);
 
   if (session->reply[3] == '-')
     {
@@ -258,7 +258,7 @@ int fptc_getreply(struct ftpc_session_s *session)
               break;
             }
 
-          nvdbg("Reply: %s\n", session->reply);
+          ninfo("Reply: %s\n", session->reply);
         }
       while (strncmp(tmp, session->reply, 4) != 0);
     }
diff --git a/netutils/ftpc/ftpc_listdir.c b/netutils/ftpc/ftpc_listdir.c
index 5d6c6d156..6177bdd16 100644
--- a/netutils/ftpc/ftpc_listdir.c
+++ b/netutils/ftpc/ftpc_listdir.c
@@ -145,7 +145,7 @@ static void ftpc_nlstparse(FAR FILE *instream, callback_t callback,
         {
           break;
         }
-      nvdbg("File: %s\n", buffer);
+      ninfo("File: %s\n", buffer);
 
       /* Perform the callback operation */
 
@@ -349,7 +349,7 @@ FAR struct ftpc_dirlist_s *ftpc_listdir(SESSION handle,
           ndbg("Nothing found in directory\n");
           goto errout;
         }
-      nvdbg("nnames: %d\n", nnames);
+      ninfo("nnames: %d\n", nnames);
 
       /* Allocate and initialize a directory container */
 
diff --git a/netutils/ftpc/ftpc_login.c b/netutils/ftpc/ftpc_login.c
index 3d41d8a25..b2e01d268 100644
--- a/netutils/ftpc/ftpc_login.c
+++ b/netutils/ftpc/ftpc_login.c
@@ -114,7 +114,7 @@ int ftpc_login(SESSION handle, FAR struct ftpc_login_s *login)
   FTPC_CLR_PASSIVE(session);
   if (login->pasv)
     {
-      nvdbg("Setting passive mode\n");
+      ninfo("Setting passive mode\n");
       FTPC_SET_PASSIVE(session);
     }
 
diff --git a/netutils/ftpc/ftpc_putfile.c b/netutils/ftpc/ftpc_putfile.c
index 751597259..29a8f17f4 100644
--- a/netutils/ftpc/ftpc_putfile.c
+++ b/netutils/ftpc/ftpc_putfile.c
@@ -276,7 +276,7 @@ static int ftpc_sendfile(struct ftpc_session_s *session, const char *path,
                 else
                   {
                     rname = strndup(str, len-1);
-                    nvdbg("Unique filename is: %s\n",  rname);
+                    ninfo("Unique filename is: %s\n",  rname);
                   }
                 free(rname);
               }
diff --git a/netutils/ftpc/ftpc_transfer.c b/netutils/ftpc/ftpc_transfer.c
index b84cf509b..2b2d46edd 100644
--- a/netutils/ftpc/ftpc_transfer.c
+++ b/netutils/ftpc/ftpc_transfer.c
@@ -407,7 +407,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream)
   {
     /* Read data from command channel */
 
-    nvdbg("Flush cmd channel data\n");
+    ninfo("Flush cmd channel data\n");
     while (stream && fread(session->buffer, 1, CONFIG_FTP_BUFSIZE, stream) > 0);
     return OK;
   }
@@ -418,7 +418,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream)
    * <IAC IP><IAC DM>ABORT<CR><LF>
    */
 
-  nvdbg("Telnet ABORt sequence\n");
+  ninfo("Telnet ABORt sequence\n");
   ftpc_sockprintf(&session->cmd, "%c%c", TELNET_IAC, TELNET_IP); /* Interrupt process */
   ftpc_sockprintf(&session->cmd, "%c%c", TELNET_IAC, TELNET_DM); /* Telnet synch signal */
   ftpc_sockprintf(&session->cmd, "ABOR\r\n");                    /* Abort */
@@ -438,7 +438,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream)
 
   if (session->code != 226 && session->code != 426)
     {
-      nvdbg("Expected 226 or 426 reply\n");
+      ninfo("Expected 226 or 426 reply\n");
     }
   else
     {
@@ -452,7 +452,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream)
 
      if (session->code != 226 && session->code != 225)
        {
-         nvdbg("Expected 225 or 226 reply\n");
+         ninfo("Expected 225 or 226 reply\n");
        }
     }
 
@@ -493,7 +493,7 @@ FAR char *ftpc_absrpath(FAR struct ftpc_session_s *session,
 {
   FAR char *absrpath = ftpc_abspath(session, relpath,
                                     session->homerdir, session->currdir);
-  nvdbg("%s -> %s\n", relpath, absrpath);
+  ninfo("%s -> %s\n", relpath, absrpath);
   return absrpath;
 }
 
@@ -510,7 +510,7 @@ FAR char *ftpc_abslpath(FAR struct ftpc_session_s *session,
 {
   FAR char *abslpath = ftpc_abspath(session, relpath,
                                     session->homeldir, session->curldir);
-  nvdbg("%s -> %s\n", relpath, abslpath);
+  ninfo("%s -> %s\n", relpath, abslpath);
   return abslpath;
 }
 
diff --git a/netutils/ftpd/ftpd.c b/netutils/ftpd/ftpd.c
index 51cf1c315..d14f6a435 100644
--- a/netutils/ftpd/ftpd.c
+++ b/netutils/ftpd/ftpd.c
@@ -796,13 +796,13 @@ static int ftpd_rxpoll(int sd, int timeout)
 
   if (ret == 0)
     {
-      //nvdbg("poll() timed out\n");
+      //ninfo("poll() timed out\n");
       return -ETIMEDOUT;
     }
   else if (ret < 0)
     {
       int errval = errno;
-      nvdbg("poll() failed: %d\n", errval);
+      ninfo("poll() failed: %d\n", errval);
       return -errval;
     }
   else
@@ -838,13 +838,13 @@ static int ftpd_txpoll(int sd, int timeout)
 
   if (ret == 0)
     {
-      nvdbg("poll() timed out\n");
+      ninfo("poll() timed out\n");
       return -ETIMEDOUT;
     }
   else if (ret < 0)
     {
       int errval = errno;
-      nvdbg("poll() failed: %d\n", errval);
+      ninfo("poll() failed: %d\n", errval);
       return -errval;
     }
   else
@@ -911,7 +911,7 @@ static ssize_t ftpd_recv(int sd, FAR void *data, size_t size, int timeout)
       status = ftpd_rxpoll(sd, timeout);
       if (status < 0)
         {
-          nvdbg("ftpd_rxpoll: %d\n", status);
+          ninfo("ftpd_rxpoll: %d\n", status);
           return (ssize_t)status;
         }
     }
@@ -948,7 +948,7 @@ static ssize_t ftpd_send(int sd, FAR const void *data, size_t size, int timeout)
       int status = ftpd_txpoll(sd, timeout);
       if (status < 0)
         {
-          nvdbg("ftpd_rxpoll: %d\n", status);
+          ninfo("ftpd_rxpoll: %d\n", status);
           return (ssize_t)status;
         }
     }
@@ -4022,7 +4022,7 @@ static FAR void *ftpd_worker(FAR void *arg)
   uint8_t ch;
   int ret;
 
-  nvdbg("Worker started\n");
+  ninfo("Worker started\n");
   DEBUGASSERT(session);
 
   /* Configure the session sockets */
diff --git a/netutils/netlib/netlib_ipmsfilter.c b/netutils/netlib/netlib_ipmsfilter.c
index 47e2688ab..1bace33e6 100644
--- a/netutils/netlib/netlib_ipmsfilter.c
+++ b/netutils/netlib/netlib_ipmsfilter.c
@@ -85,7 +85,7 @@ int ipmsfilter(FAR const char *ifname, FAR const struct in_addr *multiaddr,
 {
   int ret = ERROR;
 
-  nvdbg("ifname: %s muliaddr: %08x fmode: %ld\n", ifname, *multiaddr, fmode);
+  ninfo("ifname: %s muliaddr: %08x fmode: %ld\n", ifname, *multiaddr, fmode);
   if (ifname && multiaddr)
     {
       /* Get a socket (only so that we get access to the INET subsystem) */
diff --git a/netutils/netlib/netlib_listenon.c b/netutils/netlib/netlib_listenon.c
index ec774c72a..c46fa672e 100644
--- a/netutils/netlib/netlib_listenon.c
+++ b/netutils/netlib/netlib_listenon.c
@@ -124,7 +124,7 @@ int netlib_listenon(uint16_t portno)
 
   /* Begin accepting connections */
 
-  nvdbg("Accepting connections on port %d\n", ntohs(portno));
+  ninfo("Accepting connections on port %d\n", ntohs(portno));
   return listensd;
 
 errout_with_socket:
diff --git a/netutils/netlib/netlib_server.c b/netutils/netlib/netlib_server.c
index 559db2fb1..42ed151dc 100644
--- a/netutils/netlib/netlib_server.c
+++ b/netutils/netlib/netlib_server.c
@@ -113,7 +113,7 @@ void netlib_server(uint16_t portno, pthread_startroutine_t handler, int stacksiz
           break;
         }
 
-      nvdbg("Connection accepted -- spawning sd=%d\n", acceptsd);
+      ninfo("Connection accepted -- spawning sd=%d\n", acceptsd);
 
       /* Configure to "linger" until all data is sent when the socket is
        * closed.
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index 570938545..5562cd615 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -274,7 +274,7 @@ static void ntpc_settime(FAR uint8_t *timestamp)
   tp.tv_nsec = nsec;
   clock_settime(CLOCK_REALTIME, &tp);
 
-  svdbg("Set time to %lu seconds: %d\n", (unsigned long)tp.tv_sec, ret);
+  sinfo("Set time to %lu seconds: %d\n", (unsigned long)tp.tv_sec, ret);
 }
 
 /****************************************************************************
@@ -373,7 +373,7 @@ static int ntpc_daemon(int argc, char **argv)
       memset(&xmit, 0, sizeof(xmit));
       xmit.lvm = MKLVM(0, 3, NTP_VERSION);
 
-      svdbg("Sending a NTP packet\n");
+      sinfo("Sending a NTP packet\n");
 
       ret = sendto(sd, &xmit, sizeof(struct ntp_datagram_s),
                    0, (FAR struct sockaddr *)&server,
@@ -415,7 +415,7 @@ static int ntpc_daemon(int argc, char **argv)
 
       if (nbytes >= (ssize_t)NTP_DATAGRAM_MINSIZE)
         {
-          svdbg("Setting time\n");
+          sinfo("Setting time\n");
           ntpc_settime(recv.recvtimestamp);
         }
 
@@ -453,7 +453,7 @@ static int ntpc_daemon(int argc, char **argv)
 
       if (g_ntpc_daemon.state == NTP_RUNNING)
         {
-          svdbg("Waiting for %d seconds\n",
+          sinfo("Waiting for %d seconds\n",
                 CONFIG_NETUTILS_NTPCLIENT_POLLDELAYSEC);
 
           (void)sleep(CONFIG_NETUTILS_NTPCLIENT_POLLDELAYSEC);
diff --git a/netutils/ping/icmpv6_ping.c b/netutils/ping/icmpv6_ping.c
index c7bfefccd..4c0136ad7 100644
--- a/netutils/ping/icmpv6_ping.c
+++ b/netutils/ping/icmpv6_ping.c
@@ -95,7 +95,7 @@ static void icmpv6_echo_request(FAR struct net_driver_s *dev,
   uint16_t reqlen;
   int i;
 
-  nllvdbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
+  nllinfo("Send ECHO request: seqno=%d\n", pstate->png_seqno);
 
   /* Set up the IPv6 header (most is probably already in place) */
 
diff --git a/netutils/telnetd/telnetd_daemon.c b/netutils/telnetd/telnetd_daemon.c
index 70e02e020..405f980cf 100644
--- a/netutils/telnetd/telnetd_daemon.c
+++ b/netutils/telnetd/telnetd_daemon.c
@@ -241,7 +241,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
   for (;;)
     {
-      nllvdbg("Accepting connections on port %d\n", ntohs(daemon->port));
+      nllinfo("Accepting connections on port %d\n", ntohs(daemon->port));
 
       addrlen = sizeof(struct sockaddr_in);
       acceptsd = accept(listensd, (struct sockaddr*)&myaddr, &addrlen);
@@ -287,7 +287,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
       /* Create a character device to "wrap" the accepted socket descriptor */
 
-      nllvdbg("Creating the telnet driver\n");
+      nllinfo("Creating the telnet driver\n");
 
       session.ts_sd         = acceptsd;
       session.ts_devpath[0] = '\0';
@@ -303,7 +303,7 @@ static int telnetd_daemon(int argc, char *argv[])
 
       /* Open the driver */
 
-      nllvdbg("Opening the telnet driver at %s\n", session.ts_devpath);
+      nllinfo("Opening the telnet driver at %s\n", session.ts_devpath);
       drvrfd = open(session.ts_devpath, O_RDWR);
       if (drvrfd < 0)
         {
@@ -328,7 +328,7 @@ static int telnetd_daemon(int argc, char *argv[])
        * will inherit the new stdin, stdout, and stderr.
        */
 
-      nllvdbg("Starting the telnet session\n");
+      nllinfo("Starting the telnet session\n");
       pid = task_create("Telnet session", daemon->priority, daemon->stacksize,
                          daemon->entry, NULL);
       if (pid < 0)
diff --git a/netutils/tftpc/tftpc_get.c b/netutils/tftpc/tftpc_get.c
index ddc518a2b..6b90024f2 100644
--- a/netutils/tftpc/tftpc_get.c
+++ b/netutils/tftpc/tftpc_get.c
@@ -99,7 +99,7 @@ static inline ssize_t tftp_write(int fd, const uint8_t *buf, size_t len)
 
       /* Handle partial writes */
 
-      nvdbg("Wrote %d bytes to file\n", nbyteswritten);
+      ninfo("Wrote %d bytes to file\n", nbyteswritten);
       left -= nbyteswritten;
       buf  += nbyteswritten;
     }
@@ -242,14 +242,14 @@ int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
 
               if (server.sin_addr.s_addr != from.sin_addr.s_addr)
                 {
-                  nvdbg("Invalid address in DATA\n");
+                  ninfo("Invalid address in DATA\n");
                   retry--;
                   continue;
                 }
 
               if (server.sin_port && server.sin_port != from.sin_port)
                 {
-                  nvdbg("Invalid port in DATA\n");
+                  ninfo("Invalid port in DATA\n");
                   len = tftp_mkerrpacket(packet, TFTP_ERR_UNKID, TFTP_ERRST_UNKID);
                   ret = tftp_sendto(sd, packet, len, &from);
                   retry--;
@@ -262,7 +262,7 @@ int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
                 {
                   /* Packet is not big enough to be parsed */
 
-                  nvdbg("Tiny data packet ignored\n");
+                  ninfo("Tiny data packet ignored\n");
                   continue;
                 }
 
@@ -271,7 +271,7 @@ int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
                 {
                   /* Opcode is not TFTP_DATA or the block number is unexpected */
 
-                  nvdbg("Parse failure\n");
+                  ninfo("Parse failure\n");
                   if (opcode > TFTP_MAXRFC1350)
                     {
                       len = tftp_mkerrpacket(packet, TFTP_ERR_ILLEGALOP, TFTP_ERRST_ILLEGALOP);
@@ -297,7 +297,7 @@ int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
 
       if (retry == TFTP_RETRIES)
         {
-          nvdbg("Retry limit exceeded\n");
+          ninfo("Retry limit exceeded\n");
           goto errout_with_sd;
         }
 
@@ -318,7 +318,7 @@ int tftpget(FAR const char *remote, FAR const char *local, in_addr_t addr,
         {
           goto errout_with_sd;
         }
-      nvdbg("ACK blockno %d\n", blockno);
+      ninfo("ACK blockno %d\n", blockno);
     }
   while (ndatabytes >= TFTP_DATASIZE);
 
diff --git a/netutils/tftpc/tftpc_internal.h b/netutils/tftpc/tftpc_internal.h
index 31a3faade..18aeabcc6 100644
--- a/netutils/tftpc/tftpc_internal.h
+++ b/netutils/tftpc/tftpc_internal.h
@@ -170,7 +170,7 @@ extern ssize_t tftp_recvfrom(int sd, void *buf, size_t len, struct sockaddr_in *
 extern ssize_t tftp_sendto(int sd, const void *buf, size_t len, struct sockaddr_in *to);
 
 #ifdef CONFIG_NETUTILS_TFTP_DUMPBUFFERS
-# define tftp_dumpbuffer(msg, buffer, nbytes) nvdbgdumpbuffer(msg, buffer, nbytes)
+# define tftp_dumpbuffer(msg, buffer, nbytes) ninfodumpbuffer(msg, buffer, nbytes)
 #else
 # define tftp_dumpbuffer(msg, buffer, nbytes)
 #endif
diff --git a/netutils/tftpc/tftpc_put.c b/netutils/tftpc/tftpc_put.c
index 1c22a5e80..492febc16 100644
--- a/netutils/tftpc/tftpc_put.c
+++ b/netutils/tftpc/tftpc_put.c
@@ -247,13 +247,13 @@ static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server,
 
                if (server->sin_addr.s_addr != from.sin_addr.s_addr)
                  {
-                   nvdbg("Invalid address in DATA\n");
+                   ninfo("Invalid address in DATA\n");
                    continue;
                  }
 
               if (*port != server->sin_port)
                 {
-                  nvdbg("Invalid port in DATA\n");
+                  ninfo("Invalid port in DATA\n");
                   packetlen = tftp_mkerrpacket(packet, TFTP_ERR_UNKID, TFTP_ERRST_UNKID);
                   (void)tftp_sendto(sd, packet, packetlen, server);
                   continue;
@@ -270,7 +270,7 @@ static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server,
 
                if (opcode != TFTP_ACK)
                  {
-                   nvdbg("Bad opcode\n");
+                   ninfo("Bad opcode\n");
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_NET)
                   if (opcode == TFTP_ERR)
                     {
@@ -291,7 +291,7 @@ static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server,
 
               /* Success! */
 
-              nvdbg("Received ACK for block %d\n", rblockno);
+              ninfo("Received ACK for block %d\n", rblockno);
               *blockno = rblockno;
               return OK;
             }
diff --git a/netutils/thttpd/fdwatch.c b/netutils/thttpd/fdwatch.c
index ba955f420..960979bc5 100644
--- a/netutils/thttpd/fdwatch.c
+++ b/netutils/thttpd/fdwatch.c
@@ -65,25 +65,25 @@
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define fwdbg(format, ...)    ndbg(format, ##__VA_ARGS__)
 #    define fwlldbg(format, ...)  nlldbg(format, ##__VA_ARGS__)
-#    define fwvdbg(format, ...)   nvdbg(format, ##__VA_ARGS__)
-#    define fwllvdbg(format, ...) nllvdbg(format, ##__VA_ARGS__)
+#    define fwinfo(format, ...)   ninfo(format, ##__VA_ARGS__)
+#    define fwllinfo(format, ...) nllinfo(format, ##__VA_ARGS__)
 #  else
 #    define fwdbg    ndbg
 #    define fwlldbg  nlldbg
-#    define fwvdbg   nvdbg
-#    define fwllvdbg nllvdbg
+#    define fwinfo   ninfo
+#    define fwllinfo nllinfo
 #  endif
 #else
 #  ifdef CONFIG_CPP_HAVE_VARARGS
 #    define fwdbg(x...)
 #    define fwlldbg(x...)
-#    define fwvdbg(x...)
-#    define fwllvdbg(x...)
+#    define fwinfo(x...)
+#    define fwllinfo(x...)
 #  else
 #    define fwdbg    (void)
 #    define fwlldbg  (void)
-#    define fwvdbg   (void)
-#    define fwllvdbg (void)
+#    define fwinfo   (void)
+#    define fwllinfo (void)
 #  endif
 #endif
 
@@ -108,18 +108,18 @@ static void fdwatch_dump(const char *msg, FAR struct fdwatch_s *fw)
 {
   int i;
 
-  fwvdbg("%s\n", msg);
-  fwvdbg("nwatched: %d nfds: %d\n", fw->nwatched, fw->nfds);
+  fwinfo("%s\n", msg);
+  fwinfo("nwatched: %d nfds: %d\n", fw->nwatched, fw->nfds);
   for (i = 0; i < fw->nwatched; i++)
   {
-    fwvdbg("%2d. pollfds: {fd: %d events: %02x revents: %02x} client: %p\n",
+    fwinfo("%2d. pollfds: {fd: %d events: %02x revents: %02x} client: %p\n",
            i+1, fw->pollfds[i].fd, fw->pollfds[i].events,
            fw->pollfds[i].revents, fw->client[i]);
   }
-  fwvdbg("nactive: %d next: %d\n", fw->nactive, fw->next);
+  fwinfo("nactive: %d next: %d\n", fw->nactive, fw->next);
   for (i = 0; i < fw->nactive; i++)
   {
-    fwvdbg("%2d. %d active\n", i, fw->ready[i]);
+    fwinfo("%2d. %d active\n", i, fw->ready[i]);
   }
 }
 #else
@@ -136,7 +136,7 @@ static int fdwatch_pollndx(FAR struct fdwatch_s *fw, int fd)
     {
       if (fw->pollfds[pollndx].fd == fd)
         {
-          fwvdbg("pollndx: %d\n", pollndx);
+          fwinfo("pollndx: %d\n", pollndx);
           return pollndx;
         }
     }
@@ -224,7 +224,7 @@ void fdwatch_uninitialize(struct fdwatch_s *fw)
 
 void fdwatch_add_fd(struct fdwatch_s *fw, int fd, void *client_data)
 {
-  fwvdbg("fd: %d client_data: %p\n", fd, client_data);
+  fwinfo("fd: %d client_data: %p\n", fd, client_data);
   fdwatch_dump("Before adding:", fw);
 
   if (fw->nwatched >= fw->nfds)
@@ -251,7 +251,7 @@ void fdwatch_del_fd(struct fdwatch_s *fw, int fd)
 {
   int pollndx;
 
-  fwvdbg("fd: %d\n", fd);
+  fwinfo("fd: %d\n", fd);
   fdwatch_dump("Before deleting:", fw);
 
   /* Get the index associated with the fd */
@@ -292,11 +292,11 @@ int fdwatch(struct fdwatch_s *fw, long timeout_msecs)
    */
 
   fdwatch_dump("Before waiting:", fw);
-  fwvdbg("Waiting... (timeout %d)\n", timeout_msecs);
+  fwinfo("Waiting... (timeout %d)\n", timeout_msecs);
   fw->nactive = 0;
   fw->next    = 0;
   ret         = poll(fw->pollfds, fw->nwatched, (int)timeout_msecs);
-  fwvdbg("Awakened: %d\n", ret);
+  fwinfo("Awakened: %d\n", ret);
 
   /* Look through all of the descriptors and make a list of all of them than
    * have activity.
@@ -312,7 +312,7 @@ int fdwatch(struct fdwatch_s *fw, long timeout_msecs)
             {
               /* Yes... save it in a shorter list */
 
-              fwvdbg("pollndx: %d fd: %d revents: %04x\n",
+              fwinfo("pollndx: %d fd: %d revents: %04x\n",
                     i, fw->pollfds[i].fd, fw->pollfds[i].revents);
 
               fw->ready[fw->nactive++] = fw->pollfds[i].fd;
@@ -328,7 +328,7 @@ int fdwatch(struct fdwatch_s *fw, long timeout_msecs)
 
   /* Return the number of descriptors with activity */
 
-  fwvdbg("nactive: %d\n", fw->nactive);
+  fwinfo("nactive: %d\n", fw->nactive);
   fdwatch_dump("After wakeup:", fw);
   return ret;
 }
@@ -339,7 +339,7 @@ int fdwatch_check_fd(struct fdwatch_s *fw, int fd)
 {
   int pollndx;
 
-  fwvdbg("fd: %d\n", fd);
+  fwinfo("fd: %d\n", fd);
   fdwatch_dump("Checking:", fw);
 
   /* Get the index associated with the fd */
@@ -350,7 +350,7 @@ int fdwatch_check_fd(struct fdwatch_s *fw, int fd)
       return fw->pollfds[pollndx].revents & (POLLIN | POLLHUP | POLLNVAL);
     }
 
-  fwvdbg("POLLERR fd: %d\n", fd);
+  fwinfo("POLLERR fd: %d\n", fd);
   return 0;
 }
 
@@ -359,11 +359,11 @@ void *fdwatch_get_next_client_data(struct fdwatch_s *fw)
   fdwatch_dump("Before getting client data:", fw);
   if (fw->next >= fw->nwatched)
     {
-      fwvdbg("All client data returned: %d\n", fw->next);
+      fwinfo("All client data returned: %d\n", fw->next);
       return (void*)-1;
     }
 
-  fwvdbg("client_data[%d]: %p\n", fw->next, fw->client[fw->next]);
+  fwinfo("client_data[%d]: %p\n", fw->next, fw->client[fw->next]);
   return fw->client[fw->next++];
 }
 
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 8d9b32031..04311f95c 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -231,7 +231,7 @@ static int initialize_listen_socket(httpd_sockaddr *saP)
 
   /* Create socket. */
 
-  nvdbg("Create listen socket\n");
+  ninfo("Create listen socket\n");
   listen_fd = socket(saP->sin_family, SOCK_STREAM, 0);
   if (listen_fd < 0)
     {
@@ -418,7 +418,7 @@ static void send_response(httpd_conn *hc, int status, const char *title, const c
   char defanged[72];
   char buf[128];
 
-  nvdbg("title: \"%s\" form: \"%s\"\n", title, form);
+  ninfo("title: \"%s\" form: \"%s\"\n", title, form);
 
   send_mime(hc, status, title, "", extraheads, "text/html; charset=%s", (off_t)-1, (time_t)0);
   add_response(hc, html_html);
@@ -1116,7 +1116,7 @@ static char *expand_filename(char *path, char **restP, bool tildemapped)
   char *cp2;
   int i;
 
-  nvdbg("path: \"%s\"\n", path);
+  ninfo("path: \"%s\"\n", path);
 #if 0 // REVISIT
   /* We need to do the pathinfo check.  we do a single stat() of the whole
    * filename - if it exists, then we return it as is with nothing in restP.
@@ -1302,7 +1302,7 @@ static char *expand_filename(char *path, char **restP, bool tildemapped)
       (void)strcpy(checked, httpd_root);
     }
 
-  nvdbg("checked: \"%s\"\n", checked);
+  ninfo("checked: \"%s\"\n", checked);
   return checked;
 }
 
@@ -2101,7 +2101,7 @@ FAR httpd_server *httpd_initialize(FAR httpd_sockaddr *sa)
 #else
   hs->hostname = httpd_strdup(httpd_ntoa(sa));
 #endif
-  nvdbg("hostname: %s\n", hs->hostname);
+  ninfo("hostname: %s\n", hs->hostname);
 
   if (!hs->hostname)
     {
@@ -2213,7 +2213,7 @@ void httpd_send_err(httpd_conn *hc, int status, const char *title, const char *e
                      "%s/%s/err%d.html", hc->hostdir, CONFIG_THTTPD_ERROR_DIRECTORY, status);
       if (send_err_file(hc, status, title, extraheads, filename))
         {
-          nvdbg("Sent VHOST error file\n");
+          ninfo("Sent VHOST error file\n");
           return;
         }
     }
@@ -2224,7 +2224,7 @@ void httpd_send_err(httpd_conn *hc, int status, const char *title, const char *e
   (void)snprintf(filename, sizeof(filename), "%s/err%d.html", CONFIG_THTTPD_ERROR_DIRECTORY, status);
   if (send_err_file(hc, status, title, extraheads, filename))
     {
-      nvdbg("Sent server-wide error page\n");
+      ninfo("Sent server-wide error page\n");
       return;
     }
 
@@ -2293,7 +2293,7 @@ int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc)
 
   /* Accept the new connection. */
 
-  nvdbg("accept() new connection on listen_fd %d\n", listen_fd);
+  ninfo("accept() new connection on listen_fd %d\n", listen_fd);
   sz = sizeof(sa);
   hc->conn_fd = accept(listen_fd, (struct sockaddr*)&sa, &sz);
   if (hc->conn_fd < 0)
@@ -2368,7 +2368,7 @@ int httpd_get_conn(httpd_server *hs, int listen_fd, httpd_conn *hc)
   hc->should_linger     = false;
   hc->file_fd           = -1;
 
-  nvdbg("New connection accepted on %d\n", hc->conn_fd);
+  ninfo("New connection accepted on %d\n", hc->conn_fd);
   return GC_OK;
 }
 
@@ -2597,7 +2597,7 @@ int httpd_parse_request(httpd_conn *hc)
 
   hc->checked_idx = 0;          /* reset */
   method_str      = bufgets(hc);
-  nvdbg("method_str: \"%s\"\n", method_str);
+  ninfo("method_str: \"%s\"\n", method_str);
 
   url = strpbrk(method_str, " \t\012\015");
   if (!url)
@@ -2609,10 +2609,10 @@ int httpd_parse_request(httpd_conn *hc)
 
   *url++ = '\0';
   url   += strspn(url, " \t\012\015");
-  nvdbg("url: \"%s\"\n", url);
+  ninfo("url: \"%s\"\n", url);
 
   protocol = strpbrk(url, " \t\012\015");
-  nvdbg("protocol: \"%s\"\n", protocol ? protocol : "<null>");
+  ninfo("protocol: \"%s\"\n", protocol ? protocol : "<null>");
 
   if (!protocol)
     {
@@ -3025,7 +3025,7 @@ int httpd_parse_request(httpd_conn *hc)
   (void)strcpy(hc->expnfilename, cp);
   httpd_realloc_str(&hc->pathinfo, &hc->maxpathinfo, strlen(pi));
   (void)strcpy(hc->pathinfo, pi);
-  nvdbg("expnfilename: \"%s\" pathinfo: \"%s\"\n", hc->expnfilename, hc->pathinfo);
+  ninfo("expnfilename: \"%s\" pathinfo: \"%s\"\n", hc->expnfilename, hc->pathinfo);
 
   /* Remove pathinfo stuff from the original filename too. */
 
@@ -3123,7 +3123,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowP)
   char *pi;
   int i;
 
-  nvdbg("File: \"%s\"\n", hc->expnfilename);
+  ninfo("File: \"%s\"\n", hc->expnfilename);
   expnlen = strlen(hc->expnfilename);
 
   if (hc->method != METHOD_GET && hc->method != METHOD_HEAD &&
diff --git a/netutils/thttpd/libhttpd.h b/netutils/thttpd/libhttpd.h
index d83c2c419..275473ba9 100644
--- a/netutils/thttpd/libhttpd.h
+++ b/netutils/thttpd/libhttpd.h
@@ -77,7 +77,7 @@
 #  if !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_NET)
 #    undef CONFIG_THTTPD_BADREQUEST
 #  else
-#    define BADREQUEST(s) nvdbg("Bad Request: \"%s\"\n", s)
+#    define BADREQUEST(s) ninfo("Bad Request: \"%s\"\n", s)
 #  endif
 #endif
 
@@ -94,7 +94,7 @@
 #  if !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_NET)
 #    undef CONFIG_THTTPD_NOTIMPLEMENTED
 #  else
-#    define NOTIMPLEMENTED(s) nvdbg("Not Implemented: \"%s\"\n", s)
+#    define NOTIMPLEMENTED(s) ninfo("Not Implemented: \"%s\"\n", s)
 #  endif
 #endif
 
@@ -111,7 +111,7 @@
 #  if !defined(CONFIG_DEBUG_INFO) || !defined(CONFIG_DEBUG_NET)
 #    undef CONFIG_THTTPD_INTERNALERROR
 #  else
-#    define INTERNALERROR(s) nvdbg("Internal Error: \"%s\"\n", s)
+#    define INTERNALERROR(s) ninfo("Internal Error: \"%s\"\n", s)
 #  endif
 #endif
 
diff --git a/netutils/thttpd/tdate_parse.c b/netutils/thttpd/tdate_parse.c
index e91ab5ebb..6287cbd6f 100644
--- a/netutils/thttpd/tdate_parse.c
+++ b/netutils/thttpd/tdate_parse.c
@@ -200,7 +200,7 @@ time_t tdate_parse(char *str)
   long tm_wday;
 #endif
 
-  nvdbg("str: \"%s\"\n", str);
+  ninfo("str: \"%s\"\n", str);
 
   /* Initialize. */
 
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index ea7abc94c..f2b657d51 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -178,7 +178,7 @@ static int handle_newconnect(FAR struct timeval *tv, int listen_fd)
    * fast as possible so we don't overrun the listen queue.
    */
 
-  nvdbg("New connection(s) on listen_fd %d\n", listen_fd);
+  ninfo("New connection(s) on listen_fd %d\n", listen_fd);
   for (;;)
     {
       /* Get the next free connection from the free list */
@@ -234,7 +234,7 @@ static int handle_newconnect(FAR struct timeval *tv, int listen_fd)
           break;
         }
 
-      nvdbg("New connection fd %d\n", conn->hc->conn_fd);
+      ninfo("New connection fd %d\n", conn->hc->conn_fd);
 
       /* Remove the connection entry from the free list */
 
@@ -426,7 +426,7 @@ static void handle_send(struct connect_s *conn, struct timeval *tv)
 
   while (conn->offset < conn->end_offset)
     {
-      nvdbg("offset: %d end_offset: %d bytes_sent: %d\n",
+      ninfo("offset: %d end_offset: %d bytes_sent: %d\n",
             conn->offset, conn->end_offset, conn->hc->bytes_sent);
 
       /* Fill the rest of the response buffer with file data */
@@ -437,7 +437,7 @@ static void handle_send(struct connect_s *conn, struct timeval *tv)
           ndbg("File read error: %d\n", errno);
           goto errout_clear_connection;
         }
-      nvdbg("Read %d bytes, buflen %d\n", nread, hc->buflen);
+      ninfo("Read %d bytes, buflen %d\n", nread, hc->buflen);
 
       /* Send the buffer */
 
@@ -465,13 +465,13 @@ static void handle_send(struct connect_s *conn, struct timeval *tv)
 
           conn->offset         += nwritten;
           conn->hc->bytes_sent += nwritten;
-          nvdbg("Wrote %d bytes\n", nwritten);
+          ninfo("Wrote %d bytes\n", nwritten);
         }
     }
 
   /* The file transfer is complete -- finish the connection */
 
-  nvdbg("Finish connection\n");
+  ninfo("Finish connection\n");
   finish_connection(conn, tv);
   return;
 
@@ -616,7 +616,7 @@ static void linger_clear_connection(ClientData client_data, struct timeval *nowP
 {
   struct connect_s *conn;
 
-  nvdbg("Clear connection\n");
+  ninfo("Clear connection\n");
   conn = (struct connect_s *) client_data.p;
   conn->linger_timer = NULL;
   really_clear_connection(conn);
@@ -663,7 +663,7 @@ int thttpd_main(int argc, char **argv)
   int ret;
 #endif
 
-  nvdbg("THTTPD started\n");
+  ninfo("THTTPD started\n");
 
   /* Setup host address */
 
@@ -702,7 +702,7 @@ int thttpd_main(int argc, char **argv)
 
   /* Initialize the HTTP layer */
 
-  nvdbg("Calling httpd_initialize()\n");
+  ninfo("Calling httpd_initialize()\n");
   hs = httpd_initialize(&sa);
   if (!hs)
     {
@@ -756,7 +756,7 @@ int thttpd_main(int argc, char **argv)
 
   /* Main loop */
 
-  nvdbg("Entering the main loop\n");
+  ninfo("Entering the main loop\n");
   (void)gettimeofday(&tv, NULL);
   for (;;)
     {
@@ -810,7 +810,7 @@ int thttpd_main(int argc, char **argv)
               hc = conn->hc;
               if (fdwatch_check_fd(fw, hc->conn_fd))
                 {
-                  nvdbg("Handle conn_state %d\n", conn->conn_state);
+                  ninfo("Handle conn_state %d\n", conn->conn_state);
                   switch (conn->conn_state)
                     {
                       case CNST_READING:
diff --git a/netutils/thttpd/thttpd_alloc.c b/netutils/thttpd/thttpd_alloc.c
index 7bf072a58..63145f5be 100644
--- a/netutils/thttpd/thttpd_alloc.c
+++ b/netutils/thttpd/thttpd_alloc.c
@@ -110,7 +110,7 @@ FAR void *httpd_malloc(size_t nbytes)
     }
   else
     {
-      nvdbg("Allocated %d bytes at %p\n", nbytes, ptr);
+      ninfo("Allocated %d bytes at %p\n", nbytes, ptr);
       g_nallocations++;
       g_allocated += nbytes;
     }
@@ -130,7 +130,7 @@ FAR void *httpd_realloc(FAR void *oldptr, size_t oldsize, size_t newsize)
     }
   else
     {
-      nvdbg("Re-allocated form %d to %d bytes (from %p to %p)\n",
+      ninfo("Re-allocated form %d to %d bytes (from %p to %p)\n",
             oldsize, newsize, oldptr, ptr);
       g_allocated += (newsize - oldsize);
     }
@@ -144,7 +144,7 @@ void httpd_free(FAR void *ptr)
 {
   free(ptr);
   g_nfreed++;
-  nvdbg("Freed memory at %p\n", ptr);
+  ninfo("Freed memory at %p\n", ptr);
   httpd_memstats();
 }
 #endif
@@ -159,7 +159,7 @@ FAR char *httpd_strdup(const char *str)
     }
   else
     {
-      nvdbg("strdup'ed %s\n", str);
+      ninfo("strdup'ed %s\n", str);
       g_nallocations++;
       g_allocated += (strlen(str)+1);
     }
diff --git a/netutils/thttpd/thttpd_cgi.c b/netutils/thttpd/thttpd_cgi.c
index d88fb6bc2..45ef74387 100644
--- a/netutils/thttpd/thttpd_cgi.c
+++ b/netutils/thttpd/thttpd_cgi.c
@@ -366,14 +366,14 @@ static inline int cgi_interpose_input(struct cgi_conn_s *cc)
   ssize_t nbytes_read;
   ssize_t nbytes_written;
 
-  nllvdbg("nbytes: %d contentlength: %d\n", cc->inbuf.nbytes, cc->inbuf.contentlength);
+  nllinfo("nbytes: %d contentlength: %d\n", cc->inbuf.nbytes, cc->inbuf.contentlength);
   if (cc->inbuf.nbytes < cc->inbuf.contentlength)
     {
       do
         {
           nbytes_read = read(cc->connfd, cc->inbuf.buffer,
             MIN(CONFIG_THTTPD_CGIINBUFFERSIZE, cc->inbuf.contentlength - cc->inbuf.nbytes));
-          nllvdbg("nbytes_read: %d\n", nbytes_read);
+          nllinfo("nbytes_read: %d\n", nbytes_read);
           if (nbytes_read < 0)
             {
               if (errno != EINTR)
@@ -388,7 +388,7 @@ static inline int cgi_interpose_input(struct cgi_conn_s *cc)
       if (nbytes_read > 0)
         {
           nbytes_written = httpd_write(cc->wrfd, cc->inbuf.buffer, nbytes_read);
-          nllvdbg("nbytes_written: %d\n", nbytes_written);
+          nllinfo("nbytes_written: %d\n", nbytes_written);
           if (nbytes_written != nbytes_read)
             {
               nlldbg("httpd_write failed\n");
@@ -447,7 +447,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
 
   /* Loop while there are things we can do without waiting for more input */
 
-  nllvdbg("state: %d\n", cc->outbuf.state);
+  nllinfo("state: %d\n", cc->outbuf.state);
   switch (cc->outbuf.state)
     {
       case CGI_OUTBUFFER_READHEADER:
@@ -461,7 +461,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
                */
 
               nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
-              nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
+              nllinfo("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
 
               if (nbytes_read < 0)
                 {
@@ -485,7 +485,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
 
           if (nbytes_read <= 0)
             {
-              nllvdbg("End-of-file\n");
+              nllinfo("End-of-file\n");
               br               = &(cc->outbuf.buffer[cc->outbuf.len]);
               cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
             }
@@ -497,14 +497,14 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
               (void)memcpy(&(cc->outbuf.buffer[cc->outbuf.len]), cc->inbuf.buffer, nbytes_read);
               cc->outbuf.len                   += nbytes_read;
               cc->outbuf.buffer[cc->outbuf.len] = '\0';
-              nllvdbg("Header bytes accumulated: %d\n", cc->outbuf.len);
+              nllinfo("Header bytes accumulated: %d\n", cc->outbuf.len);
 
               /* Check for end of header */
 
               if ((br = strstr(cc->outbuf.buffer, "\r\n\r\n")) != NULL ||
                   (br = strstr(cc->outbuf.buffer, "\012\012")) != NULL)
                 {
-                  nllvdbg("End-of-header\n");
+                  nllinfo("End-of-header\n");
                   cc->outbuf.state = CGI_OUTBUFFER_HEADERREAD;
                 }
               else
@@ -559,7 +559,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
 
           /* Write the status line. */
 
-          nllvdbg("Status: %d\n", status);
+          nllinfo("Status: %d\n", status);
           switch (status)
             {
             case 200:
@@ -643,7 +643,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
                */
 
               nbytes_read = read(cc->rdfd, cc->inbuf.buffer, CONFIG_THTTPD_CGIINBUFFERSIZE);
-              nllvdbg("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
+              nllinfo("Read %d bytes from fd %d\n", nbytes_read, cc->rdfd);
 
               if (nbytes_read < 0)
                 {
@@ -667,7 +667,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc)
 
           if (nbytes_read == 0)
             {
-              nllvdbg("End-of-file\n");
+              nllinfo("End-of-file\n");
               cc->outbuf.state = CGI_OUTBUFFER_DONE;
               return 1;
             }
@@ -713,7 +713,7 @@ static int cgi_child(int argc, char **argv)
    * all file descriptors
    */
 
-  nllvdbg("Started: %s\n", argv[1]);
+  nllinfo("Started: %s\n", argv[1]);
 
   /* Allocate memory and initialize memory for interposing */
 
@@ -746,7 +746,7 @@ static int cgi_child(int argc, char **argv)
    * now prevents re-use of fd=0 and 1 by pipe().
    */
 
-  nllvdbg("Closing descriptors\n");
+  nllinfo("Closing descriptors\n");
   for (fd = 3; fd < (CONFIG_NFILE_DESCRIPTORS + CONFIG_NSOCKET_DESCRIPTORS); fd++)
     {
        /* Keep hc->conn_fd open for obvious reasons */
@@ -764,7 +764,7 @@ static int cgi_child(int argc, char **argv)
    * socket to the CGI program.
    */
 
-  nllvdbg("Create STDIN pipe\n");
+  nllinfo("Create STDIN pipe\n");
   ret = pipe(pipefd);
   if (ret < 0)
     {
@@ -795,7 +795,7 @@ static int cgi_child(int argc, char **argv)
 
   if (ret == 0)
     {
-      nllvdbg("Create STDOUT pipe\n");
+      nllinfo("Create STDOUT pipe\n");
       ret = pipe(pipefd);
       if (ret < 0)
         {
@@ -857,7 +857,7 @@ static int cgi_child(int argc, char **argv)
 
   /* Run the CGI program. */
 
-  nllvdbg("Starting CGI: %s\n", hc->expnfilename);
+  nllinfo("Starting CGI: %s\n", hc->expnfilename);
 
 #ifdef CONFIG_THTTPD_NXFLAT
   child = exec(hc->expnfilename, (FAR char * const *)argp, g_thttpdsymtab, g_thttpdnsymbols);
@@ -891,7 +891,7 @@ static int cgi_child(int argc, char **argv)
   /* Send any data that is already buffer to the CGI task */
 
   nbytes = hc->read_idx - hc->checked_idx;
-  nllvdbg("nbytes: %d contentlength: %d\n", nbytes, hc->contentlength);
+  nllinfo("nbytes: %d contentlength: %d\n", nbytes, hc->contentlength);
   if (nbytes > 0)
     {
       if (httpd_write(cc->wrfd, &(hc->read_buf[hc->checked_idx]), nbytes) != nbytes)
@@ -909,7 +909,7 @@ static int cgi_child(int argc, char **argv)
   indone  = false;
   outdone = false;
 
-  nllvdbg("Interposing\n");
+  nllinfo("Interposing\n");
   cgi_semgive();  /* Not safe to reference hc after this point */
   do
     {
@@ -921,7 +921,7 @@ static int cgi_child(int argc, char **argv)
         {
           /* Transfer data from the client to the CGI program (POST) */
 
-          nllvdbg("Interpose input\n");
+          nllinfo("Interpose input\n");
           indone = cgi_interpose_input(cc);
           if (indone)
             {
@@ -935,7 +935,7 @@ static int cgi_child(int argc, char **argv)
         {
           /* Handle receipt of headers and CGI program response (GET) */
 
-          nllvdbg("Interpose output\n");
+          nllinfo("Interpose output\n");
           outdone = cgi_interpose_output(cc);
         }
 
@@ -949,7 +949,7 @@ static int cgi_child(int argc, char **argv)
 
       else if (kill(child, 0) != 0)
         {
-          nllvdbg("CGI no longer running: %d\n", errno);
+          nllinfo("CGI no longer running: %d\n", errno);
           outdone = true;
         }
   }
@@ -977,7 +977,7 @@ errout_with_cgiconn:
   httpd_free(cc);
 
 errout:
-  nllvdbg("Return %d\n", err);
+  nllinfo("Return %d\n", err);
   if (err != 0)
     {
       INTERNALERROR("errout");
diff --git a/netutils/webclient/webclient.c b/netutils/webclient/webclient.c
index d8e6dc367..df91a112d 100644
--- a/netutils/webclient/webclient.c
+++ b/netutils/webclient/webclient.c
@@ -350,7 +350,7 @@ static inline int wget_parseheaders(struct wget_s *ws)
                   (void)netlib_parsehttpurl(ws->line + strlen(g_httplocation), &ws->port,
                                          ws->hostname, CONFIG_WEBCLIENT_MAXHOSTNAME,
                                          ws->filename, CONFIG_WEBCLIENT_MAXFILENAME);
-                  nvdbg("New hostname='%s' filename='%s'\n", ws->hostname, ws->filename);
+                  ninfo("New hostname='%s' filename='%s'\n", ws->hostname, ws->filename);
                 }
             }
 
@@ -470,7 +470,7 @@ static int wget_base(FAR const char *url, FAR char *buffer, int buflen,
       return ERROR;
     }
 
-  nvdbg("hostname='%s' filename='%s'\n", ws.hostname, ws.filename);
+  ninfo("hostname='%s' filename='%s'\n", ws.hostname, ws.filename);
 
   /* The following sequence may repeat indefinitely if we are redirected */
 
@@ -606,7 +606,7 @@ static int wget_base(FAR const char *url, FAR char *buffer, int buflen,
             }
           else if (ws.datend == 0)
             {
-              nvdbg("Connection lost\n");
+              ninfo("Connection lost\n");
               close(sockfd);
               break;
             }
diff --git a/netutils/webserver/httpd.c b/netutils/webserver/httpd.c
index b46f0739d..774a7f66c 100644
--- a/netutils/webserver/httpd.c
+++ b/netutils/webserver/httpd.c
@@ -197,7 +197,7 @@ static void httpd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsign
    * defined or the following does nothing.
    */
 
-  nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
+  ninfodumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes);
 }
 #else
 # define httpd_dumpbuffer(msg,buffer,nbytes)
@@ -207,15 +207,15 @@ static void httpd_dumpbuffer(FAR const char *msg, FAR const char *buffer, unsign
 static void httpd_dumppstate(struct httpd_state *pstate, const char *msg)
 {
 #if defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_INFO) && defined(CONFIG_DEBUG_NET)
-  nvdbg("[%d] pstate(%p): [%s]\n", pstate->ht_sockfd, pstate, msg);
-  nvdbg("  filename:      [%s]\n", pstate->ht_filename);
-  nvdbg("  htfile len:    %d\n", pstate->ht_file.len);
-  nvdbg("  sockfd:        %d\n", pstate->ht_sockfd);
+  ninfo("[%d] pstate(%p): [%s]\n", pstate->ht_sockfd, pstate, msg);
+  ninfo("  filename:      [%s]\n", pstate->ht_filename);
+  ninfo("  htfile len:    %d\n", pstate->ht_file.len);
+  ninfo("  sockfd:        %d\n", pstate->ht_sockfd);
 #ifndef CONFIG_NETUTILS_HTTPD_SCRIPT_DISABLE
-  nvdbg("  scriptptr:     %p\n", pstate->ht_scriptptr);
-  nvdbg("  scriptlen:     %d\n", pstate->ht_scriptlen);
+  ninfo("  scriptptr:     %p\n", pstate->ht_scriptptr);
+  ninfo("  scriptlen:     %d\n", pstate->ht_scriptlen);
 #endif
-  nvdbg("  sndlen:        %d\n", pstate->ht_sndlen);
+  ninfo("  sndlen:        %d\n", pstate->ht_sndlen);
 #endif
 }
 #else
@@ -439,7 +439,7 @@ static int httpd_senderror(struct httpd_state *pstate, int status)
   int ret;
   char msg[10 + 1];
 
-  nvdbg("[%d] sending error '%d'\n", pstate->ht_sockfd, status);
+  ninfo("[%d] sending error '%d'\n", pstate->ht_sockfd, status);
 
   if (status < 400 || status >= 600)
     {
@@ -495,7 +495,7 @@ static int httpd_sendfile(struct httpd_state *pstate)
 
   pstate->ht_sndlen = 0;
 
-  nvdbg("[%d] sending file '%s'\n", pstate->ht_sockfd, pstate->ht_filename);
+  ninfo("[%d] sending file '%s'\n", pstate->ht_sockfd, pstate->ht_filename);
 
 #ifdef CONFIG_NETUTILS_HTTPD_CGIPATH
   {
@@ -684,7 +684,7 @@ static inline int httpd_parse(struct httpd_state *pstate)
                 return 400;
               }
 
-            nvdbg("[%d] Request header %s: %s\n", pstate->ht_sockfd, start, v);
+            ninfo("[%d] Request header %s: %s\n", pstate->ht_sockfd, start, v);
 
             if (0 == strcasecmp(start, "Content-Length") && 0 != atoi(v))
               {
@@ -719,7 +719,7 @@ static inline int httpd_parse(struct httpd_state *pstate)
     }
 #endif
 
-  nvdbg("[%d] Filename: %s\n", pstate->ht_sockfd, pstate->ht_filename);
+  ninfo("[%d] Filename: %s\n", pstate->ht_sockfd, pstate->ht_filename);
 
   return 200;
 }
@@ -739,7 +739,7 @@ static void *httpd_handler(void *arg)
   struct httpd_state *pstate = (struct httpd_state *)malloc(sizeof(struct httpd_state));
   int sockfd = (int)arg;
 
-  nvdbg("[%d] Started\n", sockfd);
+  ninfo("[%d] Started\n", sockfd);
 
   /* Verify that the state structure was successfully allocated */
 
@@ -781,7 +781,7 @@ static void *httpd_handler(void *arg)
 
   /* Exit the task */
 
-  nvdbg("[%d] Exitting\n", sockfd);
+  ninfo("[%d] Exitting\n", sockfd);
   close(sockfd);
   return NULL;
 }
@@ -819,7 +819,7 @@ static void single_server(uint16_t portno, pthread_startroutine_t handler, int s
           break;
         }
 
-      nvdbg("Connection accepted -- serving sd=%d\n", acceptsd);
+      ninfo("Connection accepted -- serving sd=%d\n", acceptsd);
 
       /* Configure to "linger" until all data is sent when the socket is closed */
 
diff --git a/nshlib/nsh_netinit.c b/nshlib/nsh_netinit.c
index caca5e3c8..0f4d8504e 100644
--- a/nshlib/nsh_netinit.c
+++ b/nshlib/nsh_netinit.c
@@ -228,7 +228,7 @@ static void nsh_netinit_configure(void)
   uint8_t mac[IFHWADDRLEN];
 #endif
 
-  nvdbg("Entry\n");
+  ninfo("Entry\n");
 
   /* Many embedded network interfaces must have a software assigned MAC */
 
@@ -345,7 +345,7 @@ static void nsh_netinit_configure(void)
 #endif
 #endif /* NSH_HAVE_NETDEV */
 
-  nvdbg("Exit\n");
+  ninfo("Exit\n");
 }
 
 /****************************************************************************
@@ -373,7 +373,7 @@ static void nsh_netinit_signal(int signo, FAR siginfo_t *siginfo,
       sem_post(&g_notify_sem);
     }
 
-  nllvdbg("Exit\n");
+  nllinfo("Exit\n");
 }
 #endif
 
@@ -397,7 +397,7 @@ static int nsh_netinit_monitor(void)
   int ret;
   int sd;
 
-  nvdbg("Entry\n");
+  ninfo("Entry\n");
 
   /* Initialize the notification semaphore */
 
@@ -499,7 +499,7 @@ static int nsh_netinit_monitor(void)
           goto errout_with_notification;
         }
 
-      nvdbg("%s: devup=%d PHY address=%02x MSR=%04x\n",
+      ninfo("%s: devup=%d PHY address=%02x MSR=%04x\n",
             ifr.ifr_name, devup, ifr.ifr_mii_phy_id, ifr.ifr_mii_val_out);
 
       /* Check for link up or down */
@@ -514,7 +514,7 @@ static int nsh_netinit_monitor(void)
                * Bring the link up.
                */
 
-              nvdbg("Bringing the link up\n");
+              ninfo("Bringing the link up\n");
 
               ifr.ifr_flags = IFF_UP;
               ret = ioctl(sd, SIOCSIFFLAGS, (unsigned long)&ifr);
@@ -552,7 +552,7 @@ static int nsh_netinit_monitor(void)
                * the link down.
                */
 
-              nvdbg("Taking the link down\n");
+              ninfo("Taking the link down\n");
 
               ifr.ifr_flags = IFF_DOWN;
               ret = ioctl(sd, SIOCSIFFLAGS, (unsigned long)&ifr);
@@ -616,7 +616,7 @@ errout:
 #ifdef CONFIG_NSH_NETINIT_THREAD
 static pthread_addr_t nsh_netinit_thread(pthread_addr_t arg)
 {
-  nvdbg("Entry\n");
+  ninfo("Entry\n");
 
   /* Configure the network */
 
@@ -628,7 +628,7 @@ static pthread_addr_t nsh_netinit_thread(pthread_addr_t arg)
   nsh_netinit_monitor();
 #endif
 
-  nvdbg("Exit\n");
+  ninfo("Exit\n");
   return NULL;
 }
 #endif
@@ -662,7 +662,7 @@ int nsh_netinit(void)
   (void)pthread_attr_setschedparam(&attr, &sparam);
   (void)pthread_attr_setstacksize(&attr, CONFIG_NSH_NETINIT_THREAD_STACKSIZE);
 
-  nvdbg("Starting netinit thread\n");
+  ninfo("Starting netinit thread\n");
   ret = pthread_create(&tid, &attr, nsh_netinit_thread, NULL);
   if (ret != OK)
     {
diff --git a/nshlib/nsh_romfsetc.c b/nshlib/nsh_romfsetc.c
index 15c5ee8b8..3e3ff3544 100644
--- a/nshlib/nsh_romfsetc.c
+++ b/nshlib/nsh_romfsetc.c
@@ -109,7 +109,7 @@ int nsh_romfsetc(void)
 
   /* Mount the file system */
 
-  vdbg("Mounting ROMFS filesystem at target=%s with source=%s\n",
+  info("Mounting ROMFS filesystem at target=%s with source=%s\n",
        CONFIG_NSH_ROMFSMOUNTPT, MOUNT_DEVNAME);
 
   ret = mount(MOUNT_DEVNAME, CONFIG_NSH_ROMFSMOUNTPT, "romfs", MS_RDONLY, NULL);
diff --git a/nshlib/nsh_telnetd.c b/nshlib/nsh_telnetd.c
index 5c9560f80..b80bc72be 100644
--- a/nshlib/nsh_telnetd.c
+++ b/nshlib/nsh_telnetd.c
@@ -201,7 +201,7 @@ int nsh_telnetstart(void)
 
   /* Start the telnet daemon */
 
-  vdbg("Starting the Telnet daemon\n");
+  info("Starting the Telnet daemon\n");
   ret = telnetd_start(&config);
   if (ret < 0)
     {
diff --git a/platform/arduino-due/sam_cxxinitialize.c b/platform/arduino-due/sam_cxxinitialize.c
index 58662cee9..53289960d 100644
--- a/platform/arduino-due/sam_cxxinitialize.c
+++ b/platform/arduino-due/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/cloudctrl/stm32_cxxinitialize.c b/platform/cloudctrl/stm32_cxxinitialize.c
index 63216a310..7ffcb6f02 100644
--- a/platform/cloudctrl/stm32_cxxinitialize.c
+++ b/platform/cloudctrl/stm32_cxxinitialize.c
@@ -62,17 +62,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/fire-stm32v2/stm32_cxxinitialize.c b/platform/fire-stm32v2/stm32_cxxinitialize.c
index cd6fd0e5a..87811ddd7 100644
--- a/platform/fire-stm32v2/stm32_cxxinitialize.c
+++ b/platform/fire-stm32v2/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/mikroe-stm32f4/stm32_cxxinitialize.c b/platform/mikroe-stm32f4/stm32_cxxinitialize.c
index aabfab73b..05c430ba6 100644
--- a/platform/mikroe-stm32f4/stm32_cxxinitialize.c
+++ b/platform/mikroe-stm32f4/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/nucleo-144/stm32_cxxinitialize.c b/platform/nucleo-144/stm32_cxxinitialize.c
index 48fe9d67a..6d592a1a3 100644
--- a/platform/nucleo-144/stm32_cxxinitialize.c
+++ b/platform/nucleo-144/stm32_cxxinitialize.c
@@ -62,17 +62,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/nucleo-f303re/stm32_cxxinitialize.c b/platform/nucleo-f303re/stm32_cxxinitialize.c
index 856d0c5ab..e915348ac 100644
--- a/platform/nucleo-f303re/stm32_cxxinitialize.c
+++ b/platform/nucleo-f303re/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/nucleo-f4x1re/stm32_cxxinitialize.c b/platform/nucleo-f4x1re/stm32_cxxinitialize.c
index bd1075efb..c7f4b9488 100644
--- a/platform/nucleo-f4x1re/stm32_cxxinitialize.c
+++ b/platform/nucleo-f4x1re/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/nucleo-l476rg/stm32_cxxinitialize.c b/platform/nucleo-l476rg/stm32_cxxinitialize.c
index bcb9f2712..f94721ab5 100644
--- a/platform/nucleo-l476rg/stm32_cxxinitialize.c
+++ b/platform/nucleo-l476rg/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/olimex-stm32-h405/stm32_cxxinitialize.c b/platform/olimex-stm32-h405/stm32_cxxinitialize.c
index 5fa0dae58..786118dd1 100644
--- a/platform/olimex-stm32-h405/stm32_cxxinitialize.c
+++ b/platform/olimex-stm32-h405/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/olimex-stm32-h407/stm32_cxxinitialize.c b/platform/olimex-stm32-h407/stm32_cxxinitialize.c
index 6b6b961e3..8511cf2b4 100644
--- a/platform/olimex-stm32-h407/stm32_cxxinitialize.c
+++ b/platform/olimex-stm32-h407/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/olimex-stm32-p207/stm32_cxxinitialize.c b/platform/olimex-stm32-p207/stm32_cxxinitialize.c
index 742141fbb..4aa67c363 100644
--- a/platform/olimex-stm32-p207/stm32_cxxinitialize.c
+++ b/platform/olimex-stm32-p207/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/olimexino-stm32/stm32_cxxinitialize.c b/platform/olimexino-stm32/stm32_cxxinitialize.c
index 3d06bc7d0..543956d98 100644
--- a/platform/olimexino-stm32/stm32_cxxinitialize.c
+++ b/platform/olimexino-stm32/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/pcduino-a10/a1x_cxxinitialize.c b/platform/pcduino-a10/a1x_cxxinitialize.c
index 1cdd6efc2..caca40f3d 100644
--- a/platform/pcduino-a10/a1x_cxxinitialize.c
+++ b/platform/pcduino-a10/a1x_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sabre-6quad/imx_cxxinitialize.c b/platform/sabre-6quad/imx_cxxinitialize.c
index 8edc5ae8e..ac1b00402 100644
--- a/platform/sabre-6quad/imx_cxxinitialize.c
+++ b/platform/sabre-6quad/imx_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sam3u-ek/sam_cxxinitialized.c b/platform/sam3u-ek/sam_cxxinitialized.c
index 3685f00fb..766b938b2 100644
--- a/platform/sam3u-ek/sam_cxxinitialized.c
+++ b/platform/sam3u-ek/sam_cxxinitialized.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sam4e-ek/sam_cxxinitialize.c b/platform/sam4e-ek/sam_cxxinitialize.c
index 8498bc63b..7e4d16a6a 100644
--- a/platform/sam4e-ek/sam_cxxinitialize.c
+++ b/platform/sam4e-ek/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sam4l-xplained/sam_cxxinitialize.c b/platform/sam4l-xplained/sam_cxxinitialize.c
index 04e777848..881a1dd4f 100644
--- a/platform/sam4l-xplained/sam_cxxinitialize.c
+++ b/platform/sam4l-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sam4s-xplained-pro/sam_cxxinitialize.c b/platform/sam4s-xplained-pro/sam_cxxinitialize.c
index 5b705fef7..f6e090322 100644
--- a/platform/sam4s-xplained-pro/sam_cxxinitialize.c
+++ b/platform/sam4s-xplained-pro/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sam4s-xplained/sam_cxxinitialize.c b/platform/sam4s-xplained/sam_cxxinitialize.c
index 54bcd399b..7e8c65993 100644
--- a/platform/sam4s-xplained/sam_cxxinitialize.c
+++ b/platform/sam4s-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sama5d2-xult/sam_cxxinitialize.c b/platform/sama5d2-xult/sam_cxxinitialize.c
index 213b9eff3..283cc6d9d 100644
--- a/platform/sama5d2-xult/sam_cxxinitialize.c
+++ b/platform/sama5d2-xult/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sama5d3-xplained/sam_cxxinitialize.c b/platform/sama5d3-xplained/sam_cxxinitialize.c
index 1af07a7ba..013e3ded3 100644
--- a/platform/sama5d3-xplained/sam_cxxinitialize.c
+++ b/platform/sama5d3-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sama5d3x-ek/sam_cxxinitialize.c b/platform/sama5d3x-ek/sam_cxxinitialize.c
index 256690198..e65426b13 100644
--- a/platform/sama5d3x-ek/sam_cxxinitialize.c
+++ b/platform/sama5d3x-ek/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/sama5d4-ek/sam_cxxinitialize.c b/platform/sama5d4-ek/sam_cxxinitialize.c
index 8b492e857..3630c420a 100644
--- a/platform/sama5d4-ek/sam_cxxinitialize.c
+++ b/platform/sama5d4-ek/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/samd20-xplained/sam_cxxinitialize.c b/platform/samd20-xplained/sam_cxxinitialize.c
index 4ed7ce4df..8ce87c07a 100644
--- a/platform/samd20-xplained/sam_cxxinitialize.c
+++ b/platform/samd20-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/samd21-xplained/sam_cxxinitialize.c b/platform/samd21-xplained/sam_cxxinitialize.c
index 3b05662d1..39108333b 100644
--- a/platform/samd21-xplained/sam_cxxinitialize.c
+++ b/platform/samd21-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/same70-xplained/sam_cxxinitialize.c b/platform/same70-xplained/sam_cxxinitialize.c
index 187069e8e..745a74a63 100644
--- a/platform/same70-xplained/sam_cxxinitialize.c
+++ b/platform/same70-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/saml21-xplained/sam_cxxinitialize.c b/platform/saml21-xplained/sam_cxxinitialize.c
index ffbeac444..7d5fead2c 100644
--- a/platform/saml21-xplained/sam_cxxinitialize.c
+++ b/platform/saml21-xplained/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/samv71-xult/sam_cxxinitialize.c b/platform/samv71-xult/sam_cxxinitialize.c
index e9ed9356f..efdff7f76 100644
--- a/platform/samv71-xult/sam_cxxinitialize.c
+++ b/platform/samv71-xult/sam_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/shenzhou/stm32_cxxinitialize.c b/platform/shenzhou/stm32_cxxinitialize.c
index 70ab6e958..f3dfdb106 100644
--- a/platform/shenzhou/stm32_cxxinitialize.c
+++ b/platform/shenzhou/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/spark/stm32_cxxinitialize.c b/platform/spark/stm32_cxxinitialize.c
index 7be868fab..dbf3bf67f 100644
--- a/platform/spark/stm32_cxxinitialize.c
+++ b/platform/spark/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm3220g-eval/stm32_cxxinitialize.c b/platform/stm3220g-eval/stm32_cxxinitialize.c
index 3123536d4..ab6044e94 100644
--- a/platform/stm3220g-eval/stm32_cxxinitialize.c
+++ b/platform/stm3220g-eval/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm3240g-eval/stm32_cxxinitialize.c b/platform/stm3240g-eval/stm32_cxxinitialize.c
index c98e897ee..0356fc6ea 100644
--- a/platform/stm3240g-eval/stm32_cxxinitialize.c
+++ b/platform/stm3240g-eval/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32f3discovery/stm32_cxxinitialize.c b/platform/stm32f3discovery/stm32_cxxinitialize.c
index 46720754a..050930846 100644
--- a/platform/stm32f3discovery/stm32_cxxinitialize.c
+++ b/platform/stm32f3discovery/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32f429i-disco/stm32_cxxinitialize.c b/platform/stm32f429i-disco/stm32_cxxinitialize.c
index f5e588073..c71f79cba 100644
--- a/platform/stm32f429i-disco/stm32_cxxinitialize.c
+++ b/platform/stm32f429i-disco/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32f4discovery/stm32_cxxinitialize.c b/platform/stm32f4discovery/stm32_cxxinitialize.c
index b22e6abca..1596b3f51 100644
--- a/platform/stm32f4discovery/stm32_cxxinitialize.c
+++ b/platform/stm32f4discovery/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32f746g-disco/stm32_cxxinitialize.c b/platform/stm32f746g-disco/stm32_cxxinitialize.c
index ab5a51014..ce83890dc 100644
--- a/platform/stm32f746g-disco/stm32_cxxinitialize.c
+++ b/platform/stm32f746g-disco/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32l476vg-disco/stm32_cxxinitialize.c b/platform/stm32l476vg-disco/stm32_cxxinitialize.c
index 0a59c0967..6141f33f5 100644
--- a/platform/stm32l476vg-disco/stm32_cxxinitialize.c
+++ b/platform/stm32l476vg-disco/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/stm32ldiscovery/stm32_cxxinitialize.c b/platform/stm32ldiscovery/stm32_cxxinitialize.c
index a0b644e09..726a7c95d 100644
--- a/platform/stm32ldiscovery/stm32_cxxinitialize.c
+++ b/platform/stm32ldiscovery/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/teensy-lc/kl_cxxinitialize.c b/platform/teensy-lc/kl_cxxinitialize.c
index ac914ddbd..24205a24d 100644
--- a/platform/teensy-lc/kl_cxxinitialize.c
+++ b/platform/teensy-lc/kl_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/platform/viewtool-stm32f107/stm32_cxxinitialize.c b/platform/viewtool-stm32f107/stm32_cxxinitialize.c
index cc619ddfe..f5058c2cf 100644
--- a/platform/viewtool-stm32f107/stm32_cxxinitialize.c
+++ b/platform/viewtool-stm32f107/stm32_cxxinitialize.c
@@ -61,17 +61,17 @@
 #  define cxxdbg              dbg
 #  define cxxlldbg            lldbg
 #  ifdef CONFIG_DEBUG_INFO
-#    define cxxvdbg           vdbg
-#    define cxxllvdbg         llvdbg
+#    define cxxinfo           info
+#    define cxxllinfo         llinfo
 #  else
-#    define cxxvdbg(x...)
-#    define cxxllvdbg(x...)
+#    define cxxinfo(x...)
+#    define cxxllinfo(x...)
 #  endif
 #else
 #  define cxxdbg(x...)
 #  define cxxlldbg(x...)
-#  define cxxvdbg(x...)
-#  define cxxllvdbg(x...)
+#  define cxxinfo(x...)
+#  define cxxllinfo(x...)
 #endif
 
 /****************************************************************************
diff --git a/system/cle/cle.c b/system/cle/cle.c
index 1f744cf5c..da8b79bf8 100644
--- a/system/cle/cle.c
+++ b/system/cle/cle.c
@@ -115,10 +115,10 @@
 #  endif
 
 #  if CONFIG_SYSTEM_CLE_DEBUGLEVEL > 1
-#    define clevdbg(format, ...) \
+#    define cleinfo(format, ...) \
        syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
-#    define clevdbg(x...)
+#    define cleinfo(x...)
 #  endif
 #else
 #  if CONFIG_SYSTEM_CLE_DEBUGLEVEL > 0
@@ -128,9 +128,9 @@
 #  endif
 
 #  if CONFIG_SYSTEM_CLE_DEBUGLEVEL > 1
-#    define clevdbg cle_debug
+#    define cleinfo cle_debug
 #  else
-#    define clevdbg (void)
+#    define cleinfo (void)
 #  endif
 #endif
 
@@ -250,7 +250,7 @@ static void cle_write(FAR struct cle_s *priv, FAR const char *buffer,
   ssize_t nwritten;
   uint16_t  nremaining = buflen;
 
-  //clevdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  //cleinfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Loop until all bytes have been successfully written (or until a
    * unrecoverable error is encountered)
@@ -346,7 +346,7 @@ static int cle_getch(FAR struct cle_s *priv)
 
   /* On success, return the character that was read */
 
-  clevdbg("Returning: %c[%02x]\n", isprint(buffer) ? buffer : '.', buffer);
+  cleinfo("Returning: %c[%02x]\n", isprint(buffer) ? buffer : '.', buffer);
   return buffer;
 }
 
@@ -393,7 +393,7 @@ static void cle_setcursor(FAR struct cle_s *priv, uint16_t column)
   char buffer[16];
   int len;
 
-  clevdbg("row=%d column=%d offset=%d\n", priv->row, column, priv->coloffs);
+  cleinfo("row=%d column=%d offset=%d\n", priv->row, column, priv->coloffs);
 
   /* Format the cursor position command.  The origin is (1,1). */
 
@@ -524,7 +524,7 @@ static int cle_getcursor(FAR struct cle_s *priv, FAR uint16_t *prow,
         }
     }
 
-  clevdbg("row=%ld column=%ld\n", row, column);
+  cleinfo("row=%ld column=%ld\n", row, column);
 
   /* Make sure that the values are within range */
 
@@ -569,7 +569,7 @@ static bool cle_opentext(FAR struct cle_s *priv, uint16_t pos,
 {
   int i;
 
-  clevdbg("pos=%ld increment=%ld\n", (long)pos, (long)increment);
+  cleinfo("pos=%ld increment=%ld\n", (long)pos, (long)increment);
 
   /* Check if there is space in the line buffer to open up a region the size
    * of 'increment'
@@ -609,7 +609,7 @@ static void cle_closetext(FAR struct cle_s *priv, uint16_t pos, uint16_t size)
 {
   int i;
 
-  clevdbg("pos=%ld size=%ld\n", (long)pos, (long)size);
+  cleinfo("pos=%ld size=%ld\n", (long)pos, (long)size);
 
   /* Close up the gap to remove 'size' characters at 'pos' */
 
@@ -714,7 +714,7 @@ static void cle_showtext(FAR struct cle_s *priv)
 
 static void cle_insertch(FAR struct cle_s *priv, char ch)
 {
-  clevdbg("curpos=%ld ch=%c[%02x]\n", priv->curpos, isprint(ch) ? ch : '.', ch);
+  cleinfo("curpos=%ld ch=%c[%02x]\n", priv->curpos, isprint(ch) ? ch : '.', ch);
 
   /* Make space in the buffer for the new character */
 
@@ -953,7 +953,7 @@ int cle(FAR char *line, uint16_t linelen, FILE *instream, FILE *outstream)
 
   priv.coloffs = column - 1;
 
-  clevdbg("row=%d column=%d\n", priv.row, column);
+  cleinfo("row=%d column=%d\n", priv.row, column);
 
   /* The editor loop */
 
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 123be07ef..5fbb0006f 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -519,7 +519,7 @@ static int nxplayer_readbuffer(FAR struct nxplayer_s *pPlayer,
       int errcode   = errno;
       int readerror = ferror(pPlayer->fileFd);
 
-      audvdbg("Closing audio file, nbytes=%d readerr=%d\n",
+      audinfo("Closing audio file, nbytes=%d readerr=%d\n",
               apb->nbytes, readerror);
 #endif
 
@@ -639,7 +639,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
   int                         x;
   int                         ret;
 
-  audvdbg("Entry\n");
+  audinfo("Entry\n");
 
   /* Query the audio device for it's preferred buffer size / qty */
 
@@ -783,7 +783,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
         }
     }
 
-  audvdbg("%d buffers queued, running=%d streaming=%d\n",
+  audinfo("%d buffers queued, running=%d streaming=%d\n",
           x, running, streaming);
 
   /* Start the audio device */
@@ -849,7 +849,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
    * (3) Terminate playing by sending the AUDIO_MSG_COMPLETE message.
    */
 
-  audvdbg("%s\n", running ? "Playing..." : "Not runnning");
+  audinfo("%s\n", running ? "Playing..." : "Not runnning");
   while (running)
     {
       /* Wait for a signal either from the Audio driver that it needs
@@ -946,7 +946,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
           case AUDIO_MSG_STOP:
             /* Send a stop message to the device */
 
-            audvdbg("Stopping! outstanding=%d\n", outstanding);
+            audinfo("Stopping! outstanding=%d\n", outstanding);
 
 #ifdef CONFIG_AUDIO_MULTI_SESSION
             ioctl(pPlayer->devFd, AUDIOIOC_STOP,
@@ -965,7 +965,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
           /* Message indicating the playback is complete */
 
           case AUDIO_MSG_COMPLETE:
-            audvdbg("Play complete.  outstanding=%d\n", outstanding);
+            audinfo("Play complete.  outstanding=%d\n", outstanding);
             DEBUGASSERT(outstanding == 0);
             running = false;
             break;
@@ -980,7 +980,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
   /* Release our audio buffers and unregister / release the device */
 
 err_out:
-  audvdbg("Clean-up and exit\n");
+  audinfo("Clean-up and exit\n");
 
   /* Unregister the message queue and release the session */
 
@@ -999,7 +999,7 @@ err_out:
 #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
   if (pBuffers != NULL)
     {
-      audvdbg("Freeing buffers\n");
+      audinfo("Freeing buffers\n");
       for (x = 0; x < buf_info.nbuffers; x++)
         {
           /* Fill in the buffer descriptor struct to issue a free request */
@@ -1016,7 +1016,7 @@ err_out:
       free(pBuffers);
     }
 #else
-    audvdbg("Freeing buffers\n");
+    audinfo("Freeing buffers\n");
     for (x = 0; x < CONFIG_AUDIO_NUM_BUFFERS; x++)
       {
         /* Fill in the buffer descriptor struct to issue a free request */
@@ -1052,7 +1052,7 @@ err_out:
 
   nxplayer_release(pPlayer);
 
-  audvdbg("Exit\n");
+  audinfo("Exit\n");
 
   return NULL;
 }
@@ -1661,9 +1661,9 @@ int nxplayer_playfile(FAR struct nxplayer_s *pPlayer,
       return -EBUSY;
     }
 
-  audvdbg("==============================\n");
-  audvdbg("Playing file %s\n", pFilename);
-  audvdbg("==============================\n");
+  audinfo("==============================\n");
+  audinfo("Playing file %s\n", pFilename);
+  audinfo("==============================\n");
 
   /* Test that the specified file exists */
 
diff --git a/system/prun/prun.c b/system/prun/prun.c
index d1af40bfb..59dc29b4c 100644
--- a/system/prun/prun.c
+++ b/system/prun/prun.c
@@ -99,7 +99,7 @@ int prun(FAR char *exepath, size_t varsize, size_t strsize)
       return -ENOEXEC;
     }
 
-  bvdbg("Loaded %s\n", exepath);
+  binfo("Loaded %s\n", exepath);
 
   /* Execute the P-Code program until a stopping condition occurs */
 
@@ -124,7 +124,7 @@ int prun(FAR char *exepath, size_t varsize, size_t strsize)
 
   /* Clean up resources used by the interpreter */
 
-  bvdbg("Execution terminated\n");
+  binfo("Execution terminated\n");
   pexec_release(st);
   return ret;
 }
diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c
index bec4d1fdf..d5beedd90 100644
--- a/system/ubloxmodem/ubloxmodem_main.c
+++ b/system/ubloxmodem/ubloxmodem_main.c
@@ -60,14 +60,14 @@
 
 #ifdef CONFIG_MODEM_U_BLOX_DEBUG
 #  define m_dbg    dbg
-#  define m_vdbg   vdbg
+#  define m_info   info
 #  define m_vlldbg  lldbg
-#  define m_vllvdbg llvdbg
+#  define m_vllinfo llinfo
 #else
 #  define m_dbg(x...)
-#  define m_vdbg(x...)
+#  define m_info(x...)
 #  define m_lldbg(x...)
-#  define m_llvdbg(x...)
+#  define m_llinfo(x...)
 #endif
 
 #define UBLOXMODEM_MAX_REGISTERS 16
@@ -131,14 +131,14 @@ static int ubloxmodem_open_tty(void)
   fd = open(CONFIG_SYSTEM_UBLOXMODEM_TTY_DEVNODE, O_RDWR);
   if (fd < 0)
     {
-      m_vdbg("failed to open TTY\n");
+      m_info("failed to open TTY\n");
       return fd;
     }
 
   ret = make_nonblock(fd);
   if (ret < 0)
     {
-      m_vdbg("make_nonblock failed\n");
+      m_info("make_nonblock failed\n");
       close(fd);
       return ret;
     }
@@ -158,14 +158,14 @@ static int chat_readb(int fd, FAR char* dst, int timeout_ms)
   ret = poll(&fds, 1, timeout_ms);
   if (ret <= 0)
     {
-      m_vdbg("poll timed out\n");
+      m_info("poll timed out\n");
       return -ETIMEDOUT;
     }
 
   ret = read(fd, dst, 1);
   if (ret != 1)
     {
-      m_vdbg("read failed\n");
+      m_info("read failed\n");
       return -EPERM;
     }
 
@@ -196,7 +196,7 @@ static int chat_match_response(int fd, FAR char* response, int timeout_ms)
         }
       else
         {
-          m_vdbg("expected %c (0x%02X), got %c (0x%02X)\n",
+          m_info("expected %c (0x%02X), got %c (0x%02X)\n",
                  *response, *response, c, c);
           return -EILSEQ;
         }
@@ -230,7 +230,7 @@ static int chat_single(int fd, FAR char* cmd, FAR char* resp)
   ret = chat_match_response(fd, cmd,  5 * 1000);
   if (ret < 0)
     {
-      m_vdbg("invalid echo\n");
+      m_info("invalid echo\n");
       return ret;
     }
 
diff --git a/system/vi/vi.c b/system/vi/vi.c
index 6289ee219..63ff0b902 100644
--- a/system/vi/vi.c
+++ b/system/vi/vi.c
@@ -160,10 +160,10 @@
 #  endif
 
 #  if CONFIG_SYSTEM_VI_DEBUGLEVEL > 1
-#    define vivdbg(format, ...) \
+#    define viinfo(format, ...) \
        syslog(LOG_DEBUG, EXTRA_FMT format EXTRA_ARG, ##__VA_ARGS__)
 #  else
-#    define vivdbg(x...)
+#    define viinfo(x...)
 #  endif
 #else
 #  if CONFIG_SYSTEM_VI_DEBUGLEVEL > 0
@@ -175,9 +175,9 @@
 #  endif
 
 #  if CONFIG_SYSTEM_VI_DEBUGLEVEL > 1
-#    define vivdbg vi_debug
+#    define viinfo vi_debug
 #  else
-#    define vivdbg (void)
+#    define viinfo (void)
 #  endif
 #endif
 
@@ -494,7 +494,7 @@ static void vi_write(FAR struct vi_s *vi, FAR const char *buffer,
   ssize_t nwritten;
   size_t  nremaining = buflen;
 
-  //vivdbg("buffer=%p buflen=%d\n", buffer, (int)buflen);
+  //viinfo("buffer=%p buflen=%d\n", buffer, (int)buflen);
 
   /* Loop until all bytes have been successfully written (or until a
    * unrecoverable error is encountered)
@@ -592,7 +592,7 @@ static char vi_getch(FAR struct vi_s *vi)
 
   /* On success, return the character that was read */
 
-  vivdbg("Returning: %c[%02x]\n", isprint(buffer) ? buffer : '.', buffer);
+  viinfo("Returning: %c[%02x]\n", isprint(buffer) ? buffer : '.', buffer);
   return buffer;
 }
 
@@ -718,7 +718,7 @@ static void vi_setcursor(FAR struct vi_s *vi, uint16_t row, uint16_t column)
   char buffer[16];
   int len;
 
-  vivdbg("row=%d column=%d\n", row, column);
+  viinfo("row=%d column=%d\n", row, column);
 
   /* Format the cursor position command.  The origin is (1,1). */
 
@@ -772,7 +772,7 @@ static void vi_clrscreen(FAR struct vi_s *vi)
 
 static void vi_scrollup(FAR struct vi_s *vi, uint16_t nlines)
 {
-  vivdbg("nlines=%d\n", nlines);
+  viinfo("nlines=%d\n", nlines);
 
   /* Scroll for the specified number of lines */
 
@@ -794,7 +794,7 @@ static void vi_scrollup(FAR struct vi_s *vi, uint16_t nlines)
 
 static void vi_scrolldown(FAR struct vi_s *vi, uint16_t nlines)
 {
-  vivdbg("nlines=%d\n", nlines);
+  viinfo("nlines=%d\n", nlines);
 
   /* Scroll for the specified number of lines */
 
@@ -883,7 +883,7 @@ static off_t vi_linebegin(FAR struct vi_s *vi, off_t pos)
       pos--;
     }
 
-  vivdbg("Return pos=%ld\n", (long)pos);
+  viinfo("Return pos=%ld\n", (long)pos);
   return pos;
 }
 
@@ -910,7 +910,7 @@ static off_t vi_prevline(FAR struct vi_s *vi, off_t pos)
       pos = vi_linebegin(vi, pos - 1);
     }
 
-  vivdbg("Return pos=%ld\n", (long)pos);
+  viinfo("Return pos=%ld\n", (long)pos);
   return pos;
 }
 
@@ -933,7 +933,7 @@ static off_t vi_lineend(FAR struct vi_s *vi, off_t pos)
       pos++;
     }
 
-  vivdbg("Return pos=%ld\n", (long)pos);
+  viinfo("Return pos=%ld\n", (long)pos);
   return pos;
 }
 
@@ -960,7 +960,7 @@ static off_t vi_nextline(FAR struct vi_s *vi, off_t pos)
       pos++;
     }
 
-  vivdbg("Return pos=%ld\n", (long)pos);
+  viinfo("Return pos=%ld\n", (long)pos);
   return pos;
 }
 
@@ -982,7 +982,7 @@ static bool vi_extendtext(FAR struct vi_s *vi, off_t pos, size_t increment)
   FAR char *alloc;
   int i;
 
-  vivdbg("pos=%ld increment=%ld\n", (long)pos, (long)increment);
+  viinfo("pos=%ld increment=%ld\n", (long)pos, (long)increment);
 
   /* Check if we need to reallocate */
 
@@ -1041,7 +1041,7 @@ static bool vi_extendtext(FAR struct vi_s *vi, off_t pos, size_t increment)
 
 static void vi_shrinkpos(off_t delpos, size_t delsize, FAR off_t *pos)
 {
-  vivdbg("delpos=%ld delsize=%ld pos=%ld\n",
+  viinfo("delpos=%ld delsize=%ld pos=%ld\n",
          (long)delpos, (long)delsize, (long)*pos);
 
   /* Check if the position is beyond the deleted region */
@@ -1079,7 +1079,7 @@ static void vi_shrinktext(FAR struct vi_s *vi, off_t pos, size_t size)
   size_t allocsize;
   int i;
 
-  vivdbg("pos=%ld size=%ld\n", (long)pos, (long)size);
+  viinfo("pos=%ld size=%ld\n", (long)pos, (long)size);
 
   /* Close up the gap to remove 'size' characters at 'pos' */
 
@@ -1137,7 +1137,7 @@ static bool vi_insertfile(FAR struct vi_s *vi, off_t pos,
   int result;
   bool ret;
 
-  vivdbg("pos=%ld filename=\"%s\"\n", (long)pos, filename);
+  viinfo("pos=%ld filename=\"%s\"\n", (long)pos, filename);
 
   /* Get the size of the file  */
 
@@ -1208,7 +1208,7 @@ static bool vi_savetext(FAR struct vi_s *vi, FAR const char *filename,
   FILE *stream;
   size_t nwritten;
 
-  vivdbg("filename=\"%s\" pos=%ld size=%ld\n",
+  viinfo("filename=\"%s\" pos=%ld size=%ld\n",
          filename, (long)pos, (long)size);
 
   /* Open the file for writing */
@@ -1251,7 +1251,7 @@ static bool vi_checkfile(FAR struct vi_s *vi, FAR const char *filename)
   struct stat buf;
   int ret;
 
-  vivdbg("filename=\"%s\"\n", filename);
+  viinfo("filename=\"%s\"\n", filename);
 
   /* Get the size of the file  */
 
@@ -1293,7 +1293,7 @@ static bool vi_checkfile(FAR struct vi_s *vi, FAR const char *filename)
 
 static void vi_setmode(FAR struct vi_s *vi, uint8_t mode, long value)
 {
-  vivdbg("mode=%d value=%ld\n", mode, value);
+  viinfo("mode=%d value=%ld\n", mode, value);
 
   /* Set the mode and clear mode-dependent states that are not preserved
    * across mode changes.
@@ -1320,7 +1320,7 @@ static void vi_setmode(FAR struct vi_s *vi, uint8_t mode, long value)
 static void vi_setsubmode(FAR struct vi_s *vi, uint8_t mode, char prompt,
                           long value)
 {
-  vivdbg("mode=%d prompt='%c' value=%ld\n", mode, prompt, value);
+  viinfo("mode=%d prompt='%c' value=%ld\n", mode, prompt, value);
 
   /* Set up the new mode */
 
@@ -1362,7 +1362,7 @@ static void vi_setsubmode(FAR struct vi_s *vi, uint8_t mode, char prompt,
 
 static void vi_exitsubmode(FAR struct vi_s *vi, uint8_t mode)
 {
-  vivdbg("mode=%d\n", mode);
+  viinfo("mode=%d\n", mode);
 
   /* Set up the new mode */
 
@@ -1394,7 +1394,7 @@ static void vi_windowpos(FAR struct vi_s *vi, off_t start, off_t end,
   uint16_t column;
   off_t pos;
 
-  vivdbg("start=%ld end=%ld\n", (long)start, (long)end);
+  viinfo("start=%ld end=%ld\n", (long)start, (long)end);
 
   /* Make sure that the end position is not beyond the end of the text. We
    * assume that the start position is okay.
@@ -1588,7 +1588,7 @@ static void vi_scrollcheck(FAR struct vi_s *vi)
    */
 
   vi->prevpos = vi->winpos;
-  vivdbg("winpos=%ld hscroll=%d\n",
+  viinfo("winpos=%ld hscroll=%d\n",
          (long)vi->winpos, (long)vi->hscroll);
 }
 
@@ -1754,7 +1754,7 @@ static void vi_cusorup(FAR struct vi_s *vi, int nlines)
   off_t start;
   off_t end;
 
-  vivdbg("nlines=%d\n", nlines);
+  viinfo("nlines=%d\n", nlines);
 
   /* How many lines do we need to move?  Zero means 1 (so does 1) */
 
@@ -1795,7 +1795,7 @@ static void vi_cursordown(FAR struct vi_s *vi, int nlines)
   off_t start;
   off_t end;
 
-  vivdbg("nlines=%d\n", nlines);
+  viinfo("nlines=%d\n", nlines);
 
   /* How many lines do we need to move?  Zero means 1 (so does 1) */
 
@@ -1836,7 +1836,7 @@ static off_t vi_cursorleft(FAR struct vi_s *vi, off_t curpos, int ncolumns)
 {
   int remaining;
 
-  vivdbg("curpos=%ld ncolumns=%d\n", curpos, ncolumns);
+  viinfo("curpos=%ld ncolumns=%d\n", curpos, ncolumns);
 
   /* Loop decrementing the cursor position for each repetition count.  Break
    * out early if we hit either the beginning of the text buffer, or the end
@@ -1864,7 +1864,7 @@ static off_t vi_cursorright(FAR struct vi_s *vi, off_t curpos, int ncolumns)
 {
   int remaining;
 
-  vivdbg("curpos=%ld ncolumns=%d\n", curpos, ncolumns);
+  viinfo("curpos=%ld ncolumns=%d\n", curpos, ncolumns);
 
   /* Loop incrementing the cursor position for each repetition count.  Break
    * out early if we hit either the end of the text buffer, or the end of the line.
@@ -1890,7 +1890,7 @@ static void vi_delforward(FAR struct vi_s *vi)
   off_t end;
   size_t size;
 
-  vivdbg("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
+  viinfo("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
 
   /* Get the cursor position as if we would have move the cursor right N
    * times (which might be <N characters).
@@ -1920,7 +1920,7 @@ static void vi_delbackward(FAR struct vi_s *vi)
   off_t end;
   size_t size;
 
-  vivdbg("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
+  viinfo("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
 
   /* Back up one character.  This is where the deletion will end */
 
@@ -1992,7 +1992,7 @@ static void vi_delline(FAR struct vi_s *vi)
    */
 
   vi_linerange(vi, &start, &end);
-  vivdbg("start=%ld end=%ld\n", (long)start, (long)end);
+  viinfo("start=%ld end=%ld\n", (long)start, (long)end);
 
   /* Remove the text from the text buffer */
 
@@ -2019,7 +2019,7 @@ static void vi_yank(FAR struct vi_s *vi)
    */
 
   vi_linerange(vi, &start, &end);
-  vivdbg("start=%ld end=%ld\n", (long)start, (long)end);
+  viinfo("start=%ld end=%ld\n", (long)start, (long)end);
 
   /* Free any previously yanked lines */
 
@@ -2062,7 +2062,7 @@ static void vi_paste(FAR struct vi_s *vi)
 {
   off_t start;
 
-  vivdbg("curpos=%ld yankalloc=%d\n", (long)vi->curpos, (long)vi->yankalloc);
+  viinfo("curpos=%ld yankalloc=%d\n", (long)vi->curpos, (long)vi->yankalloc);
 
   /* Make sure there is something to be yanked */
 
@@ -2108,7 +2108,7 @@ static void vi_paste(FAR struct vi_s *vi)
 
 static void vi_gotoline(FAR struct vi_s *vi)
 {
-  vivdbg("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
+  viinfo("curpos=%ld value=%ld\n", (long)vi->curpos, vi->value);
 
   /* Special case the first line */
 
@@ -2153,7 +2153,7 @@ static void vi_gotoline(FAR struct vi_s *vi)
 
 static void vi_cmd_mode(FAR struct vi_s *vi)
 {
-  vivdbg("Enter command mode\n");
+  viinfo("Enter command mode\n");
 
   /* Loop while we are in command mode */
 
@@ -2205,7 +2205,7 @@ static void vi_cmd_mode(FAR struct vi_s *vi)
 
           vi->value = tmp;
 
-          vivdbg("Value=%ld\n", vi->value);
+          viinfo("Value=%ld\n", vi->value);
           continue;
         }
 
@@ -2468,7 +2468,7 @@ static void vi_cmdch(FAR struct vi_s *vi, char ch)
   int index = vi->cmdlen;
   int next  = index + 1;
 
-  vivdbg("cmdlen=%d ch=%c[%02x]\n", vi->cmdlen, isprint(ch) ? ch : '.', ch);
+  viinfo("cmdlen=%d ch=%c[%02x]\n", vi->cmdlen, isprint(ch) ? ch : '.', ch);
 
   /* Abort gracelessly if the scratch buffer becomes full */
 
@@ -2502,7 +2502,7 @@ static void vi_cmdch(FAR struct vi_s *vi, char ch)
 
 static void vi_cmdbackspace(FAR struct vi_s *vi)
 {
-  vivdbg("cmdlen=%d\n", vi->cmdlen);
+  viinfo("cmdlen=%d\n", vi->cmdlen);
 
   if (vi->cmdlen > 0)
     {
@@ -2540,7 +2540,7 @@ static void vi_parsecolon(FAR struct vi_s *vi)
   int col;
   int ch;
 
-  vivdbg("Parse: \"%s\"\n", vi->scratch);
+  viinfo("Parse: \"%s\"\n", vi->scratch);
 
   /* NUL terminate the command */
 
@@ -2679,7 +2679,7 @@ static void vi_parsecolon(FAR struct vi_s *vi)
    * A filename where one is not needed is also an error.
    */
 
-  vivdbg("cmd=%d filename=\"%s\"\n", cmd, vi->filename);
+  viinfo("cmd=%d filename=\"%s\"\n", cmd, vi->filename);
 
   if (cmd == CMD_NONE || (IS_READ(cmd) && !filename) ||
       (!USES_FILE(cmd) && filename))
@@ -2838,7 +2838,7 @@ static void vi_cmd_submode(FAR struct vi_s *vi)
 {
   int ch;
 
-  vivdbg("Enter colon command sub-mode\n");
+  viinfo("Enter colon command sub-mode\n");
 
   /* Loop while we are in colon command mode */
 
@@ -2941,7 +2941,7 @@ static bool vi_findstring(FAR struct vi_s *vi)
   off_t pos;
   int len;
 
-  vivdbg("findstr: \"%s\"\n", vi->findstr);
+  viinfo("findstr: \"%s\"\n", vi->findstr);
 
   /* The search string is in the find buffer */
 
@@ -2997,7 +2997,7 @@ static void vi_parsefind(FAR struct vi_s *vi)
    * string from the previous find operation.
    */
 
-  vivdbg("scratch: \"%s\"\n", vi->scratch);
+  viinfo("scratch: \"%s\"\n", vi->scratch);
 
   if (vi->cmdlen > 0)
     {
@@ -3033,7 +3033,7 @@ static void vi_find_submode(FAR struct vi_s *vi)
 {
   int ch;
 
-  vivdbg("Enter find sub-mode\n");
+  viinfo("Enter find sub-mode\n");
 
   /* Loop while we are in find mode */
 
@@ -3133,7 +3133,7 @@ static void vi_find_submode(FAR struct vi_s *vi)
 
 static void vi_replacech(FAR struct vi_s *vi, char ch)
 {
-  vivdbg("curpos=%ld ch=%c[%02x]\n", vi->curpos, isprint(ch) ? ch : '.', ch);
+  viinfo("curpos=%ld ch=%c[%02x]\n", vi->curpos, isprint(ch) ? ch : '.', ch);
 
   /* Is there a newline at the current cursor position? */
 
@@ -3170,7 +3170,7 @@ static void vi_replacech_submode(FAR struct vi_s *vi)
 
   nchars = (vi->value > 0 ? vi->value : 1);
 
-  vivdbg("Enter replaces character(s) sub-mode: nchars=%d\n", nchars);
+  viinfo("Enter replaces character(s) sub-mode: nchars=%d\n", nchars);
 
   /* Are there that many characters left on the line to be replaced? */
 
@@ -3284,7 +3284,7 @@ static void vi_replacech_submode(FAR struct vi_s *vi)
 
 static void vi_insertch(FAR struct vi_s *vi, char ch)
 {
-  vivdbg("curpos=%ld ch=%c[%02x]\n", vi->curpos, isprint(ch) ? ch : '.', ch);
+  viinfo("curpos=%ld ch=%c[%02x]\n", vi->curpos, isprint(ch) ? ch : '.', ch);
 
   /* Make space in the buffer for the new character */
 
@@ -3308,7 +3308,7 @@ static void vi_insert_mode(FAR struct vi_s *vi)
 {
   int ch;
 
-  vivdbg("Enter insert mode\n");
+  viinfo("Enter insert mode\n");
 
   /* Loop while we are in insert mode */
 
@@ -3427,7 +3427,7 @@ static void vi_replace_mode(FAR struct vi_s *vi)
   off_t start = vi->curpos;
   int ch;
 
-  vivdbg("Enter replace mode\n");
+  viinfo("Enter replace mode\n");
 
   /* Loop until ESC is pressed */
 
@@ -3716,7 +3716,7 @@ int vi_main(int argc, char **argv)
     {
       /* We loop, processing each mode change */
 
-      vivdbg("mode=%d\n", vi->mode);
+      viinfo("mode=%d\n", vi->mode);
 
       switch (vi->mode)
         {