diff --git a/include/zephyr/bluetooth/cs.h b/include/zephyr/bluetooth/cs.h
index 2c661c09c57..6e712627a06 100644
--- a/include/zephyr/bluetooth/cs.h
+++ b/include/zephyr/bluetooth/cs.h
@@ -88,24 +88,14 @@ enum bt_le_cs_test_cs_sync_antenna_selection {
 	BT_LE_CS_TEST_CS_SYNC_ANTENNA_SELECTION_FOUR = BT_HCI_OP_LE_CS_ANTENNA_SEL_FOUR,
 };
 
-/** CS Test Initiator SNR control options */
-enum bt_le_cs_initiator_snr_control {
-	BT_LE_CS_INITIATOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_18,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_21,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_24,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_27,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_INITIATOR_SNR_30,
-	BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED,
-};
-
-/** CS Test Reflector SNR control options */
-enum bt_le_cs_reflector_snr_control {
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_21,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_24,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_27,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_REFLECTOR_SNR_30,
-	BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED,
+/** CS SNR control options */
+enum bt_le_cs_snr_control {
+	BT_LE_CS_SNR_CONTROL_18dB = BT_HCI_OP_LE_CS_SNR_18,
+	BT_LE_CS_SNR_CONTROL_21dB = BT_HCI_OP_LE_CS_SNR_21,
+	BT_LE_CS_SNR_CONTROL_24dB = BT_HCI_OP_LE_CS_SNR_24,
+	BT_LE_CS_SNR_CONTROL_27dB = BT_HCI_OP_LE_CS_SNR_27,
+	BT_LE_CS_SNR_CONTROL_30dB = BT_HCI_OP_LE_CS_SNR_30,
+	BT_LE_CS_SNR_CONTROL_NOT_USED = BT_HCI_OP_LE_CS_SNR_NOT_USED,
 };
 
 /** CS Test Override 3 T_PM Tone Extension */
@@ -364,9 +354,9 @@ struct bt_le_cs_test_param {
 	 */
 	enum bt_conn_le_cs_tone_antenna_config_selection tone_antenna_config_selection;
 	/** Initiator SNR control options */
-	enum bt_le_cs_initiator_snr_control initiator_snr_control;
+	enum bt_le_cs_snr_control initiator_snr_control;
 	/** Reflector SNR control options */
-	enum bt_le_cs_reflector_snr_control reflector_snr_control;
+	enum bt_le_cs_snr_control reflector_snr_control;
 	/** Determines octets 14 and 15 of the initial value of the DRBG nonce. */
 	uint16_t drbg_nonce;
 
@@ -803,10 +793,10 @@ struct bt_le_cs_set_procedure_parameters_param {
 	uint8_t preferred_peer_antenna;
 
 	/* Initiator SNR control adjustment */
-	enum bt_le_cs_initiator_snr_control snr_control_initiator;
+	enum bt_le_cs_snr_control snr_control_initiator;
 
 	/* Reflector SNR control adjustment */
-	enum bt_le_cs_reflector_snr_control snr_control_reflector;
+	enum bt_le_cs_snr_control snr_control_reflector;
 };
 
 /** @brief CS Set Procedure Parameters
diff --git a/include/zephyr/bluetooth/hci_types.h b/include/zephyr/bluetooth/hci_types.h
index 126e2de23a5..e7d20350f48 100644
--- a/include/zephyr/bluetooth/hci_types.h
+++ b/include/zephyr/bluetooth/hci_types.h
@@ -2578,19 +2578,12 @@ struct bt_hci_cp_le_procedure_enable {
 #define BT_HCI_OP_LE_CS_ACI_6 0x6
 #define BT_HCI_OP_LE_CS_ACI_7 0x7
 
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_INITIATOR_SNR_NOT_USED 0xFF
-
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_18 0x0
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_21 0x1
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_24 0x2
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_27 0x3
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_30 0x4
-#define BT_HCI_OP_LE_CS_REFLECTOR_SNR_NOT_USED 0xFF
+#define BT_HCI_OP_LE_CS_SNR_18 0x0
+#define BT_HCI_OP_LE_CS_SNR_21 0x1
+#define BT_HCI_OP_LE_CS_SNR_24 0x2
+#define BT_HCI_OP_LE_CS_SNR_27 0x3
+#define BT_HCI_OP_LE_CS_SNR_30 0x4
+#define BT_HCI_OP_LE_CS_SNR_NOT_USED 0xFF
 
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_0_MASK BIT(0)
 #define BT_HCI_OP_LE_CS_TEST_OVERRIDE_CONFIG_2_MASK BIT(2)
diff --git a/samples/bluetooth/channel_sounding/include/cs_test_params.h b/samples/bluetooth/channel_sounding/include/cs_test_params.h
index dc141167b98..1171ea1ee1e 100644
--- a/samples/bluetooth/channel_sounding/include/cs_test_params.h
+++ b/samples/bluetooth/channel_sounding/include/cs_test_params.h
@@ -33,8 +33,8 @@ static struct bt_le_cs_test_param test_params_get(enum bt_conn_le_cs_role role)
 	params.t_sw_time = 0;
 	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
 
-	params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 
 	params.drbg_nonce = 0x1234;
 
diff --git a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
index e10d74fc78d..13f23d3c8e0 100644
--- a/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
+++ b/samples/bluetooth/channel_sounding/src/connected_cs_initiator.c
@@ -333,8 +333,8 @@ int main(void)
 		.phy = BT_LE_CS_PROCEDURE_PHY_1M,
 		.tx_power_delta = 0x80,
 		.preferred_peer_antenna = BT_LE_CS_PROCEDURE_PREFERRED_PEER_ANTENNA_1,
-		.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED,
-		.snr_control_reflector = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED,
+		.snr_control_initiator = BT_LE_CS_SNR_CONTROL_NOT_USED,
+		.snr_control_reflector = BT_LE_CS_SNR_CONTROL_NOT_USED,
 	};
 
 	err = bt_le_cs_set_procedure_parameters(connection, &procedure_params);
diff --git a/subsys/bluetooth/host/shell/cs.c b/subsys/bluetooth/host/shell/cs.c
index b1f6f18aceb..86f3a311932 100644
--- a/subsys/bluetooth/host/shell/cs.c
+++ b/subsys/bluetooth/host/shell/cs.c
@@ -220,8 +220,8 @@ static int cmd_cs_test_simple(const struct shell *sh, size_t argc, char *argv[])
 	params.t_pm_time = 20;
 	params.t_sw_time = 0;
 	params.tone_antenna_config_selection = BT_LE_CS_TONE_ANTENNA_CONFIGURATION_INDEX_ONE;
-	params.initiator_snr_control = BT_LE_CS_INITIATOR_SNR_CONTROL_NOT_USED;
-	params.reflector_snr_control = BT_LE_CS_REFLECTOR_SNR_CONTROL_NOT_USED;
+	params.initiator_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
+	params.reflector_snr_control = BT_LE_CS_SNR_CONTROL_NOT_USED;
 	params.drbg_nonce = 0x1234;
 	params.override_config = 0;
 	params.override_config_0.channel_map_repetition = 1;
@@ -641,8 +641,8 @@ static int cmd_set_procedure_parameters(const struct shell *sh, size_t argc, cha
 	params.phy = 0x01;
 	params.tx_power_delta = 0x80;
 	params.preferred_peer_antenna = 1;
-	params.snr_control_initiator = BT_LE_CS_INITIATOR_SNR_CONTROL_18dB;
-	params.snr_control_reflector = BT_HCI_OP_LE_CS_REFLECTOR_SNR_18;
+	params.snr_control_initiator = BT_LE_CS_SNR_CONTROL_18dB;
+	params.snr_control_reflector = BT_LE_CS_SNR_CONTROL_18dB;
 
 	err = bt_le_cs_set_procedure_parameters(default_conn, &params);