diff --git a/src/hci_cmd.c b/src/hci_cmd.c
index 7bd2ec5e0..cf339411f 100644
--- a/src/hci_cmd.c
+++ b/src/hci_cmd.c
@@ -1706,14 +1706,8 @@ const hci_cmd_t hci_le_set_periodic_advertising_enable = {
  * @param scan_window * 0.625, range = 0x0004..0xffff
  */
 
-// Variants for 1 (1M or Coded) PHY
-const hci_cmd_t hci_le_set_extended_scan_parameters_1 = {
-    HCI_OPCODE_HCI_LE_SET_EXTENDED_SCAN_PARAMETERS, "111122"
-};
-
-// Variants for 2 (1M and Coded) PHY
-const hci_cmd_t hci_le_set_extended_scan_parameters_2 = {
-        HCI_OPCODE_HCI_LE_SET_EXTENDED_SCAN_PARAMETERS, "111122122"
+const hci_cmd_t hci_le_set_extended_scan_parameters = {
+    HCI_OPCODE_HCI_LE_SET_EXTENDED_SCAN_PARAMETERS, "11b[122]"
 };
 
 /**
diff --git a/src/hci_cmd.h b/src/hci_cmd.h
index 06c77dec4..b4695a515 100644
--- a/src/hci_cmd.h
+++ b/src/hci_cmd.h
@@ -466,7 +466,7 @@ extern const hci_cmd_t hci_le_periodic_advertising_terminate_sync;
 extern const hci_cmd_t hci_le_rand;
 extern const hci_cmd_t hci_le_read_advertising_channel_tx_power;
 extern const hci_cmd_t hci_le_read_antenna_information;
-extern const hci_cmd_t hci_le_read_buffer_size ;
+extern const hci_cmd_t hci_le_read_buffer_size;
 extern const hci_cmd_t hci_le_read_channel_map;
 extern const hci_cmd_t hci_le_read_iso_link_quality;
 extern const hci_cmd_t hci_le_read_iso_tx_sync;
@@ -520,8 +520,7 @@ extern const hci_cmd_t hci_le_set_extended_advertising_data;
 extern const hci_cmd_t hci_le_set_extended_advertising_enable;
 extern const hci_cmd_t hci_le_set_extended_advertising_parameters;
 extern const hci_cmd_t hci_le_set_extended_scan_enable;
-extern const hci_cmd_t hci_le_set_extended_scan_parameters_1;
-extern const hci_cmd_t hci_le_set_extended_scan_parameters_2;
+extern const hci_cmd_t hci_le_set_extended_scan_parameters;
 extern const hci_cmd_t hci_le_set_extended_scan_response_data;
 extern const hci_cmd_t hci_le_set_host_channel_classification;
 extern const hci_cmd_t hci_le_set_host_feature;