diff --git a/include/nuttx/wireless/bluetooth/bt_core.h b/include/nuttx/wireless/bluetooth/bt_core.h
index f54547997c7..66461ff8bbf 100644
--- a/include/nuttx/wireless/bluetooth/bt_core.h
+++ b/include/nuttx/wireless/bluetooth/bt_core.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_core.h
+ * include/nuttx/wireless/bluetooth/bt_core.h
  * Bluetooth subsystem core APIs.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
@@ -195,7 +195,7 @@ static inline int bt_addr_to_str(FAR const bt_addr_t *addr, FAR char *str,
  ****************************************************************************/
 
 static inline int bt_addr_le_to_str(FAR const bt_addr_le_t *addr, char *str,
-            size_t len)
+                                    size_t len)
 {
   char type[7];
 
diff --git a/include/nuttx/wireless/bluetooth/bt_driver.h b/include/nuttx/wireless/bluetooth/bt_driver.h
index b5fb1f2decc..db96d19067a 100644
--- a/include/nuttx/wireless/bluetooth/bt_driver.h
+++ b/include/nuttx/wireless/bluetooth/bt_driver.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_driver.h
+ * include/nuttx/wireless/bluetooth/bt_driver.h
  * Bluetooth HCI driver API.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
@@ -96,7 +96,7 @@ int bt_netdev_register(FAR const struct bt_driver_s *btdev);
  * Description:
  *   Called by the Bluetooth low-level driver when new data is received from
  *   the radio.  This may be called from the low-level driver and is part of
- *   the driver interface prototyped in include/nuttx/wireless/bluetooth/bt_driver.h
+ *   the driver interface
  *
  * Input Parameters:
  *   buf - An instance of the buffer structure providing the received frame.
diff --git a/include/nuttx/wireless/bluetooth/bt_gatt.h b/include/nuttx/wireless/bluetooth/bt_gatt.h
index 9f89a5d08a8..755469eea81 100644
--- a/include/nuttx/wireless/bluetooth/bt_gatt.h
+++ b/include/nuttx/wireless/bluetooth/bt_gatt.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_gatt.h
+ * include/nuttx/wireless/bluetooth/bt_gatt.h
  * Generic Attribute Profile handling.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_hci.h b/include/nuttx/wireless/bluetooth/bt_hci.h
index dcbc3d61db7..98822c04df3 100644
--- a/include/nuttx/wireless/bluetooth/bt_hci.h
+++ b/include/nuttx/wireless/bluetooth/bt_hci.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_hci.h
+ * include/nuttx/wireless/bluetooth/bt_hci.h
  * Bluetooth Host Control Interface definitions.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_ioctl.h b/include/nuttx/wireless/bluetooth/bt_ioctl.h
index 6f131be6097..f8409625f1c 100644
--- a/include/nuttx/wireless/bluetooth/bt_ioctl.h
+++ b/include/nuttx/wireless/bluetooth/bt_ioctl.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_ioctl.h
+ * include/nuttx/wireless/bluetooth/bt_ioctl.h
  * Bluetooth Network IOCTL commands.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_null.h b/include/nuttx/wireless/bluetooth/bt_null.h
index 1093c786f6e..7fcffa2589a 100644
--- a/include/nuttx/wireless/bluetooth/bt_null.h
+++ b/include/nuttx/wireless/bluetooth/bt_null.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/wireless/bluetooth/bt_null.h
+ * include/nuttx/wireless/bluetooth/bt_null.h
  * NULL based Bluetooth driver
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_uart.h b/include/nuttx/wireless/bluetooth/bt_uart.h
index a323f7ba0f1..4dce3b47b61 100644
--- a/include/nuttx/wireless/bluetooth/bt_uart.h
+++ b/include/nuttx/wireless/bluetooth/bt_uart.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/wireless/bluetooth/bt_uart.h
+ * include/nuttx/wireless/bluetooth/bt_uart.h
  * UART based Bluetooth driver
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_uart_shim.h b/include/nuttx/wireless/bluetooth/bt_uart_shim.h
index 034a81e7997..335260018ae 100644
--- a/include/nuttx/wireless/bluetooth/bt_uart_shim.h
+++ b/include/nuttx/wireless/bluetooth/bt_uart_shim.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * drivers/wireless/bluetooth/bt_uart_shim.h
+ * include/nuttx/wireless/bluetooth/bt_uart_shim.h
  * Shim for connecting generic UART ports to bluetooth H4 interfaces
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
diff --git a/include/nuttx/wireless/bluetooth/bt_uuid.h b/include/nuttx/wireless/bluetooth/bt_uuid.h
index 31050f67485..7ae531089ed 100644
--- a/include/nuttx/wireless/bluetooth/bt_uuid.h
+++ b/include/nuttx/wireless/bluetooth/bt_uuid.h
@@ -1,6 +1,6 @@
 /****************************************************************************
- * wireless/bluetooth/bt_uuid.h
- * B Bluetooth UUID handling.
+ * include/nuttx/wireless/bluetooth/bt_uuid.h
+ * Bluetooth UUID handling.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/wireless/bluetooth/bt_buf.c b/wireless/bluetooth/bt_buf.c
index cb4a9d55622..d4b75b93065 100644
--- a/wireless/bluetooth/bt_buf.c
+++ b/wireless/bluetooth/bt_buf.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_buf_s.c
+ * wireless/bluetooth/bt_buf.c
  * Bluetooth buffer management
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
@@ -111,7 +111,7 @@ static struct bt_buf_s *g_buf_free_irq;
 /* Pool of pre-allocated buffer structures */
 
 static struct bt_buf_s
-  g_buf_pool[CONFIG_BLUETOOTH_BUFFER_PREALLOC];
+g_buf_pool[CONFIG_BLUETOOTH_BUFFER_PREALLOC];
 
 static bool g_poolinit = false;
 
diff --git a/wireless/bluetooth/bt_l2cap.h b/wireless/bluetooth/bt_l2cap.h
index f724aa2b131..2daeae75e99 100644
--- a/wireless/bluetooth/bt_l2cap.h
+++ b/wireless/bluetooth/bt_l2cap.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_l2cap.c
+ * wireless/bluetooth/bt_l2cap.h
  * L2CAP handling
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
diff --git a/wireless/bluetooth/bt_uuid.c b/wireless/bluetooth/bt_uuid.c
index 07778c87fed..3821583169b 100644
--- a/wireless/bluetooth/bt_uuid.c
+++ b/wireless/bluetooth/bt_uuid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * wireless/bluetooth/bt_att.c
+ * wireless/bluetooth/bt_uuid.c
  *  Bluetooth UUID handling.
  *
  *   Copyright (C) 2018 Gregory Nutt. All rights reserved.