Index: xfconf/Makefile.am
===================================================================
--- xfconf/Makefile.am	(revision 27429)
+++ xfconf/Makefile.am	(working copy)
@@ -49,9 +49,7 @@
 	xfconf-dbus-bindings.h
 
 xfconf-dbus-bindings.h: $(top_srcdir)/common/xfconf-dbus.xml Makefile
-	dbus-binding-tool --mode=glib-client --prefix=xfconf_client $< \
-	    | sed -e 's/org_xfce_Xfconf_/xfconf_client_/g;' \
-	          -e 's/_GUI_/_gui_/g;' > $@
+	dbus-binding-tool --mode=glib-client $< > $@
 
 if HAVE_GNUC_VISIBILITY
 TESTS = abicheck.sh
Index: common/xfconf-dbus.xml
===================================================================
--- common/xfconf-dbus.xml	(revision 27429)
+++ common/xfconf-dbus.xml	(working copy)
@@ -2,7 +2,10 @@
 
 <node name="/org/xfce/Xfconf">
     <interface name="org.xfce.Xfconf">
-        <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="xfconf"/>
+        <annotation name="org.freedesktop.DBus.GLib.CSymbol"
+                    value="xfconf"/>
+        <annotation name="org.freedesktop.DBus.GLib.ClientCSymbol"
+                    value="xfconf_client"/>
     
         <!--
              void org.xfce.Xfconf.SetProperty(String channel,
@@ -142,6 +145,8 @@
     <interface name="org.xfce.Xfconf.GUI">
         <annotation name="org.freedesktop.DBus.GLib.CSymbol"
                     value="xfconf_gui"/>
+        <annotation name="org.freedesktop.DBus.GLib.ClientCSymbol"
+                    value="xfconf_client_gui"/>
         
         <!--
              void org.xfce.Xfconf.GUI.ShowList(String display)