diff --git a/include/mtp_data.h b/include/mtp_data.h
index 48b0ddb..7af263f 100644
--- a/include/mtp_data.h
+++ b/include/mtp_data.h
@@ -42,7 +42,7 @@ struct ss7_application;
  */
 struct mtp_link_set {
 	struct llist_head entry;
-	int no;
+	int nr;
 	char *name;
 
 
diff --git a/src/mtp_layer3.c b/src/mtp_layer3.c
index 507990d..aeb1866 100644
--- a/src/mtp_layer3.c
+++ b/src/mtp_layer3.c
@@ -615,7 +615,7 @@ struct mtp_link_set *mtp_link_set_alloc(struct bsc_data *bsc)
 	link->ni = MTP_NI_NATION_NET;
 	INIT_LLIST_HEAD(&link->links);
 
-	link->no = bsc->num_linksets++;
+	link->nr = bsc->num_linksets++;
 	llist_add(&link->entry, &bsc->linksets);
 
 	return link;
@@ -626,7 +626,7 @@ struct mtp_link_set *mtp_link_set_num(struct bsc_data *bsc, int num)
 	struct mtp_link_set *set;
 
 	llist_for_each_entry(set, &bsc->linksets, entry)
-		if (set->no == num)
+		if (set->nr == num)
 			return set;
 
 	return NULL;
diff --git a/src/ss7_application.c b/src/ss7_application.c
index b860b8a..1756bf2 100644
--- a/src/ss7_application.c
+++ b/src/ss7_application.c
@@ -51,7 +51,7 @@ void mtp_link_set_forward_sccp(struct mtp_link_set *set, struct msgb *_msg, int
 {
 	if (!set->app) {
 		LOGP(DINP, LOGL_ERROR, "Linkset %d/%s has no application.\n",
-		     set->no, set->name);
+		     set->nr, set->name);
 		return;
 	}
 
@@ -70,7 +70,7 @@ void mtp_link_set_forward_isup(struct mtp_link_set *set, struct msgb *msg, int s
 {
 	if (!set->app) {
 		LOGP(DINP, LOGL_ERROR, "Linkset %d/%s has no application.\n",
-		     set->no, set->name);
+		     set->nr, set->name);
 		return;
 	}
 
@@ -177,7 +177,7 @@ static int ss7_app_setup_stp(struct ss7_application *app,
 		LOGP(DINP, LOGL_ERROR,
 		     "SS7 %d/%s is using linkset %d/%s\n",
 		      src->app->nr, src->app->name,
-		      src->no, src->name);
+		      src->nr, src->name);
 		return -3;
 	}
 
@@ -194,7 +194,7 @@ static int ss7_app_setup_stp(struct ss7_application *app,
 		LOGP(DINP, LOGL_ERROR,
 		     "SS7 %d/%s is using linkset %d/%s\n",
 		      dst->app->nr, dst->app->name,
-		      dst->no, dst->name);
+		      dst->nr, dst->name);
 		return -3;
 	}
 
@@ -251,7 +251,7 @@ static int ss7_app_setup_relay(struct ss7_application *app, int type,
 		LOGP(DINP, LOGL_ERROR,
 		     "SS7 %d/%s is using linkset %d/%s\n",
 		      mtp->app->nr, mtp->app->name,
-		      mtp->no, mtp->name);
+		      mtp->nr, mtp->name);
 		return -3;
 	}