diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
index 88ac610..fad75c2 100644
--- a/include/osmocom/gsm/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
@@ -503,37 +503,37 @@
 /* 3GPP TS 48.008 3.2.2.11 Channel Type
  * Transparent: Data Rate */
 enum gsm0808_data_rate_transp {
-	GSM0808_DATA_RATE_TRANSP_32000	  = 0x3a,
-	GSM0808_DATA_RATE_TRANSP_28800	  = 0x39,
-	GSM0808_DATA_RATE_TRANSP_14400	  = 0x18,
-	GSM0808_DATA_RATE_TRANSP_09600	  = 0x10,
-	GSM0808_DATA_RATE_TRANSP_04800	  = 0x11,
-	GSM0808_DATA_RATE_TRANSP_02400	  = 0x12,
-	GSM0808_DATA_RATE_TRANSP_01200	  = 0x13,
-	GSM0808_DATA_RATE_TRANSP_00600	  = 0x14,
-	GSM0808_DATA_RATE_TRANSP_01200_75 = 0x15,
+	GSM0808_DATA_RATE_TRANSP_32k0	 = 0x3a,
+	GSM0808_DATA_RATE_TRANSP_28k8	 = 0x39,
+	GSM0808_DATA_RATE_TRANSP_14k4	 = 0x18,
+	GSM0808_DATA_RATE_TRANSP_9k6	 = 0x10,
+	GSM0808_DATA_RATE_TRANSP_4k8	 = 0x11,
+	GSM0808_DATA_RATE_TRANSP_2k4	 = 0x12,
+	GSM0808_DATA_RATE_TRANSP_1k2	 = 0x13,
+	GSM0808_DATA_RATE_TRANSP_600	 = 0x14,
+	GSM0808_DATA_RATE_TRANSP_1200_75 = 0x15,
 };
 
 /* 3GPP TS 48.008 3.2.2.11 Channel Type
  * Non-Transparent: Radio Interface Data Rate (preferred) */
 enum gsm0808_data_rate_non_transp {
 	GSM0808_DATA_RATE_NON_TRANSP_12000_6000	= 0x00,
-	GSM0808_DATA_RATE_NON_TRANSP_43500	= 0x34,
-	GSM0808_DATA_RATE_NON_TRANSP_29000	= 0x31,
-	GSM0808_DATA_RATE_NON_TRANSP_14500	= 0x14,
-	GSM0808_DATA_RATE_NON_TRANSP_12000	= 0x10,
-	GSM0808_DATA_RATE_NON_TRANSP_06000	= 0x11,
+	GSM0808_DATA_RATE_NON_TRANSP_43k5	= 0x34,
+	GSM0808_DATA_RATE_NON_TRANSP_29k0	= 0x31,
+	GSM0808_DATA_RATE_NON_TRANSP_14k5	= 0x14,
+	GSM0808_DATA_RATE_NON_TRANSP_12k0	= 0x10,
+	GSM0808_DATA_RATE_NON_TRANSP_6k0	= 0x11,
 };
 
 /* 3GPP TS 48.008 3.2.2.11 Channel Type
  * Non-Transparent: Allowed Radio Interface Data Rate (all possible allowed) */
 enum gsm0808_data_rate_allowed_r_if {
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_43500 = 0x40,
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_32000 = 0x20,
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_29000 = 0x10,
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14500 = 0x08,
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12000 = 0x02,
-	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_06000 = 0x01,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_43k5 = 0x40,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_32k0 = 0x20,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_29k0 = 0x10,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14k5 = 0x08,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12k0 = 0x02,
+	GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_6k0  = 0x01,
 };
 
 extern const struct value_string gsm0808_permitted_speech_names[];
diff --git a/tests/gsm0808/gsm0808_test.c b/tests/gsm0808/gsm0808_test.c
index 501b743..aa086a2 100644
--- a/tests/gsm0808/gsm0808_test.c
+++ b/tests/gsm0808/gsm0808_test.c
@@ -1093,7 +1093,7 @@
 		.ch_rate_type = GSM0808_DATA_HALF_PREF,
 
 		.data_transparent = true,
-		.data_rate = GSM0808_DATA_RATE_TRANSP_04800,
+		.data_rate = GSM0808_DATA_RATE_TRANSP_4k8,
 	};
 	struct gsm0808_channel_type dec_ct = {};
 	struct msgb *msg;
@@ -1131,11 +1131,11 @@
 		.ch_rate_type = GSM0808_DATA_HALF_PREF,
 
 		.data_transparent = false,
-		.data_rate = GSM0808_DATA_RATE_NON_TRANSP_06000,
+		.data_rate = GSM0808_DATA_RATE_NON_TRANSP_6k0,
 		.data_rate_allowed_is_set = true,
-		.data_rate_allowed = GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_06000
-				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12000
-				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14500,
+		.data_rate_allowed = GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_6k0
+				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_12k0
+				     | GSM0808_DATA_RATE_NON_TRANSP_ALLOWED_14k5,
 		.data_asym_pref_is_set = true,
 		.data_asym_pref = GSM0808_CT_ASYM_PREF_UL,
 	};