all: rename nm_g_slice*() helpers to nm_slice*()

  for p in \
       nm_g_slice_free:nm_slice_free \
       nm_g_slice_free_fcn:nm_slice_free_fcn \
       nm_g_slice_free_fcn1:nm_slice_free_fcn1 \
       nm_g_slice_free_fcn_gint64:nm_slice_free_fcn_gint64 \
       _nm_g_slice_free_fcn_define:_nm_slice_free_fcn_define \
       _nm_g_slice_free_fcn_1:_nm_slice_free_fcn_1\
       _nm_g_slice_free_fcn_2:_nm_slice_free_fcn_2\
       _nm_g_slice_free_fcn_4:_nm_slice_free_fcn_4\
       _nm_g_slice_free_fcn_8:_nm_slice_free_fcn_8\
       _nm_g_slice_free_fcn_10:_nm_slice_free_fcn_10\
       _nm_g_slice_free_fcn_12:_nm_slice_free_fcn_12\
       _nm_g_slice_free_fcn_16:_nm_slice_free_fcn_16\
       _nm_g_slice_free_fcn_32:_nm_slice_free_fcn_32\
       _nm_g_slice_free_fcn_:_nm_slice_free_fcn_ \
       test_nm_g_slice_free_fcn:test_nm_slice_free_fcn \
     ; do
     git grep -l ${p%:*} |
     xargs sed "s/\<${p%:*}\>/${p#*:}/g" -i
  done
  ./contrib/scripts/nm-code-format.sh -u

54 files changed, 130 insertions, 130 deletions

diff --git a/src/core/devices/bluetooth/nm-bluez-manager.c b/src/core/devices/bluetooth/nm-bluez-manager.c
index 752e21b884..7400a00f6d 100644
--- a/src/core/devices/bluetooth/nm-bluez-manager.c
+++ b/src/core/devices/bluetooth/nm-bluez-manager.c
@@ -288,7 +288,7 @@ _network_server_register_req_data_complete(NetworkServerRegisterReqData *r_req_d
     }
 
     g_object_unref(r_req_data->ext_cancellable);
-    nm_g_slice_free(r_req_data);
+    nm_slice_free(r_req_data);
 }
 
 static void
@@ -318,7 +318,7 @@ _device_connect_req_data_complete(DeviceConnectReqData *c_req_data,
 
     g_object_unref(c_req_data->ext_cancellable);
     nm_clear_g_free(&c_req_data->device_name);
-    nm_g_slice_free(c_req_data);
+    nm_slice_free(c_req_data);
 }
 
 /*****************************************************************************/
@@ -2826,7 +2826,7 @@ nm_bluez_manager_init(NMBluezManager *self)
         g_hash_table_new_full(_conn_data_head_hash, _conn_data_head_equal, g_free, NULL);
     priv->conn_data_elems = g_hash_table_new_full(nm_pdirect_hash,
                                                   nm_pdirect_equal,
-                                                  nm_g_slice_free_fcn(ConnDataElem),
+                                                  nm_slice_free_fcn(ConnDataElem),
                                                   NULL);
 
     priv->bzobjs = g_hash_table_new_full(nm_pstr_hash,
diff --git a/src/core/devices/bluetooth/nm-bluez5-dun.c b/src/core/devices/bluetooth/nm-bluez5-dun.c
index b2648d2780..5d9c0af4c7 100644
--- a/src/core/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/core/devices/bluetooth/nm-bluez5-dun.c
@@ -762,7 +762,7 @@ _context_cleanup_connect_data(NMBluez5DunContext *context)
 
     g_clear_error(&cdat->rfcomm_sdp_search_error);
 
-    nm_g_slice_free(cdat);
+    nm_slice_free(cdat);
 }
 
 static void
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index adc892e968..638fb64142 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -943,7 +943,7 @@ _hostname_resolver_free(HostnameResolver *resolver)
     nm_clear_g_cancellable(&resolver->cancellable);
     nm_g_object_unref(resolver->address);
     g_free(resolver->hostname);
-    nm_g_slice_free(resolver);
+    nm_slice_free(resolver);
 }
 
 /*****************************************************************************/
@@ -6250,7 +6250,7 @@ nm_device_master_release_slave(NMDevice           *self,
 
     c_list_unlink(&info->lst_slave);
     g_signal_handler_disconnect(slave, info->watch_id);
-    nm_g_slice_free(info);
+    nm_slice_free(info);
 
     if (c_list_is_empty(&priv->slaves)) {
         _active_connection_set_state_flags_full(self,
@@ -7190,7 +7190,7 @@ sriov_op_cb(GError *error, gpointer user_data)
         op->callback(error, op->callback_data);
 
     priv->sriov.pending = NULL;
-    nm_g_slice_free(op);
+    nm_slice_free(op);
 
     if (priv->sriov.next) {
         sriov_op_start(self, g_steal_pointer(&priv->sriov.next));
@@ -7215,7 +7215,7 @@ sriov_op_queue_op(NMDevice *self, SriovOp *op)
             op_next->callback(error, op_next->callback_data);
         }
 
-        nm_g_slice_free(op_next);
+        nm_slice_free(op_next);
         return;
     }
 
@@ -17791,7 +17791,7 @@ dispose(GObject *object)
 
     nm_assert(!priv->sriov.pending);
     if (priv->sriov.next) {
-        nm_g_slice_free(priv->sriov.next);
+        nm_slice_free(priv->sriov.next);
         priv->sriov.next = NULL;
     }
 
diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index 36f17d20d6..10e9ae6bcc 100644
--- a/src/core/devices/nm-lldp-listener.c
+++ b/src/core/devices/nm-lldp-listener.c
@@ -240,7 +240,7 @@ lldp_neighbor_free(LldpNeighbor *neighbor)
     g_free(neighbor->port_id);
     nm_g_variant_unref(neighbor->variant);
     sd_lldp_neighbor_unref(neighbor->neighbor_sd);
-    nm_g_slice_free(neighbor);
+    nm_slice_free(neighbor);
 }
 
 static void
@@ -1002,7 +1002,7 @@ fail_attached:
     sd_lldp_rx_detach_event(lldp_handle);
 fail_handle:
     if (self)
-        nm_g_slice_free(self);
+        nm_slice_free(self);
     sd_lldp_rx_unref(lldp_handle);
     return NULL;
 }
