diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h
index d7e51a0..e0086fa 100644
--- a/openbsc/include/openbsc/mgcp_internal.h
+++ b/openbsc/include/openbsc/mgcp_internal.h
@@ -46,9 +46,11 @@
 
 	uint32_t orig_ssrc;
 	uint32_t ssrc;
-	int first_seq_no;
-	uint16_t seq_no;
+
+	uint16_t base_seq;
+	uint16_t max_seq;
 	int seq_offset;
+
 	uint32_t last_timestamp;
 	int32_t  timestamp_offset;
 };
diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c
index 408fea4..bb531cc 100644
--- a/openbsc/src/libmgcp/mgcp_network.c
+++ b/openbsc/src/libmgcp/mgcp_network.c
@@ -120,14 +120,14 @@
 	timestamp = ntohl(rtp_hdr->timestamp);
 
 	if (!state->initialized) {
-		state->first_seq_no = seq;
-		state->seq_no = seq - 1;
+		state->base_seq = seq;
+		state->max_seq = seq - 1;
 		state->ssrc = state->orig_ssrc = rtp_hdr->ssrc;
 		state->initialized = 1;
 		state->last_timestamp = timestamp;
 	} else if (state->ssrc != rtp_hdr->ssrc) {
 		state->ssrc = rtp_hdr->ssrc;
-		state->seq_offset = (state->seq_no + 1) - seq;
+		state->seq_offset = (state->max_seq + 1) - seq;
 		state->timestamp_offset = state->last_timestamp - timestamp;
 		state->patch = endp->allow_patch;
 		LOGP(DMGCP, LOGL_NOTICE,
@@ -146,7 +146,7 @@
 		rtp_hdr->timestamp = htonl(timestamp);
 	}
 
-	state->seq_no = seq;
+	state->max_seq = seq;
 	state->last_timestamp = timestamp;
 
 	if (payload < 0)