diff --git a/drivers/coresight/coresight_common.c b/drivers/coresight/coresight_common.c
index 10af662402..8ab261a94f 100644
--- a/drivers/coresight/coresight_common.c
+++ b/drivers/coresight/coresight_common.c
@@ -229,7 +229,7 @@ int coresight_get_system_trace_id(void)
       return -EINVAL;
     }
 
-  __set_bit(traceid, g_coresight_trace_id_bitmap);
+  set_bit(traceid, g_coresight_trace_id_bitmap);
   spin_unlock_irqrestore(&g_coresight_trace_id_lock, flags);
 
   return traceid;
@@ -251,7 +251,7 @@ void coresight_put_system_trace_id(int traceid)
   irqstate_t flags;
 
   flags = spin_lock_irqsave(&g_coresight_trace_id_lock);
-  __clear_bit(traceid, g_coresight_trace_id_bitmap);
+  clear_bit(traceid, g_coresight_trace_id_bitmap);
   spin_unlock_irqrestore(&g_coresight_trace_id_lock, flags);
 }
 
diff --git a/drivers/coresight/coresight_stm.c b/drivers/coresight/coresight_stm.c
index 4bb586b212..308e2d4b52 100644
--- a/drivers/coresight/coresight_stm.c
+++ b/drivers/coresight/coresight_stm.c
@@ -355,11 +355,11 @@ int stm_set_channel_options(FAR struct coresight_stm_dev_s *stmdev,
   switch (options)
     {
       case STM_OPTION_GUARANTEED:
-        __set_bit(channel, stmdev->guaranteed);
+        set_bit(channel, stmdev->guaranteed);
         break;
 
       case STM_OPTION_INVARIANT:
-        __clear_bit(channel, stmdev->guaranteed);
+        clear_bit(channel, stmdev->guaranteed);
         break;
 
       default:
diff --git a/drivers/input/aw86225.c b/drivers/input/aw86225.c
index 5e76088f1c..2c95184073 100644
--- a/drivers/input/aw86225.c
+++ b/drivers/input/aw86225.c
@@ -2397,10 +2397,10 @@ int aw86225_initialize(FAR struct i2c_master_s *master,
   aw86225_haptic_init(aw86225);
   aw86225_ram_work_init(aw86225);
 
-  __set_bit(FF_CUSTOM, lower->ffbit);
-  __set_bit(FF_GAIN, lower->ffbit);
-  __set_bit(FF_CONSTANT, lower->ffbit);
-  __set_bit(FF_PERIODIC, lower->ffbit);
+  set_bit(FF_CUSTOM, lower->ffbit);
+  set_bit(FF_GAIN, lower->ffbit);
+  set_bit(FF_CONSTANT, lower->ffbit);
+  set_bit(FF_PERIODIC, lower->ffbit);
 
   if (aw86225->effects_count + 1 > FF_EFFECT_COUNT_MAX)
     {
diff --git a/drivers/input/ff_dummy.c b/drivers/input/ff_dummy.c
index f11418ae2b..64703b2013 100644
--- a/drivers/input/ff_dummy.c
+++ b/drivers/input/ff_dummy.c
@@ -120,10 +120,10 @@ int ff_dummy_initialize(int devno)
 
   /* set dummy device capabilities */
 
-  __set_bit(FF_CUSTOM, lower->ffbit);
-  __set_bit(FF_GAIN, lower->ffbit);
-  __set_bit(FF_CONSTANT, lower->ffbit);
-  __set_bit(FF_PERIODIC, lower->ffbit);
+  set_bit(FF_CUSTOM, lower->ffbit);
+  set_bit(FF_GAIN, lower->ffbit);
+  set_bit(FF_CONSTANT, lower->ffbit);
+  set_bit(FF_PERIODIC, lower->ffbit);
 
   snprintf(path, FF_DEVNAME_MAX, FF_DEVNAME_FMT, devno);
   ret = ff_register(lower, path, FF_EFFECT_COUNT_MAX);
diff --git a/drivers/lcd/max7219.c b/drivers/lcd/max7219.c
index a6157aa5ad..447ab25649 100644
--- a/drivers/lcd/max7219.c
+++ b/drivers/lcd/max7219.c
@@ -431,11 +431,11 @@ static int max7219_putrun(FAR struct lcd_dev_s *dev, fb_coord_t row,
     {
       if ((*buffer & usrmask) != 0)
         {
-          __set_bit(col % 8 + i, ptr);
+          set_bit(col % 8 + i, ptr);
         }
       else
         {
-          __clear_bit(col % 8 + i, ptr);
+          clear_bit(col % 8 + i, ptr);
         }
 
 #ifdef CONFIG_LCD_PACKEDMSFIRST
diff --git a/drivers/lcd/memlcd.c b/drivers/lcd/memlcd.c
index 979e71f23a..86bdda6691 100644
--- a/drivers/lcd/memlcd.c
+++ b/drivers/lcd/memlcd.c
@@ -433,11 +433,11 @@ static int memlcd_putrun(FAR struct lcd_dev_s *dev,
     {
       if ((*buffer & usrmask) != 0)
         {
-          __set_bit(col % 8 + i, p);
+          set_bit(col % 8 + i, p);
         }
       else
         {
-          __clear_bit(col % 8 + i, p);
+          clear_bit(col % 8 + i, p);
         }
 
 #ifdef CONFIG_MEMLCD_BYTE_PER_PIXEL
diff --git a/include/nuttx/bits.h b/include/nuttx/bits.h
index eb0c2c9126..c39d75dff3 100644
--- a/include/nuttx/bits.h
+++ b/include/nuttx/bits.h
@@ -81,11 +81,11 @@
 #define DECLARE_BITMAP(name, bits) \
         unsigned long name[BITS_TO_LONGS(bits)]
 
-#define __set_bit(nr, addr) \
+#define set_bit(nr, addr) \
         (*(((FAR unsigned long *)(addr)) + BIT_WORD(nr)) |= \
         BIT_WORD_MASK(nr))
 
-#define __clear_bit(nr, addr) \
+#define clear_bit(nr, addr) \
         (*(((FAR unsigned long *)(addr)) + BIT_WORD(nr)) &= \
         ~BIT_WORD_MASK(nr))