diff --git a/pipewire-pulseaudio/src/context.c b/pipewire-pulseaudio/src/context.c
index 22ef86003..2bcef4656 100644
--- a/pipewire-pulseaudio/src/context.c
+++ b/pipewire-pulseaudio/src/context.c
@@ -527,8 +527,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
 	g->pending_seq = pw_proxy_sync(g->proxy, 0);
 }
 
-static const struct pw_client_proxy_events client_events = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events client_events = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = client_event_info,
 };
 
@@ -688,7 +688,7 @@ static int set_mask(pa_context *c, struct global *g)
 		g->mask = PA_SUBSCRIPTION_MASK_CLIENT;
 		g->event = PA_SUBSCRIPTION_EVENT_CLIENT;
 		events = &client_events;
-                client_version = PW_VERSION_CLIENT_PROXY;
+                client_version = PW_VERSION_CLIENT;
                 destroy = client_destroy;
 		break;
 
@@ -1196,10 +1196,10 @@ pa_operation* pa_context_set_name(pa_context *c, const char *name, pa_context_su
 	changed = pw_properties_update(c->props, &dict);
 
 	if (changed) {
-		struct pw_client_proxy *client_proxy;
+		struct pw_client *client;
 
-		client_proxy = pw_core_get_client_proxy(c->core);
-		pw_client_proxy_update_properties(client_proxy, &c->props->dict);
+		client = pw_core_get_client(c->core);
+		pw_client_update_properties(client, &c->props->dict);
 	}
 
 	o = pa_operation_new(c, NULL, on_success, sizeof(struct success_data));
diff --git a/src/examples/export-sink.c b/src/examples/export-sink.c
index 2b7fb6b03..2c0de01ce 100644
--- a/src/examples/export-sink.c
+++ b/src/examples/export-sink.c
@@ -489,8 +489,8 @@ static void set_permissions(struct data *data)
 	permissions[1].id = SPA_ID_INVALID;
 	permissions[1].permissions = PW_PERM_R;
 
-	pw_client_proxy_update_permissions(
-			pw_core_get_client_proxy(data->core),
+	pw_client_update_permissions(
+			pw_core_get_client(data->core),
 			2, permissions);
 }
 
diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c
index 943419546..3be52ad86 100644
--- a/src/examples/media-session/media-session.c
+++ b/src/examples/media-session/media-session.c
@@ -287,8 +287,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
 	pw_proxy_sync(client->obj.proxy, 1);
 }
 
-static const struct pw_client_proxy_events client_events = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events client_events = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = client_event_info,
 };
 
