diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index e102dc8e81..1ca88d553d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -7547,7 +7547,7 @@ dhcp4_get_client_id (NMDevice *self,
 		}
 
 		hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
-		arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len);
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
 		if (arp_type < 0) {
 			fail_reason = "unsupported link-layer address";
 			goto out_fail;
@@ -7569,7 +7569,7 @@ dhcp4_get_client_id (NMDevice *self,
 		if (!_nm_utils_hwaddr_aton (hwaddr_str, hwaddr_bin_buf, sizeof (hwaddr_bin_buf), &hwaddr_len))
 			g_return_val_if_reached (NULL);
 
-		arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len);
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
 		if (arp_type < 0) {
 			fail_reason = "unsupported permanent link-layer address";
 			goto out_fail;
@@ -8376,7 +8376,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 		}
 
 		hwaddr_bin = g_bytes_get_data (hwaddr, &hwaddr_len);
-		arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len);
+		arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len);
 		if (arp_type < 0) {
 			duid_error = "unsupported link-layer address";
 			goto out_fail;
@@ -8434,7 +8434,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
 				duid_error = "missing link-layer address";
 				goto out_fail;
 			}
-			if ((arp_type = nm_utils_detect_arp_type_from_addrlen (g_bytes_get_size (hwaddr))) < 0) {
+			if ((arp_type = nm_utils_arp_type_detect_from_hwaddrlen (g_bytes_get_size (hwaddr))) < 0) {
 				duid_error = "unsupported link-layer address";
 				goto out_fail;
 			}
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index f0d41fa593..632d49998c 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -681,7 +681,7 @@ ip4_start (NMDhcpClient *client,
 	hwaddr = nm_dhcp_client_get_hw_addr (client);
 	if (   !hwaddr
 	    || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
-	    || (arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len)) < 0) {
+	    || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
 		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
 		return FALSE;
 	}
@@ -1034,7 +1034,7 @@ ip6_start (NMDhcpClient *client,
 	hwaddr = nm_dhcp_client_get_hw_addr (client);
 	if (   !hwaddr
 	    || !(hwaddr_arr = g_bytes_get_data (hwaddr, &hwaddr_len))
-	    || (arp_type = nm_utils_detect_arp_type_from_addrlen (hwaddr_len)) < 0) {
+	    || (arp_type = nm_utils_arp_type_detect_from_hwaddrlen (hwaddr_len)) < 0) {
 		nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
 		return FALSE;
 	}
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 0ba3a5cb94..d039a98351 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2841,7 +2841,7 @@ nm_utils_boot_id_bin (void)
 /*****************************************************************************/
 
 /**
- * nm_utils_detect_arp_type_from_addrlen:
+ * nm_utils_arp_type_detect_from_hwaddrlen:
  * @hwaddr_len: the length of the hardware address in bytes.
  *
  * Detects the arp-type based on the length of the MAC address.
@@ -2852,7 +2852,7 @@ nm_utils_boot_id_bin (void)
  *
  * Returns: the arp-type or negative value on error. */
 int
-nm_utils_detect_arp_type_from_addrlen (gsize hwaddr_len)
+nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len)
 {
 	switch (hwaddr_len) {
 	case ETH_ALEN:
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index ea9174bd15..f0e0c4d2ec 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -279,7 +279,7 @@ gboolean nm_utils_host_id_get (const guint8 **out_host_id,
                                gsize *out_host_id_len);
 gint64 nm_utils_host_id_get_timestamp_ns (void);
 
-int nm_utils_detect_arp_type_from_addrlen (gsize hwaddr_len);
+int nm_utils_arp_type_detect_from_hwaddrlen (gsize hwaddr_len);
 
 /* IPv6 Interface Identifier helpers */