34 files changed, 21 insertions, 27 deletions
diff --git a/bta/sys/bta_sys_main.c b/bta/sys/bta_sys_main.c
index 2fa239de9..739d5f8c6 100644
--- a/bta/sys/bta_sys_main.c
+++ b/bta/sys/bta_sys_main.c
@@ -58,7 +58,7 @@ static pthread_mutex_t bta_alarm_lock;
 extern thread_t *bt_workqueue_thread;
 
 /* trace level */
-/* TODO Bluedroid - Hard-coded trace levels -  Needs to be configurable */
+/* TODO Hard-coded trace levels -  Needs to be configurable */
 UINT8 appl_trace_level = BT_TRACE_LEVEL_WARNING; //APPL_INITIAL_TRACE_LEVEL;
 UINT8 btif_trace_level = BT_TRACE_LEVEL_WARNING;
 
diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c
index 48d66d4f5..04509e72c 100644
--- a/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@ -25,7 +25,7 @@
  ***********************************************************************************/
 
 #define LOG_NDDEBUG 0
-#define LOG_TAG "bt_bluedroid"
+#define LOG_TAG "bt_btif"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c
index b546a47e6..412a15825 100644
--- a/btif/src/btif_av.c
+++ b/btif/src/btif_av.c
@@ -16,14 +16,6 @@
  *
  ******************************************************************************/
 
-/*****************************************************************************
- *
- *  Filename:      btif_av.c
- *
- *  Description:   Bluedroid AV implementation
- *
- *****************************************************************************/
-
 #include "btif_av.h"
 
 #include <assert.h>
diff --git a/btif/src/btif_sock_l2cap.c b/btif/src/btif_sock_l2cap.c
index e57efa2ea..12c301d77 100644
--- a/btif/src/btif_sock_l2cap.c
+++ b/btif/src/btif_sock_l2cap.c
@@ -997,7 +997,7 @@ void btsock_l2cap_signaled(int fd, int flags, uint32_t user_id)
                          * typically written to the socket in a tight loop, hence we risk the ioctl
                          * will return the total amount of data in the buffer, which could be
                          * multiple 64kbyte chunks.
-                         * UPDATE: As bluedroid cannot handle 64kbyte buffers, the size is reduced
+                         * UPDATE: As the stack cannot handle 64kbyte buffers, the size is reduced
                          * to around 8kbyte - and using malloc for buffer allocation here seems to
                          * be wrong
                          * UPDATE: Since we are responsible for freeing the buffer in the
diff --git a/doc/btsnoop_net.md b/doc/btsnoop_net.md
index efd1071e1..25009081a 100644
--- a/doc/btsnoop_net.md
+++ b/doc/btsnoop_net.md
@@ -4,7 +4,7 @@ btsnoop_net exposes Bluetooth snoop logs over a local TCP socket which enables
 real-time debugging of HCI data with hcidump.
 
 This feature is enabled by  setting `BtSnoopLogOutput=true` in `bt_stack.conf`.
-Once it has been enabled and the stack restarted, bluedroid will listen for
+Once it has been enabled and the stack restarted, the stack will listen for
 incoming TCP connections on port 8872.
 
 To use this feature with hcidump on a Linux host, you can run:
diff --git a/doc/directory_layout.md b/doc/directory_layout.md
index b13d826eb..80b17c847 100644
--- a/doc/directory_layout.md
+++ b/doc/directory_layout.md
@@ -12,11 +12,11 @@ of one or more modules.
 * audio_a2dp_hw - A2DP audio HAL implementation.
 * bta - *Bluetooth Application* - Strange collection of a-lot of things **Deprecate?**
 * btcore - *Bluetooth Core* - Bluetooth data type definitions and operations on those data types.
-* btif - *Bluetooth Interface* - Bluedroid JNI interface to Android.
+* btif - *Bluetooth Interface* - JNI interface to Android.
 * conf - *Configuration* - Various configuration text files.
 * doc - *Documentation* - Stack documentation.
 * embdrv - **Deprecated** - Bluetooth SBC Codec.
