From fb07ec06d8ee813d62cc84914064fcca66ec713b Mon Sep 17 00:00:00 2001
From: Piotr Narajowski <piotr.narajowski@codecoup.pl>
Date: Wed, 16 Oct 2024 10:56:34 +0200
Subject: [PATCH] btp: Apply proper naming convention for btp commands and
 events

This commit changes naming convention of variables that are opcodes for
btp commands and events. This is needed for socat log parser, but will also
enhance clarity in files like defs.py, especially for services like GAP for
which many service related variables share the same value.
For now changes applied only for following svcs:
Core, Gap, Gatt, GattCL, L2CAP.
---
 autopts/client.py                        |   2 +-
 autopts/ptsprojects/bluez/iutctl.py      |   2 +-
 autopts/ptsprojects/mynewt/iutctl.py     |   2 +-
 autopts/ptsprojects/stack/layers/core.py |   6 +-
 autopts/ptsprojects/zephyr/iutctl.py     |   6 +-
 autopts/pybtp/btp/btp.py                 |  84 +++----
 autopts/pybtp/btp/core.py                |   4 +-
 autopts/pybtp/btp/gap.py                 | 146 +++++------
 autopts/pybtp/btp/gatt.py                | 112 ++++-----
 autopts/pybtp/btp/gatt_cl.py             |  76 +++---
 autopts/pybtp/btp/l2cap.py               |  36 +--
 autopts/pybtp/defs.py                    | 301 ++++++++++++-----------
 tools/btpclient.py                       |   4 +-
 tools/generate_profile.py                |   2 +-
 14 files changed, 392 insertions(+), 391 deletions(-)

diff --git a/autopts/client.py b/autopts/client.py
index 4f537b9754..ad97c2ab80 100755
--- a/autopts/client.py
+++ b/autopts/client.py
@@ -1540,7 +1540,7 @@ def run_recovery(args, ptses):
         # mynewt project has not been refactored yet to reduce the number of
         # IUT board resets.
         if stack_inst.core:
-            stack_inst.core.event_received(defs.CORE_EV_IUT_READY, True)
+            stack_inst.core.event_received(defs.BTP_EV_CORE_IUT_READY, True)
 
     log('Recovery finished')
 
diff --git a/autopts/ptsprojects/bluez/iutctl.py b/autopts/ptsprojects/bluez/iutctl.py
index 1b28f08099..67aaed3df9 100644
--- a/autopts/ptsprojects/bluez/iutctl.py
+++ b/autopts/ptsprojects/bluez/iutctl.py
@@ -83,7 +83,7 @@ def wait_iut_ready_event(self):
 
         try:
             if (tuple_hdr.svc_id != defs.BTP_SERVICE_ID_CORE or
-                    tuple_hdr.op != defs.CORE_EV_IUT_READY):
+                    tuple_hdr.op != defs.BTP_EV_CORE_IUT_READY):
                 raise BTPError("Failed to get ready event")
         except BTPError as err:
             log("Unexpected event received (%s), expected IUT ready!", err)
diff --git a/autopts/ptsprojects/mynewt/iutctl.py b/autopts/ptsprojects/mynewt/iutctl.py
index eff69fd6e6..be0968729d 100644
--- a/autopts/ptsprojects/mynewt/iutctl.py
+++ b/autopts/ptsprojects/mynewt/iutctl.py
@@ -165,7 +165,7 @@ def wait_iut_ready_event(self):
 
             try:
                 if (tuple_hdr.svc_id != defs.BTP_SERVICE_ID_CORE or
-                        tuple_hdr.op != defs.CORE_EV_IUT_READY):
+                        tuple_hdr.op != defs.BTP_EV_CORE_IUT_READY):
                     raise BTPError("Failed to get ready event")
             except BTPError as err:
                 log("Unexpected event received (%s), expected IUT ready!", err)
diff --git a/autopts/ptsprojects/stack/layers/core.py b/autopts/ptsprojects/stack/layers/core.py
index b9be622cb4..809779f980 100644
--- a/autopts/ptsprojects/stack/layers/core.py
+++ b/autopts/ptsprojects/stack/layers/core.py
@@ -20,7 +20,7 @@
 class CORE:
     def __init__(self):
         self.event_queues = {
-            defs.CORE_EV_IUT_READY: [],
+            defs.BTP_EV_CORE_IUT_READY: [],
         }
 
     def event_received(self, event_type, event_data_tuple):
@@ -28,13 +28,13 @@ def event_received(self, event_type, event_data_tuple):
 
     def wait_iut_ready_ev(self, timeout, remove=True):
         return wait_for_queue_event(
-            self.event_queues[defs.CORE_EV_IUT_READY],
+            self.event_queues[defs.BTP_EV_CORE_IUT_READY],
             lambda *_: True,
             timeout, remove)
 
     def cleanup(self):
         for key in self.event_queues:
-            if key == defs.CORE_EV_IUT_READY:
+            if key == defs.BTP_EV_CORE_IUT_READY:
                 # To pass IUT ready event between test cases
                 continue
 
diff --git a/autopts/ptsprojects/zephyr/iutctl.py b/autopts/ptsprojects/zephyr/iutctl.py
index 5e6130f0c8..66905b9cbc 100644
--- a/autopts/ptsprojects/zephyr/iutctl.py
+++ b/autopts/ptsprojects/zephyr/iutctl.py
@@ -223,7 +223,7 @@ def wait_iut_ready_event(self, reset=True):
                 ev = stack.core.wait_iut_ready_ev(30)
                 # If the board has reset unexpectedly in the middle of a test case,
                 # two IUT events may be received because of cleanup.
-                stack.core.event_queues[defs.CORE_EV_IUT_READY].clear()
+                stack.core.event_queues[defs.BTP_EV_CORE_IUT_READY].clear()
                 if not ev:
                     self.stop()
                     raise Exception('IUT ready event NOT received!')
@@ -241,7 +241,7 @@ def hw_reset(self):
             # test case, to avoid double reset let's use 'hw_reset'
             # only if it was not received, e.g. at the beginning of
             # the first test case.
-            if len(stack.core.event_queues[defs.CORE_EV_IUT_READY]) == 0:
+            if len(stack.core.event_queues[defs.BTP_EV_CORE_IUT_READY]) == 0:
                 self.board.reset()
 
     def stop(self):
@@ -258,7 +258,7 @@ def stop(self):
         if not self.gdb and self.board and \
                 stack.core and not get_global_end():
 
-            stack.core.event_queues[defs.CORE_EV_IUT_READY].clear()
+            stack.core.event_queues[defs.BTP_EV_CORE_IUT_READY].clear()
             self.board.reset()
 
             # We have to wait for IUT ready event before we close socket
diff --git a/autopts/pybtp/btp/btp.py b/autopts/pybtp/btp/btp.py
index fa7db4d78f..f6a544ea03 100644
--- a/autopts/pybtp/btp/btp.py
+++ b/autopts/pybtp/btp/btp.py
@@ -53,7 +53,7 @@ def read_supp_svcs():
     tuple_hdr, tuple_data = iutctl.btp_socket.read()
     btp_hdr_check(tuple_hdr,
                   defs.BTP_SERVICE_ID_CORE,
-                  defs.CORE_READ_SUPPORTED_SERVICES)
+                  defs.BTP_CMD_CORE_READ_SUPPORTED_SERVICES)
     logging.debug("%s received %r %r", read_supp_svcs.__name__,
                   tuple_hdr, tuple_data)
 
@@ -61,84 +61,84 @@ def read_supp_svcs():
 
 
 CORE = {
-    "gap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "gap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GAP),
-    "gap_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "gap_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                   defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GAP),
-    "gatt_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "gatt_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GATT),
-    "gatt_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "gatt_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                    defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GATT),
-    "l2cap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "l2cap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                   defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_L2CAP),
-    "l2cap_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "l2cap_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                     defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_L2CAP),
-    "mesh_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "mesh_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MESH),
-    "mesh_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "mesh_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                    defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MESH),
-    "mmdl_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "mmdl_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MMDL),
-    "mmdl_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "mmdl_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                    defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MMDL),
-    "gatt_cl_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "gatt_cl_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                     defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GATTC),
-    "gatt_cl_unreg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_UNREGISTER_SERVICE,
+    "gatt_cl_unreg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                       defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GATTC),
-    "vcs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "vcs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_VCS),
-    "vocs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "vocs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_VOCS),
-    "aics_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "aics_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_AICS),
-    "ias_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "ias_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_IAS),
-    "pacs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "pacs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_PACS),
-    "ascs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "ascs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_ASCS),
-    "bap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "bap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_BAP),
-    "has_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "has_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_HAS),
-    "csis_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "csis_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_CSIS),
-    "micp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "micp_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MICP),
-    "mics_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "mics_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MICS),
-    "ccp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "ccp_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_CCP),
-    "vcp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "vcp_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_VCP),
-    "cas_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "cas_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_CAS),
-    "mcp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "mcp_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_MCP),
-    "gmcs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "gmcs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_GMCS),
-    "hap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "hap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_HAP),
-    "cap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "cap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_CAP),
-    "csip_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "csip_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_CSIP),
-    "tbs_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "tbs_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_TBS),
-    "tmap_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "tmap_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                  defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_TMAP),
-    "ots_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "ots_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_OTS),
-    "pbp_reg": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,
+    "pbp_reg": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,
                 defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_PBP),
     # GENERATOR append 4
     "read_supp_cmds": (defs.BTP_SERVICE_ID_CORE,
-                       defs.CORE_READ_SUPPORTED_COMMANDS,
+                       defs.BTP_CMD_CORE_READ_SUPPORTED_COMMANDS,
                        defs.BTP_INDEX_NONE, ""),
     "read_supp_svcs": (defs.BTP_SERVICE_ID_CORE,
-                       defs.CORE_READ_SUPPORTED_SERVICES,
+                       defs.BTP_CMD_CORE_READ_SUPPORTED_SERVICES,
                        defs.BTP_INDEX_NONE, ""),
-    "log_message": (defs.BTP_SERVICE_ID_CORE, defs.CORE_LOG_MESSAGE,
+    "log_message": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_LOG_MESSAGE,
                     defs.BTP_INDEX_NONE),
 }
 
@@ -720,7 +720,7 @@ def core_reg_svc_rsp_succ():
     iutctl = get_iut()
 
     expected_frame = ((defs.BTP_SERVICE_ID_CORE,
-                       defs.CORE_REGISTER_SERVICE,
+                       defs.BTP_CMD_CORE_REGISTER_SERVICE,
                        defs.BTP_INDEX_NONE,
                        0),
                       (b'',))
@@ -741,7 +741,7 @@ def core_unreg_svc_rsp_succ():
     iutctl = get_iut()
 
     expected_frame = ((defs.BTP_SERVICE_ID_CORE,
-                       defs.CORE_UNREGISTER_SERVICE,
+                       defs.BTP_CMD_CORE_UNREGISTER_SERVICE,
                        defs.BTP_INDEX_NONE,
                        0),
                       (b'',))