@@ -1024,5 +1024,5 @@ nm_lldp_listener_destroy(NMLldpListener *self)
 
     _LOGT("lldp listener destroyed");
 
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/core/devices/ovs/nm-device-ovs-interface.c b/src/core/devices/ovs/nm-device-ovs-interface.c
index d4707d3098..f2719c3bb4 100644
--- a/src/core/devices/ovs/nm-device-ovs-interface.c
+++ b/src/core/devices/ovs/nm-device-ovs-interface.c
@@ -346,7 +346,7 @@ deactivate_invoke_cb(DeactivateData *data, GError *error)
     nm_clear_g_source(&data->link_timeout_id);
     g_object_unref(data->self);
     g_object_unref(data->cancellable);
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 static void
diff --git a/src/core/devices/ovs/nm-device-ovs-port.c b/src/core/devices/ovs/nm-device-ovs-port.c
index 7b24e1f2be..cdac174d97 100644
--- a/src/core/devices/ovs/nm-device-ovs-port.c
+++ b/src/core/devices/ovs/nm-device-ovs-port.c
@@ -107,7 +107,7 @@ add_iface_cb(GError *error, gpointer user_data)
     g_object_unref(data->port);
     nm_clear_g_cancellable(&data->cancellable);
 
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 static gboolean
diff --git a/src/core/devices/ovs/nm-ovsdb.c b/src/core/devices/ovs/nm-ovsdb.c
index 19bbcc823a..9a0a062b9b 100644
--- a/src/core/devices/ovs/nm-ovsdb.c
+++ b/src/core/devices/ovs/nm-ovsdb.c
@@ -290,7 +290,7 @@ _call_complete(OvsdbMethodCall *call, json_t *response, GError *error)
         break;
     }
 
-    nm_g_slice_free(call);
+    nm_slice_free(call);
 }
 
 /*****************************************************************************/
@@ -303,7 +303,7 @@ _free_bridge(OpenvswitchBridge *ovs_bridge)
     g_free(ovs_bridge->connection_uuid);
     g_ptr_array_free(ovs_bridge->ports, TRUE);
     nm_g_array_unref(ovs_bridge->external_ids);
-    nm_g_slice_free(ovs_bridge);
+    nm_slice_free(ovs_bridge);
 }
 
 static void
@@ -314,7 +314,7 @@ _free_port(OpenvswitchPort *ovs_port)
     g_free(ovs_port->connection_uuid);
     g_ptr_array_free(ovs_port->interfaces, TRUE);
     nm_g_array_unref(ovs_port->external_ids);
-    nm_g_slice_free(ovs_port);
+    nm_slice_free(ovs_port);
 }
 
 static void
@@ -325,7 +325,7 @@ _free_interface(OpenvswitchInterface *ovs_interface)
     g_free(ovs_interface->connection_uuid);
     g_free(ovs_interface->type);
     nm_g_array_unref(ovs_interface->external_ids);
-    nm_g_slice_free(ovs_interface);
+    nm_slice_free(ovs_interface);
 }
 
 /*****************************************************************************/
@@ -2516,7 +2516,7 @@ _transact_cb(NMOvsdb *self, json_t *result, GError *error, gpointer user_data)
     }
 
     call->callback(local ?: error, call->user_data);
-    nm_g_slice_free(call);
+    nm_slice_free(call);
 }
 
 static OvsdbCall *
diff --git a/src/core/devices/wifi/nm-device-wifi.c b/src/core/devices/wifi/nm-device-wifi.c
index 59791a6bc2..1c5a991c73 100644
--- a/src/core/devices/wifi/nm-device-wifi.c
+++ b/src/core/devices/wifi/nm-device-wifi.c
@@ -219,7 +219,7 @@ _scan_request_ssids_remove(ScanRequestSsidData *srs_data)
 {
     c_list_unlink_stale(&srs_data->lst);
     g_bytes_unref(srs_data->ssid);
-    nm_g_slice_free(srs_data);
+    nm_slice_free(srs_data);
 }
 
 static void
diff --git a/src/core/dns/nm-dns-dnsmasq.c b/src/core/dns/nm-dns-dnsmasq.c
index 69f7fce0d1..e5952696e3 100644
--- a/src/core/dns/nm-dns-dnsmasq.c
+++ b/src/core/dns/nm-dns-dnsmasq.c
@@ -349,7 +349,7 @@ _gl_pid_spawn_notify(GlPidSpawnAsyncData *sdata, GPid pid, const int *p_exit_cod
 
     if (destroy) {
         g_clear_object(&sdata->cancellable);
-        nm_g_slice_free(sdata);
+        nm_slice_free(sdata);
     }
 }
 
diff --git a/src/core/dns/nm-dns-manager.c b/src/core/dns/nm-dns-manager.c
index 410f11b5ac..7ab41417ed 100644
--- a/src/core/dns/nm-dns-manager.c
+++ b/src/core/dns/nm-dns-manager.c
@@ -395,7 +395,7 @@ _dns_config_ip_data_free(NMDnsConfigIPData *ip_data)
     g_strfreev(ip_data->domains.reverse);
 
     nm_l3_config_data_unref(ip_data->l3cd);
-    nm_g_slice_free(ip_data);
+    nm_slice_free(ip_data);
 }
 
 static void
@@ -405,7 +405,7 @@ _dns_config_data_free(NMDnsConfigData *data)
 
     nm_assert(c_list_is_empty(&data->data_lst_head));
     c_list_unlink_stale(&data->configs_lst);
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 static int
diff --git a/src/core/dns/nm-dns-systemd-resolved.c b/src/core/dns/nm-dns-systemd-resolved.c
index b8630b6065..955a6e9836 100644
--- a/src/core/dns/nm-dns-systemd-resolved.c
+++ b/src/core/dns/nm-dns-systemd-resolved.c
@@ -233,7 +233,7 @@ _request_item_unref(RequestItem *request_item)
     nm_assert(c_list_is_empty(&request_item->request_queue_lst));
 
     g_variant_unref(request_item->argument);
-    nm_g_slice_free(request_item);
+    nm_slice_free(request_item);
 }
 
 static void
@@ -262,7 +262,7 @@ static void
 _interface_config_free(InterfaceConfig *config)
 {
     nm_g_ptr_array_unref(config->ip_data_list);
-    nm_g_slice_free(config);
+    nm_slice_free(config);
 }
 
 static void
@@ -898,7 +898,7 @@ _resolve_complete(NMDnsSystemdResolvedResolveHandle       *handle,
     handle->r_address
         .callback(self, handle, names, names_len, flags, error, handle->callback_user_data);
 
-    nm_g_slice_free(handle);
+    nm_slice_free(handle);
 }
 
 static void
diff --git a/src/core/nm-auth-utils.c b/src/core/nm-auth-utils.c
index 5d7b01cfd0..b4a9390300 100644
--- a/src/core/nm-auth-utils.c
+++ b/src/core/nm-auth-utils.c
@@ -170,7 +170,7 @@ auth_call_free(AuthCall *call)
         call->chain->num_pending_auth_calls--;
         nm_auth_manager_check_authorization_cancel(call->call_id);
     }
-    nm_g_slice_free(call);
+    nm_slice_free(call);
 }
 
 static AuthCall *
