diff --git a/btif/co/bta_ag_co.c b/btif/co/bta_ag_co.c
index 2092d58..502813f 100755
--- a/btif/co/bta_ag_co.c
+++ b/btif/co/bta_ag_co.c
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#define LOG_TAG "BTA_AG_CO"
+#define LOG_TAG "bt_btif_bta_ag"
 
 #include "gki.h"
 #include "bta_api.h"
diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c
index c6f550c..18d0339 100644
--- a/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@ -41,7 +41,7 @@
 #include <hardware/bt_rc.h>
 
 #define LOG_NDDEBUG 0
-#define LOG_TAG "bluedroid"
+#define LOG_TAG "bt_bluedroid"
 
 #include "btif_api.h"
 #include "btsnoop.h"
diff --git a/btif/src/btif_av.c b/btif/src/btif_av.c
index ba83f0a..28d0d9a 100644
--- a/btif/src/btif_av.c
+++ b/btif/src/btif_av.c
@@ -29,7 +29,7 @@
 #include <system/audio.h>
 #include "hardware/bt_av.h"
 
-#define LOG_TAG "BTIF_AV"
+#define LOG_TAG "bt_btif_av"
 
 #include "btif_av.h"
 #include "btif_util.h"
diff --git a/btif/src/btif_core.c b/btif/src/btif_core.c
index 4894000..3dd5b2b 100644
--- a/btif/src/btif_core.c
+++ b/btif/src/btif_core.c
@@ -36,8 +36,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#define LOG_TAG "BTIF_CORE"
+#define LOG_TAG "bt_btif_core"
 #include "btcore/include/bdaddr.h"
+
+#include "bdaddr.h"
 #include "bt_utils.h"
 #include "bta_api.h"
 #include "bte.h"
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
index 3dd7d3e..399410b 100644
--- a/btif/src/btif_dm.c
+++ b/btif/src/btif_dm.c
@@ -25,7 +25,7 @@
  *
  ***********************************************************************************/
 
-#define LOG_TAG "btif_dm"
+#define LOG_TAG "bt_btif_dm"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,6 +47,7 @@
 
 #include "bta_gatt_api.h"
 #include "include/stack_config.h"
+
 #include "osi/include/log.h"
 
 /******************************************************************************
@@ -373,7 +374,7 @@
                                sizeof(uint32_t), &remote_cod);
     if (btif_storage_get_remote_device_property((bt_bdaddr_t *)remote_bdaddr, &prop_name) == BT_STATUS_SUCCESS)
     {
-        BTIF_TRACE_ERROR("%s: remote_cod = 0x%06x", __FUNCTION__, remote_cod);
+        LOG_INFO("%s remote_cod = 0x%08x cod = 0x%08x", __func__, remote_cod, cod);
         if ((remote_cod & 0x7ff) == cod)
             return TRUE;
     }
@@ -559,16 +560,16 @@
 
     /* class of device */
     cod = devclass2uint(dev_class);
-    BTIF_TRACE_DEBUG("%s():cod is 0x%06x", __FUNCTION__, cod);
+    BTIF_TRACE_DEBUG("%s cod is 0x%06x", __func__, cod);
     if ( cod == 0) {
        /* Try to retrieve cod from storage */
-        BTIF_TRACE_DEBUG("%s():cod is 0, checking cod from storage", __FUNCTION__);
+        BTIF_TRACE_DEBUG("%s cod is 0, checking cod from storage", __func__);
         BTIF_STORAGE_FILL_PROPERTY(&properties[num_properties],
             BT_PROPERTY_CLASS_OF_DEVICE, sizeof(cod), &cod);
         status = btif_storage_get_remote_device_property(&bdaddr, &properties[num_properties]);
-        BTIF_TRACE_DEBUG("%s():cod retreived from storage is 0x%06x", __FUNCTION__, cod);
+        BTIF_TRACE_DEBUG("%s cod retrieved from storage is 0x%06x", __func__, cod);
         if ( cod == 0) {
-            BTIF_TRACE_DEBUG("%s():cod is again 0, set as unclassified", __FUNCTION__);
+            BTIF_TRACE_DEBUG("%s cod is again 0, set as unclassified", __func__);
             cod = COD_UNCLASSIFIED;
         }
     }
@@ -848,8 +849,8 @@
 
     cod = devclass2uint(p_pin_req->dev_class);
 