@@ -768,7 +768,7 @@ def core_log_message(message):
     tuple_hdr, tuple_data = iutctl.btp_socket.read()
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_CORE, defs.CORE_LOG_MESSAGE)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_LOG_MESSAGE)
 
 
 def btp2uuid(uuid_len, uu):
diff --git a/autopts/pybtp/btp/core.py b/autopts/pybtp/btp/core.py
index 02cac2a694..645c46f501 100644
--- a/autopts/pybtp/btp/core.py
+++ b/autopts/pybtp/btp/core.py
@@ -27,9 +27,9 @@
 def core_iut_ready_ev(core, data, data_len):
     logging.debug("%s", core_iut_ready_ev.__name__)
 
-    core.event_received(defs.CORE_EV_IUT_READY, True)
+    core.event_received(defs.BTP_EV_CORE_IUT_READY, True)
 
 
 CORE_EV = {
-    defs.CORE_EV_IUT_READY: core_iut_ready_ev,
+    defs.BTP_EV_CORE_IUT_READY: core_iut_ready_ev,
 }
diff --git a/autopts/pybtp/btp/gap.py b/autopts/pybtp/btp/gap.py
index c16e679234..c38f5bcb0f 100644
--- a/autopts/pybtp/btp/gap.py
+++ b/autopts/pybtp/btp/gap.py
@@ -29,108 +29,108 @@
     set_lt3_addr
 
 GAP = {
-    "start_adv": (defs.BTP_SERVICE_ID_GAP, defs.GAP_START_ADVERTISING,
+    "start_adv": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_START_ADVERTISING,
                   CONTROLLER_INDEX),
-    "stop_adv": (defs.BTP_SERVICE_ID_GAP, defs.GAP_STOP_ADVERTISING,
+    "stop_adv": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_STOP_ADVERTISING,
                  CONTROLLER_INDEX, ""),
-    "conn": (defs.BTP_SERVICE_ID_GAP, defs.GAP_CONNECT, CONTROLLER_INDEX),
-    "pair": (defs.BTP_SERVICE_ID_GAP, defs.GAP_PAIR, CONTROLLER_INDEX),
-    "unpair": (defs.BTP_SERVICE_ID_GAP, defs.GAP_UNPAIR, CONTROLLER_INDEX),
-    "disconn": (defs.BTP_SERVICE_ID_GAP, defs.GAP_DISCONNECT,
+    "conn": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_CONNECT, CONTROLLER_INDEX),
+    "pair": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_PAIR, CONTROLLER_INDEX),
+    "unpair": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_UNPAIR, CONTROLLER_INDEX),
+    "disconn": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_DISCONNECT,
                 CONTROLLER_INDEX),
-    "set_io_cap": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_IO_CAP,
+    "set_io_cap": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_IO_CAP,
                    CONTROLLER_INDEX),
-    "set_conn": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_CONNECTABLE,
+    "set_conn": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_CONNECTABLE,
                  CONTROLLER_INDEX, 1),
-    "set_nonconn": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_CONNECTABLE,
+    "set_nonconn": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_CONNECTABLE,
                     CONTROLLER_INDEX, 0),
-    "set_nondiscov": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_DISCOVERABLE,
+    "set_nondiscov": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_DISCOVERABLE,
                       CONTROLLER_INDEX, defs.GAP_NON_DISCOVERABLE),
-    "set_gendiscov": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_DISCOVERABLE,
+    "set_gendiscov": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_DISCOVERABLE,
                       CONTROLLER_INDEX, defs.GAP_GENERAL_DISCOVERABLE),
-    "set_limdiscov": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_DISCOVERABLE,
+    "set_limdiscov": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_DISCOVERABLE,
                       CONTROLLER_INDEX, defs.GAP_LIMITED_DISCOVERABLE),
-    "set_powered_on": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_POWERED,
+    "set_powered_on": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_POWERED,
                        CONTROLLER_INDEX, 1),
-    "set_powered_off": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_POWERED,
+    "set_powered_off": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_POWERED,
                         CONTROLLER_INDEX, 0),
-    "set_bondable_on": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_BONDABLE,
+    "set_bondable_on": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_BONDABLE,
                         CONTROLLER_INDEX, 1),
-    "set_bondable_off": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_BONDABLE,
+    "set_bondable_off": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_BONDABLE,
                          CONTROLLER_INDEX, 0),
     "start_discov": (defs.BTP_SERVICE_ID_GAP,
-                     defs.GAP_START_DISCOVERY, CONTROLLER_INDEX),
-    "stop_discov": (defs.BTP_SERVICE_ID_GAP, defs.GAP_STOP_DISCOVERY,
+                     defs.BTP_CMD_GAP_START_DISCOVERY, CONTROLLER_INDEX),
+    "stop_discov": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_STOP_DISCOVERY,
                     CONTROLLER_INDEX, ""),
     "read_ctrl_info": (defs.BTP_SERVICE_ID_GAP,
-                       defs.GAP_READ_CONTROLLER_INFO,
+                       defs.BTP_CMD_GAP_READ_CONTROLLER_INFO,
                        CONTROLLER_INDEX, ""),
     "passkey_entry_rsp": (defs.BTP_SERVICE_ID_GAP,
-                          defs.GAP_PASSKEY_ENTRY,
+                          defs.BTP_CMD_GAP_PASSKEY_ENTRY,
                           CONTROLLER_INDEX),
     "passkey_confirm_rsp": (defs.BTP_SERVICE_ID_GAP,
-                            defs.GAP_PASSKEY_CONFIRM,
+                            defs.BTP_CMD_GAP_PASSKEY_CONFIRM,
                             CONTROLLER_INDEX),
-    "start_direct_adv": (defs.BTP_SERVICE_ID_GAP, defs.GAP_START_DIRECT_ADV,
+    "start_direct_adv": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_START_DIRECT_ADV,
                          CONTROLLER_INDEX),
     "conn_param_update": (defs.BTP_SERVICE_ID_GAP,
-                          defs.GAP_CONN_PARAM_UPDATE,
+                          defs.BTP_CMD_GAP_CONN_PARAM_UPDATE,
                           CONTROLLER_INDEX),
     "pairing_consent_rsp": (defs.BTP_SERVICE_ID_GAP,
-                            defs.GAP_PAIRING_CONSENT_RSP,
+                            defs.BTP_CMD_GAP_PAIRING_CONSENT_RSP,
                             CONTROLLER_INDEX),
     "oob_legacy_set_data": (defs.BTP_SERVICE_ID_GAP,
-                            defs.GAP_OOB_LEGACY_SET_DATA,
+                            defs.BTP_CMD_GAP_OOB_LEGACY_SET_DATA,
                             CONTROLLER_INDEX),
     "oob_sc_get_local_data": (defs.BTP_SERVICE_ID_GAP,
-                              defs.GAP_OOB_SC_GET_LOCAL_DATA,
+                              defs.BTP_CMD_GAP_OOB_SC_GET_LOCAL_DATA,
                               CONTROLLER_INDEX),
     "oob_sc_set_remote_data": (defs.BTP_SERVICE_ID_GAP,
-                               defs.GAP_OOB_SC_SET_REMOTE_DATA,
+                               defs.BTP_CMD_GAP_OOB_SC_SET_REMOTE_DATA,
                                CONTROLLER_INDEX),
-    "set_mitm_on": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_MITM,
+    "set_mitm_on": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_MITM,
                     CONTROLLER_INDEX, 1),
-    "set_mitm_off": (defs.BTP_SERVICE_ID_GAP, defs.GAP_SET_MITM,
+    "set_mitm_off": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_SET_MITM,
                      CONTROLLER_INDEX, 0),
-    "reset": (defs.BTP_SERVICE_ID_GAP, defs.GAP_RESET, CONTROLLER_INDEX, ""),
+    "reset": (defs.BTP_SERVICE_ID_GAP, defs.BTP_CMD_GAP_RESET, CONTROLLER_INDEX, ""),
     "set_filter_accept_list": (defs.BTP_SERVICE_ID_GAP,
-                               defs.GAP_SET_FILTER_ACCEPT_LIST, CONTROLLER_INDEX),
+                               defs.BTP_CMD_GAP_SET_FILTER_ACCEPT_LIST, CONTROLLER_INDEX),
     "set_privacy_on": (defs.BTP_SERVICE_ID_GAP,
-                       defs.GAP_SET_PRIVACY, CONTROLLER_INDEX, 1),
+                       defs.BTP_CMD_GAP_SET_PRIVACY, CONTROLLER_INDEX, 1),
     "set_privacy_off": (defs.BTP_SERVICE_ID_GAP,
-                        defs.GAP_SET_PRIVACY, CONTROLLER_INDEX, 0),
+                        defs.BTP_CMD_GAP_SET_PRIVACY, CONTROLLER_INDEX, 0),
     "set_sc_only_on": (defs.BTP_SERVICE_ID_GAP,
-                       defs.GAP_SET_SC_ONLY, CONTROLLER_INDEX, 1),
+                       defs.BTP_CMD_GAP_SET_SC_ONLY, CONTROLLER_INDEX, 1),
     "set_sc_only_off": (defs.BTP_SERVICE_ID_GAP,
-                        defs.GAP_SET_SC_ONLY, CONTROLLER_INDEX, 0),
+                        defs.BTP_CMD_GAP_SET_SC_ONLY, CONTROLLER_INDEX, 0),
     "set_sc_on": (defs.BTP_SERVICE_ID_GAP,
-                  defs.GAP_SET_SC, CONTROLLER_INDEX, 1),
+                  defs.BTP_CMD_GAP_SET_SC, CONTROLLER_INDEX, 1),
     "set_sc_off": (defs.BTP_SERVICE_ID_GAP,
-                   defs.GAP_SET_SC, CONTROLLER_INDEX, 0),
+                   defs.BTP_CMD_GAP_SET_SC, CONTROLLER_INDEX, 0),
     "set_min_enc_key_size": (defs.BTP_SERVICE_ID_GAP,
-                             defs.GAP_SET_MIN_ENC_KEY_SIZE, CONTROLLER_INDEX),
+                             defs.BTP_CMD_GAP_SET_MIN_ENC_KEY_SIZE, CONTROLLER_INDEX),
     "set_extend_advertising_on": (defs.BTP_SERVICE_ID_GAP,
-                                  defs.GAP_SET_EXTENDED_ADVERTISING, CONTROLLER_INDEX, 1),
+                                  defs.BTP_CMD_GAP_SET_EXTENDED_ADVERTISING, CONTROLLER_INDEX, 1),
     "set_extend_advertising_off": (defs.BTP_SERVICE_ID_GAP,
-                                   defs.GAP_SET_EXTENDED_ADVERTISING, CONTROLLER_INDEX, 0),
+                                   defs.BTP_CMD_GAP_SET_EXTENDED_ADVERTISING, CONTROLLER_INDEX, 0),
     "padv_configure": (defs.BTP_SERVICE_ID_GAP,
-                       defs.GAP_PADV_CONFIGURE, CONTROLLER_INDEX),
+                       defs.BTP_CMD_GAP_PADV_CONFIGURE, CONTROLLER_INDEX),
     "padv_start": (defs.BTP_SERVICE_ID_GAP,
-                   defs.GAP_PADV_START, CONTROLLER_INDEX),
+                   defs.BTP_CMD_GAP_PADV_START, CONTROLLER_INDEX),
     "padv_stop": (defs.BTP_SERVICE_ID_GAP,
-                  defs.GAP_PADV_STOP, CONTROLLER_INDEX, ""),
+                  defs.BTP_CMD_GAP_PADV_STOP, CONTROLLER_INDEX, ""),
     "padv_set_data": (defs.BTP_SERVICE_ID_GAP,
-                      defs.GAP_PADV_SET_DATA, CONTROLLER_INDEX),
+                      defs.BTP_CMD_GAP_PADV_SET_DATA, CONTROLLER_INDEX),
     "padv_create_sync": (defs.BTP_SERVICE_ID_GAP,
-                         defs.GAP_PADV_CREATE_SYNC, CONTROLLER_INDEX),
+                         defs.BTP_CMD_GAP_PADV_CREATE_SYNC, CONTROLLER_INDEX),
     "padv_sync_transfer_set_info": (defs.BTP_SERVICE_ID_GAP,
-                                    defs.GAP_PADV_SYNC_TRANSFER_SET_INFO,
+                                    defs.BTP_CMD_GAP_PADV_SYNC_TRANSFER_SET_INFO,
                                     CONTROLLER_INDEX),
     "padv_sync_transfer_start": (defs.BTP_SERVICE_ID_GAP,
-                                 defs.GAP_PADV_SYNC_TRANSFER_START,
+                                 defs.BTP_CMD_GAP_PADV_SYNC_TRANSFER_START,
                                  CONTROLLER_INDEX),
     "padv_sync_transfer_recv": (defs.BTP_SERVICE_ID_GAP,
-                                defs.GAP_PADV_SYNC_TRANSFER_RECV,
+                                defs.BTP_CMD_GAP_PADV_SYNC_TRANSFER_RECV,
                                 CONTROLLER_INDEX),
 }
 
