diff --git a/src/gprs_ms.c b/src/gprs_ms.c
index 1450d19..720617e 100644
--- a/src/gprs_ms.c
+++ b/src/gprs_ms.c
@@ -151,7 +151,7 @@
 	LOGP(DMS, LOGL_INFO, "Creating MS object\n");
 
 	ms->imsi[0] = '\0';
-	osmo_timer_setup(&ms->timer, ms_release_timer_cb, ms);
+	osmo_timer_setup(&ms->release_timer, ms_release_timer_cb, ms);
 	llc_queue_init(&ms->llc_queue, ms);
 	memset(&ms->llc_timer, 0, sizeof(ms->llc_timer));
 	osmo_timer_setup(&ms->llc_timer, ms_llc_timer_cb, ms);
@@ -189,7 +189,7 @@
 
 	ms_set_reserved_slots(ms, NULL, 0, 0);
 
-	osmo_timer_del(&ms->timer);
+	osmo_timer_del(&ms->release_timer);
 
 	if (ms->ul_tbf) {
 		tbf_set_ms(ul_tbf_as_tbf(ms->ul_tbf), NULL);
@@ -241,17 +241,17 @@
 	}
 
 	LOGPMS(ms, DMS, LOGL_INFO, "Schedule MS release in %lu secs\n", delay_rel_sec);
-	osmo_timer_schedule(&ms->timer, delay_rel_sec, 0);
+	osmo_timer_schedule(&ms->release_timer, delay_rel_sec, 0);
 }
 
 static void ms_becomes_active(struct GprsMs *ms)
 {
-	if (!osmo_timer_pending(&ms->timer))
+	if (!osmo_timer_pending(&ms->release_timer))
 		return;
 
 	LOGPMS(ms, DMS, LOGL_DEBUG, "Cancel scheduled MS release\n");
 
-	osmo_timer_del(&ms->timer);
+	osmo_timer_del(&ms->release_timer);
 }
 
 void ms_set_mode(struct GprsMs *ms, enum mcs_kind mode)
diff --git a/src/gprs_ms.h b/src/gprs_ms.h
index 4f6456e..b2b3274 100644
--- a/src/gprs_ms.h
+++ b/src/gprs_ms.h
@@ -79,7 +79,7 @@
 	struct osmo_timer_list llc_timer;
 
 	struct osmo_use_count use_count;
-	struct osmo_timer_list timer;
+	struct osmo_timer_list release_timer;
 
 	int64_t last_cs_not_low;
 
diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp
index 776f77c7..ea54a12 100644
--- a/tests/ms/MsTest.cpp
+++ b/tests/ms/MsTest.cpp
@@ -404,7 +404,7 @@
 	/* test MS still exists and it's idle: */
 	OSMO_ASSERT(bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI) != NULL);
 	OSMO_ASSERT(ms_is_idle(ms));
-	OSMO_ASSERT(osmo_timer_pending(&ms->timer));
+	OSMO_ASSERT(osmo_timer_pending(&ms->release_timer));
 
 	usleep(1100000);
 	osmo_timers_update();