diff --git a/test/exchange-business-cards b/test/exchange-business-cards
index aace07b..9271fdf 100755
--- a/test/exchange-business-cards
+++ b/test/exchange-business-cards
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 bus = dbus.SessionBus()
-client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 					"org.bluez.obex.Client")
 
 if (len(sys.argv) < 4):
@@ -13,7 +13,7 @@ if (len(sys.argv) < 4):
 
 print "Creating Session"
 path = client.CreateSession(sys.argv[1], { "Target": "OPP" })
-opp = dbus.Interface(bus.get_object("org.bluez.obex.client", path),
+opp = dbus.Interface(bus.get_object("org.bluez.obex", path),
 					"org.bluez.obex.ObjectPush")
 
 opp.ExchangeBusinessCards(sys.argv[2], sys.argv[3])
diff --git a/test/ftp-client b/test/ftp-client
index 064a81a..e1a051b 100755
--- a/test/ftp-client
+++ b/test/ftp-client
@@ -40,7 +40,7 @@ class FtpClient:
 		self.transfer_size = 0
 		self.verbose = verbose
 		bus = dbus.SessionBus()
-		obj = bus.get_object("org.bluez.obex.client", session_path)
+		obj = bus.get_object("org.bluez.obex", session_path)
 		self.session = dbus.Interface(obj, "org.bluez.obex.Session")
 		self.ftp = dbus.Interface(obj, "org.bluez.obex.FileTransfer")
 		bus.add_signal_receiver(self.transfer_complete,
@@ -151,7 +151,7 @@ if  __name__ == '__main__':
 	bus = dbus.SessionBus()
 	mainloop = gobject.MainLoop()
 
-	client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+	client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 				"org.bluez.obex.Client")
 
 	print "Creating Session"
diff --git a/test/get-obex-capabilities b/test/get-obex-capabilities
index a06f2eb..3fdf8e8 100755
--- a/test/get-obex-capabilities
+++ b/test/get-obex-capabilities
@@ -4,7 +4,7 @@ import sys
 import dbus
 
 bus = dbus.SessionBus()
-client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 					"org.bluez.obex.Client")
 
 if (len(sys.argv) < 3):
@@ -13,7 +13,7 @@ if (len(sys.argv) < 3):
 
 print "Creating Session"
 session_path = client.CreateSession(sys.argv[1], { "Target": sys.argv[2] })
-session = dbus.Interface(bus.get_object("org.bluez.obex.client", session_path),
+session = dbus.Interface(bus.get_object("org.bluez.obex", session_path),
 					"org.bluez.obex.Session")
 
 print session.GetCapabilities()
diff --git a/test/list-folders b/test/list-folders
index ecd456c..2203feb 100755
--- a/test/list-folders
+++ b/test/list-folders
@@ -6,12 +6,12 @@ import dbus
 
 def list_folder(folder):
 	bus = dbus.SessionBus()
-	client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+	client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 				"org.bluez.obex.Client")
 
 	path = client.CreateSession(sys.argv[1], { "Target": "ftp" })
 
-	ftp = dbus.Interface(bus.get_object("org.bluez.obex.client", path),
+	ftp = dbus.Interface(bus.get_object("org.bluez.obex", path),
 				"org.bluez.obex.FileTransfer")
 
 	if folder:
diff --git a/test/map-client b/test/map-client
index 39dd79f..9a9dff2 100755
--- a/test/map-client
+++ b/test/map-client
@@ -67,7 +67,7 @@ class MapClient:
 		self.verbose = verbose
 		self.path = session_path
 		bus = dbus.SessionBus()
-		obj = bus.get_object("org.bluez.obex.client", session_path)
+		obj = bus.get_object("org.bluez.obex", session_path)
 		self.session = dbus.Interface(obj, "org.bluez.obex.Session")
 		self.map = dbus.Interface(obj, "org.bluez.obex.MessageAccess")
 		bus.add_signal_receiver(self.transfer_complete,
@@ -127,7 +127,7 @@ class MapClient:
 	def get_message(self, handle):
 		self.map.ListMessages("", dict())
 		path = self.path + "/message" + handle
-		obj = bus.get_object("org.bluez.obex.client", path)
+		obj = bus.get_object("org.bluez.obex", path)
 		msg = dbus.Interface(obj, "org.bluez.obex.Message")
 		msg.Get("", True, reply_handler=self.create_transfer_reply,
 						error_handler=self.error)
@@ -135,7 +135,7 @@ class MapClient:
 	def get_message_properties(self, handle):
 		self.map.ListMessages("", dict())
 		path = self.path + "/message" + handle
-		obj = bus.get_object("org.bluez.obex.client", path)
+		obj = bus.get_object("org.bluez.obex", path)
 		msg = dbus.Interface(obj, "org.freedesktop.DBus.Properties")
 		ret = msg.GetAll("org.bluez.obex.Message")
 		print pformat(unwrap(ret))
@@ -143,7 +143,7 @@ class MapClient:
 	def set_message_property(self, handle, prop, flag):
 		self.map.ListMessages("", dict())
 		path = self.path + "/message" + handle
-		obj = bus.get_object("org.bluez.obex.client", path)
+		obj = bus.get_object("org.bluez.obex", path)
 		msg = dbus.Interface(obj, "org.bluez.obex.Message")
 		msg.SetProperty (prop, flag);
 
@@ -166,7 +166,7 @@ if  __name__ == '__main__':
 	bus = dbus.SessionBus()
 	mainloop = gobject.MainLoop()
 
-	client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+	client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 				"org.bluez.obex.Client")
 
 	print "Creating Session"
diff --git a/test/opp-client b/test/opp-client
index 3d23dfb..cb0a683 100755
--- a/test/opp-client
+++ b/test/opp-client
@@ -25,7 +25,7 @@ class OppClient:
 		self.transfer_path = None
 		self.verbose = verbose
 		bus = dbus.SessionBus()
-		obj = bus.get_object("org.bluez.obex.client", session_path)
+		obj = bus.get_object("org.bluez.obex", session_path)
 		self.session = dbus.Interface(obj, "org.bluez.obex.Session")
 		self.opp = dbus.Interface(obj, "org.bluez.obex.ObjectPush")
 		bus.add_signal_receiver(self.transfer_complete,
@@ -104,7 +104,7 @@ if  __name__ == '__main__':
 	bus = dbus.SessionBus()
 	mainloop = gobject.MainLoop()
 
-	client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+	client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 				"org.bluez.obex.Client")
 
 	print "Creating Session"
diff --git a/test/pbap-client b/test/pbap-client
index 7be8bad..ac7b28b 100755
--- a/test/pbap-client
+++ b/test/pbap-client
@@ -20,7 +20,7 @@ class PbapClient:
 		self.props = dict()
 		self.flush_func = None
 		bus = dbus.SessionBus()
-		obj = bus.get_object("org.bluez.obex.client", session_path)
+		obj = bus.get_object("org.bluez.obex", session_path)
 		self.session = dbus.Interface(obj, "org.bluez.obex.Session")
 		self.pbap = dbus.Interface(obj,
 					"org.bluez.obex.PhonebookAccess")
@@ -98,7 +98,7 @@ if  __name__ == '__main__':
 	bus = dbus.SessionBus()
 	mainloop = gobject.MainLoop()
 
-	client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+	client = dbus.Interface(bus.get_object("org.bluez.obex", "/"),
 				"org.bluez.obex.Client")
 
 	if (len(sys.argv) < 2):