diff --git a/src/Makefile.am b/src/Makefile.am
index f83205786..c1b9eed85 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -60,7 +60,7 @@ libNetworkManager_la_SOURCES = \
 	config/nm-config-device.c \
 	config/nm-config-device.h \
 	\
-	devices/nm-device-interface-glue.h \
+	devices/nm-device-glue.h \
 	devices/nm-device.c \
 	devices/nm-device.h \
 	devices/nm-device-adsl-glue.h \
@@ -317,17 +317,12 @@ if WITH_WEXT
 libNetworkManager_la_SOURCES += wifi/wifi-utils-wext.c wifi/wifi-utils-wext.h
 endif
 
-# dbus-glib glue. We define nm-device-interface-glue.h specially, because its
-# name doesn't match the general pattern.
-devices/nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml
-	$(AM_V_GEN) dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $<
-
 define glue_rule
 $(1): $$(top_srcdir)/introspection/$(notdir $(subst -glue.h,,$(1))).xml
 	$$(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(notdir $(subst -glue.h,,$(1)))) --mode=glib-server --output=$$@ $$<
 endef
 
-$(foreach f,$(filter-out devices/nm-device-interface-glue.h,$(filter %-glue.h,$(libNetworkManager_la_SOURCES))),$(eval $(call glue_rule,$(f))))
+$(foreach f,$(filter %-glue.h,$(libNetworkManager_la_SOURCES)),$(eval $(call glue_rule,$(f))))
 
 
 GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 38de7e02f..02c44474a 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -71,7 +71,7 @@
 
 static void impl_device_disconnect (NMDevice *device, DBusGMethodInvocation *context);
 
-#include "nm-device-interface-glue.h"
+#include "nm-device-glue.h"
 
 #define PENDING_IP4_CONFIG "pending-ip4-config"
 #define PENDING_IP6_CONFIG "pending-ip6-config"
@@ -5145,7 +5145,7 @@ nm_device_class_init (NMDeviceClass *klass)
 		              G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_OBJECT);
 
 	dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
-	                                 &dbus_glib_nm_device_interface_object_info);
+	                                 &dbus_glib_nm_device_object_info);
 
 	dbus_g_error_domain_register (NM_DEVICE_ERROR, NULL, NM_TYPE_DEVICE_ERROR);
 }