@@ -376,23 +376,23 @@ def gap_passkey_entry_req_ev_(gap, data, data_len):
 
 
 GAP_EV = {
-    defs.GAP_EV_NEW_SETTINGS: gap_new_settings_ev_,
-    defs.GAP_EV_DEVICE_FOUND: gap_device_found_ev_,
-    defs.GAP_EV_DEVICE_CONNECTED: gap_connected_ev_,
-    defs.GAP_EV_DEVICE_DISCONNECTED: gap_disconnected_ev_,
-    defs.GAP_EV_PASSKEY_DISPLAY: gap_passkey_disp_ev_,
-    defs.GAP_EV_PASSKEY_ENTRY_REQ: gap_passkey_entry_req_ev_,
-    defs.GAP_EV_PASSKEY_CONFIRM_REQ: gap_passkey_confirm_req_ev_,
-    defs.GAP_EV_IDENTITY_RESOLVED: gap_identity_resolved_ev_,
-    defs.GAP_EV_CONN_PARAM_UPDATE: gap_conn_param_update_ev_,
-    defs.GAP_EV_SEC_LEVEL_CHANGED: gap_sec_level_changed_ev_,
-    defs.GAP_EV_PAIRING_CONSENT_REQ: gap_pairing_consent_ev_,
-    defs.GAP_EV_PAIRING_FAILED: gap_pairing_failed_ev_,
-    defs.GAP_EV_BOND_LOST: gap_bond_lost_ev_,
-    defs.GAP_EV_PERIODIC_SYNC_ESTABLISHED: gap_padv_sync_established_ev_,
-    defs.GAP_EV_PERIODIC_SYNC_LOST: gap_padv_sync_lost_ev_,
-    defs.GAP_EV_PERIODIC_REPORT: gap_padv_report_ev_,
-    defs.GAP_EV_PERIODIC_TRANSFER_RECEIVED: gap_padv_transfer_received_ev_
+    defs.BTP_EV_GAP_NEW_SETTINGS: gap_new_settings_ev_,
+    defs.BTP_EV_GAP_DEVICE_FOUND: gap_device_found_ev_,
+    defs.BTP_EV_GAP_DEVICE_CONNECTED: gap_connected_ev_,
+    defs.BTP_EV_GAP_DEVICE_DISCONNECTED: gap_disconnected_ev_,
+    defs.BTP_EV_GAP_PASSKEY_DISPLAY: gap_passkey_disp_ev_,
+    defs.BTP_EV_GAP_PASSKEY_ENTRY_REQ: gap_passkey_entry_req_ev_,
+    defs.BTP_EV_GAP_PASSKEY_CONFIRM_REQ: gap_passkey_confirm_req_ev_,
+    defs.BTP_EV_GAP_IDENTITY_RESOLVED: gap_identity_resolved_ev_,
+    defs.BTP_EV_GAP_CONN_PARAM_UPDATE: gap_conn_param_update_ev_,
+    defs.BTP_EV_GAP_SEC_LEVEL_CHANGED: gap_sec_level_changed_ev_,
+    defs.BTP_EV_GAP_PAIRING_CONSENT_REQ: gap_pairing_consent_ev_,
+    defs.BTP_EV_GAP_PAIRING_FAILED: gap_pairing_failed_ev_,
+    defs.BTP_EV_GAP_BOND_LOST: gap_bond_lost_ev_,
+    defs.BTP_EV_GAP_PERIODIC_SYNC_ESTABLISHED: gap_padv_sync_established_ev_,
+    defs.BTP_EV_GAP_PERIODIC_SYNC_LOST: gap_padv_sync_lost_ev_,
+    defs.BTP_EV_GAP_PERIODIC_REPORT: gap_padv_report_ev_,
+    defs.BTP_EV_GAP_PERIODIC_TRANSFER_RECEIVED: gap_padv_transfer_received_ev_
 }
 
 
@@ -505,7 +505,7 @@ def gap_adv_ind_on(ad=None, sd=None, duration=AdDuration.forever, own_addr_type=
 
     iutctl.btp_socket.send(*GAP['start_adv'], data=data_ba)
 
-    tuple_data = gap_command_rsp_succ(defs.GAP_START_ADVERTISING)
+    tuple_data = gap_command_rsp_succ(defs.BTP_CMD_GAP_START_ADVERTISING)
     __gap_current_settings_update(tuple_data)
 
 
@@ -522,7 +522,7 @@ def gap_adv_off():
 
     iutctl.btp_socket.send(*GAP['stop_adv'])
 
-    tuple_data = gap_command_rsp_succ(defs.GAP_STOP_ADVERTISING)
+    tuple_data = gap_command_rsp_succ(defs.BTP_CMD_GAP_STOP_ADVERTISING)
     __gap_current_settings_update(tuple_data)
 
 
@@ -553,7 +553,7 @@ def gap_direct_adv_on(addr, addr_type, high_duty=0, peer_rpa=0):
 
     iutctl.btp_socket.send(*GAP['start_direct_adv'], data=data_ba)
 
-    tuple_data = gap_command_rsp_succ(defs.GAP_START_DIRECT_ADV)
+    tuple_data = gap_command_rsp_succ(defs.BTP_CMD_GAP_START_DIRECT_ADV)
     __gap_current_settings_update(tuple_data)
 
 
@@ -697,7 +697,7 @@ def gap_unpair(bd_addr=None, bd_addr_type=None):
     iutctl.btp_socket.send(*GAP['unpair'], data=data_ba)
 
     # Expected result
-    gap_command_rsp_succ(defs.GAP_UNPAIR)
+    gap_command_rsp_succ(defs.BTP_CMD_GAP_UNPAIR)
 
 
 def gap_passkey_entry_rsp(bd_addr, bd_addr_type, passkey):
@@ -944,7 +944,7 @@ def gap_read_ctrl_info():
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GAP,
-                  defs.GAP_READ_CONTROLLER_INFO)
+                  defs.BTP_CMD_GAP_READ_CONTROLLER_INFO)
 
     fmt = '<6sII3s249s11s'
     if len(tuple_data[0]) < struct.calcsize(fmt):
@@ -1034,7 +1034,7 @@ def gap_oob_sc_get_local_data():
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GAP,
-                  defs.GAP_OOB_SC_GET_LOCAL_DATA)
+                  defs.BTP_CMD_GAP_OOB_SC_GET_LOCAL_DATA)
 
     hdr = '<16s16s'
     r, c = struct.unpack_from(hdr, tuple_data[0])
@@ -1322,7 +1322,7 @@ def gap_padv_configure(include_tx_power, intvl_min, intvl_max):
 
     iutctl.btp_socket.send(*GAP['padv_configure'], data=data_ba)
 
-    tuple_data = gap_command_rsp_succ(defs.GAP_PADV_CONFIGURE)
+    tuple_data = gap_command_rsp_succ(defs.BTP_CMD_GAP_PADV_CONFIGURE)
     __gap_current_settings_update(tuple_data)
 
 
@@ -1334,7 +1334,7 @@ def gap_padv_start(flags=0):
 
     iutctl.btp_socket.send(*GAP['padv_start'], data=data_ba)
 
-    tuple_data = gap_command_rsp_succ(defs.GAP_PADV_START)
+    tuple_data = gap_command_rsp_succ(defs.BTP_CMD_GAP_PADV_START)
     __gap_current_settings_update(tuple_data)
 
 
diff --git a/autopts/pybtp/btp/gatt.py b/autopts/pybtp/btp/gatt.py
index ba5de26eba..aed616e3c4 100644
--- a/autopts/pybtp/btp/gatt.py
+++ b/autopts/pybtp/btp/gatt.py
@@ -31,68 +31,68 @@
 GATT_SVCS = None
 
 GATTS = {
-    "add_svc": (defs.BTP_SERVICE_ID_GATT, defs.GATT_ADD_SERVICE,
+    "add_svc": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_ADD_SERVICE,
                 CONTROLLER_INDEX),
-    "start_server": (defs.BTP_SERVICE_ID_GATT, defs.GATT_START_SERVER,
+    "start_server": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_START_SERVER,
                      CONTROLLER_INDEX, ""),
     "add_inc_svc": (defs.BTP_SERVICE_ID_GATT,
-                    defs.GATT_ADD_INCLUDED_SERVICE, CONTROLLER_INDEX),
-    "add_char": (defs.BTP_SERVICE_ID_GATT, defs.GATT_ADD_CHARACTERISTIC,
+                    defs.BTP_CMD_GATT_ADD_INCLUDED_SERVICE, CONTROLLER_INDEX),
+    "add_char": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_ADD_CHARACTERISTIC,
                  CONTROLLER_INDEX),
