diff --git a/src/eapol.c b/src/eapol.c
index 3d7b3d38..bad4bbb7 100644
--- a/src/eapol.c
+++ b/src/eapol.c
@@ -1299,7 +1299,8 @@ static void eapol_handle_ptk_1_of_4(struct eapol_sm *sm,
 		ies_len = ies[1] + 2;
 
 		ies_len += append_ie(ies + ies_len, sm->handshake->mde);
-		ies_len += append_ie(ies + ies_len, sm->handshake->fte);
+		ies_len += append_ie(ies + ies_len,
+					sm->handshake->authenticator_fte);
 	} else {
 		ies_len = append_ie(ies, own_ie);
 	}
@@ -1795,7 +1796,7 @@ static void eapol_handle_ptk_3_of_4(struct eapol_sm *sm,
 		if (eapol_ie_matches(decrypted_key_data,
 					decrypted_key_data_size,
 					IE_TYPE_FAST_BSS_TRANSITION,
-					hs->fte) < 0)
+					hs->authenticator_fte) < 0)
 			goto error_ie_different;
 	}
 
diff --git a/src/fils.c b/src/fils.c
index c3337352..f876e7e5 100644
--- a/src/fils.c
+++ b/src/fils.c
@@ -445,7 +445,7 @@ static int fils_rx_authenticate(struct auth_proto *driver, const uint8_t *frame,
 					kck_len, &ft_info) < 0)
 			goto invalid_ies;
 
-		handshake_state_set_fte(fils->hs, fte);
+		handshake_state_set_authenticator_fte(fils->hs, fte);
 		handshake_state_set_kh_ids(fils->hs, ft_info.r0khid,
 							ft_info.r0khid_len,
 							ft_info.r1khid);
diff --git a/src/ft.c b/src/ft.c
index 2cc611b8..43399828 100644
--- a/src/ft.c
+++ b/src/ft.c
@@ -922,7 +922,7 @@ static void ft_prepare_handshake(struct ft_info *info,
 
 	memcpy(hs->snonce, info->snonce, sizeof(hs->snonce));
 
-	handshake_state_set_fte(hs, info->fte);
+	handshake_state_set_authenticator_fte(hs, info->fte);
 
 	handshake_state_set_anonce(hs, info->ft_info.anonce);
 
diff --git a/src/handshake.c b/src/handshake.c
index 07e0657d..8382aa66 100644
--- a/src/handshake.c
+++ b/src/handshake.c
@@ -540,7 +540,7 @@ bool handshake_state_derive_ptk(struct handshake_state *s)
 				IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 |
 				IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 |
 				IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384)) &&
-			(!s->mde || !s->fte))
+			(!s->mde || !s->authenticator_fte))
 		return false;
 
 	s->ptk_complete = false;
diff --git a/src/netdev.c b/src/netdev.c
index f2e887b4..b9dc930e 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -2777,7 +2777,7 @@ process_resp_ies:
 			 */
 			if (ie_parse_fast_bss_transition_from_data(fte,
 					fte[1] + 2, kck_len, &ft_info) >= 0) {
-				handshake_state_set_fte(hs, fte);
+				handshake_state_set_authenticator_fte(hs, fte);
 				handshake_state_set_kh_ids(hs,
 							ft_info.r0khid,
 							ft_info.r0khid_len,