-    if ( cod == 0) {
-        BTIF_TRACE_DEBUG("%s():cod is 0, set as unclassified", __FUNCTION__);
+    if (cod == 0) {
+        BTIF_TRACE_DEBUG("%s cod is 0, set as unclassified", __func__);
         cod = COD_UNCLASSIFIED;
     }
 
@@ -968,8 +969,8 @@
 
     cod = devclass2uint(p_ssp_cfm_req->dev_class);
 
-    if ( cod == 0) {
-        LOG_DEBUG("cod is 0, set as unclassified");
+    if (cod == 0) {
+        LOG_DEBUG("%s cod is 0, set as unclassified", __func__);
         cod = COD_UNCLASSIFIED;
     }
 
@@ -1003,8 +1004,8 @@
     pairing_cb.is_ssp = TRUE;
     cod = devclass2uint(p_ssp_key_notif->dev_class);
 
-    if ( cod == 0) {
-        LOG_DEBUG("cod is 0, set as unclassified");
+    if (cod == 0) {
+        LOG_DEBUG("%s cod is 0, set as unclassified", __func__);
         cod = COD_UNCLASSIFIED;
     }
 
@@ -1247,8 +1248,8 @@
 
             cod = devclass2uint (p_search_data->inq_res.dev_class);
 
-            if ( cod == 0) {
-                LOG_DEBUG("cod is 0, set as unclassified");
+            if (cod == 0) {
+                LOG_DEBUG("%s cod is 0, set as unclassified", __func__);
                 cod = COD_UNCLASSIFIED;
             }
 
@@ -1407,7 +1408,7 @@
                  {
                       char temp[256];
                       uuid_to_string_legacy((bt_uuid_t*)(p_data->disc_res.p_uuid_list + (i*MAX_UUID_SIZE)), temp);
-                      BTIF_TRACE_ERROR("Index: %d uuid:%s", i, temp);
+                      LOG_INFO("%s index:%d uuid:%s", __func__, i, temp);
                  }
             }
 
@@ -1467,7 +1468,7 @@
                 }
 
                 uuid_to_string_legacy(&uuid, temp);
-                BTIF_TRACE_ERROR(" uuid:%s", temp);
+                LOG_INFO("%s uuid:%s", __func__, temp);
 
                 bdcpy(bd_addr.address, p_data->disc_ble_res.bd_addr);
                 prop.type = BT_PROPERTY_UUIDS;
diff --git a/btif/src/btif_gatt.c b/btif/src/btif_gatt.c
index ebc03b6..50ebaee 100644
--- a/btif/src/btif_gatt.c
+++ b/btif/src/btif_gatt.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BtGatt.btif"
+#define LOG_TAG "bt_btif_gatt"
 
 #include "btif_common.h"
 #include "btif_util.h"
diff --git a/btif/src/btif_gatt_client.c b/btif/src/btif_gatt_client.c
index bfffcd4..1314055 100644
--- a/btif/src/btif_gatt_client.c
+++ b/btif/src/btif_gatt_client.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BtGatt.btif"
+#define LOG_TAG "bt_btif_gattc"
 
 #include "btcore/include/bdaddr.h"
 #include "btif_common.h"
diff --git a/btif/src/btif_gatt_multi_adv_util.c b/btif/src/btif_gatt_multi_adv_util.c
index 2a61cc8..7e5dc8d 100644
--- a/btif/src/btif_gatt_multi_adv_util.c
+++ b/btif/src/btif_gatt_multi_adv_util.c
@@ -30,7 +30,7 @@
 #include "btu.h"
 #include "bt_target.h"
 
-#define LOG_TAG "BtGatt.btif"
+#define LOG_TAG "bt_btif_gatt"
 #if (BLE_INCLUDED == TRUE)
 
 #include "btif_gatt_multi_adv_util.h"
diff --git a/btif/src/btif_gatt_server.c b/btif/src/btif_gatt_server.c
index 3a4fa29..1632b01 100644
--- a/btif/src/btif_gatt_server.c
+++ b/btif/src/btif_gatt_server.c
@@ -32,7 +32,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BtGatt.btif"
+#define LOG_TAG "bt_btif_gatt"
 
 #include "btif_common.h"
 #include "btif_util.h"
diff --git a/btif/src/btif_gatt_test.c b/btif/src/btif_gatt_test.c
index 219136f..4ccf5b0 100644
--- a/btif/src/btif_gatt_test.c
+++ b/btif/src/btif_gatt_test.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BtGatt.btif_test"
+#define LOG_TAG "bt_btif_gatt"
 
 #include "btif_common.h"
 #include "btif_util.h"
diff --git a/btif/src/btif_gatt_util.c b/btif/src/btif_gatt_util.c
index df0600b..11a41ea 100644
--- a/btif/src/btif_gatt_util.c
+++ b/btif/src/btif_gatt_util.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BtGatt.btif"
+#define LOG_TAG "bt_btif_gatt"
 
 #include "btcore/include/bdaddr.h"
 #include "bta_api.h"
diff --git a/btif/src/btif_hf.c b/btif/src/btif_hf.c
index 02006cd..25ced48 100644
--- a/btif/src/btif_hf.c
+++ b/btif/src/btif_hf.c
@@ -29,7 +29,7 @@
 #include <hardware/bt_hf.h>
 #include <stdlib.h>
 
-#define LOG_TAG "BTIF_HF"
+#define LOG_TAG "bt_btif_hf"
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btif_profile_queue.h"
diff --git a/btif/src/btif_hf_client.c b/btif/src/btif_hf_client.c
index 196578b..7bc2d9a 100644
--- a/btif/src/btif_hf_client.c
+++ b/btif/src/btif_hf_client.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <cutils/properties.h>
 
-#define LOG_TAG "BTIF_HF_CLIENT"
+#define LOG_TAG "bt_btif_hfc"
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btif_profile_queue.h"
diff --git a/btif/src/btif_hh.c b/btif/src/btif_hh.c
index 99ce373..20c8e3c 100644
--- a/btif/src/btif_hh.c
+++ b/btif/src/btif_hh.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <string.h>
 
-#define LOG_TAG "BTIF_HH"
+#define LOG_TAG "bt_btif_hh"
 
 #include "bta_api.h"
 #include "bta_hh_api.h"
diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index 1d7394d..d11ba25 100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
@@ -24,7 +24,7 @@
  *
  *
  ***********************************************************************************/
-#define LOG_TAG "BTIF_HL"
+#define LOG_TAG "bt_btif_hl"
 
 #include <assert.h>
 #include <ctype.h>
diff --git a/btif/src/btif_mce.c b/btif/src/btif_mce.c
index 9961e2d..bf4c3bd 100644
--- a/btif/src/btif_mce.c
+++ b/btif/src/btif_mce.c
@@ -30,7 +30,7 @@
 #include <hardware/bt_mce.h>
 #include <stdlib.h>
 
-#define LOG_TAG "BTIF_MCE"
+#define LOG_TAG "bt_btif_mce"
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btif_profile_queue.h"
diff --git a/btif/src/btif_media_task.c b/btif/src/btif_media_task.c
index 2ff7664..d1dac72 100644
--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -26,7 +26,7 @@
  **
  ******************************************************************************/
 
-#define LOG_TAG "btif-media"
+#define LOG_TAG "bt_btif_media"
 
 #include <assert.h>
 #include <string.h>
diff --git a/btif/src/btif_pan.c b/btif/src/btif_pan.c
index c412f2b..d7228c3 100644
--- a/btif/src/btif_pan.c
+++ b/btif/src/btif_pan.c
@@ -46,7 +46,7 @@
 #include <linux/if_tun.h>
 #include <linux/if_ether.h>
 
-#define LOG_TAG "BTIF_PAN"
+#define LOG_TAG "bt_btif_pan"
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btm_api.h"
diff --git a/btif/src/btif_profile_queue.c b/btif/src/btif_profile_queue.c
index 0d3e49e..87a008c 100644
--- a/btif/src/btif_profile_queue.c
+++ b/btif/src/btif_profile_queue.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <hardware/bluetooth.h>
 
-#define LOG_TAG "BTIF_QUEUE"
+#define LOG_TAG "bt_btif_queue"
 #include "btif_common.h"
 #include "btif_profile_queue.h"
 #include "gki.h"
diff --git a/btif/src/btif_rc.c b/btif/src/btif_rc.c
index 7a9eaf6..80a10da 100644
--- a/btif/src/btif_rc.c
+++ b/btif/src/btif_rc.c
@@ -31,7 +31,7 @@
 #include "avrc_defs.h"
 #include "gki.h"
 
-#define LOG_TAG "BTIF_RC"
+#define LOG_TAG "bt_btif_avrc"
 #include "btif_common.h"
 #include "btif_util.h"
 #include "btif_av.h"
diff --git a/btif/src/btif_sm.c b/btif/src/btif_sm.c
index f8b4fea..61409ae 100644
--- a/btif/src/btif_sm.c
+++ b/btif/src/btif_sm.c
@@ -25,7 +25,7 @@
  *
  *****************************************************************************/
 
-#define LOG_TAG "BTIF_SM"
+#define LOG_TAG "bt_btif"
 
 #include <hardware/bluetooth.h>
 
diff --git a/btif/src/btif_sock.c b/btif/src/btif_sock.c
index 0721324..831ae73 100644
--- a/btif/src/btif_sock.c
+++ b/btif/src/btif_sock.c
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#define LOG_TAG "btif_sock"
+#define LOG_TAG "bt_btif_sock"
 
 #include <assert.h>
 #include <hardware/bluetooth.h>
diff --git a/btif/src/btif_sock_rfc.c b/btif/src/btif_sock_rfc.c
index 50ed08d..1cd25a3 100644
--- a/btif/src/btif_sock_rfc.c
+++ b/btif/src/btif_sock_rfc.c
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#define LOG_TAG "btif_sock_rfcomm"
+#define LOG_TAG "bt_btif_sock_rfcomm"
 
 #include <assert.h>
 #include <errno.h>
diff --git a/btif/src/btif_sock_sco.c b/btif/src/btif_sock_sco.c
index 26d37dc..2c6be49 100644
--- a/btif/src/btif_sock_sco.c
+++ b/btif/src/btif_sock_sco.c
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#define LOG_TAG "btif_sock_sco"
+#define LOG_TAG "bt_btif_sock_sco"
 
 #include <assert.h>
 #include <hardware/bluetooth.h>
diff --git a/btif/src/btif_sock_sdp.c b/btif/src/btif_sock_sdp.c
index f929c1f..1fcae8f 100644
--- a/btif/src/btif_sock_sdp.c
+++ b/btif/src/btif_sock_sdp.c
@@ -16,7 +16,7 @@
  *
  ******************************************************************************/
 
-#define LOG_TAG "BTIF_SOCK_SDP"
+#define LOG_TAG "bt_btif_sock_sdp"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/btif/src/btif_sock_thread.c b/btif/src/btif_sock_thread.c
index b83f83d..7e4e839 100644
--- a/btif/src/btif_sock_thread.c
+++ b/btif/src/btif_sock_thread.c
@@ -48,7 +48,7 @@
 #include <cutils/sockets.h>
 #include <alloca.h>
 
-#define LOG_TAG "BTIF_SOCK"
+#define LOG_TAG "bt_btif_sock"
 #include "btif_common.h"
 #include "btif_util.h"
 
diff --git a/btif/src/btif_sock_util.c b/btif/src/btif_sock_util.c
index 9738371..ee49eeb 100644
--- a/btif/src/btif_sock_util.c
+++ b/btif/src/btif_sock_util.c
@@ -45,7 +45,7 @@
 #include <netinet/tcp.h>
 
 
-#define LOG_TAG "BTIF_SOCK"
+#define LOG_TAG "bt_btif_sock"
 #include "btif_common.h"
 #include "btif_util.h"
 
diff --git a/btif/src/btif_storage.c b/btif/src/btif_storage.c
index 69018e1..c8e5264 100644
--- a/btif/src/btif_storage.c
+++ b/btif/src/btif_storage.c
@@ -36,7 +36,7 @@
 
 #include <hardware/bluetooth.h>
 #include "btif_config.h"
-#define LOG_TAG "BTIF_STORAGE"
+#define LOG_TAG "bt_btif_storage"
 
 #include "btif_api.h"
 #include "btif_storage.h"
@@ -606,7 +606,7 @@
         uint32_t i;
 
         tBTA_SERVICE_MASK service_mask = btif_get_enabled_services_mask();
-        BTIF_TRACE_ERROR("%s service_mask:0x%x", __FUNCTION__, service_mask);
+        LOG_INFO("%s service_mask:0x%x", __FUNCTION__, service_mask);
         for (i=0; i < BTA_MAX_SERVICE_ID; i++)
         {
             /* This should eventually become a function when more services are enabled */
diff --git a/btif/src/btif_util.c b/btif/src/btif_util.c
index 2abfb13..42576eb 100644
--- a/btif/src/btif_util.c
+++ b/btif/src/btif_util.c
@@ -36,7 +36,7 @@
 #include <ctype.h>
 
 
-#define LOG_TAG "BTIF_UTIL"
+#define LOG_TAG "bt_btif_util"
 #include "btif_common.h"
 #include "bta_api.h"
 #include "gki.h"