-    "set_val": (defs.BTP_SERVICE_ID_GATT, defs.GATT_SET_VALUE,
+    "set_val": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_SET_VALUE,
                 CONTROLLER_INDEX),
-    "add_desc": (defs.BTP_SERVICE_ID_GATT, defs.GATT_ADD_DESCRIPTOR,
+    "add_desc": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_ADD_DESCRIPTOR,
                  CONTROLLER_INDEX),
     "set_enc_key_size": (defs.BTP_SERVICE_ID_GATT,
-                         defs.GATT_SET_ENC_KEY_SIZE, CONTROLLER_INDEX),
-    "get_attrs": (defs.BTP_SERVICE_ID_GATT, defs.GATT_GET_ATTRIBUTES,
+                         defs.BTP_CMD_GATT_SET_ENC_KEY_SIZE, CONTROLLER_INDEX),
+    "get_attrs": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_GET_ATTRIBUTES,
                   CONTROLLER_INDEX),
     "get_attr_val": (defs.BTP_SERVICE_ID_GATT,
-                     defs.GATT_GET_ATTRIBUTE_VALUE, CONTROLLER_INDEX),
+                     defs.BTP_CMD_GATT_GET_ATTRIBUTES, CONTROLLER_INDEX),
     "change_database": (defs.BTP_SERVICE_ID_GATT,
-                        defs.GATT_CHANGE_DATABASE, CONTROLLER_INDEX),
+                        defs.BTP_CMD_GATT_CHANGE_DATABASE, CONTROLLER_INDEX),
     "notify_mult": (defs.BTP_SERVICE_ID_GATT,
-                    defs.GATT_NOTIFY_MULTIPLE, CONTROLLER_INDEX),
+                    defs.BTP_CMD_GATT_NOTIFY_MULTIPLE, CONTROLLER_INDEX),
 }
 
 GATTC = {
-    "exchange_mtu": (defs.BTP_SERVICE_ID_GATT, defs.GATT_EXCHANGE_MTU,
+    "exchange_mtu": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_EXCHANGE_MTU,
                      CONTROLLER_INDEX),
-    "disc_all_prim": (defs.BTP_SERVICE_ID_GATT, defs.GATT_DISC_ALL_PRIM,
+    "disc_all_prim": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_DISC_ALL_PRIM,
                       CONTROLLER_INDEX),
-    "disc_prim_uuid": (defs.BTP_SERVICE_ID_GATT, defs.GATT_DISC_PRIM_UUID,
+    "disc_prim_uuid": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_DISC_PRIM_UUID,
                        CONTROLLER_INDEX),
-    "find_included": (defs.BTP_SERVICE_ID_GATT, defs.GATT_FIND_INCLUDED,
+    "find_included": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_FIND_INCLUDED,
                       CONTROLLER_INDEX),
-    "disc_all_chrc": (defs.BTP_SERVICE_ID_GATT, defs.GATT_DISC_ALL_CHRC,
+    "disc_all_chrc": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_DISC_ALL_CHRC,
                       CONTROLLER_INDEX),
-    "disc_chrc_uuid": (defs.BTP_SERVICE_ID_GATT, defs.GATT_DISC_CHRC_UUID,
+    "disc_chrc_uuid": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_DISC_CHRC_UUID,
                        CONTROLLER_INDEX),
-    "disc_all_desc": (defs.BTP_SERVICE_ID_GATT, defs.GATT_DISC_ALL_DESC,
+    "disc_all_desc": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_DISC_ALL_DESC,
                       CONTROLLER_INDEX),
-    "read": (defs.BTP_SERVICE_ID_GATT, defs.GATT_READ, CONTROLLER_INDEX),
-    "read_uuid": (defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_UUID,
+    "read": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ, CONTROLLER_INDEX),
+    "read_uuid": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_UUID,
                   CONTROLLER_INDEX),
-    "read_long": (defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_LONG,
+    "read_long": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_LONG,
                   CONTROLLER_INDEX),
-    "read_multiple": (defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_MULTIPLE,
+    "read_multiple": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_MULTIPLE,
                       CONTROLLER_INDEX),
-    "read_multiple_var": (defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_MULTIPLE_VAR,
+    "read_multiple_var": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_MULTIPLE_VAR,
                           CONTROLLER_INDEX),
     "write_without_rsp": (defs.BTP_SERVICE_ID_GATT,
-                          defs.GATT_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
+                          defs.BTP_CMD_GATT_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
     "signed_write": (defs.BTP_SERVICE_ID_GATT,
-                     defs.GATT_SIGNED_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
-    "write": (defs.BTP_SERVICE_ID_GATT, defs.GATT_WRITE, CONTROLLER_INDEX),
-    "write_long": (defs.BTP_SERVICE_ID_GATT, defs.GATT_WRITE_LONG,
+                     defs.BTP_CMD_GATT_SIGNED_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
+    "write": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_WRITE, CONTROLLER_INDEX),
+    "write_long": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_WRITE_LONG,
                    CONTROLLER_INDEX),
-    "write_reliable": (defs.BTP_SERVICE_ID_GATT, defs.GATT_WRITE_RELIABLE,
+    "write_reliable": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_WRITE_RELIABLE,
                        CONTROLLER_INDEX),
-    "cfg_notify": (defs.BTP_SERVICE_ID_GATT, defs.GATT_CFG_NOTIFY,
+    "cfg_notify": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_CFG_NOTIFY,
                    CONTROLLER_INDEX),
-    "cfg_indicate": (defs.BTP_SERVICE_ID_GATT, defs.GATT_CFG_INDICATE,
+    "cfg_indicate": (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_CFG_INDICATE,
                      CONTROLLER_INDEX),
-    'eatt_connect': (defs.BTP_SERVICE_ID_GATT, defs.GATT_EATT_CONNECT,
+    'eatt_connect': (defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_EATT_CONNECT,
                      CONTROLLER_INDEX),
 }
 
@@ -115,8 +115,8 @@ def gatt_notification_ev_(gatt, data, data_len):
 
 
 GATT_EV = {
-    defs.GATT_EV_ATTR_VALUE_CHANGED: gatt_attr_value_changed_ev_,
-    defs.GATT_EV_NOTIFICATION: gatt_notification_ev_,
+    defs.BTP_GATT_EV_ATTR_VALUE_CHANGED: gatt_attr_value_changed_ev_,
+    defs.BTP_EV_GATT_NOTIFICATION: gatt_notification_ev_,
 }
 
 
@@ -354,7 +354,7 @@ def gatts_attr_value_changed_ev():
     (tuple_hdr, tuple_data) = iutctl.btp_socket.read()
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_EV_ATTR_VALUE_CHANGED)
+                  defs.BTP_GATT_EV_ATTR_VALUE_CHANGED)
 
     (handle, data) = gatts_dec_attr_value_changed_ev_data(tuple_data[0])
     logging.debug("%s %r %r", gatts_attr_value_changed_ev.__name__,
@@ -434,7 +434,7 @@ def gatts_get_attrs(start_handle=0x0001, end_handle=0xffff, type_uuid=None):
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_GET_ATTRIBUTES)
+                  defs.BTP_CMD_GATT_GET_ATTRIBUTES)
 
     return dec_gatts_get_attrs_rp(tuple_data[0], tuple_hdr.data_len)
 
@@ -462,7 +462,7 @@ def gatts_get_attr_val(bd_addr_type, bd_addr, handle):
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_GET_ATTRIBUTE_VALUE)
+                  defs.BTP_CMD_GATT_GET_ATTRIBUTES)
 
     hdr = '<BH'
     hdr_len = struct.calcsize(hdr)
@@ -559,7 +559,7 @@ def _gattc_find_included_rsp():
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_FIND_INCLUDED)
+                  defs.BTP_CMD_GATT_FIND_INCLUDED)
 
     incls_list = gatt_dec_disc_rsp(tuple_data[0], "include")
     logging.debug("%s %r", gattc_find_included_rsp.__name__, incls_list)
@@ -610,7 +610,7 @@ def gattc_disc_all_chrc_find_attrs_rsp(exp_chars, store_attrs=False):
                   gattc_disc_all_chrc_find_attrs_rsp.__name__, tuple_hdr,
                   tuple_data)
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_ALL_CHRC)
+                  defs.BTP_CMD_GATT_DISC_ALL_CHRC)
 
     chars_list = gatt_dec_disc_rsp(tuple_data[0], "characteristic")
 
@@ -1083,7 +1083,7 @@ def gattc_cfg_notify(bd_addr_type, bd_addr, enable, ccc_hdl):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_CFG_NOTIFY)
+                  defs.BTP_CMD_GATT_CFG_NOTIFY)
 
 
 def gattc_cfg_indicate(bd_addr_type, bd_addr, enable, ccc_hdl):
@@ -1112,7 +1112,7 @@ def gattc_cfg_indicate(bd_addr_type, bd_addr, enable, ccc_hdl):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_CFG_INDICATE)
+                  defs.BTP_CMD_GATT_CFG_INDICATE)
 
 
 def gattc_notification_ev(bd_addr, bd_addr_type, ev_type):
@@ -1124,7 +1124,7 @@ def gattc_notification_ev(bd_addr, bd_addr_type, ev_type):
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_EV_NOTIFICATION)
+                  defs.BTP_EV_GATT_NOTIFICATION)
 
     data_ba = bytearray()
     bd_addr_ba = addr2btp_ba(bd_addr)
@@ -1331,7 +1331,7 @@ def gattc_disc_prim_uuid_find_attrs_rsp(exp_svcs, store_attrs=False):
                   gattc_disc_prim_uuid_find_attrs_rsp.__name__, tuple_hdr,
                   tuple_data)
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_PRIM_UUID)
+                  defs.BTP_CMD_GATT_DISC_PRIM_UUID)
 
     svcs_list = gatt_dec_disc_rsp(tuple_data[0], "service")
 
@@ -1367,7 +1367,7 @@ def gattc_disc_all_prim_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_ALL_PRIM)
+                  defs.BTP_CMD_GATT_DISC_ALL_PRIM)
 
     svcs_list = gatt_dec_disc_rsp(tuple_data[0], "service")
     logging.debug("%s %r", gattc_disc_all_prim_rsp.__name__, svcs_list)
@@ -1405,7 +1405,7 @@ def gattc_disc_prim_uuid_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_PRIM_UUID)
+                  defs.BTP_CMD_GATT_DISC_PRIM_UUID)
 
     svcs_list = gatt_dec_disc_rsp(tuple_data[0], "service")
     logging.debug("%s %r", gattc_disc_prim_uuid_rsp.__name__, svcs_list)
@@ -1454,7 +1454,7 @@ def gattc_find_included_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_FIND_INCLUDED)
+                  defs.BTP_CMD_GATT_FIND_INCLUDED)
 
     incls_tuple = gatt_dec_disc_rsp(tuple_data[0], "include")
     logging.debug("%s %r", gattc_find_included_rsp.__name__, incls_tuple)