@@ -592,7 +592,7 @@ _auth_chain_destroy(NMAuthChain *self)
 
     nm_g_object_unref(self->cancellable);
 
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
 
 /******************************************************************************
diff --git a/src/core/nm-bond-manager.c b/src/core/nm-bond-manager.c
index 5fd39b89f3..bb95a5f815 100644
--- a/src/core/nm-bond-manager.c
+++ b/src/core/nm-bond-manager.c
@@ -963,5 +963,5 @@ _bond_manager_destroy(NMBondManager *self)
     g_hash_table_unref(self->previous_ifindexes);
     g_hash_table_unref(self->previous_members);
     g_free(self->connection_uuid);
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/core/nm-firewall-utils.c b/src/core/nm-firewall-utils.c
index 7eeac25f4b..c8cc78beb0 100644
--- a/src/core/nm-firewall-utils.c
+++ b/src/core/nm-firewall-utils.c
@@ -447,7 +447,7 @@ _fw_nft_call_data_free(FwNftCallData *call_data, GError *error_take)
     nm_g_object_unref(call_data->subprocess);
     g_free(call_data->identifier);
 
-    nm_g_slice_free(call_data);
+    nm_slice_free(call_data);
 }
 
 static void
@@ -980,7 +980,7 @@ nm_firewall_config_free(NMFirewallConfig *self)
         return;
 
     g_free(self->ip_iface);
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
 
 /*****************************************************************************/
diff --git a/src/core/nm-firewalld-manager.c b/src/core/nm-firewalld-manager.c
index 904c3bf78f..c61497f5ff 100644
--- a/src/core/nm-firewalld-manager.c
+++ b/src/core/nm-firewalld-manager.c
@@ -224,7 +224,7 @@ _cb_info_complete(NMFirewalldManagerCallId *call_id, GError *error)
     }
     g_free(call_id->iface);
     g_object_unref(call_id->self);
-    nm_g_slice_free(call_id);
+    nm_slice_free(call_id);
 }
 
 static gboolean
diff --git a/src/core/nm-l3-config-data.c b/src/core/nm-l3-config-data.c
index 45e7e7fab4..45d3000787 100644
--- a/src/core/nm-l3-config-data.c
+++ b/src/core/nm-l3-config-data.c
@@ -810,7 +810,7 @@ nm_l3_config_data_unref(const NML3ConfigData *self)
     nm_ref_string_unref(mutable->proxy_pac_url);
     nm_ref_string_unref(mutable->proxy_pac_script);
 
-    nm_g_slice_free(mutable);
+    nm_slice_free(mutable);
 }
 
 /*****************************************************************************/
diff --git a/src/core/nm-l3-ipv4ll.c b/src/core/nm-l3-ipv4ll.c
index ac5d96c110..5b79122cf7 100644
--- a/src/core/nm-l3-ipv4ll.c
+++ b/src/core/nm-l3-ipv4ll.c
@@ -226,7 +226,7 @@ _registration_update(NML3IPv4LL             *self,
         c_list_unlink_stale(&reg->reg_lst);
         if (c_list_is_empty(&self->reg_lst_head))
             self_unref_on_exit = self;
-        nm_g_slice_free(reg);
+        nm_slice_free(reg);
         reg = NULL;
         goto out;
     }
@@ -1037,5 +1037,5 @@ nm_l3_ipv4ll_unref(NML3IPv4LL *self)
 
     g_clear_object(&self->l3cfg);
     nmp_object_unref(self->plobj);
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/core/nm-l3-ipv6ll.c b/src/core/nm-l3-ipv6ll.c
index 969208da6a..048ad491ad 100644
--- a/src/core/nm-l3-ipv6ll.c
+++ b/src/core/nm-l3-ipv6ll.c
@@ -715,5 +715,5 @@ nm_l3_ipv6ll_destroy(NML3IPv6LL *self)
         g_free((char *) self->addrgen.stable_privacy.network_id);
     }
 
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 5f12403eae..a72d065034 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
@@ -829,7 +829,7 @@ _obj_state_data_free(gpointer data)
     c_list_unlink_stale(&obj_state->os_temporary_not_available_lst);
     nmp_object_unref(obj_state->obj);
     nmp_object_unref(obj_state->os_plobj);
-    nm_g_slice_free(obj_state);
+    nm_slice_free(obj_state);
 }
 
 static const char *
@@ -1426,7 +1426,7 @@ _acd_data_free(AcdData *acd_data)
     c_list_unlink_stale(&acd_data->acd_lst);
     c_list_unlink_stale(&acd_data->acd_event_notify_lst);
     g_free((NML3AcdAddrTrackInfo *) acd_data->info.track_infos);
-    nm_g_slice_free(acd_data);
+    nm_slice_free(acd_data);
 }
 
 static guint
@@ -4713,7 +4713,7 @@ nm_l3cfg_unblock_obj_pruning(NML3CfgBlockHandle *handle)
           IS_IPv4 ? '4' : '6',
           c_list_length(&self->priv.p->blocked_lst_head_x[IS_IPv4]));
 
-    nm_g_slice_free(handle);
+    nm_slice_free(handle);
 }
 
 /* See DOC(l3cfg:commit-type) */
@@ -4836,7 +4836,7 @@ nm_l3cfg_commit_type_unregister(NML3Cfg *self, NML3CfgCommitTypeHandle *handle)
     c_list_unlink_stale(&handle->commit_type_lst);
     if (c_list_is_empty(&self->priv.p->commit_type_lst_head))
         g_object_unref(self);
-    nm_g_slice_free(handle);
+    nm_slice_free(handle);
 }
 
 void
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index 25444777c3..aaa9198dd9 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -688,7 +688,7 @@ _device_route_metric_get(NMManager   *self,
             g_hash_table_new_full(_device_route_metric_data_by_ifindex_hash,
                                   _device_route_metric_data_by_ifindex_equal,
                                   NULL,
-                                  nm_g_slice_free_fcn(DeviceRouteMetricData));
+                                  nm_slice_free_fcn(DeviceRouteMetricData));
         cleaned = TRUE;
 
         /* we need to pre-populate the cache for all (still existing) devices from the state-file */
diff --git a/src/core/nm-netns.c b/src/core/nm-netns.c
index e6f1ce1e7f..bc59ee5155 100644
--- a/src/core/nm-netns.c
+++ b/src/core/nm-netns.c
@@ -107,7 +107,7 @@ _l3cfg_data_free(gpointer ptr)
 
     c_list_unlink_stale(&l3cfg_data->signal_pending_lst);
 
-    nm_g_slice_free(l3cfg_data);
+    nm_slice_free(l3cfg_data);
 }
 
 static void
@@ -346,7 +346,7 @@ nm_netns_shared_ip_release(NMNetnsSharedIPHandle *handle)
     _LOGD("shared-ip4: release IP address range %s/24", nm_inet4_ntop(handle->addr, sbuf_addr));
 
     handle->_self = NULL;