@@ -301,7 +301,7 @@ static void client_destroy(void *object)
 
 static const struct object_info client_info = {
 	.type = PW_TYPE_INTERFACE_Client,
-	.version = PW_VERSION_CLIENT_PROXY,
+	.version = PW_VERSION_CLIENT,
 	.events = &client_events,
 	.size = sizeof(struct sm_client),
 	.init = NULL,
diff --git a/src/examples/media-session/policy-ep.c b/src/examples/media-session/policy-ep.c
index 24e13b657..aba76b91e 100644
--- a/src/examples/media-session/policy-ep.c
+++ b/src/examples/media-session/policy-ep.c
@@ -494,7 +494,7 @@ static int rescan_endpoint(struct impl *impl, struct endpoint *ep)
 
 		obj = sm_media_session_find_object(impl->session, ep->client_id);
 		if (obj && obj->type == PW_TYPE_INTERFACE_Client) {
-			pw_client_proxy_error((struct pw_client_proxy*)obj->proxy,
+			pw_client_error((struct pw_client*)obj->proxy,
 				ep->id, -ENOENT, "no endpoint available");
 		}
 		return -ENOENT;
diff --git a/src/modules/module-protocol-native/protocol-native.c b/src/modules/module-protocol-native/protocol-native.c
index 8a138eb9b..cbcf3a3e7 100644
--- a/src/modules/module-protocol-native/protocol-native.c
+++ b/src/modules/module-protocol-native/protocol-native.c
@@ -1481,7 +1481,7 @@ static int port_demarshal_enum_params(void *object, const struct pw_protocol_nat
 
 static int client_method_marshal_add_listener(void *object,
 			struct spa_hook *listener,
-			const struct pw_client_proxy_events *events,
+			const struct pw_client_events *events,
 			void *data)
 {
 	struct pw_proxy *proxy = object;
@@ -1495,7 +1495,7 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
 	struct spa_pod_builder *b;
 	struct spa_pod_frame f;
 
-	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_EVENT_INFO, NULL);
+	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_EVENT_INFO, NULL);
 
 	spa_pod_builder_push_struct(b, &f);
 	spa_pod_builder_add(b,
@@ -1533,7 +1533,7 @@ static int client_demarshal_info(void *object, const struct pw_protocol_native_m
 	if (parse_dict(&prs, &props) < 0)
 		return -EINVAL;
 
-	return pw_proxy_notify(proxy, struct pw_client_proxy_events, info, 0, &info);
+	return pw_proxy_notify(proxy, struct pw_client_events, info, 0, &info);
 }
 
 static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_permissions,
@@ -1544,7 +1544,7 @@ static void client_marshal_permissions(void *object, uint32_t index, uint32_t n_
 	struct spa_pod_frame f[2];
 	uint32_t i, n = 0;
 
-	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_EVENT_PERMISSIONS, NULL);
+	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_EVENT_PERMISSIONS, NULL);
 
 	for (i = 0; i < n_permissions; i++) {
 		if (permissions[i].permissions != SPA_ID_INVALID)
@@ -1594,7 +1594,7 @@ static int client_demarshal_permissions(void *object, const struct pw_protocol_n
 				SPA_POD_Int(&permissions[i].permissions), NULL) < 0)
 			return -EINVAL;
 	}
-	return pw_proxy_notify(proxy, struct pw_client_proxy_events, permissions, 0, index, n_permissions, permissions);
+	return pw_proxy_notify(proxy, struct pw_client_events, permissions, 0, index, n_permissions, permissions);
 }
 
 static int client_marshal_error(void *object, uint32_t id, int res, const char *error)
@@ -1602,7 +1602,7 @@ static int client_marshal_error(void *object, uint32_t id, int res, const char *
 	struct pw_proxy *proxy = object;
 	struct spa_pod_builder *b;
 
-	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_ERROR, NULL);
+	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_ERROR, NULL);
 	spa_pod_builder_add_struct(b,
 			       SPA_POD_Int(id),
 			       SPA_POD_Int(res),
@@ -1624,7 +1624,7 @@ static int client_demarshal_error(void *object, const struct pw_protocol_native_
 				SPA_POD_String(&error)) < 0)
 		return -EINVAL;
 
-	return pw_resource_notify(resource, struct pw_client_proxy_methods, error, 0, id, res, error);
+	return pw_resource_notify(resource, struct pw_client_methods, error, 0, id, res, error);
 }
 
 static int client_marshal_get_permissions(void *object, uint32_t index, uint32_t num)
@@ -1632,7 +1632,7 @@ static int client_marshal_get_permissions(void *object, uint32_t index, uint32_t
 	struct pw_proxy *proxy = object;
 	struct spa_pod_builder *b;
 
-	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS, NULL);
+	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_GET_PERMISSIONS, NULL);
 
 	spa_pod_builder_add_struct(b,
 			SPA_POD_Int(index),
@@ -1647,7 +1647,7 @@ static int client_marshal_update_properties(void *object, const struct spa_dict
 	struct spa_pod_builder *b;
 	struct spa_pod_frame f;
 
-	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES, NULL);
+	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_UPDATE_PROPERTIES, NULL);
 
 	spa_pod_builder_push_struct(b, &f);
 	push_dict(b, props);
@@ -1674,7 +1674,7 @@ static int client_demarshal_update_properties(void *object, const struct pw_prot
 	if (parse_dict(&prs, &props) < 0)
 		return -EINVAL;
 
-	return pw_resource_notify(resource, struct pw_client_proxy_methods, update_properties, 0,
+	return pw_resource_notify(resource, struct pw_client_methods, update_properties, 0,
 			&props);
 }
 
@@ -1690,7 +1690,7 @@ static int client_demarshal_get_permissions(void *object, const struct pw_protoc
 				SPA_POD_Int(&num)) < 0)
 		return -EINVAL;
 