@@ -1485,7 +1485,7 @@ def gattc_disc_all_chrc_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_ALL_CHRC)
+                  defs.BTP_CMD_GATT_DISC_ALL_CHRC)
 
     chrcs_list = gatt_dec_disc_rsp(tuple_data[0], "characteristic")
     logging.debug("%s %r", gattc_disc_all_chrc_rsp.__name__, chrcs_list)
@@ -1519,7 +1519,7 @@ def gattc_disc_chrc_uuid_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_CHRC_UUID)
+                  defs.BTP_CMD_GATT_DISC_CHRC_UUID)
 
     chrcs_list = gatt_dec_disc_rsp(tuple_data[0], "characteristic")
     logging.debug("%s %r", gattc_disc_chrc_uuid_rsp.__name__, chrcs_list)
@@ -1561,7 +1561,7 @@ def gattc_disc_all_desc_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_DISC_ALL_DESC)
+                  defs.BTP_CMD_GATT_DISC_ALL_DESC)
 
     descs_list = gatt_dec_disc_rsp(tuple_data[0], "descriptor")
     logging.debug("%s %r", gattc_disc_all_desc_rsp.__name__, descs_list)
@@ -1598,7 +1598,7 @@ def gattc_read_rsp(store_rsp=False, store_val=False, timeout=None):
     logging.debug("%s received %r %r", gattc_read_rsp.__name__, tuple_hdr,
                   tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.GATT_READ)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ)
 
     rsp, value = gatt_dec_read_rsp(tuple_data[0])
     logging.debug("%s %r %r", gattc_read_rsp.__name__, rsp, value)
@@ -1622,7 +1622,7 @@ def gattc_read_uuid_rsp(store_rsp=False, store_val=False):
     logging.debug("%s received %r %r", gattc_read_uuid_rsp.__name__, tuple_hdr,
                   tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_UUID)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_UUID)
 
     rsp, char_values = gatt_dec_read_uuid_rsp(tuple_data[0])
     logging.debug("%s %r %r", gattc_read_uuid_rsp.__name__, rsp, char_values)
@@ -1649,7 +1649,7 @@ def gattc_read_long_rsp(store_rsp=False, store_val=False):
     logging.debug("%s received %r %r", gattc_read_long_rsp.__name__, tuple_hdr,
                   tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.GATT_READ_LONG)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_READ_LONG)
 
     rsp, value = gatt_dec_read_rsp(tuple_data[0])
     logging.debug("%s %r %r", gattc_read_long_rsp.__name__, rsp, value)
@@ -1672,7 +1672,7 @@ def gattc_read_multiple_rsp(store_val=False, store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_READ_MULTIPLE)
+                  defs.BTP_CMD_GATT_READ_MULTIPLE)
 
     rsp, values = gatt_dec_read_rsp(tuple_data[0])
     logging.debug("%s %r %r", gattc_read_multiple_rsp.__name__, rsp, values)
@@ -1694,7 +1694,7 @@ def gattc_read_multiple_var_rsp(store_val=False, store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_READ_MULTIPLE_VAR)
+                  defs.BTP_CMD_GATT_READ_MULTIPLE_VAR)
 
     rsp, values = gatt_dec_read_rsp(tuple_data[0])
     logging.debug("%s %r %r", gattc_read_multiple_var_rsp.__name__, rsp, values)
@@ -1718,7 +1718,7 @@ def gattc_write_rsp(store_rsp=False, timeout=None):
     logging.debug("%s received %r %r", gattc_write_rsp.__name__, tuple_hdr,
                   tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.GATT_WRITE)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT, defs.BTP_CMD_GATT_WRITE)
 
     rsp = gatt_dec_write_rsp(tuple_data[0])
     logging.debug("%s %r", gattc_write_rsp.__name__, rsp)
@@ -1736,7 +1736,7 @@ def gattc_write_long_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_WRITE_LONG)
+                  defs.BTP_CMD_GATT_WRITE_LONG)
 
     rsp = gatt_dec_write_rsp(tuple_data[0])
     logging.debug("%s %r", gattc_write_long_rsp.__name__, rsp)
@@ -1754,7 +1754,7 @@ def gattc_write_reliable_rsp(store_rsp=False):
                   tuple_hdr, tuple_data)
 
     btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_GATT,
-                  defs.GATT_WRITE_RELIABLE)
+                  defs.BTP_CMD_GATT_WRITE_RELIABLE)
 
     rsp = gatt_dec_write_rsp(tuple_data[0])
     logging.debug("%s %r", gattc_write_long_rsp.__name__, rsp)
diff --git a/autopts/pybtp/btp/gatt_cl.py b/autopts/pybtp/btp/gatt_cl.py
index 2c7e2e2d34..5db1c883fe 100644
--- a/autopts/pybtp/btp/gatt_cl.py
+++ b/autopts/pybtp/btp/gatt_cl.py
@@ -28,44 +28,44 @@
 
 GATTC = {
     "read_supp_cmds": (defs.BTP_SERVICE_ID_GATTC,
-                       defs.GATTC_READ_SUPPORTED_COMMANDS,
+                       defs.BTP_CMD_GATTC_READ_SUPPORTED_COMMANDS,
                        defs.BTP_INDEX_NONE, ""),
     "exchange_mtu": (defs.BTP_SERVICE_ID_GATTC,
-                     defs.GATTC_EXCHANGE_MTU,
+                     defs.BTP_CMD_GATTC_EXCHANGE_MTU,
                      CONTROLLER_INDEX),
-    "disc_all_prim": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_DISC_ALL_PRIM,
+    "disc_all_prim": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_DISC_ALL_PRIM,
                       CONTROLLER_INDEX),
-    "disc_prim_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_DISC_PRIM_UUID,
+    "disc_prim_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_DISC_PRIM_UUID,
                        CONTROLLER_INDEX),
-    "find_included": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_FIND_INCLUDED,
+    "find_included": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_FIND_INCLUDED,
                       CONTROLLER_INDEX),
-    "disc_all_chrc": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_DISC_ALL_CHRC,
+    "disc_all_chrc": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_DISC_ALL_CHRC,
                       CONTROLLER_INDEX),
-    "disc_chrc_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_DISC_CHRC_UUID,
+    "disc_chrc_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_DISC_CHRC_UUID,
                        CONTROLLER_INDEX),
-    "disc_all_desc": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_DISC_ALL_DESC,
+    "disc_all_desc": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_DISC_ALL_DESC,
                       CONTROLLER_INDEX),
-    "read": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_READ, CONTROLLER_INDEX),
-    "read_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_READ_UUID,
+    "read": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_READ, CONTROLLER_INDEX),
+    "read_uuid": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_READ_UUID,
                   CONTROLLER_INDEX),
-    "read_long": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_READ_LONG,
+    "read_long": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_READ_LONG,
                   CONTROLLER_INDEX),
-    "read_multiple": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_READ_MULTIPLE,
+    "read_multiple": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_READ_MULTIPLE,
                       CONTROLLER_INDEX),
     "write_without_rsp": (defs.BTP_SERVICE_ID_GATTC,
-                          defs.GATTC_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
+                          defs.BTP_CMD_GATTC_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
     "signed_write": (defs.BTP_SERVICE_ID_GATTC,
-                     defs.GATTC_SIGNED_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
-    "write": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_WRITE, CONTROLLER_INDEX),
-    "write_long": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_WRITE_LONG,
+                     defs.BTP_CMD_GATTC_SIGNED_WRITE_WITHOUT_RSP, CONTROLLER_INDEX),
+    "write": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_WRITE, CONTROLLER_INDEX),
+    "write_long": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_WRITE_LONG,
                    CONTROLLER_INDEX),
-    "write_reliable": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_WRITE_RELIABLE,
+    "write_reliable": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_WRITE_RELIABLE,
                        CONTROLLER_INDEX),
-    "cfg_notify": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_CFG_NOTIFY,
+    "cfg_notify": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_CFG_NOTIFY,
                    CONTROLLER_INDEX),
-    "cfg_indicate": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_CFG_INDICATE,
+    "cfg_indicate": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_CFG_INDICATE,
                      CONTROLLER_INDEX),
-    "read_multiple_var": (defs.BTP_SERVICE_ID_GATTC, defs.GATTC_READ_MULTIPLE_VAR,
+    "read_multiple_var": (defs.BTP_SERVICE_ID_GATTC, defs.BTP_CMD_GATTC_READ_MULTIPLE_VAR,
                           CONTROLLER_INDEX),
 }
 
@@ -639,24 +639,24 @@ def gatt_cl_notification_rxed_ev_(gatt_cl, data, data_len):
 
 
 GATTC_EV = {
-    defs.GATTC_EV_MTU_EXCHANGED: gatt_cl_mtu_exchanged_ev_,
-    defs.GATTC_DISC_ALL_PRIM_RP: gatt_cl_disc_all_prim_rsp_ev_,
-    defs.GATTC_DISC_PRIM_UUID_RP: gatt_cl_disc_prim_uuid_rsp_ev_,
-    defs.GATTC_FIND_INCLUDED_RP: gatt_cl_find_incld_rsp_ev_,
-    defs.GATTC_DISC_ALL_CHRC_RP: gatt_cl_disc_all_chrc_rsp_ev_,
-    defs.GATTC_DISC_CHRC_UUID_RP: gatt_cl_disc_chrc_uuid_rsp_ev_,
-    defs.GATTC_DISC_ALL_DESC_RP: gatt_cl_disc_all_desc_rsp_ev_,
-    defs.GATTC_READ_RP: gatt_cl_read_rsp_ev_,
-    defs.GATTC_READ_UUID_RP: gatt_cl_read_uuid_rsp_ev_,
-    defs.GATTC_READ_LONG_RP: gatt_cl_read_long_rsp_ev_,
-    defs.GATTC_READ_MULTIPLE_RP: gatt_cl_read_mult_rsp_ev_,
-    defs.GATTC_WRITE_RP: gatt_cl_write_rsp_ev_,
-    defs.GATTC_WRITE_LONG_RP: gatt_cl_write_rsp_ev_,
-    defs.GATTC_RELIABLE_WRITE_RP: gatt_cl_write_rsp_ev_,
-    defs.GATTC_CFG_NOTIFY_RP: gatt_cl_write_rsp_ev_,
-    defs.GATTC_CFG_INDICATE_RP: gatt_cl_write_rsp_ev_,
-    defs.GATTC_EV_NOTIFICATION_RXED: gatt_cl_notification_rxed_ev_,
-    defs.GATTC_READ_MULTIPLE_VAR_RP: gatt_cl_read_mult_var_rsp_ev_,
+    defs.BTP_EV_GATTC_MTU_EXCHANGED: gatt_cl_mtu_exchanged_ev_,
+    defs.BTP_EV_GATTC_DISC_ALL_PRIM_RP: gatt_cl_disc_all_prim_rsp_ev_,
+    defs.BTP_EV_GATTC_DISC_PRIM_UUID_RP: gatt_cl_disc_prim_uuid_rsp_ev_,
+    defs.BTP_EV_GATTC_FIND_INCLUDED_RP: gatt_cl_find_incld_rsp_ev_,
+    defs.BTP_EV_GATTC_DISC_ALL_CHRC_RP: gatt_cl_disc_all_chrc_rsp_ev_,
+    defs.BTP_EV_GATTC_DISC_CHRC_UUID_RP: gatt_cl_disc_chrc_uuid_rsp_ev_,
+    defs.BTP_EV_GATTC_DISC_ALL_DESC_RP: gatt_cl_disc_all_desc_rsp_ev_,
+    defs.BTP_EV_GATTC_READ_RP: gatt_cl_read_rsp_ev_,
+    defs.BTP_EV_GATTC_READ_UUID_RP: gatt_cl_read_uuid_rsp_ev_,
+    defs.BTP_EV_GATTC_READ_LONG_RP: gatt_cl_read_long_rsp_ev_,
+    defs.BTP_EV_GATTC_READ_MULTIPLE_RP: gatt_cl_read_mult_rsp_ev_,
+    defs.BTP_EV_GATTC_WRITE_RP: gatt_cl_write_rsp_ev_,
+    defs.BTP_EV_GATTC_WRITE_LONG_RP: gatt_cl_write_rsp_ev_,
+    defs.BTP_EV_GATTC_RELIABLE_WRITE_RP: gatt_cl_write_rsp_ev_,
+    defs.BTP_EV_GATTC_CFG_NOTIFY_RP: gatt_cl_write_rsp_ev_,
+    defs.BTP_EV_GATTC_CFG_INDICATE_RP: gatt_cl_write_rsp_ev_,
+    defs.BTP_EV_GATTC_EV_NOTIFICATION_RXED: gatt_cl_notification_rxed_ev_,
+    defs.BTP_EV_GATTC_READ_MULTIPLE_VAR_RP: gatt_cl_read_mult_var_rsp_ev_,
 }
 
 