-    nm_g_slice_free(handle);
+    nm_slice_free(handle);
 }
 
 /*****************************************************************************/
diff --git a/src/core/nm-rfkill-manager.c b/src/core/nm-rfkill-manager.c
index 713b159e5f..ccbd81c903 100644
--- a/src/core/nm-rfkill-manager.c
+++ b/src/core/nm-rfkill-manager.c
@@ -167,7 +167,7 @@ killswitch_destroy(Killswitch *ks)
     g_free(ks->name);
     g_free(ks->path);
     g_free(ks->driver);
-    nm_g_slice_free(ks);
+    nm_slice_free(ks);
 }
 
 static NMRfkillState
diff --git a/src/core/platform/tests/test-common.c b/src/core/platform/tests/test-common.c
index e57a39f5ea..09689904db 100644
--- a/src/core/platform/tests/test-common.c
+++ b/src/core/platform/tests/test-common.c
@@ -2796,5 +2796,5 @@ nmtstp_acd_defender_destroy(NMTstpAcdDefender *defender)
     nm_clear_pointer(&defender->nacd, n_acd_unref);
     nm_clear_pointer(&defender->probe, n_acd_probe_free);
 
-    nm_g_slice_free(defender);
+    nm_slice_free(defender);
 }
diff --git a/src/core/ppp/nm-ppp-mgr.c b/src/core/ppp/nm-ppp-mgr.c
index c6194df2b0..88e991fa1a 100644
--- a/src/core/ppp/nm-ppp-mgr.c
+++ b/src/core/ppp/nm-ppp-mgr.c
@@ -616,5 +616,5 @@ nm_ppp_mgr_destroy(NMPppMgr *self)
 
     g_object_unref(self->config.netns);
 
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/core/settings/nm-secret-agent.c b/src/core/settings/nm-secret-agent.c
index 02f84b6287..8102cab005 100644
--- a/src/core/settings/nm-secret-agent.c
+++ b/src/core/settings/nm-secret-agent.c
@@ -176,7 +176,7 @@ _call_id_free(NMSecretAgentCallId *call_id)
     g_free(call_id->setting_name);
     nm_g_object_unref(call_id->cancellable);
     g_object_unref(call_id->self);
-    nm_g_slice_free(call_id);
+    nm_slice_free(call_id);
 }
 
 static void
diff --git a/src/core/settings/nm-settings-connection.c b/src/core/settings/nm-settings-connection.c
index 1e99421f88..80fc649973 100644
--- a/src/core/settings/nm-settings-connection.c
+++ b/src/core/settings/nm-settings-connection.c
@@ -96,7 +96,7 @@ _seen_bssid_entry_free(gpointer data)
     SeenBssidEntry *entry = data;
 
     c_list_unlink_stale(&entry->seen_bssids_lst);
-    nm_g_slice_free(entry);
+    nm_slice_free(entry);
 }
 
 /*****************************************************************************/
diff --git a/src/core/settings/nm-settings.c b/src/core/settings/nm-settings.c
index 6fa6cd4aa5..e3bdefe63b 100644
--- a/src/core/settings/nm-settings.c
+++ b/src/core/settings/nm-settings.c
@@ -491,7 +491,7 @@ _startup_complete_data_destroy(StartupCompleteData *scd)
 {
     c_list_unlink_stale(&scd->scd_lst);
     g_object_unref(scd->sett_conn);
-    nm_g_slice_free(scd);
+    nm_slice_free(scd);
 }
 
 static gboolean
diff --git a/src/core/supplicant/nm-supplicant-interface.c b/src/core/supplicant/nm-supplicant-interface.c
index 24cec5aa55..11c6055db8 100644
--- a/src/core/supplicant/nm-supplicant-interface.c
+++ b/src/core/supplicant/nm-supplicant-interface.c
@@ -586,7 +586,7 @@ _bss_info_destroy(NMSupplicantBssInfo *bss_info)
     nm_clear_g_cancellable(&bss_info->_init_cancellable);
     g_bytes_unref(bss_info->ssid);
     nm_ref_string_unref(bss_info->bss_path);
-    nm_g_slice_free(bss_info);
+    nm_slice_free(bss_info);
 }
 
 static void
@@ -891,7 +891,7 @@ _peer_info_destroy(NMSupplicantPeerInfo *peer_info)
 
     nm_ref_string_unref(peer_info->peer_path);
 
-    nm_g_slice_free(peer_info);
+    nm_slice_free(peer_info);
 }
 
 static void
@@ -1622,7 +1622,7 @@ _wps_data_free(WpsData *wps_data, GDBusConnection *dbus_connection)
     g_free(wps_data->type);
     g_free(wps_data->pin);
     g_free(wps_data->bssid);
-    nm_g_slice_free(wps_data);
+    nm_slice_free(wps_data);
 }
 
 static void
@@ -2288,7 +2288,7 @@ assoc_add_network_cb(GObject *source, GAsyncResult *result, gpointer user_data)
         assoc_data->add_network_data = NULL;
     name_owner  = g_steal_pointer(&add_network_data->name_owner);
     object_path = g_steal_pointer(&add_network_data->object_path);
-    nm_g_slice_free(add_network_data);
+    nm_slice_free(add_network_data);
 
     res = g_dbus_connection_call_finish(G_DBUS_CONNECTION(source), result, &error);
 
@@ -2628,7 +2628,7 @@ scan_request_cb(GObject *source, GAsyncResult *result, gpointer user_data)
         if (!data->callback) {
             /* the self instance was not kept alive. We also must not touch it. Return. */
             nm_g_object_unref(data->cancellable);
-            nm_g_slice_free(data);
+            nm_slice_free(data);
             return;
         }
         cancelled = TRUE;
@@ -2661,7 +2661,7 @@ scan_request_cb(GObject *source, GAsyncResult *result, gpointer user_data)
         data->callback(self, data->cancellable, data->user_data);
 
     nm_g_object_unref(data->cancellable);
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 void
diff --git a/src/core/supplicant/nm-supplicant-manager.c b/src/core/supplicant/nm-supplicant-manager.c
index 6d73eb890c..0298e3822f 100644
--- a/src/core/supplicant/nm-supplicant-manager.c
+++ b/src/core/supplicant/nm-supplicant-manager.c
@@ -381,7 +381,7 @@ _create_iface_complete(NMSupplMgrCreateIfaceHandle *handle,
     nm_clear_g_cancellable(&handle->cancellable);
     nm_ref_string_unref(handle->name_owner);
 
-    nm_g_slice_free(handle);
+    nm_slice_free(handle);
 }
 
 static void
