diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index a0e5e75..49d19b9 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -990,7 +990,7 @@ gint obex_session_start(gint fd, struct server *server)
 	}
 
 	OBEX_SetUserData(obex, os);
-	os->handle = obex;
+	os->obex = obex;
 
 	OBEX_SetTransportMTU(obex, os->rx_mtu, os->tx_mtu);
 
diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index 188e0a8..9856e3c 100644
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -81,7 +81,7 @@ struct obex_session {
 	struct obex_commands *cmds;
 	struct server *server;
 	gboolean	checked;
-	obex_t		*handle;
+	obex_t		*obex;
 	struct phonebook_context *pbctx;
 	gboolean	finished;
 };
diff --git a/obexd/src/phonebook.c b/obexd/src/phonebook.c
index 4b760b2..1b7d723 100644
--- a/obexd/src/phonebook.c
+++ b/obexd/src/phonebook.c
@@ -123,7 +123,7 @@ void phonebook_return(struct phonebook_context *context,
 
 	if (buf == NULL || size == 0) {
 		session->finished = 1;
-		OBEX_ResumeRequest(session->handle);
+		OBEX_ResumeRequest(session->obex);
 		return;
 	}
 
@@ -131,7 +131,7 @@ void phonebook_return(struct phonebook_context *context,
 	memcpy(session->buf + session->size, buf, size);
 	session->size += size;
 
-	OBEX_ResumeRequest(session->handle);
+	OBEX_ResumeRequest(session->obex);
 }
 
 struct phonebook_driver *phonebook_get_driver(const char *name)