diff --git a/obexd/client/session.c b/obexd/client/session.c
index 8523a86..f8f8da4 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -970,7 +970,7 @@ guint obc_session_get(struct obc_session *session, const char *type,
 		return 0;
 	}
 
-	transfer = obc_transfer_get(targetfile, name, type, apparam,
+	transfer = obc_transfer_get(type, name, targetfile, apparam,
 							apparam_size, err);
 	if (transfer == NULL)
 		return 0;
@@ -989,7 +989,7 @@ guint obc_session_send(struct obc_session *session, const char *filename,
 		return 0;
 	}
 
-	transfer = obc_transfer_put(filename, name, NULL, NULL, 0, NULL, 0,
+	transfer = obc_transfer_put(NULL, name, filename, NULL, 0, NULL, 0,
 									err);
 	if (transfer == NULL)
 		return 0;
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index 2277a95..37963c8 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -339,9 +339,9 @@ done:
 	return TRUE;
 }
 
-struct obc_transfer *obc_transfer_get(const char *filename,
+struct obc_transfer *obc_transfer_get(const char *type,
 					const char *name,
-					const char *type,
+					const char *filename,
 					const void *params, size_t psize,
 					GError **err)
 {
@@ -360,9 +360,9 @@ struct obc_transfer *obc_transfer_get(const char *filename,
 	return transfer;
 }
 
-struct obc_transfer *obc_transfer_put(const char *filename,
+struct obc_transfer *obc_transfer_put(const char *type,
 					const char *name,
-					const char *type,
+					const char *filename,
 					const void *contents, size_t csize,
 					const void *params, size_t psize,
 					GError **err)
diff --git a/obexd/client/transfer.h b/obexd/client/transfer.h
index aebba7f..94bb800 100644
--- a/obexd/client/transfer.h
+++ b/obexd/client/transfer.h
@@ -27,14 +27,14 @@ typedef void (*transfer_callback_t) (struct obc_transfer *transfer,
 					gint64 transferred, GError *err,
 					void *user_data);
 
-struct obc_transfer *obc_transfer_get(const char *filename,
+struct obc_transfer *obc_transfer_get(const char *type,
 					const char *name,
-					const char *type,
+					const char *filename,
 					const void *params, size_t psize,
 					GError **err);
-struct obc_transfer *obc_transfer_put(const char *filename,
+struct obc_transfer *obc_transfer_put(const char *type,
 					const char *name,
-					const char *type,
+					const char *filename,
 					const void *contents, size_t csize,
 					const void *params, size_t psize,
 					GError **err);