diff --git a/src/libnm-client-impl/nm-client.c b/src/libnm-client-impl/nm-client.c
index 86ae96a8c3..c86cb497fd 100644
--- a/src/libnm-client-impl/nm-client.c
+++ b/src/libnm-client-impl/nm-client.c
@@ -462,7 +462,7 @@ nml_init_data_return(NMLInitData *init_data, GError *error_take)
         g_object_unref(init_data->data.async.task);
     }
     nm_g_object_unref(init_data->cancellable);
-    nm_g_slice_free(init_data);
+    nm_slice_free(init_data);
 }
 
 /*****************************************************************************/
@@ -1134,7 +1134,7 @@ nml_dbus_object_unref(NMLDBusObject *dbobj)
     nm_assert(!dbobj->nmobj);
 
     nm_ref_string_unref(dbobj->dbus_path);
-    nm_g_slice_free(dbobj);
+    nm_slice_free(dbobj);
 }
 
 static NMLDBusObjIfaceData *
@@ -3738,7 +3738,7 @@ _request_wait_data_free(RequestWaitData *request_data)
     nm_g_variant_unref(request_data->extra_results);
     if (request_data->dbobj)
         nml_dbus_object_unref(request_data->dbobj);
-    nm_g_slice_free(request_data);
+    nm_slice_free(request_data);
 }
 
 static void
diff --git a/src/libnm-client-impl/nm-device.c b/src/libnm-client-impl/nm-device.c
index 1bffae88be..ea8fd1deb8 100644
--- a/src/libnm-client-impl/nm-device.c
+++ b/src/libnm-client-impl/nm-device.c
@@ -3053,7 +3053,7 @@ nm_lldp_neighbor_unref(NMLldpNeighbor *neighbor)
 
     if (g_atomic_int_dec_and_test(&neighbor->refcount)) {
         g_hash_table_unref(neighbor->attrs);
-        nm_g_slice_free(neighbor);
+        nm_slice_free(neighbor);
     }
 }
 
diff --git a/src/libnm-client-impl/nm-secret-agent-old.c b/src/libnm-client-impl/nm-secret-agent-old.c
index 3f251d185b..47c720556a 100644
--- a/src/libnm-client-impl/nm-secret-agent-old.c
+++ b/src/libnm-client-impl/nm-secret-agent-old.c
@@ -268,7 +268,7 @@ get_secret_info_free(GetSecretsInfo *info)
     c_list_unlink_stale(&info->gsi_lst);
     g_free(info->connection_path);
     g_free(info->setting_name);
-    nm_g_slice_free(info);
+    nm_slice_free(info);
 }
 
 static void
diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c
index 9045cb1640..f2cfdf8db5 100644
--- a/src/libnm-core-impl/nm-connection.c
+++ b/src/libnm-core-impl/nm-connection.c
@@ -72,7 +72,7 @@ _nm_connection_private_free(gpointer data)
 
     _nm_connection_private_clear(priv);
 
-    nm_g_slice_free(priv);
+    nm_slice_free(priv);
 }
 
 static NMConnectionPrivate *
diff --git a/src/libnm-core-impl/nm-setting-ip-config.c b/src/libnm-core-impl/nm-setting-ip-config.c
index b2342e18dd..9800d5b592 100644
--- a/src/libnm-core-impl/nm-setting-ip-config.c
+++ b/src/libnm-core-impl/nm-setting-ip-config.c
@@ -249,7 +249,7 @@ nm_ip_address_unref(NMIPAddress *address)
     if (address->refcount == 0) {
         g_free(address->address);
         nm_g_hash_table_unref(address->attributes);
-        nm_g_slice_free(address);
+        nm_slice_free(address);
     }
 }
 
@@ -723,7 +723,7 @@ nm_ip_route_unref(NMIPRoute *route)
         g_free(route->dest);
         g_free(route->next_hop);
         nm_g_hash_table_unref(route->attributes);
-        nm_g_slice_free(route);
+        nm_slice_free(route);
     }
 }
 
@@ -1748,7 +1748,7 @@ nm_ip_routing_rule_unref(NMIPRoutingRule *self)
     g_free(self->iifname);
     g_free(self->oifname);
 
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
 
 /**
diff --git a/src/libnm-core-impl/nm-setting-sriov.c b/src/libnm-core-impl/nm-setting-sriov.c
index bb2ed3cf80..f470034882 100644
--- a/src/libnm-core-impl/nm-setting-sriov.c
+++ b/src/libnm-core-impl/nm-setting-sriov.c
@@ -74,7 +74,7 @@ static GHashTable *
 _vf_vlan_create_hash(void)
 {
     G_STATIC_ASSERT_EXPR(G_STRUCT_OFFSET(VFVlan, id) == 0);
-    return g_hash_table_new_full(_vf_vlan_hash, _vf_vlan_equal, NULL, nm_g_slice_free_fcn(VFVlan));
+    return g_hash_table_new_full(_vf_vlan_hash, _vf_vlan_equal, NULL, nm_slice_free_fcn(VFVlan));
 }
 
 /**
@@ -142,7 +142,7 @@ nm_sriov_vf_unref(NMSriovVF *vf)
         if (vf->vlans)
             g_hash_table_unref(vf->vlans);
         g_free(vf->vlan_ids);
-        nm_g_slice_free(vf);
+        nm_slice_free(vf);
     }
 }
 
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index c1d0671eae..550e2cff67 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -516,7 +516,7 @@ test_nm_hash(void)
 /*****************************************************************************/
 
 static void
-test_nm_g_slice_free_fcn(void)
+test_nm_slice_free_fcn(void)
 {
     gpointer p;
     struct {
@@ -525,19 +525,19 @@ test_nm_g_slice_free_fcn(void)
     } xx;
 
     p = nm_slice_new(gint64);
-    (nm_g_slice_free_fcn(gint64))(p);
+    (nm_slice_free_fcn(gint64))(p);
 
     p = nm_slice_new(gint32);
-    (nm_g_slice_free_fcn(gint32))(p);
+    (nm_slice_free_fcn(gint32))(p);
 
     p = nm_slice_new(int);
-    (nm_g_slice_free_fcn(int))(p);
+    (nm_slice_free_fcn(int))(p);
 
     p = nm_slice_new(gint64);
-    nm_g_slice_free_fcn_gint64(p);
+    nm_slice_free_fcn_gint64(p);
 
     p = nm_slice_alloc(sizeof(xx));
-    (nm_g_slice_free_fcn(xx))(p);
+    (nm_slice_free_fcn(xx))(p);
 }
 
 /*****************************************************************************/
@@ -11133,7 +11133,7 @@ main(int argc, char **argv)
     g_test_add_func("/core/general/test_80211_mode", test_80211_mode);
     g_test_add_func("/core/general/test_vlan_flags", test_vlan_flags);
     g_test_add_func("/core/general/test_nm_hash", test_nm_hash);
