diff --git a/plugins/deaddrop/protocol_lws_deaddrop.c b/plugins/deaddrop/protocol_lws_deaddrop.c
index 85d777a96..2885706a9 100644
--- a/plugins/deaddrop/protocol_lws_deaddrop.c
+++ b/plugins/deaddrop/protocol_lws_deaddrop.c
@@ -689,7 +689,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_DEADDROP
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_deaddrop = {
+LWS_VISIBLE const lws_plugin_protocol_t deaddrop = {
 	.hdr = {
 		"deaddrop",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_client_loopback_test.c b/plugins/protocol_client_loopback_test.c
index 49f73d865..d86380c9c 100644
--- a/plugins/protocol_client_loopback_test.c
+++ b/plugins/protocol_client_loopback_test.c
@@ -173,7 +173,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_client_loopback_test = {
+LWS_VISIBLE const lws_plugin_protocol_t client_loopback_test = {
 	.hdr = {
 		"client loopback test",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_dumb_increment.c b/plugins/protocol_dumb_increment.c
index 1c3d785c6..fafe26dcb 100644
--- a/plugins/protocol_dumb_increment.c
+++ b/plugins/protocol_dumb_increment.c
@@ -121,7 +121,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_DUMB_INCREMENT
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_dumb_increment = {
+LWS_VISIBLE const lws_plugin_protocol_t dumb_increment = {
 	.hdr = {
 		"dumb increment",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_fulltext_demo.c b/plugins/protocol_fulltext_demo.c
index b15148236..aaec4a461 100644
--- a/plugins/protocol_fulltext_demo.c
+++ b/plugins/protocol_fulltext_demo.c
@@ -266,7 +266,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_FULLTEXT_DEMO
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_fulltext_demo = {
+LWS_VISIBLE const lws_plugin_protocol_t fulltext_demo = {
 	.hdr = {
 		"fulltext demo",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_lws_mirror.c b/plugins/protocol_lws_mirror.c
index d5cc8e69e..8ba111de8 100644
--- a/plugins/protocol_lws_mirror.c
+++ b/plugins/protocol_lws_mirror.c
@@ -482,7 +482,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_MIRROR
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_mirror = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_mirror = {
 	.hdr = {
 		"lws mirror",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_lws_raw_test.c b/plugins/protocol_lws_raw_test.c
index fb7d193dd..41d81f60e 100644
--- a/plugins/protocol_lws_raw_test.c
+++ b/plugins/protocol_lws_raw_test.c
@@ -279,7 +279,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_RAW_TEST
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_raw_test = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_raw_test = {
 	.hdr = {
 		"lws raw test",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_lws_server_status.c b/plugins/protocol_lws_server_status.c
index 61f81ddd9..18a92e2f2 100644
--- a/plugins/protocol_lws_server_status.c
+++ b/plugins/protocol_lws_server_status.c
@@ -204,7 +204,7 @@ static const struct lws_protocols protocols[] = {
 	},
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_server_status = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_server_status = {
 	.hdr = {
 		"lws server status",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_lws_sshd_demo.c b/plugins/protocol_lws_sshd_demo.c
index cddf0c16d..aeb686b15 100644
--- a/plugins/protocol_lws_sshd_demo.c
+++ b/plugins/protocol_lws_sshd_demo.c
@@ -455,7 +455,7 @@ static const struct lws_protocols protocols[] = {
 		LWS_PLUGIN_PROTOCOL_LWS_SSHD_DEMO
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_sshd_demo = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_sshd_demo = {
 	.hdr = {
 		"lws sshd demo",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_lws_status.c b/plugins/protocol_lws_status.c
index bf8b45f5b..b2f7f0c99 100644
--- a/plugins/protocol_lws_status.c
+++ b/plugins/protocol_lws_status.c
@@ -245,7 +245,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_LWS_STATUS
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_status = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_status = {
 	.hdr = {
 		"lws status",
 		"lws_protocol_plugin",
diff --git a/plugins/protocol_post_demo.c b/plugins/protocol_post_demo.c
index a9cf83546..cf9ab04e0 100644
--- a/plugins/protocol_post_demo.c
+++ b/plugins/protocol_post_demo.c
@@ -287,7 +287,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_POST_DEMO
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_post_demo = {
+LWS_VISIBLE const lws_plugin_protocol_t post_demo = {
 	.hdr = {
 		"post demo",
 		"lws_protocol_plugin",
diff --git a/plugins/raw-proxy/protocol_lws_raw_proxy.c b/plugins/raw-proxy/protocol_lws_raw_proxy.c
index 515da3df6..7cd729172 100644
--- a/plugins/raw-proxy/protocol_lws_raw_proxy.c
+++ b/plugins/raw-proxy/protocol_lws_raw_proxy.c
@@ -562,7 +562,7 @@ static const struct lws_protocols protocols[] = {
 	LWS_PLUGIN_PROTOCOL_RAW_PROXY
 };
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_raw_proxy = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_raw_proxy = {
 	.hdr = {
 		"raw proxy",
 		"lws_protocol_plugin",
diff --git a/plugins/ssh-base/sshd.c b/plugins/ssh-base/sshd.c
index 4ff303dd0..b4c2cdc17 100644
--- a/plugins/ssh-base/sshd.c
+++ b/plugins/ssh-base/sshd.c
@@ -2565,7 +2565,7 @@ const struct lws_protocols protocols_sshd[] = {
 
 #if !defined (LWS_PLUGIN_STATIC)
 
-LWS_VISIBLE const lws_plugin_protocol_t protocol_lws_ssh_base = {
+LWS_VISIBLE const lws_plugin_protocol_t lws_ssh_base = {
 	.hdr = {
 		"ssh base",
 		"lws_protocol_plugin",