diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index 168301ba02..37eae35bdc 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -138,7 +138,7 @@ constructor (GType type,
 	                                                                       n_construct_params,
 	                                                                       construct_params);
 
-	nm_device_set_initial_unmanaged_flag (NM_DEVICE (object), NM_UNMANAGED_DEFAULT, TRUE);
+	nm_device_set_unmanaged_initial (NM_DEVICE (object), NM_UNMANAGED_DEFAULT, TRUE);
 
 	return object;
 }
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 8c68bca544..7e6964e69d 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1118,7 +1118,7 @@ nm_device_finish_init (NMDevice *self)
 	if (   NM_DEVICE_GET_CLASS (self)->can_unmanaged_external_down (self)
 	    && !nm_platform_link_is_up (NM_PLATFORM_GET, priv->ifindex)
 	    && priv->ifindex > 0)
-		nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_EXTERNAL_DOWN, TRUE);
+		nm_device_set_unmanaged_initial (self, NM_UNMANAGED_EXTERNAL_DOWN, TRUE);
 
 	if (priv->master)
 		nm_device_enslave_slave (priv->master, self, NULL);
@@ -1128,19 +1128,19 @@ nm_device_finish_init (NMDevice *self)
 			/* Unmanaged the loopback device with an explicit NM_UNMANAGED_LOOPBACK flag.
 			 * Later we might want to manage 'lo' too. Currently that doesn't work because
 			 * NetworkManager might down the interface or remove the 127.0.0.1 address. */
-			nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_LOOPBACK, TRUE);
+			nm_device_set_unmanaged_initial (self, NM_UNMANAGED_LOOPBACK, TRUE);
 		} else if (priv->platform_link_initialized || (priv->is_nm_owned && nm_device_is_software (self))) {
 			gboolean platform_unmanaged = FALSE;
 
 			if (nm_platform_link_get_unmanaged (NM_PLATFORM_GET, priv->ifindex, &platform_unmanaged))
-				nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_DEFAULT, platform_unmanaged);
+				nm_device_set_unmanaged_initial (self, NM_UNMANAGED_DEFAULT, platform_unmanaged);
 		} else {
 			/* Hardware and externally-created software links stay unmanaged
 			 * until they are fully initialized by the platform. NM created
 			 * links must be available for activation immediately and thus
 			 * do not get the PLATFORM_INIT unmanaged flag set.
 			 */
-			nm_device_set_initial_unmanaged_flag (self, NM_UNMANAGED_PLATFORM_INIT, TRUE);
+			nm_device_set_unmanaged_initial (self, NM_UNMANAGED_PLATFORM_INIT, TRUE);
 		}
 	}
 
@@ -7797,7 +7797,7 @@ nm_device_set_unmanaged_quitting (NMDevice *self)
 }
 
 /**
- * nm_device_set_initial_unmanaged_flag():
+ * nm_device_set_unmanaged_initial():
  * @self: the #NMDevice
  * @flag: an #NMUnmanagedFlag
  * @unmanaged: %TRUE or %FALSE to set or clear @flag
@@ -7807,9 +7807,9 @@ nm_device_set_unmanaged_quitting (NMDevice *self)
  * Should only be used when initializing a device.
  */
 void
-nm_device_set_initial_unmanaged_flag (NMDevice *self,
-                                      NMUnmanagedFlags flag,
-                                      gboolean unmanaged)
+nm_device_set_unmanaged_initial (NMDevice *self,
+                                 NMUnmanagedFlags flag,
+                                 gboolean unmanaged)
 {
 	NMDevicePrivate *priv;
 
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index 50ac8b0d38..9867d6b593 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -438,9 +438,9 @@ void nm_device_set_unmanaged (NMDevice *device,
                               NMDeviceStateReason reason);
 void nm_device_set_unmanaged_by_device_spec (NMDevice *self, const GSList *unmanaged_specs);
 void nm_device_set_unmanaged_quitting (NMDevice *device);
-void nm_device_set_initial_unmanaged_flag (NMDevice *device,
-                                           NMUnmanagedFlags flag,
-                                           gboolean unmanaged);
+void nm_device_set_unmanaged_initial (NMDevice *device,
+                                      NMUnmanagedFlags flag,
+                                      gboolean unmanaged);
 
 gboolean nm_device_get_is_nm_owned (NMDevice *device);
 void     nm_device_set_nm_owned    (NMDevice *device);
diff --git a/src/nm-manager.c b/src/nm-manager.c
index be5090a8c0..de43c4ed88 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1769,10 +1769,10 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume)
 
 	unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
 	user_unmanaged = nm_device_spec_match_list (device, unmanaged_specs);
-	nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_USER, user_unmanaged);
+	nm_device_set_unmanaged_initial (device, NM_UNMANAGED_USER, user_unmanaged);
 
 	sleeping = manager_sleeping (self);
-	nm_device_set_initial_unmanaged_flag (device, NM_UNMANAGED_INTERNAL, sleeping);
+	nm_device_set_unmanaged_initial (device, NM_UNMANAGED_INTERNAL, sleeping);
 
 	dbus_path = nm_exported_object_export (NM_EXPORTED_OBJECT (device));
 	nm_log_dbg (LOGD_DEVICE, "(%s): exported as %s", nm_device_get_iface (device), dbus_path);