-    g_test_add_func("/core/general/test_nm_g_slice_free_fcn", test_nm_g_slice_free_fcn);
+    g_test_add_func("/core/general/test_nm_slice_free_fcn", test_nm_slice_free_fcn);
     g_test_add_func("/core/general/test_c_list_sort", test_c_list_sort);
     g_test_add_func("/core/general/test_c_list_insert_sorted", test_c_list_insert_sorted);
     g_test_add_func("/core/general/test_dedup_multi", test_dedup_multi);
diff --git a/src/libnm-glib-aux/nm-io-utils.c b/src/libnm-glib-aux/nm-io-utils.c
index fa9c0d116f..b3ae48be19 100644
--- a/src/libnm-glib-aux/nm-io-utils.c
+++ b/src/libnm-glib-aux/nm-io-utils.c
@@ -510,7 +510,7 @@ _subprocess_terminate_wait_cb(GObject *source, GAsyncResult *result, gpointer us
 
     nm_clear_g_source_inst(&term_data->timeout_source);
     g_object_unref(term_data->subprocess);
-    nm_g_slice_free(term_data);
+    nm_slice_free(term_data);
 }
 
 static gboolean
diff --git a/src/libnm-glib-aux/nm-macros-internal.h b/src/libnm-glib-aux/nm-macros-internal.h
index ccd8bd8f3f..0139223385 100644
--- a/src/libnm-glib-aux/nm-macros-internal.h
+++ b/src/libnm-glib-aux/nm-macros-internal.h
@@ -1235,7 +1235,7 @@ _NM_IN_STRSET_EVAL_op_streq_ascii_case(const char *x1, const char *x)
 
 /*****************************************************************************/
 
-#define nm_g_slice_free(ptr) nm_slice_free_typed(typeof(*(ptr)), ptr)
+#define nm_slice_free(ptr) nm_slice_free_typed(typeof(*(ptr)), ptr)
 
 /*****************************************************************************/
 
diff --git a/src/libnm-glib-aux/nm-shared-utils.c b/src/libnm-glib-aux/nm-shared-utils.c
index 095a98ca1e..3306e2f125 100644
--- a/src/libnm-glib-aux/nm-shared-utils.c
+++ b/src/libnm-glib-aux/nm-shared-utils.c
@@ -4270,7 +4270,7 @@ _nm_utils_invoke_on_idle_complete(InvokeOnIdleData *data)
 
     nm_g_object_unref(data->cancellable);
     g_source_destroy(data->source);
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 static gboolean
@@ -4934,7 +4934,7 @@ _poll_data_free(gpointer user_data)
 
     if (poll_data->has_many_idx)
         g_free(poll_data->idx.many);
-    nm_g_slice_free(poll_data);
+    nm_slice_free(poll_data);
 }
 
 static void
@@ -6199,10 +6199,10 @@ _tls_reg_destroy(gpointer data)
     while ((entry = c_list_last_entry(lst_head, TlsRegData, lst))) {
         c_list_unlink_stale(&entry->lst);
         entry->destroy_notify(entry->tls_data);
-        nm_g_slice_free(entry);
+        nm_slice_free(entry);
     }
 
-    nm_g_slice_free(lst_head);
+    nm_slice_free(lst_head);
 }
 
 static void
diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h
index 29d5385821..6d85aa5baa 100644
--- a/src/libnm-glib-aux/nm-shared-utils.h
+++ b/src/libnm-glib-aux/nm-shared-utils.h
@@ -850,21 +850,21 @@ void _nm_slice_assert_usable_size(gsize mem_size, gpointer mem_block);
 
 /*****************************************************************************/
 
-#define _nm_g_slice_free_fcn_define(mem_size)                              \
-    static inline void _nm_g_slice_free_fcn_##mem_size(gpointer mem_block) \
-    {                                                                      \
-        nm_slice_free_sized(mem_size, mem_block);                          \
-    }                                                                      \
+#define _nm_slice_free_fcn_define(mem_size)                              \
+    static inline void _nm_slice_free_fcn_##mem_size(gpointer mem_block) \
+    {                                                                    \
+        nm_slice_free_sized(mem_size, mem_block);                        \
+    }                                                                    \
     _NM_DUMMY_STRUCT_FOR_TRAILING_SEMICOLON
 
-_nm_g_slice_free_fcn_define(1);
-_nm_g_slice_free_fcn_define(2);
-_nm_g_slice_free_fcn_define(4);
-_nm_g_slice_free_fcn_define(8);
-_nm_g_slice_free_fcn_define(10);
-_nm_g_slice_free_fcn_define(12);
-_nm_g_slice_free_fcn_define(16);
-_nm_g_slice_free_fcn_define(32);
+_nm_slice_free_fcn_define(1);
+_nm_slice_free_fcn_define(2);
+_nm_slice_free_fcn_define(4);
+_nm_slice_free_fcn_define(8);
+_nm_slice_free_fcn_define(10);
+_nm_slice_free_fcn_define(12);
+_nm_slice_free_fcn_define(16);
+_nm_slice_free_fcn_define(32);
 
 _nm_warn_unused_result static inline GDestroyNotify
 _nm_get_warn_unused_result_gdestroynotify(GDestroyNotify f)
@@ -872,7 +872,7 @@ _nm_get_warn_unused_result_gdestroynotify(GDestroyNotify f)
     return f;
 }
 
-#define nm_g_slice_free_fcn1(mem_size)                                                        \
+#define nm_slice_free_fcn1(mem_size)                                                          \
     _nm_get_warn_unused_result_gdestroynotify(({                                              \
         void (*_fcn)(gpointer);                                                               \
                                                                                               \
@@ -884,28 +884,28 @@ _nm_get_warn_unused_result_gdestroynotify(GDestroyNotify f)
                              || ((mem_size) == 16) || ((mem_size) == 32));                    \
         switch ((mem_size)) {                                                                 \
         case 1:                                                                               \
-            _fcn = _nm_g_slice_free_fcn_1;                                                    \
+            _fcn = _nm_slice_free_fcn_1;                                                      \
             break;                                                                            \
         case 2:                                                                               \
-            _fcn = _nm_g_slice_free_fcn_2;                                                    \
+            _fcn = _nm_slice_free_fcn_2;                                                      \
             break;                                                                            \
         case 4:                                                                               \
-            _fcn = _nm_g_slice_free_fcn_4;                                                    \
+            _fcn = _nm_slice_free_fcn_4;                                                      \
             break;                                                                            \
         case 8:                                                                               \
-            _fcn = _nm_g_slice_free_fcn_8;                                                    \
+            _fcn = _nm_slice_free_fcn_8;                                                      \
             break;                                                                            \
         case 10:                                                                              \
-            _fcn = _nm_g_slice_free_fcn_10;                                                   \
+            _fcn = _nm_slice_free_fcn_10;                                                     \
             break;                                                                            \
         case 12:                                                                              \
-            _fcn = _nm_g_slice_free_fcn_12;                                                   \
+            _fcn = _nm_slice_free_fcn_12;                                                     \
             break;                                                                            \
         case 16:                                                                              \
-            _fcn = _nm_g_slice_free_fcn_16;                                                   \
+            _fcn = _nm_slice_free_fcn_16;                                                     \
             break;                                                                            \
         case 32:                                                                              \
-            _fcn = _nm_g_slice_free_fcn_32;                                                   \
+            _fcn = _nm_slice_free_fcn_32;                                                     \
             break;                                                                            \
         default:                                                                              \
             g_assert_not_reached();                                                           \
@@ -917,7 +917,7 @@ _nm_get_warn_unused_result_gdestroynotify(GDestroyNotify f)
     }))
 
 /**
- * nm_g_slice_free_fcn:
+ * nm_slice_free_fcn:
  * @type: type argument for sizeof() operator that you would
  *   pass to nm_slice_new().
  *
@@ -926,9 +926,9 @@ _nm_get_warn_unused_result_gdestroynotify(GDestroyNotify f)
  *
  * Only certain types are implemented. You'll get a compile time
  * error for the wrong types. */
