diff --git a/libfwupdplugin/fu-device.c b/libfwupdplugin/fu-device.c
index 40f5087a3..cf02d27f1 100644
--- a/libfwupdplugin/fu-device.c
+++ b/libfwupdplugin/fu-device.c
@@ -650,7 +650,8 @@ fu_device_set_parent (FuDevice *self, FuDevice *parent)
 	priv->parent = parent;
 
 	/* this is what goes over D-Bus */
-	fu_device_set_parent_id (self, parent != NULL ? fu_device_get_id (parent) : NULL);
+	fwupd_device_set_parent_id (FWUPD_DEVICE (self),
+				    parent != NULL ? fu_device_get_id (parent) : NULL);
 }
 
 /**
diff --git a/libfwupdplugin/fu-device.h b/libfwupdplugin/fu-device.h
index c9a2e8cbc..dc8665b31 100644
--- a/libfwupdplugin/fu-device.h
+++ b/libfwupdplugin/fu-device.h
@@ -117,7 +117,6 @@ FuDevice	*fu_device_new				(void);
 #define fu_device_set_description(d,v)		fwupd_device_set_description(FWUPD_DEVICE(d),v)
 #define fu_device_set_flags(d,v)		fwupd_device_set_flags(FWUPD_DEVICE(d),v)
 #define fu_device_set_modified(d,v)		fwupd_device_set_modified(FWUPD_DEVICE(d),v)
-#define fu_device_set_parent_id(d,v)		fwupd_device_set_parent_id(FWUPD_DEVICE(d),v)
 #define fu_device_set_plugin(d,v)		fwupd_device_set_plugin(FWUPD_DEVICE(d),v)
 #define fu_device_set_serial(d,v)		fwupd_device_set_serial(FWUPD_DEVICE(d),v)
 #define fu_device_set_summary(d,v)		fwupd_device_set_summary(FWUPD_DEVICE(d),v)
@@ -143,7 +142,6 @@ FuDevice	*fu_device_new				(void);
 #define fu_device_get_serial(d)			fwupd_device_get_serial(FWUPD_DEVICE(d))
 #define fu_device_get_summary(d)		fwupd_device_get_summary(FWUPD_DEVICE(d))
 #define fu_device_get_id(d)			fwupd_device_get_id(FWUPD_DEVICE(d))
-#define fu_device_get_parent_id(d)		fwupd_device_get_parent_id(FWUPD_DEVICE(d))
 #define fu_device_get_plugin(d)			fwupd_device_get_plugin(FWUPD_DEVICE(d))
 #define fu_device_get_update_error(d)		fwupd_device_get_update_error(FWUPD_DEVICE(d))
 #define fu_device_get_update_state(d)		fwupd_device_get_update_state(FWUPD_DEVICE(d))
diff --git a/src/fu-engine.c b/src/fu-engine.c
index 71ab442a1..6415d49a8 100644
--- a/src/fu-engine.c
+++ b/src/fu-engine.c
@@ -4369,7 +4369,7 @@ fu_engine_adopt_children (FuEngine *self, FuDevice *device)
 					 fu_device_get_id (device),
 					 fu_device_get_name (device_tmp),
 					 fu_device_get_id (device_tmp));
-				fu_device_set_parent_id (device, fu_device_get_id (device_tmp));
+				fu_device_add_child (device_tmp, device);
 				break;
 			}
 		}
@@ -4389,7 +4389,7 @@ fu_engine_adopt_children (FuEngine *self, FuDevice *device)
 					 fu_device_get_id (device_tmp),
 					 fu_device_get_name (device),
 					 fu_device_get_id (device));
-				fu_device_set_parent_id (device_tmp, fu_device_get_id (device));
+				fu_device_add_child (device, device_tmp);
 			}
 		}
 	}
diff --git a/src/fu-self-test.c b/src/fu-self-test.c
index 54900d5fa..40decb5cf 100644
--- a/src/fu-self-test.c
+++ b/src/fu-self-test.c
@@ -956,8 +956,9 @@ fu_engine_device_parent_func (gconstpointer user_data)
 
 	/* verify both children were adopted */
 	g_assert (fu_device_get_parent (device3) == device2);
+	g_assert (fu_device_get_parent (device1) == device2);
 	g_assert_cmpstr (fu_device_get_vendor (device3), ==, "oem");
-	g_assert_cmpstr (fu_device_get_parent_id (device1), ==, fu_device_get_id (device2));
+	g_assert_cmpstr (fu_device_get_vendor (device1), ==, "oem");
 
 	/* verify order */
 	g_assert_cmpint (fu_device_get_order (device1), ==, 0);
@@ -2737,11 +2738,11 @@ fu_plugin_composite_func (gconstpointer user_data)
 		} else if (g_strcmp0 (fu_device_get_id (device),
 					"c0a0a4aa6480ac28eea1ce164fbb466ca934e1ff") == 0) {
 			g_assert_cmpstr (fu_device_get_version (device), ==, "1");
-			g_assert_nonnull (fu_device_get_parent_id (device));
+			g_assert_nonnull (fu_device_get_parent (device));
 		} else if (g_strcmp0 (fu_device_get_id (device),
 					"bf455e9f371d2608d1cb67660fd2b335d3f6ef73") == 0) {
 			g_assert_cmpstr (fu_device_get_version (device), ==, "10");
-			g_assert_nonnull (fu_device_get_parent_id (device));
+			g_assert_nonnull (fu_device_get_parent (device));
 		}
 	}