diff --git a/nimble/controller/include/controller/ble_ll_hci.h b/nimble/controller/include/controller/ble_ll_hci.h
index 9f3fc9503..a9ea3bb05 100644
--- a/nimble/controller/include/controller/ble_ll_hci.h
+++ b/nimble/controller/include/controller/ble_ll_hci.h
@@ -43,7 +43,7 @@ extern const uint8_t g_ble_ll_supp_cmds[BLE_LL_SUPP_CMD_LEN];
 
 typedef void (*ble_ll_hci_post_cmd_complete_cb)(void);
 
-#if MYNEWT_VAL(BLE_HCI_VS)
+#if MYNEWT_VAL(BLE_LL_HCI_VS)
 typedef int (* ble_ll_hci_vs_cb_t)(uint16_t ocf,
                                    const uint8_t *cmdbuf, uint8_t cmdlen,
                                    uint8_t *rspbuf, uint8_t *rsplen);
@@ -82,7 +82,7 @@ bool ble_ll_hci_adv_mode_ext(void);
 /* Get TX power compensation rounded to integer dB */
 int8_t ble_ll_get_tx_pwr_compensation(void);
 
-#if MYNEWT_VAL(BLE_HCI_VS)
+#if MYNEWT_VAL(BLE_LL_HCI_VS)
 void ble_ll_hci_vs_register(struct ble_ll_hci_vs_cmd *cmds, uint32_t num_cmds);
 #endif
 
diff --git a/nimble/controller/src/ble_ll.c b/nimble/controller/src/ble_ll.c
index 16c2242c2..b5a527abb 100644
--- a/nimble/controller/src/ble_ll.c
+++ b/nimble/controller/src/ble_ll.c
@@ -1732,7 +1732,7 @@ ble_ll_init(void)
     ble_ll_dtm_init();
 #endif
 
-#if MYNEWT_VAL(BLE_HCI_VS)
+#if MYNEWT_VAL(BLE_LL_HCI_VS)
     ble_ll_hci_vs_init();
 #endif
 
diff --git a/nimble/controller/src/ble_ll_hci_priv.h b/nimble/controller/src/ble_ll_hci_priv.h
index f289dc103..af67e0a1a 100644
--- a/nimble/controller/src/ble_ll_hci_priv.h
+++ b/nimble/controller/src/ble_ll_hci_priv.h
@@ -24,7 +24,7 @@
 extern "C" {
 #endif
 
-#if MYNEWT_VAL(BLE_HCI_VS)
+#if MYNEWT_VAL(BLE_LL_HCI_VS)
 void ble_ll_hci_vs_init(void);
 int ble_ll_hci_vs_cmd_proc(const uint8_t *cmdbuf, uint8_t cmdlen, uint16_t ocf,
                            uint8_t *rspbuf, uint8_t *rsplen);