diff --git a/include/osmocom/gsm/protocol/gsm_44_068.h b/include/osmocom/gsm/protocol/gsm_44_068.h
index b1c4b45df..3a33c1631 100644
--- a/include/osmocom/gsm/protocol/gsm_44_068.h
+++ b/include/osmocom/gsm/protocol/gsm_44_068.h
@@ -66,12 +66,12 @@ enum osmo_gsm44068_priority_level {
 enum osmo_gsm44068_call_state {
 	OSMO_GSM44068_CSTATE_U0				= 0x0,
 	OSMO_GSM44068_CSTATE_U1				= 0x1,
-	OSMO_GSM44068_CSTATE_U2sl			= 0x2,
+	OSMO_GSM44068_CSTATE_U2sl_U2			= 0x2,
 	OSMO_GSM44068_CSTATE_U3				= 0x3,
 	OSMO_GSM44068_CSTATE_U4				= 0x4,
 	OSMO_GSM44068_CSTATE_U5				= 0x5,
 	OSMO_GSM44068_CSTATE_U0p			= 0x6,
-	OSMO_GSM44068_CSTATE_Uwr			= 0x7,
+	OSMO_GSM44068_CSTATE_U2wr_U6			= 0x7,
 	OSMO_GSM44068_CSTATE_U2r			= 0x8,
 	OSMO_GSM44068_CSTATE_U2ws			= 0x9,
 	OSMO_GSM44068_CSTATE_U2sr			= 0xa,
diff --git a/src/gsm/gsm44068.c b/src/gsm/gsm44068.c
index 7da5ae221..2556b128d 100644
--- a/src/gsm/gsm44068.c
+++ b/src/gsm/gsm44068.c
@@ -89,12 +89,12 @@ const struct value_string osmo_gsm44068_cause_names[] = {
 const struct value_string osmo_gsm44068_call_state_names[] = {
 	{ OSMO_GSM44068_CSTATE_U0,			"U0" },
 	{ OSMO_GSM44068_CSTATE_U1,			"U1" },
-	{ OSMO_GSM44068_CSTATE_U2sl,			"U2sl/U2" },
+	{ OSMO_GSM44068_CSTATE_U2sl_U2,			"U2sl/U2" },
 	{ OSMO_GSM44068_CSTATE_U3,			"U3" },
 	{ OSMO_GSM44068_CSTATE_U4,			"U4" },
 	{ OSMO_GSM44068_CSTATE_U5,			"U5" },
 	{ OSMO_GSM44068_CSTATE_U0p,			"U0.p" },
-	{ OSMO_GSM44068_CSTATE_Uwr,			"Uwr" },
+	{ OSMO_GSM44068_CSTATE_U2wr_U6,			"U2wr/U6" },
 	{ OSMO_GSM44068_CSTATE_U2r,			"U2r" },
 	{ OSMO_GSM44068_CSTATE_U2ws,			"U2ws" },
 	{ OSMO_GSM44068_CSTATE_U2sr,			"U2sr" },