diff --git a/src/classic/hfp_ag.c b/src/classic/hfp_ag.c
index 2958afd7a..e8145e889 100644
--- a/src/classic/hfp_ag.c
+++ b/src/classic/hfp_ag.c
@@ -602,7 +602,7 @@ static int codecs_exchange_state_machine(hfp_connection_t * context){
 static void hfp_init_link_settings(hfp_connection_t * context){
     // determine highest possible link setting
     context->link_setting = HFP_LINK_SETTINGS_D1;
-    if (hci_remote_eSCO_supported(context->con_handle)){
+    if (hci_remote_esco_supported(context->con_handle)){
         context->link_setting = HFP_LINK_SETTINGS_S3;
         if ((context->remote_supported_features & (1<<HFP_HFSF_ESCO_S4))
         &&  (hfp_supported_features             & (1<<HFP_AGSF_ESCO_S4))){
diff --git a/src/classic/hfp_hf.c b/src/classic/hfp_hf.c
index 92f544df9..02ac0406d 100644
--- a/src/classic/hfp_hf.c
+++ b/src/classic/hfp_hf.c
@@ -780,7 +780,7 @@ static void hfp_run_for_context(hfp_connection_t * context){
 static void hfp_init_link_settings(hfp_connection_t * context){
     // determine highest possible link setting
     context->link_setting = HFP_LINK_SETTINGS_D1;
-    if (hci_remote_eSCO_supported(context->con_handle)){
+    if (hci_remote_esco_supported(context->con_handle)){
         context->link_setting = HFP_LINK_SETTINGS_S3;
         if ((hfp_supported_features             & (1<<HFP_HFSF_ESCO_S4))
         &&  (context->remote_supported_features & (1<<HFP_AGSF_ESCO_S4))){
diff --git a/src/hci.h b/src/hci.h
index 497bf3e1e..1e27d828a 100644
--- a/src/hci.h
+++ b/src/hci.h
@@ -739,7 +739,7 @@ void hci_disconnect_security_block(hci_con_handle_t con_handle);
 int hci_send_cmd_packet(uint8_t *packet, int size);
 
 // query if remote side supports eSCO
-int hci_remote_eSCO_supported(hci_con_handle_t con_handle);
+int hci_remote_esco_supported(hci_con_handle_t con_handle);
 
 /* API_START */
 
diff --git a/tool/bt_flip_addr.cocci b/tool/bt_flip_addr.cocci
deleted file mode 100644
index d7473826c..000000000
--- a/tool/bt_flip_addr.cocci
+++ /dev/null
@@ -1,5 +0,0 @@
-@@
-expression dest, src;
-@@
-- bt_flip_addr(dest,src)
-+ reverse_bd_addr(src, dest)
diff --git a/tool/conversion_to_1.0.cocci b/tool/conversion_to_1.0.cocci
new file mode 100644
index 000000000..ec5bade58
--- /dev/null
+++ b/tool/conversion_to_1.0.cocci
@@ -0,0 +1,12 @@
+@@
+expression dest, src;
+@@
+- bt_flip_addr(dest,src)
++ reverse_bd_addr(src, dest)
+
+@@
+expression handle;
+@@
+- hci_remote_eSCO_supported(handle)
++ hci_remote_esco_supported(handle)
+