diff --git a/jack/internal.h b/jack/internal.h
index 6e3b2b7..7af53f1 100644
--- a/jack/internal.h
+++ b/jack/internal.h
@@ -427,7 +427,7 @@ struct _jack_request {
 	    jack_client_id_t client_id;
 	    char key[JACK_CLIENT_NAME_SIZE];
 	    char val[JACK_PORT_NAME_SIZE];
-	} POST_PACKED_STRUCTURE identifier;
+	} POST_PACKED_STRUCTURE metadata;
 	struct {
 	    char oldname[JACK_CLIENT_NAME_SIZE];
 	    char newname[JACK_CLIENT_NAME_SIZE];
@@ -459,7 +459,7 @@ struct _jack_request {
 typedef struct {
     char id_key[JACK_CLIENT_NAME_SIZE];
     char value[JACK_PORT_NAME_SIZE];
-} jack_identifier_t;
+} jack_metadata_t;
 
 typedef struct _jack_client_internal {
 
@@ -490,7 +490,7 @@ typedef struct _jack_client_internal {
     int portnum;
 #endif /* JACK_USE_MACH_THREADS */
    
-    JSList *identifiers;   /* listof identifiers */
+    JSList *metadatalist;   /* listof identifiers */
     jack_client_t *private_client;
 } jack_client_internal_t;
 
diff --git a/jackd/engine.c b/jackd/engine.c
index fa7aceb..efc7e7f 100644
--- a/jackd/engine.c
+++ b/jackd/engine.c
@@ -2499,11 +2499,11 @@ static void jack_do_get_id_by_uuid ( jack_engine_t *engine, jack_request_t *req)
 	req->status = -1;
 	for (node = engine->clients; node; node = jack_slist_next (node)) {
 		jack_client_internal_t* client = (jack_client_internal_t*) node->data;
-		if( client->control->uid == req->x.identifier.client_id ) {
-			for( node2=client->identifiers; node2; node2 = jack_slist_next (node2) ) {
-				jack_identifier_t *id = (jack_identifier_t *) node2->data;
-				if( !strcmp( req->x.identifier.key, id->id_key ) ) {
-					snprintf( req->x.identifier.val, sizeof(req->x.identifier.val),
+		if( client->control->uid == req->x.metadata.client_id ) {
+			for( node2=client->metadatalist; node2; node2 = jack_slist_next (node2) ) {
+				jack_metadata_t *id = (jack_metadata_t *) node2->data;
+				if( !strcmp( req->x.metadata.key, id->id_key ) ) {
+					snprintf( req->x.metadata.val, sizeof(req->x.metadata.val),
 						       	"%s", id->value );
 					req->status = 0;
 					return;
@@ -2521,13 +2521,13 @@ static void jack_do_set_id ( jack_engine_t *engine, jack_request_t *req)
 	req->status = -1;
 	for (node = engine->clients; node; node = jack_slist_next (node)) {
 		jack_client_internal_t* client = (jack_client_internal_t*) node->data;
-		if( client->control->id == req->x.identifier.client_id ) {
-			jack_identifier_t *new_id;
-			for( node2=client->identifiers; node2; node2 = jack_slist_next (node2) ) {
-				jack_identifier_t *id = (jack_identifier_t *) node2->data;
-				if( !strcmp( req->x.identifier.key, id->id_key ) ) {
+		if( client->control->id == req->x.metadata.client_id ) {
+			jack_metadata_t *new_id;
+			for( node2=client->metadatalist; node2; node2 = jack_slist_next (node2) ) {
+				jack_metadata_t *id = (jack_metadata_t *) node2->data;
+				if( !strcmp( req->x.metadata.key, id->id_key ) ) {
 					snprintf( id->value, sizeof(id->value),
-						       	"%s", req->x.identifier.val );
+						       	"%s", req->x.metadata.val );
 					req->status = 0;
 					return;
 				}
@@ -2535,16 +2535,16 @@ static void jack_do_set_id ( jack_engine_t *engine, jack_request_t *req)
 
 			}
 			/* client doesnt have key set. create it... */
-			new_id = (jack_identifier_t *) malloc( sizeof(jack_identifier_t) );
+			new_id = (jack_metadata_t *) malloc( sizeof(jack_metadata_t) );
 			if( new_id == NULL )
 				return;
 
 			snprintf( new_id->id_key, sizeof(new_id->id_key),
-					"%s", req->x.identifier.key );
+					"%s", req->x.metadata.key );
 			snprintf( new_id->value, sizeof(new_id->value),
-					"%s", req->x.identifier.val );
+					"%s", req->x.metadata.val );
 
-			client->identifiers = jack_slist_append( client->identifiers, new_id );
+			client->metadatalist = jack_slist_append( client->metadatalist, new_id );
 			req->status = 0;
 			return;
 		}
diff --git a/libjack/client.c b/libjack/client.c
index 49b081a..fbdbd66 100644
--- a/libjack/client.c
+++ b/libjack/client.c
@@ -2557,9 +2557,9 @@ int jack_client_set_cookie( jack_client_t *client, const char *key, const char *
 	jack_request_t request;
 
 	request.type = SetIdentifier;
-	request.x.identifier.client_id = client->control->id;
-	snprintf( request.x.identifier.key, sizeof(request.x.identifier.key), "%s", key );
-	snprintf( request.x.identifier.val, sizeof(request.x.identifier.val), "%s", value );
+	request.x.metadata.client_id = client->control->id;
+	snprintf( request.x.metadata.key, sizeof(request.x.metadata.key), "%s", key );
+	snprintf( request.x.metadata.val, sizeof(request.x.metadata.val), "%s", value );
 
 	return jack_client_deliver_request( client, &request );
 }
@@ -2571,13 +2571,13 @@ jack_get_cookie_by_uuid( jack_client_t *client, const char *uuid, const char *ke
 
 	jack_client_id_t uuid_int = atoi( uuid );
 	request.type = GetIdentifier;
-	request.x.identifier.client_id = uuid_int;
-	snprintf( request.x.identifier.key, sizeof(request.x.identifier.key), "%s", key );
+	request.x.metadata.client_id = uuid_int;
+	snprintf( request.x.metadata.key, sizeof(request.x.metadata.key), "%s", key );
 
 	if( jack_client_deliver_request( client, &request ) )
 		return NULL;
 
-	return strdup( request.x.identifier.val ); 
+	return strdup( request.x.metadata.val ); 
 }
 
 char *