diff --git a/lib/mgmt.h b/lib/mgmt.h
index 47a694e..f44f246 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -56,6 +56,12 @@ struct mgmt_hdr {
 } __packed;
 #define MGMT_HDR_SIZE	6
 
+struct mgmt_tlv {
+	uint16_t type;
+	uint8_t  length;
+	uint8_t  value[];
+} __packed;
+
 struct mgmt_addr_info {
 	bdaddr_t bdaddr;
 	uint8_t type;
@@ -628,22 +634,24 @@ struct mgmt_rp_set_exp_feature {
 	uint32_t flags;
 } __packed;
 
-#define MGMT_OP_READ_DEFAULT_SYSTEM_PARAMETERS	0x004b
-
-struct mgmt_system_parameter_tlv {
-	uint16_t type;
-	uint8_t  length;
-	uint8_t  value[];
+#define MGMT_OP_READ_DEF_SYSTEM_CONFIG	0x004b
+struct mgmt_rp_read_default_system_config {
+	uint8_t parameters[0]; /* mgmt_tlv */
 } __packed;
 
-struct mgmt_rp_read_default_system_parameters {
-	uint8_t  parameters[0]; /* mgmt_system_parameter_tlv */
+#define MGMT_OP_SET_DEF_SYSTEM_CONFIG	0x004c
+struct mgmt_cp_set_default_system_config {
+	uint8_t parameters[0]; /* mgmt_tlv */
 } __packed;
 
-#define MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS	0x004c
+#define MGMT_OP_READ_DEF_RUNTIME_CONFIG	0x004d
+struct mgmt_rp_read_default_runtime_config {
+	uint8_t parameters[0]; /* mgmt_tlv */
+} __packed;
 
-struct mgmt_cp_set_default_system_parameters {
-	uint8_t  parameters[0]; /* mgmt_system_parameter_tlv */
+#define MGMT_OP_SET_DEF_RUNTIME_CONFIG	0x004e
+struct mgmt_cp_set_default_runtime_config {
+	uint8_t parameters[0]; /* mgmt_tlv */
 } __packed;
 
 #define MGMT_ADV_MONITOR_FEATURE_MASK_OR_PATTERNS	(1 << 0)
diff --git a/src/adapter.c b/src/adapter.c
index 233aef4..9200267 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -120,7 +120,7 @@ static bool kernel_conn_control = false;
 
 static bool kernel_blocked_keys_supported = false;
 
-static bool kernel_set_system_params = false;
+static bool kernel_set_system_config = false;
 
 static GList *adapter_list = NULL;
 static unsigned int adapter_remaining = 0;
@@ -4180,7 +4180,7 @@ static void probe_devices(void *user_data)
 static void load_default_system_params(struct btd_adapter *adapter)
 {
 	struct {
-		struct mgmt_system_parameter_tlv entry;
+		struct mgmt_tlv entry;
 		union {
 			uint16_t u16;
 		};
@@ -4189,7 +4189,7 @@ static void load_default_system_params(struct btd_adapter *adapter)
 	size_t len = 0;
 	unsigned int err;
 
-	if (!main_opts.default_params.num_entries || !kernel_set_system_params)
+	if (!main_opts.default_params.num_entries || !kernel_set_system_config)
 		return;
 
 	params = malloc0(sizeof(*params) *
@@ -4423,11 +4423,11 @@ static void load_default_system_params(struct btd_adapter *adapter)
 		len += sizeof(params[i].u16);
 	}
 
-	err = mgmt_send(adapter->mgmt, MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS,
+	err = mgmt_send(adapter->mgmt, MGMT_OP_SET_DEF_SYSTEM_CONFIG,
 			adapter->dev_id, len, params, NULL, NULL, NULL);
 	if (!err)
 		btd_error(adapter->dev_id,
-				"Failed to set default system params for hci%u",
+				"Failed to set default system config for hci%u",
 				adapter->dev_id);
 
 	free(params);
@@ -9435,9 +9435,9 @@ static void read_commands_complete(uint8_t status, uint16_t length,
 			DBG("kernel supports the set_blocked_keys op");
 			kernel_blocked_keys_supported = true;
 			break;
-		case MGMT_OP_SET_DEFAULT_SYSTEM_PARAMETERS:
-			DBG("kernel supports set system params");
-			kernel_set_system_params = true;
+		case MGMT_OP_SET_DEF_SYSTEM_CONFIG:
+			DBG("kernel supports set system confic");
+			kernel_set_system_config = true;
 			break;
 		default:
 			break;