diff --git a/doc/obex-client-api.txt b/doc/obex-client-api.txt
index 63aff1a..c292323 100644
--- a/doc/obex-client-api.txt
+++ b/doc/obex-client-api.txt
@@ -4,56 +4,6 @@ OBEX client API description
 Copyright (C) 2007-2010  Marcel Holtmann <marcel@holtmann.org>
 Copyright (C) 2011-2012  BMW Car IT GmbH. All rights reserved.
 
-Object Push hierarchy
-=====================
-
-Service		org.bluez.obex
-Interface	org.bluez.obex.ObjectPush
-Object path	[variable prefix]/{session0,session1,...}
-
-Methods		object, dict SendFile(string sourcefile)
-
-			Send one local file to the remote device.
-
-			The returned path represents the newly created transfer,
-			which should be used to find out if the content has been
-			successfully transferred or if the operation fails.
-
-			The properties of this transfer are also returned along
-			with the object path, to avoid a call to GetProperties.
-
-		object, dict PullBusinessCard(string targetfile)
-
-			Request the business card from a remote device and
-			store it in the local file.
-
-			If an empty target file is given, a name will be
-			automatically calculated for the temporary file.
-
-			The returned path represents the newly created transfer,
-			which should be used to find out if the content has been
-			successfully transferred or if the operation fails.
-
-			The properties of this transfer are also returned along
-			with the object path, to avoid a call to GetProperties.
-
-		object, dict ExchangeBusinessCards(string clientfile,
-							string targetfile)
-
-			Push the client's business card to the remote device
-			and then retrieve the remote business card and store
-			it in a local file.
-
-			If an empty target file is given, a name will be
-			automatically calculated for the temporary file.
-
-			The returned path represents the newly created transfer,
-			which should be used to find out if the content has been
-			successfully transferred or if the operation fails.
-
-			The properties of this transfer are also returned along
-			with the object path, to avoid a call to GetProperties.
-
 File Transfer hierarchy
 =======================
 
diff --git a/doc/obexd-api.txt b/doc/obexd-api.txt
index 502d1ce..3cded1f 100644
--- a/doc/obexd-api.txt
+++ b/doc/obexd-api.txt
@@ -125,3 +125,53 @@ Properties	string Status [readonly]
 
 			Number of bytes transferred. For queued transfers, this
 			value will not be present.
+
+Object Push hierarchy
+=====================
+
+Service		org.bluez.obex
+Interface	org.bluez.obex.ObjectPush1
+Object path	/org/bluez/obex/session{0, 1, 2, ...}
+
+Methods		object, dict SendFile(string sourcefile)
+
+			Send one local file to the remote device.
+
+			The returned path represents the newly created transfer,
+			which should be used to find out if the content has been
+			successfully transferred or if the operation fails.
+
+			The properties of this transfer are also returned along
+			with the object path, to avoid a call to GetProperties.
+
+		object, dict PullBusinessCard(string targetfile)
+
+			Request the business card from a remote device and
+			store it in the local file.
+
+			If an empty target file is given, a name will be
+			automatically calculated for the temporary file.
+
+			The returned path represents the newly created transfer,
+			which should be used to find out if the content has been
+			successfully transferred or if the operation fails.
+
+			The properties of this transfer are also returned along
+			with the object path, to avoid a call to GetProperties.
+
+		object, dict ExchangeBusinessCards(string clientfile,
+							string targetfile)
+
+			Push the client's business card to the remote device
+			and then retrieve the remote business card and store
+			it in a local file.
+
+			If an empty target file is given, a name will be
+			automatically calculated for the temporary file.
+
+			The returned path represents the newly created transfer,
+			which should be used to find out if the content has been
+			successfully transferred or if the operation fails.
+
+			The properties of this transfer are also returned along
+			with the object path, to avoid a call to GetProperties.
diff --git a/obexd/client/opp.c b/obexd/client/opp.c
index 773092a..d6fd1c6 100644
--- a/obexd/client/opp.c
+++ b/obexd/client/opp.c
@@ -36,7 +36,7 @@
 #include "opp.h"
 
 #define OPP_UUID "00001105-0000-1000-8000-00805f9b34fb"
-#define OPP_INTERFACE "org.bluez.obex.ObjectPush"
+#define OPP_INTERFACE "org.bluez.obex.ObjectPush1"
 #define ERROR_INTERFACE "org.bluez.obex.Error"
 
 struct opp_data {