diff --git a/include/btstack/hci_cmds.h b/include/btstack/hci_cmds.h
index 88ec2f60e..21c458f20 100644
--- a/include/btstack/hci_cmds.h
+++ b/include/btstack/hci_cmds.h
@@ -217,9 +217,9 @@ extern "C" {
 #define GATT_ADVERTISEMENT								   0xA0
 
 #define GATT_CONNECTION_COMPLETE	 					   0xA1
-#define GATT_SERVICE				 					   0xA2
+#define GATT_SERVICE_QUERY_RESULT     					   0xA2
 #define GATT_SERVICE_QUERY_COMPLETE    					   0xA3
-#define GATT_CHARACTERISTIC				 				   0xA4
+#define GATT_CHARACTERISTIC_QUERY_RESULT				   0xA4
 #define GATT_CHARACTERISTIC_QUERY_COMPLETE    			   0xA5