-	return pw_resource_notify(resource, struct pw_client_proxy_methods, get_permissions, 0, index, num);
+	return pw_resource_notify(resource, struct pw_client_methods, get_permissions, 0, index, num);
 }
 
 static int client_marshal_update_permissions(void *object, uint32_t n_permissions,
@@ -1701,7 +1701,7 @@ static int client_marshal_update_permissions(void *object, uint32_t n_permission
 	struct spa_pod_frame f;
 	uint32_t i;
 
-	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS, NULL);
+	b = pw_protocol_native_begin_proxy(proxy, PW_CLIENT_METHOD_UPDATE_PERMISSIONS, NULL);
 
 	spa_pod_builder_push_struct(b, &f);
 	spa_pod_builder_int(b, n_permissions);
@@ -1735,7 +1735,7 @@ static int client_demarshal_update_permissions(void *object, const struct pw_pro
 				SPA_POD_Int(&permissions[i].permissions), NULL) < 0)
 			return -EINVAL;
 	}
-	return pw_resource_notify(resource, struct pw_client_proxy_methods, update_permissions, 0,
+	return pw_resource_notify(resource, struct pw_client_methods, update_permissions, 0,
 			n_permissions, permissions);
 }
 
@@ -2184,8 +2184,8 @@ static const struct pw_protocol_marshal pw_protocol_native_port_marshal = {
 	.client_demarshal = pw_protocol_native_port_event_demarshal,
 };
 
-static const struct pw_client_proxy_methods pw_protocol_native_client_method_marshal = {
-	PW_VERSION_CLIENT_PROXY_METHODS,
+static const struct pw_client_methods pw_protocol_native_client_method_marshal = {
+	PW_VERSION_CLIENT_METHODS,
 	.add_listener = &client_method_marshal_add_listener,
 	.error = &client_marshal_error,
 	.update_properties = &client_marshal_update_properties,
@@ -2194,34 +2194,34 @@ static const struct pw_client_proxy_methods pw_protocol_native_client_method_mar
 };
 
 static const struct pw_protocol_native_demarshal
-pw_protocol_native_client_method_demarshal[PW_CLIENT_PROXY_METHOD_NUM] =
+pw_protocol_native_client_method_demarshal[PW_CLIENT_METHOD_NUM] =
 {
-	[PW_CLIENT_PROXY_METHOD_ADD_LISTENER] = { NULL, 0, },
-	[PW_CLIENT_PROXY_METHOD_ERROR] = { &client_demarshal_error, PW_PERM_W, },
-	[PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES] = { &client_demarshal_update_properties, PW_PERM_W, },
-	[PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS] = { &client_demarshal_get_permissions, 0, },
-	[PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS] = { &client_demarshal_update_permissions, PW_PERM_W, },
+	[PW_CLIENT_METHOD_ADD_LISTENER] = { NULL, 0, },
+	[PW_CLIENT_METHOD_ERROR] = { &client_demarshal_error, PW_PERM_W, },
+	[PW_CLIENT_METHOD_UPDATE_PROPERTIES] = { &client_demarshal_update_properties, PW_PERM_W, },
+	[PW_CLIENT_METHOD_GET_PERMISSIONS] = { &client_demarshal_get_permissions, 0, },
+	[PW_CLIENT_METHOD_UPDATE_PERMISSIONS] = { &client_demarshal_update_permissions, PW_PERM_W, },
 };
 
-static const struct pw_client_proxy_events pw_protocol_native_client_event_marshal = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events pw_protocol_native_client_event_marshal = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = &client_marshal_info,
 	.permissions = &client_marshal_permissions,
 };
 
 static const struct pw_protocol_native_demarshal
-pw_protocol_native_client_event_demarshal[PW_CLIENT_PROXY_EVENT_NUM] =
+pw_protocol_native_client_event_demarshal[PW_CLIENT_EVENT_NUM] =
 {
-	[PW_CLIENT_PROXY_EVENT_INFO] = { &client_demarshal_info, 0, },
-	[PW_CLIENT_PROXY_EVENT_PERMISSIONS] = { &client_demarshal_permissions, 0, }
+	[PW_CLIENT_EVENT_INFO] = { &client_demarshal_info, 0, },
+	[PW_CLIENT_EVENT_PERMISSIONS] = { &client_demarshal_permissions, 0, }
 };
 
 static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
 	PW_TYPE_INTERFACE_Client,
