4 files changed, 8 insertions, 9 deletions
diff --git a/src/libcharon/plugins/ha/ha_dispatcher.c b/src/libcharon/plugins/ha/ha_dispatcher.c
index 0a89e640a..ecda9fdfc 100644
--- a/src/libcharon/plugins/ha/ha_dispatcher.c
+++ b/src/libcharon/plugins/ha/ha_dispatcher.c
@@ -260,9 +260,8 @@ static void process_ike_update(private_ha_dispatcher_t *this,
 				ike_sa->set_virtual_ip(ike_sa, FALSE, value.host);
 				received_vip = TRUE;
 				break;
-			case HA_ADDITIONAL_ADDR:
-				ike_sa->add_additional_address(ike_sa,
-											   value.host->clone(value.host));
+			case HA_PEER_ADDR:
+				ike_sa->add_peer_address(ike_sa, value.host->clone(value.host));
 				break;
 			case HA_CONFIG_NAME:
 				peer_cfg = charon->backends->get_peer_cfg_by_name(
diff --git a/src/libcharon/plugins/ha/ha_ike.c b/src/libcharon/plugins/ha/ha_ike.c
index ce1067134..e818aec9c 100644
--- a/src/libcharon/plugins/ha/ha_ike.c
+++ b/src/libcharon/plugins/ha/ha_ike.c
@@ -185,10 +185,10 @@ METHOD(listener_t, ike_updown, bool,
 		m->add_attribute(m, HA_CONDITIONS, condition);
 		m->add_attribute(m, HA_EXTENSIONS, extension);
 		m->add_attribute(m, HA_CONFIG_NAME, peer_cfg->get_name(peer_cfg));
-		enumerator = ike_sa->create_additional_address_enumerator(ike_sa);
+		enumerator = ike_sa->create_peer_address_enumerator(ike_sa);
 		while (enumerator->enumerate(enumerator, (void**)&addr))
 		{
-			m->add_attribute(m, HA_ADDITIONAL_ADDR, addr);
+			m->add_attribute(m, HA_PEER_ADDR, addr);
 		}
 		enumerator->destroy(enumerator);
 	}
diff --git a/src/libcharon/plugins/ha/ha_message.c b/src/libcharon/plugins/ha/ha_message.c
index f98f78dd4..810109a5d 100644
--- a/src/libcharon/plugins/ha/ha_message.c
+++ b/src/libcharon/plugins/ha/ha_message.c
@@ -184,7 +184,7 @@ METHOD(ha_message_t, add_attribute, void,
 		case HA_REMOTE_ADDR:
 		case HA_LOCAL_VIP:
 		case HA_REMOTE_VIP:
-		case HA_ADDITIONAL_ADDR:
+		case HA_PEER_ADDR:
 		{
 			host_encoding_t *enc;
 			host_t *host;
@@ -386,7 +386,7 @@ METHOD(enumerator_t, attribute_enumerate, bool,
 		case HA_REMOTE_ADDR:
 		case HA_LOCAL_VIP:
 		case HA_REMOTE_VIP:
-		case HA_ADDITIONAL_ADDR:
+		case HA_PEER_ADDR:
 		{
 			host_encoding_t *enc;
 
diff --git a/src/libcharon/plugins/ha/ha_message.h b/src/libcharon/plugins/ha/ha_message.h
index 1f8eabd62..d0323d7a0 100644
--- a/src/libcharon/plugins/ha/ha_message.h
+++ b/src/libcharon/plugins/ha/ha_message.h
@@ -98,8 +98,8 @@ enum ha_message_attribute_t {
 	HA_LOCAL_VIP,
 	/** host_t*, remote virtual IP */
 	HA_REMOTE_VIP,
-	/** host_t*, additional MOBIKE peer address */
-	HA_ADDITIONAL_ADDR,
+	/** host_t*, known peer addresses (used for MOBIKE) */
+	HA_PEER_ADDR,
 	/** u_int8_t, initiator of an exchange, TRUE for local */
 	HA_INITIATOR,
 	/** chunk_t, initiators nonce */