diff --git a/src/acs.c b/src/acs.c
index 6fc7dd82770f2edd5be2cf6e92ac1d2554d40ec0..75c59029f0e86152b145b0a4d873c4f64a056a98 100644
--- a/src/acs.c
+++ b/src/acs.c
@@ -673,7 +673,7 @@ static bool cntlr_acs_radio_is_bsta_connected(struct controller *cntlr, struct n
 				if (memcmp(iface->bss->bssid, s->de_sta->macaddr, sizeof(iface->bss->bssid)))
 					continue;
 
-				if (s->is_bsta && s->state == STA_ASSOCIATED)
+				if (s->is_bsta && s->state == STA_CONNECTED)
 					return true;
 			}
 		}
diff --git a/src/cntlr_commands_impl.c b/src/cntlr_commands_impl.c
index f407a646ea4e780d1360a12927e44be678c91a2b..704826290a3579dca8c670400a2adbf5537f999e 100644
--- a/src/cntlr_commands_impl.c
+++ b/src/cntlr_commands_impl.c
@@ -3118,7 +3118,7 @@ static int _cntlr_status(struct controller *c, void *args, void *out, bool full)
 			blobmsg_add_string(bb, "bssid", bssstr);
 			blobmsg_add_macaddr(bb, "node", n->almacaddr);
 			blobmsg_add_string(bb, "type", !s->is_bsta ? "NON_IEEE1905" : "IEEE1905");
-			blobmsg_add_u8(bb, "associated", s->state == STA_ASSOCIATED ? 1 : 0);
+			blobmsg_add_u8(bb, "associated", s->state == STA_CONNECTED ? 1 : 0);
 
 			/* show association time in ISO8601 format */
 			timeinfo = localtime(&s->assoc_time);
diff --git a/src/cntlr_map.c b/src/cntlr_map.c
index e98bf2eb200f633e9582f1f77fb2e3e4f1e8de30..0198d6493496e55d68c555a445b26fe999a91cad 100644
--- a/src/cntlr_map.c
+++ b/src/cntlr_map.c
@@ -235,7 +235,7 @@ int handle_topology_notification(void *cntlr, struct cmdu_buff *cmdu,
 
 				time(&s->assoc_time);
 				memcpy(s->bssid, ev->bssid, 6);
-				s->state = STA_ASSOCIATED;
+				s->state = STA_CONNECTED;
 
 				if (memcmp(s->agent_almacaddr, n->almacaddr, 6)) {
 					/* associated to a new node - remove from the old one */
@@ -276,7 +276,7 @@ int handle_topology_notification(void *cntlr, struct cmdu_buff *cmdu,
 
 				time(&s->assoc_time);
 				memcpy(s->bssid, ev->bssid, 6);
-				s->state = STA_ASSOCIATED;
+				s->state = STA_CONNECTED;
 
 				node_add_sta(n, s);
 
@@ -298,7 +298,7 @@ int handle_topology_notification(void *cntlr, struct cmdu_buff *cmdu,
 
 		cntlr_info(LOG_STA, "%s: STA " MACFMT " %s Node " MACFMT"\n",
 			   __func__, MAC2STR(s->macaddr),
-			   s->state == STA_ASSOCIATED ? "associated to" : "disconnected from",
+			   s->state == STA_CONNECTED ? "associated to" : "disconnected from",
 			   MAC2STR(s->agent_almacaddr));
 
 		cntlr_update_sta_steer_data(c, s);