diff --git a/obexd/src/mimetype.h b/obexd/src/mimetype.h
index 248b1b4..fc1fcb8 100644
--- a/obexd/src/mimetype.h
+++ b/obexd/src/mimetype.h
@@ -27,9 +27,9 @@ typedef gboolean (*obex_object_io_func) (gpointer object, int flags, int err,
 struct obex_mime_type_driver {
 	const guint8 *target;
 	const char *mimetype;
-	gpointer context;
+	gpointer driver_data;
 	gpointer (*open) (const char *name, int oflag, mode_t mode,
-			gpointer context, size_t *size, int *err);
+			gpointer driver_data, size_t *size, int *err);
 	int (*close) (gpointer object);
 	ssize_t (*read) (gpointer object, void *buf, size_t count);
 	ssize_t (*write) (gpointer object, const void *buf, size_t count);
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 32d9d22..dee732a 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -454,19 +454,19 @@ static void cmd_setpath(struct obex_session *os,
 }
 
 int obex_stream_start(struct obex_session *os,
-		const gchar *filename, gpointer context)
+		const gchar *filename, gpointer driver_data)
 {
 	gint err;
 	gpointer object;
 	size_t size;
 
-	object = os->driver->open(filename, O_RDONLY, 0, context, &size, &err);
+	object = os->driver->open(filename, O_RDONLY, 0, driver_data, &size, &err);
 	if (object == NULL) {
 		error("open(%s): %s (%d)", filename, strerror(-err), -err);
 		goto fail;
 	}
 
-	os->driver->context = context;
+	os->driver->driver_data = driver_data;
 	os->object = object;
 	os->offset = 0;
 	os->size = size;
@@ -545,7 +545,7 @@ gint obex_prepare_put(struct obex_session *os, const gchar *filename)
 	int err;
 
 	os->object = os->driver->open(filename, O_WRONLY | O_CREAT | O_TRUNC,
-					0600, os->driver->context,
+					0600, os->driver->driver_data,
 					os->size != OBJECT_SIZE_UNKNOWN ?
 					(size_t *) &os->size : NULL, &err);
 	if (os->object == NULL) {