diff --git a/autopts/pybtp/btp/l2cap.py b/autopts/pybtp/btp/l2cap.py
index 66f6a245dd..5cde2e8288 100644
--- a/autopts/pybtp/btp/l2cap.py
+++ b/autopts/pybtp/btp/l2cap.py
@@ -27,21 +27,21 @@
 
 L2CAP = {
     "read_supp_cmds": (defs.BTP_SERVICE_ID_L2CAP,
-                       defs.L2CAP_READ_SUPPORTED_COMMANDS,
+                       defs.BTP_CMD_L2CAP_READ_SUPPORTED_COMMANDS,
                        defs.BTP_INDEX_NONE, ""),
-    "connect": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_CONNECT,
+    "connect": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_CONNECT,
                 CONTROLLER_INDEX),
-    "disconnect": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_DISCONNECT,
+    "disconnect": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_DISCONNECT,
                    CONTROLLER_INDEX),
-    "send_data": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_SEND_DATA,
+    "send_data": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_SEND_DATA,
                   CONTROLLER_INDEX),
-    "listen": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_LISTEN,
+    "listen": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_LISTEN,
                CONTROLLER_INDEX),
-    "reconfigure": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_RECONFIGURE,
+    "reconfigure": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_RECONFIGURE,
                     CONTROLLER_INDEX),
-    "disconnect_eatt_chans": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_DISCONNECT_EATT_CHANS,
+    "disconnect_eatt_chans": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_DISCONNECT_EATT_CHANS,
                               CONTROLLER_INDEX),
-    "credits": (defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_CREDITS,
+    "credits": (defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_CREDITS,
                 CONTROLLER_INDEX),
 }
 
@@ -111,7 +111,7 @@ def l2cap_conn_rsp():
     tuple_hdr, tuple_data = iutctl.btp_socket.read()
     logging.debug("received %r %r", tuple_hdr, tuple_data)
 
-    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_L2CAP, defs.L2CAP_CONNECT)
+    btp_hdr_check(tuple_hdr, defs.BTP_SERVICE_ID_L2CAP, defs.BTP_CMD_L2CAP_CONNECT)
     num = struct.unpack_from('<B', tuple_data[0])[0]
     channels = struct.unpack_from('%ds' % num, tuple_data[0], 1)[0]
     return list(channels)
@@ -126,7 +126,7 @@ def l2cap_disconn(chan_id):
 
     iutctl.btp_socket.send(*L2CAP['disconnect'], data=data_ba)
 
-    l2cap_command_rsp_succ(defs.L2CAP_DISCONNECT)
+    l2cap_command_rsp_succ(defs.BTP_CMD_L2CAP_DISCONNECT)
 
 
 def l2cap_send_data(chan_id, val, val_mtp=None):
