diff --git a/src/connection.c b/src/connection.c
index 5d7f788..f750e3c 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -33,9 +33,9 @@
 struct pool_head *pool_head_connstream;
 struct xprt_ops *registered_xprt[XPRT_ENTRIES] = { NULL, };
 
-/* List head of all known muxes for ALPN */
-struct alpn_mux_list alpn_mux_list = {
-        .list = LIST_HEAD_INIT(alpn_mux_list.list)
+/* List head of all known muxes for PROTO */
+struct mux_proto_list mux_proto_list = {
+        .list = LIST_HEAD_INIT(mux_proto_list.list)
 };
 
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */
diff --git a/src/mux_h2.c b/src/mux_h2.c
index 192578b..a986b5a 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -3601,9 +3601,9 @@
 	.name = "H2",
 };
 
-/* ALPN selection : this mux registers ALPN tolen "h2" */
-static struct alpn_mux_list alpn_mux_h2 =
-	{ .token = IST("h2"), .mode = ALPN_MODE_HTTP, .side = ALPN_SIDE_FE, .mux = &h2_ops };
+/* PROTO selection : this mux registers PROTO token "h2" */
+static struct mux_proto_list mux_proto_h2 =
+	{ .token = IST("h2"), .mode = PROTO_MODE_HTTP, .side = PROTO_SIDE_FE, .mux = &h2_ops };
 
 /* config keyword parsers */
 static struct cfg_kw_list cfg_kws = {ILH, {
@@ -3622,7 +3622,7 @@
 __attribute__((constructor))
 static void __h2_init(void)
 {
-	alpn_register_mux(&alpn_mux_h2);
+	register_mux_proto(&mux_proto_h2);
 	cfg_register_keywords(&cfg_kws);
 	hap_register_post_deinit(__h2_deinit);
 	pool_head_h2c = create_pool("h2c", sizeof(struct h2c), MEM_F_SHARED);
diff --git a/src/mux_pt.c b/src/mux_pt.c
index 131b070..dbdd78b 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -215,12 +215,12 @@
 	.name = "PASS",
 };
 
-/* ALPN selection : default mux has empty name */
-static struct alpn_mux_list alpn_mux_pt =
-	{ .token = IST(""), .mode = ALPN_MODE_ANY, .side = ALPN_SIDE_BOTH, .mux = &mux_pt_ops };
+/* PROT selection : default mux has empty name */
+static struct mux_proto_list mux_proto_pt =
+	{ .token = IST(""), .mode = PROTO_MODE_ANY, .side = PROTO_SIDE_BOTH, .mux = &mux_pt_ops };
 
 __attribute__((constructor))
 static void __mux_pt_init(void)
 {
-	alpn_register_mux(&alpn_mux_pt);
+	register_mux_proto(&mux_proto_pt);
 }