diff --git a/gio/.gitignore b/gio/.gitignore
index 235f0398d..e88411eff 100644
--- a/gio/.gitignore
+++ b/gio/.gitignore
@@ -1,9 +1,9 @@
 gapplication
 gconstructor_as_data.h
 gdbus
-gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml
-gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml
-gdbus-example-objectmanager-generated.[ch]
+objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml
+objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml
+objectmanager-gen.[ch]
 gdbus-daemon-generated.[ch]
 gio
 gio_probes.h
diff --git a/gio/tests/gdbus-example-objectmanager-client.c b/gio/tests/gdbus-example-objectmanager-client.c
index b235ca140..af69c026e 100644
--- a/gio/tests/gdbus-example-objectmanager-client.c
+++ b/gio/tests/gdbus-example-objectmanager-client.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
diff --git a/gio/tests/gdbus-example-objectmanager-server.c b/gio/tests/gdbus-example-objectmanager-server.c
index 2a7bf63b6..c460e66e9 100644
--- a/gio/tests/gdbus-example-objectmanager-server.c
+++ b/gio/tests/gdbus-example-objectmanager-server.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am
index 1d0464c5c..735fddcc6 100644
--- a/gio/tests/gdbus-object-manager-example/Makefile.am
+++ b/gio/tests/gdbus-object-manager-example/Makefile.am
@@ -5,10 +5,10 @@ AM_CPPFLAGS = -g $(gio_INCLUDES) $(GLIB_DEBUG_FLAGS) -I$(top_builddir)/gio -I$(t
 # ------------------------------------------------------------------------
 
 GDBUS_GENERATED = \
-	gdbus-example-objectmanager-generated.h							\
-	gdbus-example-objectmanager-generated.c							\
-	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml    \
-	gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
+	objectmanager-gen.h							\
+	objectmanager-gen.c							\
+	objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml    \
+	objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml	\
 	$(NULL)
 
 $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen
@@ -18,8 +18,8 @@ $(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gi
 		--interface-prefix org.gtk.GDBus.Example.ObjectManager. \
 		--c-namespace Example \
 		--c-generate-object-manager \
-		--generate-c-code gdbus-example-objectmanager-generated \
-		--generate-docbook gdbus-example-objectmanager-generated \
+		--generate-c-code objectmanager-gen \
+		--generate-docbook objectmanager-gen \
 		$< \
 		$(NULL)
 
@@ -32,8 +32,8 @@ noinst_LTLIBRARIES += libgdbus-example-objectmanager.la
 endif
 
 nodist_libgdbus_example_objectmanager_la_SOURCES = \
-	gdbus-example-objectmanager-generated.h		\
-	gdbus-example-objectmanager-generated.c
+	objectmanager-gen.h		\
+	objectmanager-gen.c
 
 libgdbus_example_objectmanager_la_LIBADD = \
 	$(top_builddir)/glib/libglib-2.0.la		\
@@ -46,4 +46,4 @@ EXTRA_DIST += gdbus-example-objectmanager.xml
 
 CLEANFILES += $(GDBUS_GENERATED)
 
-check-TESTS:
\ No newline at end of file
+check-TESTS:
diff --git a/gio/tests/gdbus-object-manager-example/meson.build b/gio/tests/gdbus-object-manager-example/meson.build
index 6b27576e8..8acc0bbcd 100644
--- a/gio/tests/gdbus-object-manager-example/meson.build
+++ b/gio/tests/gdbus-object-manager-example/meson.build
@@ -1,17 +1,17 @@
 # FIXME: set UNINSTALLED_GLIB_{SRC|BUILD}DIR=top_{src|build}dir ?
-gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanager-generated',
+gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
   input  : ['gdbus-example-objectmanager.xml'],
-  output : ['gdbus-example-objectmanager-generated.h',
-            'gdbus-example-objectmanager-generated.c',
-            'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
-            'gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
+  output : ['objectmanager-gen.h',
+            'objectmanager-gen.c',
+            'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
+            'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
   command : [python, gdbus_codegen,
              '--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
              '--c-namespace', 'Example',
              '--c-generate-object-manager',
              '--output-directory', '@OUTDIR@',
-             '--generate-c-code', 'gdbus-example-objectmanager-generated',
-             '--generate-docbook', 'gdbus-example-objectmanager-generated',
+             '--generate-c-code', 'objectmanager-gen',
+             '--generate-docbook', 'objectmanager-gen',
              '@INPUT@'])
 
 libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index 7f35baae6..c21b9e9f2 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -45,7 +45,7 @@
 
 #include "gdbus-tests.h"
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/objectmanager-gen.h"
 
 #ifdef G_OS_UNIX
 static gboolean is_unix = TRUE;
diff --git a/gio/tests/gdbus-test-fixture.c b/gio/tests/gdbus-test-fixture.c
index 1e0a3223c..f8b9b93b6 100644
--- a/gio/tests/gdbus-test-fixture.c
+++ b/gio/tests/gdbus-test-fixture.c
@@ -1,5 +1,5 @@
 
-#include "gdbus-object-manager-example/gdbus-example-objectmanager-generated.h"
+#include "gdbus-object-manager-example/objectmanager-gen.h"
 
 /* ---------------------------------------------------------------------------------------------------- */