-#define nm_g_slice_free_fcn(type) (nm_g_slice_free_fcn1(sizeof(type)))
+#define nm_slice_free_fcn(type) (nm_slice_free_fcn1(sizeof(type)))
 
-#define nm_g_slice_free_fcn_gint64 (nm_g_slice_free_fcn(gint64))
+#define nm_slice_free_fcn_gint64 (nm_slice_free_fcn(gint64))
 
 /*****************************************************************************/
 
diff --git a/src/libnm-platform/nm-netlink.c b/src/libnm-platform/nm-netlink.c
index b65deb44b5..3f5c6245a8 100644
--- a/src/libnm-platform/nm-netlink.c
+++ b/src/libnm-platform/nm-netlink.c
@@ -965,7 +965,7 @@ nl_socket_free(struct nl_sock *sk)
         return;
 
     nm_close(sk->s_fd);
-    nm_g_slice_free(sk);
+    nm_slice_free(sk);
 }
 
 int
diff --git a/src/libnm-platform/nm-platform.c b/src/libnm-platform/nm-platform.c
index 55589075f1..1da7a6bb1e 100644
--- a/src/libnm-platform/nm-platform.c
+++ b/src/libnm-platform/nm-platform.c
@@ -5526,7 +5526,7 @@ nm_platform_ip4_dev_route_blacklist_set(NMPlatform *self,
                 g_hash_table_new_full((GHashFunc) nmp_object_id_hash,
                                       (GEqualFunc) nmp_object_id_equal,
                                       (GDestroyNotify) nmp_object_unref,
-                                      nm_g_slice_free_fcn_gint64);
+                                      nm_slice_free_fcn_gint64);
         }
 
         timeout_msec = nm_utils_get_monotonic_timestamp_msec() + IP4_DEV_ROUTE_BLACKLIST_TIMEOUT_MS;
diff --git a/src/libnm-platform/nmp-global-tracker.c b/src/libnm-platform/nmp-global-tracker.c
index cfac39d7a1..7fa04283f4 100644
--- a/src/libnm-platform/nmp-global-tracker.c
+++ b/src/libnm-platform/nmp-global-tracker.c
@@ -226,7 +226,7 @@ _track_data_destroy(gpointer data)
     c_list_unlink_stale(&track_data->obj_lst);
     c_list_unlink_stale(&track_data->user_tag_lst);
     nmp_object_unref(track_data->obj);
-    nm_g_slice_free(track_data);
+    nm_slice_free(track_data);
 }
 
 static const TrackData *
@@ -297,7 +297,7 @@ _track_obj_data_destroy(gpointer data)
     c_list_unlink_stale(&obj_data->obj_lst_head);
     c_list_unlink_stale(&obj_data->by_obj_lst);
     nmp_object_unref(obj_data->obj);
-    nm_g_slice_free(obj_data);
+    nm_slice_free(obj_data);
 }
 
 static void
@@ -306,7 +306,7 @@ _track_user_tag_data_destroy(gpointer data)
     TrackUserTagData *user_tag_data = data;
 
     c_list_unlink_stale(&user_tag_data->user_tag_lst_head);
-    nm_g_slice_free(user_tag_data);
+    nm_slice_free(user_tag_data);
 }
 
 static TrackData *
@@ -1273,5 +1273,5 @@ nmp_global_tracker_unref(NMPGlobalTracker *self)
     nm_assert(c_list_is_empty(&self->by_obj_lst_heads[2]));
     nm_assert(c_list_is_empty(&self->by_obj_lst_heads[3]));
     g_object_unref(self->platform);
-    nm_g_slice_free(self);
+    nm_slice_free(self);
 }
diff --git a/src/libnmc-base/nm-polkit-listener.c b/src/libnmc-base/nm-polkit-listener.c
index 09fe3d59dc..59dcb5f7c6 100644
--- a/src/libnmc-base/nm-polkit-listener.c
+++ b/src/libnmc-base/nm-polkit-listener.c
@@ -146,7 +146,7 @@ auth_request_complete(AuthRequest *request, gboolean success)
         request->child_stdin = -1;
     }
 
-    nm_g_slice_free(request);
+    nm_slice_free(request);
 }
 
 static gboolean
diff --git a/src/nm-cloud-setup/nm-cloud-setup-utils.c b/src/nm-cloud-setup/nm-cloud-setup-utils.c
index 479924cfd7..0b55a85fd0 100644
--- a/src/nm-cloud-setup/nm-cloud-setup-utils.c
+++ b/src/nm-cloud-setup/nm-cloud-setup-utils.c
@@ -194,7 +194,7 @@ _poll_task_data_free(gpointer data)
 
     g_main_context_unref(poll_task_data->context);
 
-    nm_g_slice_free(poll_task_data);
+    nm_slice_free(poll_task_data);
 }
 
 static void
diff --git a/src/nm-cloud-setup/nm-http-client.c b/src/nm-cloud-setup/nm-http-client.c
index 1fb3954a05..1471ac8bd2 100644
--- a/src/nm-cloud-setup/nm-http-client.c
+++ b/src/nm-cloud-setup/nm-http-client.c
@@ -109,7 +109,7 @@ _get_result_free(gpointer data)
     GetResult *get_result = data;
 
     g_bytes_unref(get_result->response_data);
-    nm_g_slice_free(get_result);
+    nm_slice_free(get_result);
 }
 
 typedef struct {
@@ -148,7 +148,7 @@ _ehandle_free(EHandleData *edata)
     if (edata->headers)
         curl_slist_free_all(edata->headers);
     g_free(edata->url);
-    nm_g_slice_free(edata);
+    nm_slice_free(edata);
 }
 
 static void
