diff --git a/src/core/devices/nm-device-bridge.c b/src/core/devices/nm-device-bridge.c
index 8ace4a4d54..239333edb4 100644
--- a/src/core/devices/nm-device-bridge.c
+++ b/src/core/devices/nm-device-bridge.c
@@ -1033,7 +1033,7 @@ create_and_realize(NMDevice *             device,
     const char *        iface = nm_device_get_iface(device);
     const char *        hwaddr;
     gs_free char *      hwaddr_cloned = NULL;
-    guint8              mac_address[NM_UTILS_HWADDR_LEN_MAX];
+    guint8              mac_address[_NM_UTILS_HWADDR_LEN_MAX];
     NMPlatformLnkBridge props;
     int                 r;
     guint32             mtu = 0;
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index ab66578688..aa2f0ab704 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -1567,7 +1567,7 @@ _prop_get_ipvx_dhcp_iaid(NMDevice *    self,
         iaid = unaligned_read_be32(&pllink->l_address.data[pllink->l_address.len - 4]);
         goto out_good;
     } else if (nm_streq0(iaid_str, NM_IAID_PERM_MAC)) {
-        guint8      hwaddr_buf[NM_UTILS_HWADDR_LEN_MAX];
+        guint8      hwaddr_buf[_NM_UTILS_HWADDR_LEN_MAX];
         const char *hwaddr_str;
         gsize       hwaddr_len;
 
@@ -1729,7 +1729,7 @@ _prop_get_ipv4_dhcp_client_id(NMDevice *self, NMConnection *connection, GBytes *
     gs_free char *     client_id_default = NULL;
     guint8 *           client_id_buf;
     const char *       fail_reason;
-    guint8             hwaddr_bin_buf[NM_UTILS_HWADDR_LEN_MAX];
+    guint8             hwaddr_bin_buf[_NM_UTILS_HWADDR_LEN_MAX];
     const guint8 *     hwaddr_bin;
     int                arp_type;
     gsize              hwaddr_len;
@@ -16821,7 +16821,7 @@ const char *
 nm_device_get_hw_address(NMDevice *self)
 {
     NMDevicePrivate *priv;
-    char             buf[NM_UTILS_HWADDR_LEN_MAX];
+    char             buf[_NM_UTILS_HWADDR_LEN_MAX];
     gsize            l;
 
     g_return_val_if_fail(NM_IS_DEVICE(self), NULL);
@@ -16915,7 +16915,7 @@ void
 nm_device_update_permanent_hw_address(NMDevice *self, gboolean force_freeze)
 {
     NMDevicePrivate *              priv = NM_DEVICE_GET_PRIVATE(self);
-    guint8                         buf[NM_UTILS_HWADDR_LEN_MAX];
+    guint8                         buf[_NM_UTILS_HWADDR_LEN_MAX];
     size_t                         len = 0;
     gboolean                       success_read;
     int                            ifindex;
@@ -17033,7 +17033,7 @@ _hw_addr_set(NMDevice *        self,
     NMDevicePrivate *priv;
     gboolean         success = FALSE;
     int              r;
-    guint8           addr_bytes[NM_UTILS_HWADDR_LEN_MAX];
+    guint8           addr_bytes[_NM_UTILS_HWADDR_LEN_MAX];
     gsize            addr_len;
     gboolean         was_taken_down = FALSE;
     gboolean         retry_down;
@@ -18216,7 +18216,7 @@ constructor(GType type, guint n_construct_params, GObjectConstructParam *constru
     }
 
     if (priv->hw_addr_perm) {
-        guint8 buf[NM_UTILS_HWADDR_LEN_MAX];
+        guint8 buf[_NM_UTILS_HWADDR_LEN_MAX];
         gsize  l;
 
         if (!_nm_utils_hwaddr_aton(priv->hw_addr_perm, buf, sizeof(buf), &l)) {
diff --git a/src/core/dhcp/nm-dhcp-manager.c b/src/core/dhcp/nm-dhcp-manager.c
index 9be32e014c..a9ca5a00eb 100644
--- a/src/core/dhcp/nm-dhcp-manager.c
+++ b/src/core/dhcp/nm-dhcp-manager.c
@@ -252,7 +252,7 @@ client_start(NMDhcpManager *           self,
         }
 
         hwaddr_len = g_bytes_get_size(hwaddr);
-        if (hwaddr_len == 0 || hwaddr_len > NM_UTILS_HWADDR_LEN_MAX) {
+        if (hwaddr_len == 0 || hwaddr_len > _NM_UTILS_HWADDR_LEN_MAX) {
             nm_utils_error_set(error, NM_UTILS_ERROR_UNKNOWN, "invalid MAC address");
             g_return_val_if_reached(NULL);
         }
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c
index 9d764b27fe..14f2adc4cd 100644
--- a/src/core/nm-core-utils.c
+++ b/src/core/nm-core-utils.c
@@ -1238,7 +1238,7 @@ typedef struct {
         const char *value;
         gboolean    is_parsed;
         guint       len;
-        guint8      bin[NM_UTILS_HWADDR_LEN_MAX];
+        guint8      bin[_NM_UTILS_HWADDR_LEN_MAX];
     } hwaddr;
     struct {
         const char *value;
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index d67dfab99d..9e61379660 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -1305,7 +1305,7 @@ find_device_by_permanent_hw_addr(NMManager *self, const char *hwaddr)
     NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE(self);
     NMDevice *        device;
     const char *      device_addr;
-    guint8            hwaddr_bin[NM_UTILS_HWADDR_LEN_MAX];
+    guint8            hwaddr_bin[_NM_UTILS_HWADDR_LEN_MAX];
     gsize             hwaddr_len;
 
     g_return_val_if_fail(hwaddr != NULL, NULL);
diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c
index 236148cf5e..2201e8609a 100644
--- a/src/core/platform/nm-fake-platform.c
+++ b/src/core/platform/nm-fake-platform.c
@@ -608,7 +608,7 @@ link_set_address(NMPlatform *platform, int ifindex, gconstpointer addr, size_t l
     NMFakePlatformLink *device        = link_get(platform, ifindex);
     nm_auto_nmpobj NMPObject *obj_tmp = NULL;
 
-    if (len == 0 || len > NM_UTILS_HWADDR_LEN_MAX || !addr)
+    if (len == 0 || len > _NM_UTILS_HWADDR_LEN_MAX || !addr)
         g_return_val_if_reached(-NME_BUG);
 
     if (!device)
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index 181e6a8e3b..51b9aa278c 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
@@ -2884,8 +2884,8 @@ _nmp_link_address_set(NMPLinkAddress *dst, const struct nlattr *nla)
     if (nla) {
         int l = nla_len(nla);
 
-        if (l > 0 && l <= NM_UTILS_HWADDR_LEN_MAX) {
-            G_STATIC_ASSERT_EXPR(sizeof(dst->data) == NM_UTILS_HWADDR_LEN_MAX);
+        if (l > 0 && l <= _NM_UTILS_HWADDR_LEN_MAX) {
+            G_STATIC_ASSERT_EXPR(sizeof(dst->data) == _NM_UTILS_HWADDR_LEN_MAX);
             memcpy(dst->data, nla_data(nla), l);
             dst->len = l;
         }
diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c
index e27fab203a..cbd1396efa 100644
--- a/src/core/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
@@ -55,18 +55,22 @@ G_STATIC_ASSERT(_nm_alignof(NMPlatformIPAddress) == _nm_alignof(NMPlatformIPXAdd
 
 /*****************************************************************************/
 
-G_STATIC_ASSERT(sizeof(((NMPLinkAddress *) NULL)->data) == NM_UTILS_HWADDR_LEN_MAX);
-G_STATIC_ASSERT(sizeof(((NMPlatformLink *) NULL)->l_address.data) == NM_UTILS_HWADDR_LEN_MAX);
-G_STATIC_ASSERT(sizeof(((NMPlatformLink *) NULL)->l_broadcast.data) == NM_UTILS_HWADDR_LEN_MAX);
+G_STATIC_ASSERT(sizeof(((NMPLinkAddress *) NULL)->data) == _NM_UTILS_HWADDR_LEN_MAX);
+G_STATIC_ASSERT(sizeof(((NMPlatformLink *) NULL)->l_address.data) == _NM_UTILS_HWADDR_LEN_MAX);
+G_STATIC_ASSERT(sizeof(((NMPlatformLink *) NULL)->l_broadcast.data) == _NM_UTILS_HWADDR_LEN_MAX);
 
 static const char *
 _nmp_link_address_to_string(const NMPLinkAddress *addr,
-                            char                  buf[static(NM_UTILS_HWADDR_LEN_MAX * 3)])
+                            char                  buf[static(_NM_UTILS_HWADDR_LEN_MAX * 3)])
 {
     nm_assert(addr);
 
     if (addr->len > 0) {
-        if (!_nm_utils_hwaddr_ntoa(addr->data, addr->len, TRUE, buf, NM_UTILS_HWADDR_LEN_MAX * 3)) {
+        if (!_nm_utils_hwaddr_ntoa(addr->data,
+                                   addr->len,
+                                   TRUE,
+                                   buf,
+                                   _NM_UTILS_HWADDR_LEN_MAX * 3)) {
             buf[0] = '\0';
             g_return_val_if_reached(buf);
         }
@@ -84,7 +88,7 @@ nmp_link_address_get(const NMPLinkAddress *addr, size_t *length)
         return NULL;
     }
 
-    if (addr->len > NM_UTILS_HWADDR_LEN_MAX) {
+    if (addr->len > _NM_UTILS_HWADDR_LEN_MAX) {
         NM_SET_OUT(length, 0);
         g_return_val_if_reached(NULL);
     }
@@ -1159,7 +1163,7 @@ nm_platform_link_get_by_address(NMPlatform *  self,
     if (length == 0)
         return NULL;
 
-    if (length > NM_UTILS_HWADDR_LEN_MAX)
+    if (length > _NM_UTILS_HWADDR_LEN_MAX)
         g_return_val_if_reached(NULL);
     if (!address)
         g_return_val_if_reached(NULL);
@@ -1235,7 +1239,7 @@ nm_platform_link_add(NMPlatform *           self,
                      const NMPlatformLink **out_link)
 {
     int  r;
-    char addr_buf[NM_UTILS_HWADDR_LEN_MAX * 3];
+    char addr_buf[_NM_UTILS_HWADDR_LEN_MAX * 3];
     char mtu_buf[16];
     char parent_buf[64];
     char buf[512];
@@ -1244,7 +1248,7 @@ nm_platform_link_add(NMPlatform *           self,
 
     g_return_val_if_fail(name, -NME_BUG);
     g_return_val_if_fail((address != NULL) ^ (address_len == 0), -NME_BUG);
-    g_return_val_if_fail(address_len <= NM_UTILS_HWADDR_LEN_MAX, -NME_BUG);
+    g_return_val_if_fail(address_len <= _NM_UTILS_HWADDR_LEN_MAX, -NME_BUG);
     g_return_val_if_fail(parent >= 0, -NME_BUG);
 
     r = _link_add_check_existing(self, name, type, out_link);
@@ -1784,7 +1788,7 @@ nm_platform_link_get_address(NMPlatform *self, int ifindex, size_t *length)
  * nm_platform_link_get_permanent_address:
  * @self: platform instance
  * @ifindex: Interface index
- * @buf: buffer of at least %NM_UTILS_HWADDR_LEN_MAX bytes, on success
+ * @buf: buffer of at least %_NM_UTILS_HWADDR_LEN_MAX bytes, on success
  * the permanent hardware address
  * @length: Pointer to a variable to store address length
  *
@@ -5459,8 +5463,8 @@ nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len)
     char *      s;
     gsize       l;
     char        str_addrmode[30];
-    char        str_address[NM_UTILS_HWADDR_LEN_MAX * 3];
-    char        str_broadcast[NM_UTILS_HWADDR_LEN_MAX * 3];
+    char        str_address[_NM_UTILS_HWADDR_LEN_MAX * 3];
+    char        str_broadcast[_NM_UTILS_HWADDR_LEN_MAX * 3];
     char        str_inet6_token[NM_UTILS_INET_ADDRSTRLEN];
     const char *str_link_type;
 
diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h
index f4fd387850..a659a675df 100644
--- a/src/core/platform/nm-platform.h
+++ b/src/core/platform/nm-platform.h
@@ -152,7 +152,7 @@ typedef enum {
 
 typedef struct {
     union {
-        guint8      data[20 /* NM_UTILS_HWADDR_LEN_MAX */];
+        guint8      data[20 /* _NM_UTILS_HWADDR_LEN_MAX */];
         NMEtherAddr ether_addr;
     };
     guint8 len;
@@ -799,7 +799,7 @@ typedef struct {
     guint             num_vlans;
     NMPlatformVFVlan *vlans;
     struct {
-        guint8 data[20]; /* NM_UTILS_HWADDR_LEN_MAX */
+        guint8 data[20]; /* _NM_UTILS_HWADDR_LEN_MAX */
         guint8 len;
     } mac;
     gint8 spoofchk;