-* hci - *Host Controller Interface* - Communication protocol with bluetooth chip.
+* hci - *Host Controller Interface* - Communication protocol with Bluetooth chip.
 * include - **Deprecated** - System global include files.
 * main - *Main stack entrypoint* - Provides HAL for stack access.
 * osi - *Operating System Interface* - General resource support for stack.
diff --git a/doc/log_tags.md b/doc/log_tags.md
index 9d9085b81..f460fd04b 100644
--- a/doc/log_tags.md
+++ b/doc/log_tags.md
@@ -1,11 +1,11 @@
 Log Tags
 ===
-This document lists all of the log tags used by bluedroid.
+This document lists all of the log tags used by the Bluetooth stack.
 
 * audio_a2dp_hw
-* bluedroid
 * BTA_AG_CO:
 * bta_sys_main
+* bt_btif
 * bt_btif_config
 * bt_btif_config_transcode
 * bt_classic_peer
diff --git a/doc/network_ports.md b/doc/network_ports.md
index 731ed7990..5244a1442 100644
--- a/doc/network_ports.md
+++ b/doc/network_ports.md
@@ -1,7 +1,8 @@
 Network Ports
 ===
-This document lists all of the network ports used by bluedroid. It should be
-used as a reference and as a mechanism to avoid port namespace conflicts.
+This document lists all of the network ports used by the bluetooth stack.
+It should be used as a reference and as a mechanism to avoid port
+namespace conflicts.
 
 * TCP 8872 (hci/src/btsnoop_net.c) - read live btsnoop logs
 * TCP 8873 (hci/src/hci_inject.c) - inject HCI packets into HCI stream
diff --git a/doc/power_management.md b/doc/power_management.md
index ae90d2975..b40f854fa 100644
--- a/doc/power_management.md
+++ b/doc/power_management.md
@@ -2,10 +2,10 @@
 
 ### Overview
 
-Power management (PM) in bluedroid is an event-driven state machine, tickled by
-various `bta/sys` events via a callback. The actual state switching calls are
-handled by the BTM HCI interfacing code, with results being posted back to the
-PM code via the BTA workqueue thread.
+Power management (PM) is an event-driven state machine, tickled by various
+`bta/sys` events via a callback. The actual state switching calls are handled
+by the BTM HCI interfacing code, with results being posted back to the PM
+code via the BTA workqueue thread.
 
 Power states are managed per-device, per-profile, so every incoming event
 includes a profile ID, app ID, and a `BD_ADDR`.
diff --git a/doc/properties.md b/doc/properties.md
index 7d1edca75..06c2bf452 100644
--- a/doc/properties.md
+++ b/doc/properties.md
@@ -1,6 +1,7 @@
 Properties
 ===
-This document describes all of the Android properties used by bluedroid.
+This document describes all of the Android properties used by the Bluetooth
+stack.
 
 Please keep the following list in alphabetical order.
 
diff --git a/include/bt_target.h b/include/bt_target.h
index ca3ba810a..de3d50f00 100644
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -1621,7 +1621,7 @@ The maximum number of payload octets that the local device can receive in a sing
 #define BTA_EIR_SERVER_NUM_CUSTOM_UUID     8
 #endif
 
-/* CHLD override for bluedroid */
+/* CHLD override */
 #ifndef BTA_AG_CHLD_VAL_ECC
 #define BTA_AG_CHLD_VAL_ECC  "(0,1,1x,2,2x,3)"
 #endif
