diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index 121c5c759..b315f0124 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -186,7 +186,7 @@ struct ble_gap_snapshot {
 static SLIST_HEAD(ble_gap_hook_list, ble_gap_event_listener) ble_gap_event_listener_list;
 
 static os_membuf_t ble_gap_update_entry_mem[
-                        OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_GAP_MAX_UPDATE_ENTRIES),
+                        OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_GAP_MAX_PENDING_CONN_PARAM_UPDATE),
                                         sizeof (struct ble_gap_update_entry))];
 static struct os_mempool ble_gap_update_entry_pool;
 static struct ble_gap_update_entry_list ble_gap_update_entries;
@@ -4745,7 +4745,7 @@ ble_gap_init(void)
     SLIST_INIT(&ble_gap_event_listener_list);
 
     rc = os_mempool_init(&ble_gap_update_entry_pool,
-                         MYNEWT_VAL(BLE_GAP_MAX_UPDATE_ENTRIES),
+                         MYNEWT_VAL(BLE_GAP_MAX_PENDING_CONN_PARAM_UPDATE),
                          sizeof (struct ble_gap_update_entry),
                          ble_gap_update_entry_mem,
                          "ble_gap_update");
diff --git a/nimble/host/syscfg.yml b/nimble/host/syscfg.yml
index 1218a9e52..df49742cd 100644
--- a/nimble/host/syscfg.yml
+++ b/nimble/host/syscfg.yml
@@ -172,9 +172,11 @@ syscfg.defs:
         value: 0
 
     # GAP options.
-    BLE_GAP_MAX_UPDATE_ENTRIES:
+    BLE_GAP_MAX_PENDING_CONN_PARAM_UPDATE:
         description: >
-            The maximum number of GAP update entries. (0/1)
+            Controls the number of connection parameter updates that can be pending
+            simultaneously. Devices with many concurrent connections may need
+            to increase this value.
         value: 1
 
     # Supported GATT procedures.  By default: