diff --git a/src/ac/ac_global.c b/src/ac/ac_global.c
index 2f2c3365..fb726941 100644
--- a/src/ac/ac_global.c
+++ b/src/ac/ac_global.c
@@ -47,9 +47,9 @@ cw_aciplist_t get_aciplist()
 
 		sock_copyaddr(&acip->ip,(struct sockaddr*)&sa);
 		if (acip->ip.ss_family == AF_INET)
-			acip->wtp_count=11;
+			acip->index=11;
 		else
-			acip->wtp_count=3;
+			acip->index=3;
 		
 
 //		printf ("Adding IP %s\n",sock_addr2str(&acip->ip));	
diff --git a/src/cw/aciplist.c b/src/cw/aciplist.c
index 622ff0c5..0606ace4 100644
--- a/src/cw/aciplist.c
+++ b/src/cw/aciplist.c
@@ -37,7 +37,7 @@ static int acip_cmp(const void *x1, const void *x2)
 	struct cw_acip *ip1 = (struct cw_acip *) x1;
 	struct cw_acip *ip2 = (struct cw_acip *) x2;
 		
-	int r = ip1->wtp_count - ip2->wtp_count;
+	int r = ip1->index - ip2->index;
 	if (r!=0)
 		return r;
 
diff --git a/src/cw/aciplist.h b/src/cw/aciplist.h
index e51a90d0..0b5c328d 100644
--- a/src/cw/aciplist.h
+++ b/src/cw/aciplist.h
@@ -5,7 +5,7 @@
 
 struct cw_acip{
 	struct sockaddr_storage ip;
-	uint32_t wtp_count;
+	uint32_t index;
 };
 
 typedef struct cw_acip cw_acip_t;
diff --git a/src/cw/cw_in_capwap_control_ip_address.c b/src/cw/cw_in_capwap_control_ip_address.c
index 3e542f32..ed03ba6a 100644
--- a/src/cw/cw_in_capwap_control_ip_address.c
+++ b/src/cw/cw_in_capwap_control_ip_address.c
@@ -64,7 +64,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 		addr.sin_family=AF_INET;
 		sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
 		memcpy(&acip->ip,&addr,sizeof(addr));
-		acip->wtp_count = cw_get_word(data+4);
+		acip->index = cw_get_word(data+4);
 	}
 
 	if (a->elem_id == CW_ELEM_CAPWAP_CONTROL_IPV6_ADDRESS) {
@@ -74,7 +74,7 @@ int cw_in_capwap_control_ip_address(struct conn *conn, struct cw_action_in *a,
 		addr.sin6_family=AF_INET6;
 		sock_setport((struct sockaddr*)&addr,CAPWAP_CONTROL_PORT);
 		memcpy(&acip->ip,&addr,sizeof(addr));
-		acip->wtp_count = cw_get_word(data+16);
+		acip->index = cw_get_word(data+16);
 	}
 
 
diff --git a/src/cw/cw_out_capwap_control_ip_addr_list.c b/src/cw/cw_out_capwap_control_ip_addr_list.c
index 36dfe4e1..06a79fb5 100644
--- a/src/cw/cw_out_capwap_control_ip_addr_list.c
+++ b/src/cw/cw_out_capwap_control_ip_addr_list.c
@@ -16,7 +16,7 @@ static int put_ip(uint8_t *dst /*void *priv*/, cw_acip_t * acip /*void *data*/)
 	uint8_t *d = dst+4;
 
 	d+=cw_put_sockaddr(d,&acip->ip);
-	d+=cw_put_word(d,acip->wtp_count);
+	d+=cw_put_word(d,acip->index);
 
 	int fam = sock_addrfamily(&acip->ip);
 	int elem_id=-1;
diff --git a/src/wtp/discovery.c b/src/wtp/discovery.c
index 8232fd8a..f2efa7dc 100644
--- a/src/wtp/discovery.c
+++ b/src/wtp/discovery.c
@@ -104,7 +104,7 @@ cw_aciplist_t cw_select_ac(struct conn *conn, mbag_t discs)
 		
 			/* we missuse the wtp_count to sort by 
 			 * priority and wp_count */	
-			n->wtp_count |= prio<<16; 
+			n->index |= prio<<16; 
 
 			cw_aciplist_del(resultlist,n);
 			cw_aciplist_add(resultlist,n);