diff --git a/src/examples/media-session/media-session.c b/src/examples/media-session/media-session.c
index 8a7aaea7a..d9ca8e30d 100644
--- a/src/examples/media-session/media-session.c
+++ b/src/examples/media-session/media-session.c
@@ -1284,7 +1284,7 @@ static void check_endpoint_link(struct endpoint_link *link)
 	}
 }
 
-static void link_proxy_destroy(void *data)
+static void proxy_link_destroy(void *data)
 {
 	struct link *l = data;
 
@@ -1295,9 +1295,9 @@ static void link_proxy_destroy(void *data)
 	}
 }
 
-static const struct pw_proxy_events link_proxy_events = {
+static const struct pw_proxy_events proxy_link_events = {
 	PW_VERSION_PROXY_EVENTS,
-	.destroy = link_proxy_destroy
+	.destroy = proxy_link_destroy
 };
 
 static int link_nodes(struct impl *impl, struct endpoint_link *link,
@@ -1343,7 +1343,7 @@ static int link_nodes(struct impl *impl, struct endpoint_link *link,
 			l->output_port = outport->obj.id;
 			l->input_node = innode->obj.id;
 			l->input_port = inport->obj.id;
-			pw_proxy_add_listener(p, &l->listener, &link_proxy_events, l);
+			pw_proxy_add_listener(p, &l->listener, &proxy_link_events, l);
 
 			if (link) {
 				l->endpoint_link = link;
diff --git a/src/examples/media-session/policy-ep.c b/src/examples/media-session/policy-ep.c
index 7f1a6cde9..899f57464 100644
--- a/src/examples/media-session/policy-ep.c
+++ b/src/examples/media-session/policy-ep.c
@@ -481,7 +481,7 @@ static int rescan_endpoint(struct impl *impl, struct endpoint *ep)
 		else {
 			str = spa_dict_lookup(props, PW_KEY_NODE_DONT_RECONNECT);
 			if (str != NULL && pw_properties_parse_bool(str)) {
-//				pw_registry_proxy_destroy(impl->registry_proxy, ep->id);
+//				pw_registry_destroy(impl->registry, ep->id);
 				return -ENOENT;
 			}
 		}
diff --git a/src/modules/module-client-device/proxy-device.c b/src/modules/module-client-device/proxy-device.c
index 39d8ddbb0..1a3cf667b 100644
--- a/src/modules/module-client-device/proxy-device.c
+++ b/src/modules/module-client-device/proxy-device.c
@@ -41,7 +41,7 @@ struct device_data {
 	struct spa_hook proxy_listener;
 };
 
-static void device_proxy_destroy(void *_data)
+static void proxy_device_destroy(void *_data)
 {
 	struct device_data *data = _data;
 	spa_hook_remove(&data->device_listener);
@@ -49,7 +49,7 @@ static void device_proxy_destroy(void *_data)
 
 static const struct pw_proxy_events proxy_events = {
 	PW_VERSION_PROXY_EVENTS,
-	.destroy = device_proxy_destroy,
+	.destroy = proxy_device_destroy,
 };
 
 struct pw_proxy *pw_core_spa_device_export(struct pw_core *core,
diff --git a/src/modules/module-metadata/proxy-metadata.c b/src/modules/module-metadata/proxy-metadata.c
index 0784801d2..b3a1d0cf7 100644
--- a/src/modules/module-metadata/proxy-metadata.c
+++ b/src/modules/module-metadata/proxy-metadata.c
@@ -41,7 +41,7 @@ struct object_data {
 	struct spa_hook proxy_listener;
 };
 
-static void object_proxy_destroy(void *_data)
+static void proxy_object_destroy(void *_data)
 {
 	struct object_data *data = _data;
 	spa_hook_remove(&data->object_listener);
@@ -49,7 +49,7 @@ static void object_proxy_destroy(void *_data)
 
 static const struct pw_proxy_events proxy_events = {
 	PW_VERSION_PROXY_EVENTS,
-	.destroy = object_proxy_destroy,
+	.destroy = proxy_object_destroy,
 };
 
 struct pw_proxy *pw_core_metadata_export(struct pw_core *core,