diff --git a/src/eap-pwd.c b/src/eap-pwd.c
index 5e39c76f..8384e062 100644
--- a/src/eap-pwd.c
+++ b/src/eap-pwd.c
@@ -264,7 +264,7 @@ static void eap_pwd_handle_id(struct eap_state *eap,
 
 	group = l_get_be16(pkt);
 
-	pwd->curve = l_ecc_curve_get_ike_group(group);
+	pwd->curve = l_ecc_curve_from_ike_group(group);
 	if (!pwd->curve) {
 		l_error("group %d not supported", group);
 		goto error;
diff --git a/src/owe.c b/src/owe.c
index 0b96bcb2..3f95ff8a 100644
--- a/src/owe.c
+++ b/src/owe.c
@@ -57,7 +57,7 @@ static bool owe_reset(struct owe_sm *owe)
 		return false;
 
 	owe->group = owe->ecc_groups[owe->retry];
-	owe->curve = l_ecc_curve_get_ike_group(owe->group);
+	owe->curve = l_ecc_curve_from_ike_group(owe->group);
 
 	if (owe->private)
 		l_ecc_scalar_free(owe->private);
@@ -342,7 +342,7 @@ struct auth_proto *owe_sm_new(struct handshake_state *hs,
 	owe->auth_tx = auth;
 	owe->assoc_tx = assoc;
 	owe->user_data = user_data;
-	owe->ecc_groups = l_ecc_curve_get_supported_ike_groups();
+	owe->ecc_groups = l_ecc_supported_ike_groups();
 
 	owe->ap.start = owe_start;
 	owe->ap.free = owe_free;
diff --git a/src/sae.c b/src/sae.c
index a7a357f5..ca017373 100644
--- a/src/sae.c
+++ b/src/sae.c
@@ -848,7 +848,7 @@ static int sae_verify_committed(struct sae_sm *sm, uint16_t transaction,
 		sae_reset_state(sm);
 
 		sm->group = sm->ecc_groups[sm->group_retry];
-		sm->curve = l_ecc_curve_get_ike_group(sm->group);
+		sm->curve = l_ecc_curve_from_ike_group(sm->group);
 
 		sm->sync = 0;
 
@@ -862,7 +862,7 @@ static int sae_verify_committed(struct sae_sm *sm, uint16_t transaction,
 		if (l_get_le16(frame) == sm->group)
 			return 0;
 
-		if (!l_ecc_curve_get_ike_group(l_get_le16(frame))) {
+		if (!l_ecc_curve_from_ike_group(l_get_le16(frame))) {
 			if (sm->sync > SAE_SYNC_MAX)
 				return -EBADMSG;
 
@@ -909,7 +909,7 @@ static int sae_verify_committed(struct sae_sm *sm, uint16_t transaction,
 		sm->sync = 0;
 		sm->sc++;
 		sm->group = l_get_le16(frame);
-		sm->curve = l_ecc_curve_get_ike_group(sm->group);
+		sm->curve = l_ecc_curve_from_ike_group(sm->group);
 
 		sae_send_commit(sm, false);
 
@@ -1157,9 +1157,9 @@ struct auth_proto *sae_sm_new(struct handshake_state *hs,
 	sm->user_data = user_data;
 	sm->handshake = hs;
 	sm->state = SAE_STATE_NOTHING;
-	sm->ecc_groups = l_ecc_curve_get_supported_ike_groups();
+	sm->ecc_groups = l_ecc_supported_ike_groups();
 	sm->group = sm->ecc_groups[sm->group_retry];
-	sm->curve = l_ecc_curve_get_ike_group(sm->group);
+	sm->curve = l_ecc_curve_from_ike_group(sm->group);
 
 	sm->ap.start = sae_start;
 	sm->ap.free = sae_free;