@@ -166,7 +166,7 @@ def l2cap_listen(psm, transport, mtu=0, response=L2CAPConnectionResponse.success
 
     iutctl.btp_socket.send(*L2CAP['listen'], data=data_ba)
 
-    l2cap_command_rsp_succ(defs.L2CAP_LISTEN)
+    l2cap_command_rsp_succ(defs.BTP_CMD_L2CAP_LISTEN)
 
 
 def l2cap_disconn_eatt_chans(bd_addr, bd_addr_type, channel_count):
@@ -184,7 +184,7 @@ def l2cap_disconn_eatt_chans(bd_addr, bd_addr_type, channel_count):
 
     iutctl.btp_socket.send(*L2CAP['disconnect_eatt_chans'], data=data_ba)
 
-    l2cap_command_rsp_succ(defs.L2CAP_DISCONNECT_EATT_CHANS)
+    l2cap_command_rsp_succ(defs.BTP_CMD_L2CAP_DISCONNECT_EATT_CHANS)
 
 
 def l2cap_le_listen(psm, mtu=0, response=0):
@@ -210,7 +210,7 @@ def l2cap_reconfigure(bd_addr, bd_addr_type, mtu, channels):
 
     iutctl.btp_socket.send(*L2CAP['reconfigure'], data=data_ba)
 
-    l2cap_command_rsp_succ(defs.L2CAP_RECONFIGURE)
+    l2cap_command_rsp_succ(defs.BTP_CMD_L2CAP_RECONFIGURE)
 
 
 def l2cap_credits(chan_id):
@@ -222,7 +222,7 @@ def l2cap_credits(chan_id):
 
     iutctl.btp_socket.send(*L2CAP['credits'], data=data_ba)
 
-    l2cap_command_rsp_succ(defs.L2CAP_CREDITS)
+    l2cap_command_rsp_succ(defs.BTP_CMD_L2CAP_CREDITS)
 
 
 def l2cap_connected_ev(l2cap, data, data_len):
@@ -277,8 +277,8 @@ def l2cap_reconfigured_ev(l2cap, data, data_len):
 
 
 L2CAP_EV = {
-    defs.L2CAP_EV_CONNECTED: l2cap_connected_ev,
-    defs.L2CAP_EV_DISCONNECTED: l2cap_disconnected_ev,
-    defs.L2CAP_EV_DATA_RECEIVED: l2cap_data_rcv_ev,
-    defs.L2CAP_EV_RECONFIGURED: l2cap_reconfigured_ev,
+    defs.BTP_EV_L2CAP_CONNECTED: l2cap_connected_ev,
+    defs.BTP_EV_L2CAP_DISCONNECTED: l2cap_disconnected_ev,
+    defs.BTP_EV_L2CAP_DATA_RECEIVED: l2cap_data_rcv_ev,
+    defs.BTP_EV_L2CAP_RECONFIGURED: l2cap_reconfigured_ev,
 }
diff --git a/autopts/pybtp/defs.py b/autopts/pybtp/defs.py
index c802844c2d..9c6abc082a 100644
--- a/autopts/pybtp/defs.py
+++ b/autopts/pybtp/defs.py
@@ -55,19 +55,20 @@ def BIT(bit):
 BTP_SERVICE_ID_PBP = 30
 # GENERATOR append 1
 
+BTP_ERROR = 0x00
 BTP_STATUS_SUCCESS = 0x00
 BTP_STATUS_FAILED = 0x01
 BTP_STATUS_UNKNOWN_CMD = 0x02
 BTP_STATUS_NOT_READY = 0x03
 BTP_STATUS = 0x00
-CORE_READ_SUPPORTED_COMMANDS = 0x01
-CORE_READ_SUPPORTED_SERVICES = 0x02
-CORE_REGISTER_SERVICE = 0x03
-CORE_UNREGISTER_SERVICE = 0x04
-CORE_LOG_MESSAGE = 0x05
-CORE_EV_IUT_READY = 0x80
-GAP_READ_SUPPORTED_COMMANDS = 0x01
-GAP_READ_CONTROLLER_INDEX_LIST = 0x02
+BTP_CMD_CORE_READ_SUPPORTED_COMMANDS = 0x01
+BTP_CMD_CORE_READ_SUPPORTED_SERVICES = 0x02
+BTP_CMD_CORE_REGISTER_SERVICE = 0x03
+BTP_CMD_CORE_UNREGISTER_SERVICE = 0x04
+BTP_CMD_CORE_LOG_MESSAGE = 0x05
+BTP_EV_CORE_IUT_READY = 0x80
+BTP_CMD_GAP_READ_SUPPORTED_COMMANDS = 0x01
+BTP_CMD_GAP_READ_CONTROLLER_INDEX_LIST = 0x02
 GAP_SETTINGS_POWERED = 0
 GAP_SETTINGS_CONNECTABLE = 1
 GAP_SETTINGS_FAST_CONNECTABLE = 2
@@ -86,173 +87,173 @@ def BIT(bit):
 GAP_SETTINGS_STATIC_ADDRESS = 15
 GAP_SETTINGS_SC_ONLY = 16
 GAP_SETTINGS_EXTENDED_ADVERTISING = 17
-GAP_READ_CONTROLLER_INFO = 0x03
-GAP_RESET = 0x04
-GAP_SET_POWERED = 0x05
-GAP_SET_CONNECTABLE = 0x06
-GAP_SET_FAST_CONNECTABLE = 0x07
+BTP_CMD_GAP_READ_CONTROLLER_INFO = 0x03
+BTP_CMD_GAP_RESET = 0x04
+BTP_CMD_GAP_SET_POWERED = 0x05
+BTP_CMD_GAP_SET_CONNECTABLE = 0x06
+BTP_CMD_GAP_SET_FAST_CONNECTABLE = 0x07
 GAP_NON_DISCOVERABLE = 0x00
 GAP_GENERAL_DISCOVERABLE = 0x01
 GAP_LIMITED_DISCOVERABLE = 0x02
-GAP_SET_DISCOVERABLE = 0x08
-GAP_SET_BONDABLE = 0x09
-GAP_START_ADVERTISING = 0x0a
-GAP_STOP_ADVERTISING = 0x0b
+BTP_CMD_GAP_SET_DISCOVERABLE = 0x08
+BTP_CMD_GAP_SET_BONDABLE = 0x09
+BTP_CMD_GAP_START_ADVERTISING = 0x0a
+BTP_CMD_GAP_STOP_ADVERTISING = 0x0b
 GAP_DISCOVERY_FLAG_LE = 0x01
 GAP_DISCOVERY_FLAG_BREDR = 0x02
 GAP_DISCOVERY_FLAG_LIMITED = 0x04
 GAP_DISCOVERY_FLAG_LE_ACTIVE_SCAN = 0x08
 GAP_DISCOVERY_FLAG_LE_OBSERVE = 0x10
-GAP_START_DISCOVERY = 0x0c
-GAP_STOP_DISCOVERY = 0x0d
-GAP_CONNECT = 0x0e
-GAP_DISCONNECT = 0x0f
+BTP_CMD_GAP_START_DISCOVERY = 0x0c
+BTP_CMD_GAP_STOP_DISCOVERY = 0x0d
+BTP_CMD_GAP_CONNECT = 0x0e
+BTP_CMD_GAP_DISCONNECT = 0x0f
 GAP_IO_CAP_DISPLAY_ONLY = 0
 GAP_IO_CAP_DISPLAY_YESNO = 1
 GAP_IO_CAP_KEYBOARD_ONLY = 2
 GAP_IO_CAP_NO_INPUT_OUTPUT = 3
 GAP_IO_CAP_KEYBOARD_DISPLAY = 4
-GAP_SET_IO_CAP = 0x10
-GAP_PAIR = 0x11
-GAP_UNPAIR = 0x12
-GAP_PASSKEY_ENTRY = 0x13
-GAP_PASSKEY_CONFIRM = 0x14
+BTP_CMD_GAP_SET_IO_CAP = 0x10
+BTP_CMD_GAP_PAIR = 0x11
+BTP_CMD_GAP_UNPAIR = 0x12
+BTP_CMD_GAP_PASSKEY_ENTRY = 0x13
+BTP_CMD_GAP_PASSKEY_CONFIRM = 0x14
 GAP_START_DIRECT_ADV_HD = 0x0001
 GAP_START_DIRECT_ADV_OWN_ID = 0x0002
 GAP_START_DIRECT_ADV_PEER_RPA = 0x0004
-GAP_START_DIRECT_ADV = 0x15
-GAP_CONN_PARAM_UPDATE = 0x16
-GAP_PAIRING_CONSENT_RSP = 0x17
-GAP_OOB_LEGACY_SET_DATA = 0x18
-GAP_OOB_SC_GET_LOCAL_DATA = 0x19
-GAP_OOB_SC_SET_REMOTE_DATA = 0x1a
-GAP_SET_MITM = 0x1b
-GAP_SET_FILTER_ACCEPT_LIST = 0x1c
-GAP_SET_PRIVACY = 0x1d
-GAP_SET_SC_ONLY = 0x1e
-GAP_SET_SC = 0x1f
-GAP_SET_MIN_ENC_KEY_SIZE = 0x20
-GAP_SET_EXTENDED_ADVERTISING = 0x21
-GAP_PADV_CONFIGURE = 0x22
-GAP_PADV_START = 0x23
-GAP_PADV_STOP = 0x24
-GAP_PADV_SET_DATA = 0x25
-GAP_PADV_CREATE_SYNC = 0x26
-GAP_PADV_SYNC_TRANSFER_SET_INFO = 0x27
-GAP_PADV_SYNC_TRANSFER_START = 0x28
-GAP_PADV_SYNC_TRANSFER_RECV = 0x29
-GAP_EV_NEW_SETTINGS = 0x80
+BTP_CMD_GAP_START_DIRECT_ADV = 0x15
+BTP_CMD_GAP_CONN_PARAM_UPDATE = 0x16
+BTP_CMD_GAP_PAIRING_CONSENT_RSP = 0x17
+BTP_CMD_GAP_OOB_LEGACY_SET_DATA = 0x18
+BTP_CMD_GAP_OOB_SC_GET_LOCAL_DATA = 0x19
+BTP_CMD_GAP_OOB_SC_SET_REMOTE_DATA = 0x1a
+BTP_CMD_GAP_SET_MITM = 0x1b
+BTP_CMD_GAP_SET_FILTER_ACCEPT_LIST = 0x1c
+BTP_CMD_GAP_SET_PRIVACY = 0x1d
+BTP_CMD_GAP_SET_SC_ONLY = 0x1e
+BTP_CMD_GAP_SET_SC = 0x1f
+BTP_CMD_GAP_SET_MIN_ENC_KEY_SIZE = 0x20
+BTP_CMD_GAP_SET_EXTENDED_ADVERTISING = 0x21
+BTP_CMD_GAP_PADV_CONFIGURE = 0x22
+BTP_CMD_GAP_PADV_START = 0x23
+BTP_CMD_GAP_PADV_STOP = 0x24
+BTP_CMD_GAP_PADV_SET_DATA = 0x25
+BTP_CMD_GAP_PADV_CREATE_SYNC = 0x26
+BTP_CMD_GAP_PADV_SYNC_TRANSFER_SET_INFO = 0x27
+BTP_CMD_GAP_PADV_SYNC_TRANSFER_START = 0x28
+BTP_CMD_GAP_PADV_SYNC_TRANSFER_RECV = 0x29
+BTP_EV_GAP_NEW_SETTINGS = 0x80
 GAP_DEVICE_FOUND_FLAG_RSSI = 0x01
 GAP_DEVICE_FOUND_FLAG_AD = 0x02
 GAP_DEVICE_FOUND_FLAG_SD = 0x04
-GAP_EV_DEVICE_FOUND = 0x81
-GAP_EV_DEVICE_CONNECTED = 0x82
-GAP_EV_DEVICE_DISCONNECTED = 0x83
-GAP_EV_PASSKEY_DISPLAY = 0x84
-GAP_EV_PASSKEY_ENTRY_REQ = 0x85
-GAP_EV_PASSKEY_CONFIRM_REQ = 0x86
-GAP_EV_IDENTITY_RESOLVED = 0x87
-GAP_EV_CONN_PARAM_UPDATE = 0x88
-GAP_EV_SEC_LEVEL_CHANGED = 0x89
-GAP_EV_PAIRING_CONSENT_REQ = 0x8a
-GAP_EV_BOND_LOST = 0x8b
-GAP_EV_PAIRING_FAILED = 0x8c
-GAP_EV_PERIODIC_SYNC_ESTABLISHED = 0x8d
-GAP_EV_PERIODIC_SYNC_LOST = 0x8e
-GAP_EV_PERIODIC_REPORT = 0x8f
-GAP_EV_PERIODIC_TRANSFER_RECEIVED = 0x90
-GATT_READ_SUPPORTED_COMMANDS = 0x01
+BTP_EV_GAP_DEVICE_FOUND = 0x81
+BTP_EV_GAP_DEVICE_CONNECTED = 0x82
+BTP_EV_GAP_DEVICE_DISCONNECTED = 0x83
+BTP_EV_GAP_PASSKEY_DISPLAY = 0x84
+BTP_EV_GAP_PASSKEY_ENTRY_REQ = 0x85
+BTP_EV_GAP_PASSKEY_CONFIRM_REQ = 0x86
+BTP_EV_GAP_IDENTITY_RESOLVED = 0x87
+BTP_EV_GAP_CONN_PARAM_UPDATE = 0x88
+BTP_EV_GAP_SEC_LEVEL_CHANGED = 0x89
+BTP_EV_GAP_PAIRING_CONSENT_REQ = 0x8a
+BTP_EV_GAP_BOND_LOST = 0x8b
+BTP_EV_GAP_PAIRING_FAILED = 0x8c
+BTP_EV_GAP_PERIODIC_SYNC_ESTABLISHED = 0x8d
+BTP_EV_GAP_PERIODIC_SYNC_LOST = 0x8e
+BTP_EV_GAP_PERIODIC_REPORT = 0x8f
+BTP_EV_GAP_PERIODIC_TRANSFER_RECEIVED = 0x90
+BTP_CMD_GATT_READ_SUPPORTED_COMMANDS = 0x01
 GATT_SERVICE_PRIMARY = 0x00
 GATT_SERVICE_SECONDARY = 0x01
-GATT_ADD_SERVICE = 0x02
-GATT_ADD_CHARACTERISTIC = 0x03
-GATT_ADD_DESCRIPTOR = 0x04
-GATT_ADD_INCLUDED_SERVICE = 0x05
-GATT_SET_VALUE = 0x06
-GATT_START_SERVER = 0x07
-GATT_SET_ENC_KEY_SIZE = 0x09
-GATT_EXCHANGE_MTU = 0x0a
-GATT_DISC_ALL_PRIM = 0x0b
-GATT_DISC_PRIM_UUID = 0x0c
-GATT_FIND_INCLUDED = 0x0d
-GATT_DISC_ALL_CHRC = 0x0e
-GATT_DISC_CHRC_UUID = 0x0f
-GATT_DISC_ALL_DESC = 0x10
-GATT_READ = 0x11
-GATT_READ_UUID = 0x12
-GATT_READ_LONG = 0x13
-GATT_READ_MULTIPLE = 0x14
-GATT_READ_MULTIPLE_VAR = 0x20
-GATT_WRITE_WITHOUT_RSP = 0x15
-GATT_SIGNED_WRITE_WITHOUT_RSP = 0x16
-GATT_WRITE = 0x17
-GATT_WRITE_LONG = 0x18
-GATT_WRITE_RELIABLE = 0x19
-GATT_CFG_NOTIFY = 0x1a
-GATT_CFG_INDICATE = 0x1b
-GATT_GET_ATTRIBUTES = 0x1c
-GATT_GET_ATTRIBUTE_VALUE = 0x1d
-GATT_CHANGE_DATABASE = 0x1e
-GATT_EATT_CONNECT = 0x1f
-GATT_NOTIFY_MULTIPLE = 0x21
-GATT_EV_NOTIFICATION = 0x80
-GATT_EV_ATTR_VALUE_CHANGED = 0x81
-GATTC_READ_SUPPORTED_COMMANDS = 0x01
-GATTC_EXCHANGE_MTU = 0x02
-GATTC_DISC_ALL_PRIM = 0x03
-GATTC_DISC_PRIM_UUID = 0x04
-GATTC_FIND_INCLUDED = 0x05
-GATTC_DISC_ALL_CHRC = 0x06
-GATTC_DISC_CHRC_UUID = 0x07
-GATTC_DISC_ALL_DESC = 0x08
-GATTC_READ = 0x09
-GATTC_READ_UUID = 0x0a
-GATTC_READ_LONG = 0x0b
-GATTC_READ_MULTIPLE = 0x0c
-GATTC_WRITE_WITHOUT_RSP = 0x0d
-GATTC_SIGNED_WRITE_WITHOUT_RSP = 0x0e
-GATTC_WRITE = 0x0f
-GATTC_WRITE_LONG = 0x10
-GATTC_WRITE_RELIABLE = 0x11
-GATTC_CFG_NOTIFY = 0x12
-GATTC_CFG_INDICATE = 0x13
-GATTC_READ_MULTIPLE_VAR = 0x14
-GATTC_EV_MTU_EXCHANGED = 0x80
-GATTC_DISC_ALL_PRIM_RP = 0x81
-GATTC_DISC_PRIM_UUID_RP = 0x82
-GATTC_FIND_INCLUDED_RP = 0x83
-GATTC_DISC_ALL_CHRC_RP = 0x84
-GATTC_DISC_CHRC_UUID_RP = 0x85
-GATTC_DISC_ALL_DESC_RP = 0x86
-GATTC_READ_RP = 0x87
-GATTC_READ_UUID_RP = 0x88
-GATTC_READ_LONG_RP = 0x89
-GATTC_READ_MULTIPLE_RP = 0x8a
-GATTC_WRITE_RP = 0x8b
-GATTC_WRITE_LONG_RP = 0x8c
-GATTC_RELIABLE_WRITE_RP = 0x8d
-GATTC_CFG_NOTIFY_RP = 0x8e
-GATTC_CFG_INDICATE_RP = 0x8f
-GATTC_EV_NOTIFICATION_RXED = 0x90
-GATTC_READ_MULTIPLE_VAR_RP = 0x91
-L2CAP_READ_SUPPORTED_COMMANDS = 0x01
-L2CAP_CONNECT = 0x02
+BTP_CMD_GATT_ADD_SERVICE = 0x02
+BTP_CMD_GATT_ADD_CHARACTERISTIC = 0x03
+BTP_CMD_GATT_ADD_DESCRIPTOR = 0x04
+BTP_CMD_GATT_ADD_INCLUDED_SERVICE = 0x05
+BTP_CMD_GATT_SET_VALUE = 0x06
+BTP_CMD_GATT_START_SERVER = 0x07
+BTP_CMD_GATT_SET_ENC_KEY_SIZE = 0x09
+BTP_CMD_GATT_EXCHANGE_MTU = 0x0a
+BTP_CMD_GATT_DISC_ALL_PRIM = 0x0b
+BTP_CMD_GATT_DISC_PRIM_UUID = 0x0c
+BTP_CMD_GATT_FIND_INCLUDED = 0x0d
+BTP_CMD_GATT_DISC_ALL_CHRC = 0x0e
+BTP_CMD_GATT_DISC_CHRC_UUID = 0x0f
+BTP_CMD_GATT_DISC_ALL_DESC = 0x10
+BTP_CMD_GATT_READ = 0x11
+BTP_CMD_GATT_READ_UUID = 0x12
+BTP_CMD_GATT_READ_LONG = 0x13
+BTP_CMD_GATT_READ_MULTIPLE = 0x14
+BTP_CMD_GATT_READ_MULTIPLE_VAR = 0x20
+BTP_CMD_GATT_WRITE_WITHOUT_RSP = 0x15
+BTP_CMD_GATT_SIGNED_WRITE_WITHOUT_RSP = 0x16
+BTP_CMD_GATT_WRITE = 0x17
+BTP_CMD_GATT_WRITE_LONG = 0x18
+BTP_CMD_GATT_WRITE_RELIABLE = 0x19
+BTP_CMD_GATT_CFG_NOTIFY = 0x1a
+BTP_CMD_GATT_CFG_INDICATE = 0x1b
+BTP_CMD_GATT_GET_ATTRIBUTES = 0x1c
+BTP_CMD_GATT_GET_ATTRIBUTE_VALUE = 0x1d
+BTP_CMD_GATT_CHANGE_DATABASE = 0x1e
+BTP_CMD_GATT_EATT_CONNECT = 0x1f
+BTP_CMD_GATT_NOTIFY_MULTIPLE = 0x21
+BTP_EV_GATT_NOTIFICATION = 0x80
+BTP_GATT_EV_ATTR_VALUE_CHANGED = 0x81
+BTP_CMD_GATTC_READ_SUPPORTED_COMMANDS = 0x01
+BTP_CMD_GATTC_EXCHANGE_MTU = 0x02
+BTP_CMD_GATTC_DISC_ALL_PRIM = 0x03
+BTP_CMD_GATTC_DISC_PRIM_UUID = 0x04
+BTP_CMD_GATTC_FIND_INCLUDED = 0x05
+BTP_CMD_GATTC_DISC_ALL_CHRC = 0x06
+BTP_CMD_GATTC_DISC_CHRC_UUID = 0x07
+BTP_CMD_GATTC_DISC_ALL_DESC = 0x08
+BTP_CMD_GATTC_READ = 0x09
+BTP_CMD_GATTC_READ_UUID = 0x0a
+BTP_CMD_GATTC_READ_LONG = 0x0b
+BTP_CMD_GATTC_READ_MULTIPLE = 0x0c
+BTP_CMD_GATTC_WRITE_WITHOUT_RSP = 0x0d
+BTP_CMD_GATTC_SIGNED_WRITE_WITHOUT_RSP = 0x0e
+BTP_CMD_GATTC_WRITE = 0x0f
+BTP_CMD_GATTC_WRITE_LONG = 0x10
+BTP_CMD_GATTC_WRITE_RELIABLE = 0x11
+BTP_CMD_GATTC_CFG_NOTIFY = 0x12
+BTP_CMD_GATTC_CFG_INDICATE = 0x13
+BTP_CMD_GATTC_READ_MULTIPLE_VAR = 0x14
+BTP_EV_GATTC_MTU_EXCHANGED = 0x80
+BTP_EV_GATTC_DISC_ALL_PRIM_RP = 0x81
+BTP_EV_GATTC_DISC_PRIM_UUID_RP = 0x82
+BTP_EV_GATTC_FIND_INCLUDED_RP = 0x83
+BTP_EV_GATTC_DISC_ALL_CHRC_RP = 0x84
+BTP_EV_GATTC_DISC_CHRC_UUID_RP = 0x85
+BTP_EV_GATTC_DISC_ALL_DESC_RP = 0x86
+BTP_EV_GATTC_READ_RP = 0x87
+BTP_EV_GATTC_READ_UUID_RP = 0x88
+BTP_EV_GATTC_READ_LONG_RP = 0x89
+BTP_EV_GATTC_READ_MULTIPLE_RP = 0x8a
+BTP_EV_GATTC_WRITE_RP = 0x8b
+BTP_EV_GATTC_WRITE_LONG_RP = 0x8c
+BTP_EV_GATTC_RELIABLE_WRITE_RP = 0x8d
+BTP_EV_GATTC_CFG_NOTIFY_RP = 0x8e
+BTP_EV_GATTC_CFG_INDICATE_RP = 0x8f
+BTP_EV_GATTC_EV_NOTIFICATION_RXED = 0x90
+BTP_EV_GATTC_READ_MULTIPLE_VAR_RP = 0x91
+BTP_CMD_L2CAP_READ_SUPPORTED_COMMANDS = 0x01
+BTP_CMD_L2CAP_CONNECT = 0x02
 L2CAP_CONNECT_OPT_ECFC = 0x01
 L2CAP_CONNECT_OPT_HOLD_CREDIT = 0x02
-L2CAP_DISCONNECT = 0x03
-L2CAP_SEND_DATA = 0x04
+BTP_CMD_L2CAP_DISCONNECT = 0x03
+BTP_CMD_L2CAP_SEND_DATA = 0x04
 L2CAP_TRANSPORT_BREDR = 0x00
 L2CAP_TRANSPORT_LE = 0x01
-L2CAP_LISTEN = 0x05
-L2CAP_ACCEPT_CONNECTION = 0x06
-L2CAP_RECONFIGURE = 0x07
-L2CAP_CREDITS = 0x08
-L2CAP_DISCONNECT_EATT_CHANS = 0x09
-L2CAP_EV_CONNECTION_REQ = 0x80
-L2CAP_EV_CONNECTED = 0x81
-L2CAP_EV_DISCONNECTED = 0x82
-L2CAP_EV_DATA_RECEIVED = 0x83
-L2CAP_EV_RECONFIGURED = 0x84
+BTP_CMD_L2CAP_LISTEN = 0x05
+BTP_CMD_L2CAP_ACCEPT_CONNECTION = 0x06
+BTP_CMD_L2CAP_RECONFIGURE = 0x07
+BTP_CMD_L2CAP_CREDITS = 0x08
+BTP_CMD_L2CAP_DISCONNECT_EATT_CHANS = 0x09
+BTP_EV_L2CAP_CONNECTION_REQ = 0x80
+BTP_EV_L2CAP_CONNECTED = 0x81
+BTP_EV_L2CAP_DISCONNECTED = 0x82
+BTP_EV_L2CAP_DATA_RECEIVED = 0x83
+BTP_EV_L2CAP_RECONFIGURED = 0x84
 MESH_READ_SUPPORTED_COMMANDS = 0x01
 MESH_STATIC_OOB = 0x01
 MESH_OUTPUT_OOB = 0x02
diff --git a/tools/btpclient.py b/tools/btpclient.py
index 9273cac86f..0e7dc11544 100755
--- a/tools/btpclient.py
+++ b/tools/btpclient.py
@@ -722,10 +722,10 @@ def receive(exp_svc_id=None, exp_op=None):
         return
 
     if tuple_hdr.svc_id == defs.BTP_SERVICE_ID_GAP:
-        if tuple_hdr.op == defs.GAP_EV_PASSKEY_DISPLAY:
+        if tuple_hdr.op == defs.BTP_EV_GAP_PASSKEY_DISPLAY:
             passkey = struct.unpack('I', tuple_data[0][7:11])[0]
             print("Passkey:", passkey)
-        if tuple_hdr.op == defs.GAP_READ_CONTROLLER_INFO:
+        if tuple_hdr.op == defs.BTP_CMD_GAP_READ_CONTROLLER_INFO:
             print_controller_info(tuple_data[0])
     print(green("OK"))
 
diff --git a/tools/generate_profile.py b/tools/generate_profile.py
index dc6e14f759..d20b005a29 100644
--- a/tools/generate_profile.py
+++ b/tools/generate_profile.py
@@ -323,7 +323,7 @@ def wait_dummyevent_completed_ev(self, addr_type, addr, timeout, remove=True):
 """,
         2: f"from .{profile_name_lower} import {profile_name_upper}_EV\n",
         3: f"        defs.BTP_SERVICE_ID_{profile_name_upper}: ({profile_name_upper}_EV, stack.{profile_name_lower}),\n",
-        4: f"    \"{profile_name_lower}_reg\": (defs.BTP_SERVICE_ID_CORE, defs.CORE_REGISTER_SERVICE,\n"
+        4: f"    \"{profile_name_lower}_reg\": (defs.BTP_SERVICE_ID_CORE, defs.BTP_CMD_CORE_REGISTER_SERVICE,\n"
            f"                defs.BTP_INDEX_NONE, defs.BTP_SERVICE_ID_{profile_name_upper}),\n",
     },
     f'{AUTOPTS_REPO}/autopts/pybtp/btp/__init__.py': {1: f"from autopts.pybtp.btp.{profile_name_lower} import *\n"},