-	PW_VERSION_CLIENT_PROXY,
+	PW_VERSION_CLIENT,
 	0,
-	PW_CLIENT_PROXY_METHOD_NUM,
-	PW_CLIENT_PROXY_EVENT_NUM,
+	PW_CLIENT_METHOD_NUM,
+	PW_CLIENT_EVENT_NUM,
 	.client_marshal = &pw_protocol_native_client_method_marshal,
 	.server_demarshal = pw_protocol_native_client_method_demarshal,
 	.server_marshal = &pw_protocol_native_client_event_marshal,
diff --git a/src/modules/module-protocol-native/v0/interfaces.h b/src/modules/module-protocol-native/v0/interfaces.h
index 1eb678c91..c5e600b3b 100644
--- a/src/modules/module-protocol-native/v0/interfaces.h
+++ b/src/modules/module-protocol-native/v0/interfaces.h
@@ -487,12 +487,12 @@ struct pw_factory_proxy_v0_events {
 
 #define PW_VERSION_CLIENT_V0			0
 
-#define PW_CLIENT_PROXY_V0_EVENT_INFO		0
-#define PW_CLIENT_PROXY_V0_EVENT_NUM		1
+#define PW_CLIENT_V0_EVENT_INFO		0
+#define PW_CLIENT_V0_EVENT_NUM		1
 
 /** Client events */
-struct pw_client_proxy_v0_events {
-#define PW_VERSION_CLIENT_PROXY_V0_EVENTS	0
+struct pw_client_v0_events {
+#define PW_VERSION_CLIENT_V0_EVENTS	0
 	uint32_t version;
 	/**
 	 * Notify client info
@@ -502,7 +502,7 @@ struct pw_client_proxy_v0_events {
 	void (*info) (void *object, struct pw_client_info *info);
 };
 
-#define pw_client_resource_v0_info(r,...) pw_resource_notify(r,struct pw_client_proxy_v0_events,info,__VA_ARGS__)
+#define pw_client_resource_v0_info(r,...) pw_resource_notify(r,struct pw_client_v0_events,info,__VA_ARGS__)
 
 
 #define PW_VERSION_LINK_V0		0
diff --git a/src/modules/module-protocol-native/v0/protocol-native.c b/src/modules/module-protocol-native/v0/protocol-native.c
index c71f360d2..568a535c0 100644
--- a/src/modules/module-protocol-native/v0/protocol-native.c
+++ b/src/modules/module-protocol-native/v0/protocol-native.c
@@ -195,7 +195,7 @@ static int core_demarshal_permissions(void *object, const struct pw_protocol_nat
 			return -EINVAL;
 	}
 	/* FIXME */
-	//return pw_resource_notify(resource, struct pw_impl_client_proxy_methods, update_permissions, 0,
+	//return pw_resource_notify(resource, struct pw_impl_client_methods, update_permissions, 0,
         //                n_permissions, permissions);
 	return 0;
 }
@@ -960,7 +960,7 @@ static void client_marshal_info(void *object, const struct pw_client_info *info)
 	struct spa_pod_frame f;
 	uint32_t i, n_items;
 
-	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_PROXY_V0_EVENT_INFO, NULL);
+	b = pw_protocol_native_begin_resource(resource, PW_CLIENT_V0_EVENT_INFO, NULL);
 
 	n_items = info->props ? info->props->n_items : 0;
 
@@ -1148,8 +1148,8 @@ static const struct pw_protocol_marshal pw_protocol_native_port_marshal = {
 	NULL
 };
 
-static const struct pw_client_proxy_events pw_protocol_native_client_event_marshal = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events pw_protocol_native_client_event_marshal = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = &client_marshal_info,
 	.permissions = &client_marshal_permissions,
 };
