diff --git a/src/tbf.cpp b/src/tbf.cpp
index 4bd87dd..bdba2e7 100644
--- a/src/tbf.cpp
+++ b/src/tbf.cpp
@@ -94,9 +94,9 @@ gprs_rlcmac_tbf::Meas::Meas() :
 gprs_rlcmac_tbf::gprs_rlcmac_tbf(struct gprs_rlcmac_bts *bts_, GprsMs *ms, gprs_rlcmac_tbf_direction dir) :
 	direction(dir),
 	trx(NULL),
-	first_ts(0),
-	first_common_ts(0),
-	control_ts(TBF_CONTROL_TS_UNSET),
+	first_ts(TBF_TS_UNSET),
+	first_common_ts(TBF_TS_UNSET),
+	control_ts(TBF_TS_UNSET),
 	fT(0),
 	num_fT_exp(0),
 	upgrade_to_multislot(false),
@@ -251,7 +251,7 @@ static void tbf_unlink_pdch(struct gprs_rlcmac_tbf *tbf)
 	 * confirmation from the MS and goes through the FLOW state. Hence, we
 	 * may have ULC pollings ongoing and we need to make sure we drop all
 	 * reserved nodes there: */
-	if (tbf->control_ts != TBF_CONTROL_TS_UNSET && !tbf->pdch[tbf->control_ts])
+	if (tbf->control_ts != TBF_TS_UNSET && !tbf->pdch[tbf->control_ts])
 		pdch_ulc_release_tbf(tbf->trx->pdch[tbf->control_ts].ulc, tbf);
 
 	/* Now simply detach from all attached PDCHs */
@@ -340,7 +340,7 @@ int gprs_rlcmac_tbf::update()
 
 void tbf_assign_control_ts(struct gprs_rlcmac_tbf *tbf)
 {
-	if (tbf->control_ts == TBF_CONTROL_TS_UNSET)
+	if (tbf->control_ts == TBF_TS_UNSET)
 		LOGPTBF(tbf, LOGL_INFO, "Setting Control TS %d\n",
 			tbf->first_common_ts);
 	else if (tbf->control_ts != tbf->first_common_ts)
diff --git a/src/tbf.h b/src/tbf.h
index 4013ab0..4652d95 100644
--- a/src/tbf.h
+++ b/src/tbf.h
@@ -116,7 +116,7 @@ enum tbf_counters { /* TBF counters from 3GPP TS 44.060 §13.4 */
 #define GPRS_RLCMAC_FLAG_TO_DL_ACK	3 /* DL TBF: Failed to receive last polled DL ACK/NACK */
 #define GPRS_RLCMAC_FLAG_TO_MASK	0xf0 /* timeout bits */
 
-#define TBF_CONTROL_TS_UNSET 0xff
+#define TBF_TS_UNSET 0xff
 
 #define T_START(tbf, t, T, r, f) tbf->t_start(t, T, r, f, __FILE__, __LINE__)