diff --git a/osi/src/alarm.c b/osi/src/alarm.c
index b105de45d..c8c1f831a 100644
--- a/osi/src/alarm.c
+++ b/osi/src/alarm.c
@@ -62,7 +62,7 @@ struct alarm_t {
 int64_t TIMER_INTERVAL_FOR_WAKELOCK_IN_MS = 3000;
 static const clockid_t CLOCK_ID = CLOCK_BOOTTIME;
 static const clockid_t CLOCK_ID_ALARM = CLOCK_BOOTTIME_ALARM;
-static const char *WAKE_LOCK_ID = "bluedroid_timer";
+static const char *WAKE_LOCK_ID = "bluetooth_timer";
 static const char *WAKE_LOCK_PATH = "/sys/power/wake_lock";
 static const char *WAKE_UNLOCK_PATH = "/sys/power/wake_unlock";
 static ssize_t locked_id_len = -1;
diff --git a/test/gtest_net_test_bluedroid/Android.mk b/test/gtest_net_test_bluetooth/Android.mk
index e55766b25..36e3701e0 100644
--- a/test/gtest_net_test_bluedroid/Android.mk
+++ b/test/gtest_net_test_bluetooth/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := gtest_net_test_bluedroid
+LOCAL_MODULE := gtest_net_test_bluetooth
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/../../
diff --git a/test/gtest_net_test_bluedroid/base.h b/test/gtest_net_test_bluetooth/base.h
index 7f33867b1..7f33867b1 100644
--- a/test/gtest_net_test_bluedroid/base.h
+++ b/test/gtest_net_test_bluetooth/base.h
diff --git a/test/gtest_net_test_bluedroid/cases/adapter.c b/test/gtest_net_test_bluetooth/cases/adapter.c
index 2d2008476..2d2008476 100644
--- a/test/gtest_net_test_bluedroid/cases/adapter.c
+++ b/test/gtest_net_test_bluetooth/cases/adapter.c
diff --git a/test/gtest_net_test_bluedroid/cases/cases.c b/test/gtest_net_test_bluetooth/cases/cases.c
index 99fd34879..99fd34879 100644
--- a/test/gtest_net_test_bluedroid/cases/cases.c
+++ b/test/gtest_net_test_bluetooth/cases/cases.c
diff --git a/test/gtest_net_test_bluedroid/cases/cases.h b/test/gtest_net_test_bluetooth/cases/cases.h
index 9606b2051..9606b2051 100644
--- a/test/gtest_net_test_bluedroid/cases/cases.h
+++ b/test/gtest_net_test_bluetooth/cases/cases.h
diff --git a/test/gtest_net_test_bluedroid/cases/gatt.c b/test/gtest_net_test_bluetooth/cases/gatt.c
index a38f7d69b..a38f7d69b 100644
--- a/test/gtest_net_test_bluedroid/cases/gatt.c
+++ b/test/gtest_net_test_bluetooth/cases/gatt.c
diff --git a/test/gtest_net_test_bluedroid/cases/pan.c b/test/gtest_net_test_bluetooth/cases/pan.c
index 157bd8107..157bd8107 100644
--- a/test/gtest_net_test_bluedroid/cases/pan.c
+++ b/test/gtest_net_test_bluetooth/cases/pan.c
diff --git a/test/gtest_net_test_bluedroid/cases/rfcomm.c b/test/gtest_net_test_bluetooth/cases/rfcomm.c
index 6cb2793fb..6cb2793fb 100644
--- a/test/gtest_net_test_bluedroid/cases/rfcomm.c
+++ b/test/gtest_net_test_bluetooth/cases/rfcomm.c
diff --git a/test/gtest_net_test_bluedroid/main.cpp b/test/gtest_net_test_bluetooth/main.cpp
index 3de142005..3de142005 100644
--- a/test/gtest_net_test_bluedroid/main.cpp
+++ b/test/gtest_net_test_bluetooth/main.cpp
diff --git a/test/gtest_net_test_bluedroid/support/adapter.c b/test/gtest_net_test_bluetooth/support/adapter.c
index 34ce107f2..34ce107f2 100644
--- a/test/gtest_net_test_bluedroid/support/adapter.c
+++ b/test/gtest_net_test_bluetooth/support/adapter.c
diff --git a/test/gtest_net_test_bluedroid/support/adapter.h b/test/gtest_net_test_bluetooth/support/adapter.h
index cae90dad8..cae90dad8 100644
--- a/test/gtest_net_test_bluedroid/support/adapter.h
+++ b/test/gtest_net_test_bluetooth/support/adapter.h
diff --git a/test/gtest_net_test_bluedroid/support/callbacks.c b/test/gtest_net_test_bluetooth/support/callbacks.c
index 4ad3bf6e4..4ad3bf6e4 100644
--- a/test/gtest_net_test_bluedroid/support/callbacks.c
+++ b/test/gtest_net_test_bluetooth/support/callbacks.c
diff --git a/test/gtest_net_test_bluedroid/support/callbacks.h b/test/gtest_net_test_bluetooth/support/callbacks.h
index de92f15e3..de92f15e3 100644
--- a/test/gtest_net_test_bluedroid/support/callbacks.h
+++ b/test/gtest_net_test_bluetooth/support/callbacks.h
diff --git a/test/gtest_net_test_bluedroid/support/gatt.c b/test/gtest_net_test_bluetooth/support/gatt.c
index 31a28f290..31a28f290 100644
--- a/test/gtest_net_test_bluedroid/support/gatt.c
+++ b/test/gtest_net_test_bluetooth/support/gatt.c
diff --git a/test/gtest_net_test_bluedroid/support/gatt.h b/test/gtest_net_test_bluetooth/support/gatt.h
index 2ef543364..2ef543364 100644
--- a/test/gtest_net_test_bluedroid/support/gatt.h
+++ b/test/gtest_net_test_bluetooth/support/gatt.h
diff --git a/test/gtest_net_test_bluedroid/support/hal.c b/test/gtest_net_test_bluetooth/support/hal.c
index 89f609b29..89f609b29 100644
--- a/test/gtest_net_test_bluedroid/support/hal.c
+++ b/test/gtest_net_test_bluetooth/support/hal.c
diff --git a/test/gtest_net_test_bluedroid/support/hal.h b/test/gtest_net_test_bluetooth/support/hal.h
index ccf6267f4..ccf6267f4 100644
--- a/test/gtest_net_test_bluedroid/support/hal.h
+++ b/test/gtest_net_test_bluetooth/support/hal.h
diff --git a/test/gtest_net_test_bluedroid/support/pan.c b/test/gtest_net_test_bluetooth/support/pan.c
index 2865e81ae..2865e81ae 100644
--- a/test/gtest_net_test_bluedroid/support/pan.c
+++ b/test/gtest_net_test_bluetooth/support/pan.c
diff --git a/test/gtest_net_test_bluedroid/support/pan.h b/test/gtest_net_test_bluetooth/support/pan.h
index 69dd4a9f5..69dd4a9f5 100644
--- a/test/gtest_net_test_bluedroid/support/pan.h
+++ b/test/gtest_net_test_bluetooth/support/pan.h
diff --git a/test/gtest_net_test_bluedroid/support/rfcomm.c b/test/gtest_net_test_bluetooth/support/rfcomm.c
index c9d15e46b..c9d15e46b 100644
--- a/test/gtest_net_test_bluedroid/support/rfcomm.c
+++ b/test/gtest_net_test_bluetooth/support/rfcomm.c
diff --git a/test/gtest_net_test_bluedroid/support/rfcomm.h b/test/gtest_net_test_bluetooth/support/rfcomm.h
index 1c2de7b21..1c2de7b21 100644
--- a/test/gtest_net_test_bluedroid/support/rfcomm.h
+++ b/test/gtest_net_test_bluetooth/support/rfcomm.h
diff --git a/test/suite/Android.mk b/test/suite/Android.mk
index 6dc45e394..ab7c14ade 100644
--- a/test/suite/Android.mk
+++ b/test/suite/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := net_test_bluedroid
+LOCAL_MODULE := net_test_bluetooth
 
 LOCAL_C_INCLUDES += \
     $(LOCAL_PATH)/../../