@@ -416,7 +416,7 @@ _poll_get_data_free(gpointer data)
     nm_clear_pointer(&poll_get_data->response_data, g_bytes_unref);
     g_strfreev((char **) poll_get_data->http_headers);
 
-    nm_g_slice_free(poll_get_data);
+    nm_slice_free(poll_get_data);
 }
 
 static void
diff --git a/src/nm-cloud-setup/nmcs-provider-azure.c b/src/nm-cloud-setup/nmcs-provider-azure.c
index aca17e0365..665ee2d06e 100644
--- a/src/nm-cloud-setup/nmcs-provider-azure.c
+++ b/src/nm-cloud-setup/nmcs-provider-azure.c
@@ -102,7 +102,7 @@ typedef struct {
 static void
 _azure_iface_data_destroy(AzureIfaceData *iface_data)
 {
-    nm_g_slice_free(iface_data);
+    nm_slice_free(iface_data);
 }
 
 static void
diff --git a/src/nm-cloud-setup/nmcs-provider-gcp.c b/src/nm-cloud-setup/nmcs-provider-gcp.c
index 671c95433b..c2dd67d5c8 100644
--- a/src/nm-cloud-setup/nmcs-provider-gcp.c
+++ b/src/nm-cloud-setup/nmcs-provider-gcp.c
@@ -99,7 +99,7 @@ typedef struct {
 static void
 _gcp_iface_data_destroy(GCPIfaceData *iface_data)
 {
-    nm_g_slice_free(iface_data);
+    nm_slice_free(iface_data);
 }
 
 static void
diff --git a/src/nm-cloud-setup/nmcs-provider.c b/src/nm-cloud-setup/nmcs-provider.c
index 3805e15cc7..c91e215c00 100644
--- a/src/nm-cloud-setup/nmcs-provider.c
+++ b/src/nm-cloud-setup/nmcs-provider.c
@@ -219,7 +219,7 @@ _iface_data_free(gpointer data)
     g_free(iface_data->iproutes_arr);
     g_free((char *) iface_data->hwaddr);
 
-    nm_g_slice_free(iface_data);
+    nm_slice_free(iface_data);
 }
 
 static void
@@ -260,7 +260,7 @@ _get_config_task_maybe_return(NMCSProviderGetConfigTaskData *get_config_data, GE
 
     nm_g_object_unref(get_config_data->intern_cancellable);
     g_object_unref(get_config_data->task);
-    nm_g_slice_free(get_config_data);
+    nm_slice_free(get_config_data);
 }
 
 void
diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c
index dc8c35ad02..74808121ca 100644
--- a/src/nm-initrd-generator/nmi-cmdline-reader.c
+++ b/src/nm-initrd-generator/nmi-cmdline-reader.c
@@ -73,7 +73,7 @@ reader_destroy(Reader *reader, gboolean free_hash)
     nm_clear_g_free(&reader->hostname);
     g_hash_table_unref(reader->znet_ifnames);
     nm_clear_g_free(&reader->dhcp4_vci);
-    nm_g_slice_free(reader);
+    nm_slice_free(reader);
     if (!free_hash)
         return g_steal_pointer(&hash);
     return NULL;
diff --git a/src/nm-priv-helper/nm-priv-helper.c b/src/nm-priv-helper/nm-priv-helper.c
index 252266fb5b..3d6422a266 100644
--- a/src/nm-priv-helper/nm-priv-helper.c
+++ b/src/nm-priv-helper/nm-priv-helper.c
@@ -457,7 +457,7 @@ _pending_job_register_object_release_on_idle_cb(gpointer data)
     GlobalData     *gl        = idle_data->gl;
 
     c_list_unlink_stale(&idle_data->pending_jobs_lst);
-    nm_g_slice_free(idle_data);
+    nm_slice_free(idle_data);
 
     _idle_timeout_restart(gl);
     return G_SOURCE_REMOVE;
diff --git a/src/nmcli/common.c b/src/nmcli/common.c
index 36e24110d1..7e66351f4f 100644
--- a/src/nmcli/common.c
+++ b/src/nmcli/common.c
@@ -1295,7 +1295,7 @@ got_client(GObject *source_object, GAsyncResult *res, gpointer user_data)
     }
 
     g_strfreev(call->argv);
-    nm_g_slice_free(call);
+    nm_slice_free(call);
 }
 
 typedef struct {
@@ -1363,9 +1363,9 @@ read_offline_connection_chunk(GObject *source_object, GAsyncResult *res, gpointe
 
 finish:
     g_strfreev(call->argv);
-    nm_g_slice_free(call);
+    nm_slice_free(call);
     g_string_free(data->str, TRUE);
-    nm_g_slice_free(data);
+    nm_slice_free(data);
 }
 
 static void
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index bed8c29ff6..ae013471be 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -128,7 +128,7 @@ _add_connection_info_free(AddConnectionInfo *info)
     g_free(info->orig_id);
     g_free(info->orig_uuid);
     g_free(info->new_id);
-    nm_g_slice_free(info);
+    nm_slice_free(info);
 }
 
 NM_AUTO_DEFINE_FCN(AddConnectionInfo *,
diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index ed9d66a115..f1e4607862 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -2100,7 +2100,7 @@ add_and_activate_info_free(AddAndActivateInfo *info)
     g_object_unref(info->device);
     g_clear_object(&info->active);
     g_free(info->specific_object);
-    nm_g_slice_free(info);
+    nm_slice_free(info);
 }
 
 NM_AUTO_DEFINE_FCN0(AddAndActivateInfo *,
@@ -2488,7 +2488,7 @@ static void
 modify_info_free(ModifyInfo *info)
 {
     g_strfreev(info->argv);
-    nm_g_slice_free(info);
+    nm_slice_free(info);
 }
 
 NM_AUTO_DEFINE_FCN_VOID0(ModifyInfo *, _auto_free_modify_info, modify_info_free);
@@ -3176,7 +3176,7 @@ wifi_list_finish(WifiListData *wifi_list_data, gboolean force_finished)
     nm_clear_g_signal_handler(wifi_list_data->wifi, &wifi_list_data->last_scan_id);
     nm_clear_g_source(&wifi_list_data->timeout_id);
     nm_clear_g_cancellable(&wifi_list_data->scan_cancellable);
-    nm_g_slice_free(wifi_list_data);
+    nm_slice_free(wifi_list_data);
 
     if (--scan_info->pending > 0)
         return;
@@ -3202,7 +3202,7 @@ wifi_list_finish(WifiListData *wifi_list_data, gboolean force_finished)
     g_free(scan_info->devices);
     g_array_unref(scan_info->out_indices);
     g_free(scan_info->bssid_user);
-    nm_g_slice_free(scan_info);
+    nm_slice_free(scan_info);
 
     nmc->should_wait--;
     g_main_loop_quit(loop);