@@ -1158,7 +1158,7 @@ static const struct pw_protocol_marshal pw_protocol_native_client_marshal = {
 	PW_TYPE_INTERFACE_Client,
 	PW_VERSION_CLIENT_V0,
 	0,
-	PW_CLIENT_PROXY_EVENT_NUM,
+	PW_CLIENT_EVENT_NUM,
 	0,
 	NULL, NULL,
 	&pw_protocol_native_client_event_marshal,
diff --git a/src/pipewire/client.h b/src/pipewire/client.h
index b84c39b9b..7fb96ea49 100644
--- a/src/pipewire/client.h
+++ b/src/pipewire/client.h
@@ -53,16 +53,16 @@ pw_client_info_update(struct pw_client_info *info,
 void pw_client_info_free(struct pw_client_info *info);
 
 
-#define PW_VERSION_CLIENT_PROXY		3
-struct pw_client_proxy;
+#define PW_VERSION_CLIENT		3
+struct pw_client;
 
-#define PW_CLIENT_PROXY_EVENT_INFO		0
-#define PW_CLIENT_PROXY_EVENT_PERMISSIONS	1
-#define PW_CLIENT_PROXY_EVENT_NUM		2
+#define PW_CLIENT_EVENT_INFO		0
+#define PW_CLIENT_EVENT_PERMISSIONS	1
+#define PW_CLIENT_EVENT_NUM		2
 
 /** Client events */
-struct pw_client_proxy_events {
-#define PW_VERSION_CLIENT_PROXY_EVENTS	0
+struct pw_client_events {
+#define PW_VERSION_CLIENT_EVENTS	0
 	uint32_t version;
 	/**
 	 * Notify client info
@@ -87,21 +87,21 @@ struct pw_client_proxy_events {
 };
 
 
-#define PW_CLIENT_PROXY_METHOD_ADD_LISTENER		0
-#define PW_CLIENT_PROXY_METHOD_ERROR			1
-#define PW_CLIENT_PROXY_METHOD_UPDATE_PROPERTIES	2
-#define PW_CLIENT_PROXY_METHOD_GET_PERMISSIONS		3
-#define PW_CLIENT_PROXY_METHOD_UPDATE_PERMISSIONS	4
-#define PW_CLIENT_PROXY_METHOD_NUM			5
+#define PW_CLIENT_METHOD_ADD_LISTENER		0
+#define PW_CLIENT_METHOD_ERROR			1
+#define PW_CLIENT_METHOD_UPDATE_PROPERTIES	2
+#define PW_CLIENT_METHOD_GET_PERMISSIONS	3
+#define PW_CLIENT_METHOD_UPDATE_PERMISSIONS	4
+#define PW_CLIENT_METHOD_NUM			5
 
 /** Client methods */
-struct pw_client_proxy_methods {
-#define PW_VERSION_CLIENT_PROXY_METHODS	0
+struct pw_client_methods {
+#define PW_VERSION_CLIENT_METHODS	0
 	uint32_t version;
 
 	int (*add_listener) (void *object,
 			struct spa_hook *listener,
-			const struct pw_client_proxy_events *events,
+			const struct pw_client_events *events,
 			void *data);
 	/**
 	 * Send an error to a client
@@ -144,20 +144,20 @@ struct pw_client_proxy_methods {
 			const struct pw_permission *permissions);
 };
 
-#define pw_client_proxy_method(o,method,version,...)			\
+#define pw_client_method(o,method,version,...)				\
 ({									\
 	int _res = -ENOTSUP;						\
 	spa_interface_call_res((struct spa_interface*)o,		\
-			struct pw_client_proxy_methods, _res,		\
+			struct pw_client_methods, _res,			\
 			method, version, ##__VA_ARGS__);		\
 	_res;								\
 })
 
-#define pw_client_proxy_add_listener(c,...)		pw_client_proxy_method(c,add_listener,0,__VA_ARGS__)
-#define pw_client_proxy_error(c,...)			pw_client_proxy_method(c,error,0,__VA_ARGS__)
-#define pw_client_proxy_update_properties(c,...)	pw_client_proxy_method(c,update_properties,0,__VA_ARGS__)
-#define pw_client_proxy_get_permissions(c,...)		pw_client_proxy_method(c,get_permissions,0,__VA_ARGS__)
-#define pw_client_proxy_update_permissions(c,...)	pw_client_proxy_method(c,update_permissions,0,__VA_ARGS__)
+#define pw_client_add_listener(c,...)		pw_client_method(c,add_listener,0,__VA_ARGS__)
+#define pw_client_error(c,...)			pw_client_method(c,error,0,__VA_ARGS__)
+#define pw_client_update_properties(c,...)	pw_client_method(c,update_properties,0,__VA_ARGS__)
+#define pw_client_get_permissions(c,...)	pw_client_method(c,get_permissions,0,__VA_ARGS__)
+#define pw_client_update_permissions(c,...)	pw_client_method(c,update_permissions,0,__VA_ARGS__)
 
 #ifdef __cplusplus
 }  /* extern "C" */
diff --git a/src/pipewire/context.c b/src/pipewire/context.c
index 8c016d038..1349df28b 100644
--- a/src/pipewire/context.c
+++ b/src/pipewire/context.c
@@ -185,7 +185,7 @@ static int core_hello(void *object, uint32_t version)
 
 	if (version >= 3) {
 		if ((res = pw_global_bind(client->global, client,
-				PW_PERM_RWX, PW_VERSION_CLIENT_PROXY, 1)) < 0)
+				PW_PERM_RWX, PW_VERSION_CLIENT, 1)) < 0)
 			return res;
 	}
 	return 0;
diff --git a/src/pipewire/core.c b/src/pipewire/core.c
index bafef4cf4..ed742968f 100644
--- a/src/pipewire/core.c
+++ b/src/pipewire/core.c
@@ -152,8 +152,8 @@ int pw_core_update_properties(struct pw_core *core, const struct spa_dict *dict)
 	if (!changed)
 		return 0;
 
-	if (core->client_proxy)
-		pw_client_proxy_update_properties(core->client_proxy, &core->properties->dict);
+	if (core->client)
+		pw_client_update_properties(core->client, &core->properties->dict);
 
 	return changed;
 }
@@ -199,7 +199,7 @@ static void proxy_core_destroy(void *data)
 		pw_filter_disconnect(filter);
 
 	pw_protocol_client_disconnect(core->conn);
-	core->client_proxy = NULL;
+	core->client = NULL;
 
 	pw_map_for_each(&core->objects, destroy_proxy, core);
 	pw_map_reset(&core->objects);
@@ -225,9 +225,9 @@ static const struct pw_proxy_events proxy_core_events = {
 };
 
 SPA_EXPORT
-struct pw_client_proxy * pw_core_get_client_proxy(struct pw_core *core)
+struct pw_client * pw_core_get_client(struct pw_core *core)
 {
-	return core->client_proxy;
+	return core->client;
 }
 
 SPA_EXPORT
@@ -329,9 +329,9 @@ static struct pw_core *core_new(struct pw_context *context,
 	if ((res = pw_proxy_init(&p->proxy, PW_TYPE_INTERFACE_Core, PW_VERSION_CORE)) < 0)
 		goto error_proxy;
 
-	p->client_proxy = (struct pw_client_proxy*)pw_proxy_new(&p->proxy,
-			PW_TYPE_INTERFACE_Client, PW_VERSION_CLIENT_PROXY, 0);
-	if (p->client_proxy == NULL) {
+	p->client = (struct pw_client*)pw_proxy_new(&p->proxy,
+			PW_TYPE_INTERFACE_Client, PW_VERSION_CLIENT, 0);
+	if (p->client == NULL) {
 		res = -errno;
 		goto error_proxy;
 	}
@@ -340,7 +340,7 @@ static struct pw_core *core_new(struct pw_context *context,
 	pw_proxy_add_listener(&p->proxy, &p->proxy_core_listener, &proxy_core_events, p);
 
 	pw_core_hello(p, PW_VERSION_CORE);
-	pw_client_proxy_update_properties(p->client_proxy, &p->properties->dict);
+	pw_client_update_properties(p->client, &p->properties->dict);
 
 	spa_list_append(&context->core_list, &p->link);
 
diff --git a/src/pipewire/core.h b/src/pipewire/core.h
index 13b1047b6..77d8ff945 100644
--- a/src/pipewire/core.h
+++ b/src/pipewire/core.h
@@ -529,7 +529,7 @@ int pw_core_disconnect(struct pw_core *core);
 void *pw_core_get_user_data(struct pw_core *core);
 
 /** Get the client proxy */
-struct pw_client_proxy * pw_core_get_client_proxy(struct pw_core *core);
+struct pw_client * pw_core_get_client(struct pw_core *core);
 
 /** Get the context object used to created this core */
 struct pw_context * pw_core_get_context(struct pw_core *core);
diff --git a/src/pipewire/impl-client.c b/src/pipewire/impl-client.c
index 8253ef3ca..4e2b55428 100644
--- a/src/pipewire/impl-client.c
+++ b/src/pipewire/impl-client.c
@@ -38,7 +38,7 @@ struct impl {
 	struct spa_hook pool_listener;
 };
 
-#define pw_client_resource(r,m,v,...)		pw_resource_call(r,struct pw_client_proxy_events,m,v,__VA_ARGS__)
+#define pw_client_resource(r,m,v,...)		pw_resource_call(r,struct pw_client_events,m,v,__VA_ARGS__)
 #define pw_client_resource_info(r,...)		pw_client_resource(r,info,0,__VA_ARGS__)
 #define pw_client_resource_permissions(r,...)	pw_client_resource(r,permissions,0,__VA_ARGS__)
 
@@ -162,8 +162,8 @@ static int client_update_permissions(void *object,
 	return pw_impl_client_update_permissions(client, n_permissions, permissions);
 }
 
-static const struct pw_client_proxy_methods client_methods = {
-	PW_VERSION_CLIENT_PROXY_METHODS,
+static const struct pw_client_methods client_methods = {
+	PW_VERSION_CLIENT_METHODS,
 	.error = client_error,
 	.update_properties = client_update_properties,
 	.get_permissions = client_get_permissions,
@@ -395,7 +395,7 @@ int pw_impl_client_register(struct pw_impl_client *client,
 
 	client->global = pw_global_new(context,
 				       PW_TYPE_INTERFACE_Client,
-				       PW_VERSION_CLIENT_PROXY,
+				       PW_VERSION_CLIENT,
 				       properties,
 				       global_bind,
 				       client);
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index 78cd0e13a..74f1bc3c0 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -739,7 +739,7 @@ struct pw_core {
 
 	struct pw_map objects;			/**< map of client side proxy objects
 						 *   indexed with the client id */
-	struct pw_client_proxy *client_proxy;	/**< proxy for the client object */
+	struct pw_client *client;		/**< proxy for the client object */
 
 	struct spa_list stream_list;		/**< list of \ref pw_stream objects */
 	struct spa_list filter_list;		/**< list of \ref pw_stream objects */
diff --git a/src/tests/test-interfaces.c b/src/tests/test-interfaces.c
index 2c08be645..ef80ee37e 100644
--- a/src/tests/test-interfaces.c
+++ b/src/tests/test-interfaces.c
@@ -297,26 +297,26 @@ static void test_factory_abi(void)
 
 static void test_client_abi(void)
 {
-	struct pw_client_proxy_methods m;
-	struct pw_client_proxy_events e;
+	struct pw_client_methods m;
+	struct pw_client_events e;
 	struct {
 		uint32_t version;
 		int (*add_listener) (void *object,
 			struct spa_hook *listener,
-			const struct pw_client_proxy_events *events,
+			const struct pw_client_events *events,
 			void *data);
 		int (*error) (void *object, uint32_t id, int res, const char *error);
 		int (*update_properties) (void *object, const struct spa_dict *props);
 		int (*get_permissions) (void *object, uint32_t index, uint32_t num);
 		int (*update_permissions) (void *object, uint32_t n_permissions,
 			const struct pw_permission *permissions);
-	} methods = { PW_VERSION_CLIENT_PROXY_METHODS, };
+	} methods = { PW_VERSION_CLIENT_METHODS, };
 	struct {
 		uint32_t version;
 		void (*info) (void *object, const struct pw_client_info *info);
 		void (*permissions) (void *object, uint32_t index,
 			uint32_t n_permissions, const struct pw_permission *permissions);
-	} events = { PW_VERSION_CLIENT_PROXY_EVENTS, };
+	} events = { PW_VERSION_CLIENT_EVENTS, };
 
 	TEST_FUNC(m, methods, version);
 	TEST_FUNC(m, methods, add_listener);
@@ -324,13 +324,13 @@ static void test_client_abi(void)
 	TEST_FUNC(m, methods, update_properties);
 	TEST_FUNC(m, methods, get_permissions);
 	TEST_FUNC(m, methods, update_permissions);
-	spa_assert(PW_VERSION_CLIENT_PROXY_METHODS == 0);
+	spa_assert(PW_VERSION_CLIENT_METHODS == 0);
 	spa_assert(sizeof(m) == sizeof(methods));
 
 	TEST_FUNC(e, events, version);
 	TEST_FUNC(e, events, info);
 	TEST_FUNC(e, events, permissions);
-	spa_assert(PW_VERSION_CLIENT_PROXY_EVENTS == 0);
+	spa_assert(PW_VERSION_CLIENT_EVENTS == 0);
 	spa_assert(sizeof(e) == sizeof(events));
 }
 
diff --git a/src/tools/pipewire-cli.c b/src/tools/pipewire-cli.c
index ffaffe520..67ab11630 100644
--- a/src/tools/pipewire-cli.c
+++ b/src/tools/pipewire-cli.c
@@ -850,8 +850,8 @@ static void client_event_permissions(void *object, uint32_t index,
 	}
 }
 
-static const struct pw_client_proxy_events client_events = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events client_events = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = client_event_info,
 	.permissions = client_event_permissions
 };
@@ -1128,7 +1128,7 @@ static bool bind_global(struct remote_data *rd, struct global *global, char **er
 		break;
 	case PW_TYPE_INTERFACE_Client:
 		events = &client_events;
-		client_version = PW_VERSION_CLIENT_PROXY;
+		client_version = PW_VERSION_CLIENT;
 		destroy = (pw_destroy_t) pw_client_info_free;
 		info_func = info_client;
 		break;
@@ -1511,7 +1511,7 @@ static bool do_permissions(struct data *data, const char *cmd, char *args, char
 
 	permissions[0] = PW_PERMISSION_INIT(atoi(a[1]), atoi(a[2]));
 
-	pw_client_proxy_update_permissions((struct pw_client_proxy*)global->proxy,
+	pw_client_update_permissions((struct pw_client*)global->proxy,
 			1, permissions);
 
 	return true;
@@ -1545,7 +1545,7 @@ static bool do_get_permissions(struct data *data, const char *cmd, char *args, c
 		if (!bind_global(rd, global, error))
 			return false;
 	}
-	pw_client_proxy_get_permissions((struct pw_client_proxy*)global->proxy,
+	pw_client_get_permissions((struct pw_client*)global->proxy,
 			0, UINT32_MAX);
 
 	return true;
diff --git a/src/tools/pipewire-dot.c b/src/tools/pipewire-dot.c
index 1d5282bc9..b8e4cc3bc 100644
--- a/src/tools/pipewire-dot.c
+++ b/src/tools/pipewire-dot.c
@@ -541,8 +541,8 @@ static void client_event_info(void *data, const struct pw_client_info *info)
 	global_event_info(data, info);
 }
 
-static const struct pw_client_proxy_events client_events = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events client_events = {
+	PW_VERSION_CLIENT_EVENTS,
 	.info = client_event_info
 };
 
@@ -636,7 +636,7 @@ static void registry_event_global(void *data, uint32_t id, uint32_t permissions,
 		info_destroy = (pw_destroy_t)pw_client_info_free;
 		info_update = (info_update_t)pw_client_info_update;
 		draw = draw_client;
-		client_version = PW_VERSION_CLIENT_PROXY;
+		client_version = PW_VERSION_CLIENT;
 		break;
 	case PW_TYPE_INTERFACE_Device:
 		events = &device_events;
diff --git a/src/tools/pipewire-monitor.c b/src/tools/pipewire-monitor.c
index 586a8bd8f..36d3d704a 100644
--- a/src/tools/pipewire-monitor.c
+++ b/src/tools/pipewire-monitor.c
@@ -427,8 +427,8 @@ static void client_event_info(void *object, const struct pw_client_info *info)
 	}
 }
 
-static const struct pw_client_proxy_events client_events = {
-	PW_VERSION_CLIENT_PROXY_EVENTS,
+static const struct pw_client_events client_events = {
+	PW_VERSION_CLIENT_EVENTS,
         .info = client_event_info
 };
 
@@ -606,7 +606,7 @@ static void registry_event_global(void *data, uint32_t id,
 		break;
 	case PW_TYPE_INTERFACE_Client:
 		events = &client_events;
-		client_version = PW_VERSION_CLIENT_PROXY;
+		client_version = PW_VERSION_CLIENT;
 		destroy = (pw_destroy_t) pw_client_info_free;
 		break;
 	case PW_TYPE_INTERFACE_Link: