diff --git a/Makefile b/Makefile
index 918ddc178..fb57ef8ae 100644
--- a/Makefile
+++ b/Makefile
@@ -953,7 +953,7 @@ OBJS += src/mux_h2.o src/mux_fcgi.o src/http_ana.o src/mux_h1.o               \
         src/base64.o src/uri_auth.o src/time.o src/ebsttree.o src/ebistree.o  \
         src/dynbuf.o src/auth.o src/wdt.o src/pipe.o src/http_acl.o           \
         src/hpack-huff.o src/hpack-enc.o src/dict.o src/init.o src/freq_ctr.o \
-        src/ebtree.o src/hash.o src/dgram.o src/version.o src/conn_stream.o   \
+        src/ebtree.o src/hash.o src/dgram.o src/version.o src/stconn.o        \
         src/ncbuf.o
 
 ifneq ($(TRACE),)
diff --git a/addons/promex/service-prometheus.c b/addons/promex/service-prometheus.c
index 6f54d5afa..7fffd3b87 100644
--- a/addons/promex/service-prometheus.c
+++ b/addons/promex/service-prometheus.c
@@ -19,7 +19,6 @@
 #include <haproxy/backend.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
@@ -34,6 +33,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>
diff --git a/dev/flags/flags.c b/dev/flags/flags.c
index f5c147869..5ba10a510 100644
--- a/dev/flags/flags.c
+++ b/dev/flags/flags.c
@@ -3,7 +3,7 @@
 
 #include <haproxy/channel-t.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/http_ana-t.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>
diff --git a/include/haproxy/applet.h b/include/haproxy/applet.h
index 0b10e5e2c..776a4015a 100644
--- a/include/haproxy/applet.h
+++ b/include/haproxy/applet.h
@@ -27,11 +27,11 @@
 #include <haproxy/api.h>
 #include <haproxy/applet-t.h>
 #include <haproxy/channel.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 
 extern unsigned int nb_applets;
diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index e53a588eb..1f12afb48 100644
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -396,8 +396,8 @@ struct mux_ops {
 	void (*shutr)(struct stconn *cs, enum co_shr_mode);     /* shutr function */
 	void (*shutw)(struct stconn *cs, enum co_shw_mode);     /* shutw function */
 
-	int (*attach)(struct connection *conn, struct sedesc *, struct session *sess); /* attach a conn_stream to an outgoing connection */
-	struct stconn *(*get_first_cs)(const struct connection *); /* retrieves any valid conn_stream from this connection */
+	int (*attach)(struct connection *conn, struct sedesc *, struct session *sess); /* attach a stconn to an outgoing connection */
+	struct stconn *(*get_first_cs)(const struct connection *); /* retrieves any valid stconn from this connection */
 	void (*detach)(struct sedesc *); /* Detach an stconn from the stdesc from an outgoing connection, when the request is done */
 	int (*show_fd)(struct buffer *, struct connection *); /* append some data about connection into chunk for "show fd"; returns non-zero if suspicious */
 	int (*subscribe)(struct stconn *cs, int event_type,  struct wait_event *es); /* Subscribe <es> to events, such as "being able to send" */
diff --git a/include/haproxy/connection.h b/include/haproxy/connection.h
index 34d3f70d7..8d99ca26f 100644
--- a/include/haproxy/connection.h
+++ b/include/haproxy/connection.h
@@ -27,7 +27,7 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/fd.h>
 #include <haproxy/list.h>
 #include <haproxy/listener-t.h>
diff --git a/include/haproxy/mux_quic-t.h b/include/haproxy/mux_quic-t.h
index 60cc4ad54..99f99702c 100644
--- a/include/haproxy/mux_quic-t.h
+++ b/include/haproxy/mux_quic-t.h
@@ -13,7 +13,7 @@
 #include <haproxy/list-t.h>
 #include <haproxy/ncbuf-t.h>
 #include <haproxy/quic_stream-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 
 /* Stream types */
 enum qcs_type {
@@ -112,7 +112,7 @@ struct qcs {
 		uint64_t offset; /* absolute current base offset of ncbuf */
 		uint64_t offset_max; /* maximum absolute offset received */
 		struct ncbuf ncbuf; /* receive buffer - can handle out-of-order offset frames */
-		struct buffer app_buf; /* receive buffer used by conn_stream layer */
+		struct buffer app_buf; /* receive buffer used by stconn layer */
 		uint64_t msd; /* current max-stream-data limit to enforce */
 		uint64_t msd_init; /* initial max-stream-data */
 	} rx;
diff --git a/include/haproxy/sc_strm.h b/include/haproxy/sc_strm.h
index 363371519..946b3bc71 100644
--- a/include/haproxy/sc_strm.h
+++ b/include/haproxy/sc_strm.h
@@ -28,9 +28,9 @@
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/channel.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 
 void sc_update_rx(struct stconn *cs);
diff --git a/include/haproxy/conn_stream-t.h b/include/haproxy/stconn-t.h
similarity index 97%
rename from include/haproxy/conn_stream-t.h
rename to include/haproxy/stconn-t.h
index 9ee0b9965..6623cc3ea 100644
--- a/include/haproxy/conn_stream-t.h
+++ b/include/haproxy/stconn-t.h
@@ -1,10 +1,9 @@
 /*
- * include/haproxy/conn_stream-t.h
+ * include/haproxy/stconn-t.h
  * This file describes the stream connector struct and associated constants.
  *
  * Copyright 2021 Christopher Faulet <cfaulet@haproxy.com>
  *
- *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation, version 2.1
@@ -20,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CONN_STREAM_T_H
-#define _HAPROXY_CONN_STREAM_T_H
+#ifndef _HAPROXY_STCONN_T_H
+#define _HAPROXY_STCONN_T_H
 
 #include <haproxy/obj_type-t.h>
 #include <haproxy/connection-t.h>
@@ -140,7 +139,7 @@ enum sc_state_bit {
 struct stconn;
 
 /* A Stream Endpoint Descriptor (sedesc) is the link between the stream
- * connector (ex. conn_stream) and the Stream Endpoint (mux or appctx).
+ * connector (ex. stconn) and the Stream Endpoint (mux or appctx).
  * It always exists for either of them, and binds them together. It also
  * contains some shared information relative to the endpoint. It is created by
  * the first one which needs it and is shared by the other one, i.e. on the
@@ -195,4 +194,4 @@ struct stconn {
 };
 
 
-#endif /* _HAPROXY_CONN_STREAM_T_H */
+#endif /* _HAPROXY_STCONN_T_H */
diff --git a/include/haproxy/conn_stream.h b/include/haproxy/stconn.h
similarity index 97%
rename from include/haproxy/conn_stream.h
rename to include/haproxy/stconn.h
index 0e4728566..a9b04ce3a 100644
--- a/include/haproxy/conn_stream.h
+++ b/include/haproxy/stconn.h
@@ -1,5 +1,5 @@
 /*
- * include/haproxy/conn_stream.h
+ * include/haproxy/stconn.h
  * This file contains stream connector function prototypes
  *
  * Copyright 2021 Christopher Faulet <cfaulet@haproxy.com>
@@ -19,13 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef _HAPROXY_CONN_STREAM_H
-#define _HAPROXY_CONN_STREAM_H
+#ifndef _HAPROXY_STCONN_H
+#define _HAPROXY_STCONN_H
 
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream-t.h>
 #include <haproxy/obj_type.h>
+#include <haproxy/stconn-t.h>
 
 struct buffer;
 struct session;
@@ -53,7 +53,7 @@ struct appctx *sc_applet_create(struct stconn *cs, struct applet *app);
 
 /* The se_fl_*() set of functions manipulate the stream endpoint flags from
  * the stream endpoint itself. The sc_ep_*() set of functions manipulate the
- * stream endpoint flags from the the stream connector (ex. conn_stream).
+ * stream endpoint flags from the the stream connector (ex. stconn).
  * _zero() clears all flags, _clr() clears a set of flags (&=~), _set() sets
  * a set of flags (|=), _test() tests the presence of a set of flags, _get()
  * retrieves the exact flags, _setall() replaces the flags with the new value.
@@ -398,4 +398,4 @@ static inline void se_need_more_data(struct sedesc *se)
 	se_fl_set(se, SE_FL_WILL_CONSUME | SE_FL_WAIT_DATA);
 }
 
-#endif /* _HAPROXY_CONN_STREAM_H */
+#endif /* _HAPROXY_STCONN_H */
diff --git a/include/haproxy/stream-t.h b/include/haproxy/stream-t.h
index e28e7a8a2..5e2261fb2 100644
--- a/include/haproxy/stream-t.h
+++ b/include/haproxy/stream-t.h
@@ -26,7 +26,7 @@
 
 #include <haproxy/api-t.h>
 #include <haproxy/channel-t.h>
-#include <haproxy/conn_stream-t.h>
+#include <haproxy/stconn-t.h>
 #include <haproxy/dynbuf-t.h>
 #include <haproxy/filters-t.h>
 #include <haproxy/obj_type-t.h>
diff --git a/include/haproxy/stream.h b/include/haproxy/stream.h
index 49f715be0..d5de4675e 100644
--- a/include/haproxy/stream.h
+++ b/include/haproxy/stream.h
@@ -24,13 +24,13 @@
 
 #include <haproxy/action-t.h>
 #include <haproxy/api.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/pool-t.h>
 #include <haproxy/queue.h>
 #include <haproxy/session.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task-t.h>
diff --git a/src/activity.c b/src/activity.c
index ff58fb42e..97640f341 100644
--- a/src/activity.c
+++ b/src/activity.c
@@ -17,9 +17,9 @@
 #include <haproxy/clock.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 
diff --git a/src/applet.c b/src/applet.c
index ee7abdfbf..60508665f 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -16,9 +16,9 @@
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/list.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 
diff --git a/src/backend.c b/src/backend.c
index ea5f33268..9b73ec7cb 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -27,7 +27,6 @@
 #include <haproxy/backend.h>
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
 #include <haproxy/hash.h>
@@ -53,6 +52,7 @@
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
diff --git a/src/cache.c b/src/cache.c
index 754bf63d3..c0ea11dad 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -19,7 +19,6 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/hash.h>
@@ -33,6 +32,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/shctx.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 
diff --git a/src/cli.c b/src/cli.c
index 8bbe853a7..8f21b2e17 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -34,7 +34,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/compression.h>
 #include <haproxy/dns-t.h>
 #include <haproxy/errors.h>
@@ -58,6 +57,7 @@
 #include <haproxy/session.h>
 #include <haproxy/sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
diff --git a/src/connection.c b/src/connection.c
index cd32dafea..a9bbc74ca 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,7 +17,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/hash.h>
@@ -30,6 +29,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/session.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xxhash.h>
 
diff --git a/src/debug.c b/src/debug.c
index 73b4a54d3..ca102318f 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -30,7 +30,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/clock.h>
 #include <haproxy/debug.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/log.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/thread.h>
 #include <haproxy/time.h>
diff --git a/src/dns.c b/src/dns.c
index ee9b685a8..7c5c22222 100644
--- a/src/dns.c
+++ b/src/dns.c
@@ -25,7 +25,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dgram.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
@@ -33,6 +32,7 @@
 #include <haproxy/log.h>
 #include <haproxy/ring.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 
diff --git a/src/flt_spoe.c b/src/flt_spoe.c
index b4c6d270b..dabe6938d 100644
--- a/src/flt_spoe.c
+++ b/src/flt_spoe.c
@@ -19,7 +19,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/check.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/filters.h>
 #include <haproxy/freq_ctr.h>
 #include <haproxy/frontend.h>
@@ -34,6 +33,7 @@
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
 #include <haproxy/spoe.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
diff --git a/src/h3.c b/src/h3.c
index 35c3784a6..cc609f0d2 100644
--- a/src/h3.c
+++ b/src/h3.c
@@ -18,7 +18,6 @@
 
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h3.h>
 #include <haproxy/http.h>
@@ -31,6 +30,7 @@
 #include <haproxy/qpack-dec.h>
 #include <haproxy/qpack-enc.h>
 #include <haproxy/quic_enc.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/xprt_quic.h>
 
diff --git a/src/hlua.c b/src/hlua.c
index f90427007..9304983d0 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -34,7 +34,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/clock.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/filters.h>
 #include <haproxy/h1.h>
 #include <haproxy/hlua.h>
@@ -58,6 +57,7 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
diff --git a/src/http_act.c b/src/http_act.c
index 40438c678..de462d298 100644
--- a/src/http_act.c
+++ b/src/http_act.c
@@ -23,7 +23,6 @@
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/chunk.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
@@ -35,6 +34,7 @@
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/uri_auth-t.h>
 #include <haproxy/uri_normalizer.h>
diff --git a/src/http_ana.c b/src/http_ana.c
index fb5cf030c..6950d8217 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -21,7 +21,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/filters.h>
 #include <haproxy/http.h>
@@ -35,6 +34,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 #include <haproxy/uri_auth-t.h>
diff --git a/src/http_client.c b/src/http_client.c
index 9b344d5fd..4626d6fad 100644
--- a/src/http_client.c
+++ b/src/http_client.c
@@ -18,7 +18,6 @@
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/cfgparse.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/istbuf.h>
 #include <haproxy/h1_htx.h>
@@ -35,6 +34,7 @@
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock-t.h>
 #include <haproxy/sock_inet.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 #include <string.h>
diff --git a/src/log.c b/src/log.c
index 0024d949d..287d8a0ce 100644
--- a/src/log.c
+++ b/src/log.c
@@ -27,7 +27,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/clock.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/fd.h>
 #include <haproxy/frontend.h>
 #include <haproxy/global.h>
@@ -40,6 +39,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/sink.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
diff --git a/src/map.c b/src/map.c
index 8904c5de5..76becb282 100644
--- a/src/map.c
+++ b/src/map.c
@@ -17,13 +17,13 @@
 #include <haproxy/applet.h>
 #include <haproxy/arg.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/map.h>
 #include <haproxy/pattern.h>
 #include <haproxy/regex.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index d3db7fe26..f38a475fa 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -17,7 +17,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fcgi-app.h>
@@ -33,6 +32,7 @@
 #include <haproxy/regex.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/session-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 #include <haproxy/version.h>
diff --git a/src/mux_h1.c b/src/mux_h1.c
index a30500e0f..198500699 100644
--- a/src/mux_h1.c
+++ b/src/mux_h1.c
@@ -15,7 +15,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h1.h>
 #include <haproxy/h1_htx.h>
@@ -28,6 +27,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 
diff --git a/src/mux_h2.c b/src/mux_h2.c
index cfffd6978..c405ea6c7 100644
--- a/src/mux_h2.c
+++ b/src/mux_h2.c
@@ -15,7 +15,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/h2.h>
 #include <haproxy/hpack-dec.h>
@@ -28,6 +27,7 @@
 #include <haproxy/net_helper.h>
 #include <haproxy/session-t.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/trace.h>
 
diff --git a/src/mux_pt.c b/src/mux_pt.c
index acebdee52..7e119a048 100644
--- a/src/mux_pt.c
+++ b/src/mux_pt.c
@@ -13,8 +13,8 @@
 #include <haproxy/api.h>
 #include <haproxy/buf.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/pipe-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/trace.h>
diff --git a/src/mux_quic.c b/src/mux_quic.c
index a993a5aa8..d4256cd98 100644
--- a/src/mux_quic.c
+++ b/src/mux_quic.c
@@ -4,7 +4,6 @@
 
 #include <haproxy/api.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/htx.h>
 #include <haproxy/list.h>
@@ -12,6 +11,7 @@
 #include <haproxy/pool.h>
 #include <haproxy/quic_stream.h>
 #include <haproxy/ssl_sock-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/trace.h>
 #include <haproxy/xprt_quic.h>
 
diff --git a/src/mworker.c b/src/mworker.c
index d246f2b18..73963cd7f 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -25,7 +25,6 @@
 #include <haproxy/api.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/global.h>
@@ -36,6 +35,7 @@
 #include <haproxy/proxy.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/tools.h>
 #include <haproxy/version.h>
diff --git a/src/payload.c b/src/payload.c
index 08d5826d4..354ef5c2f 100644
--- a/src/payload.c
+++ b/src/payload.c
@@ -18,12 +18,12 @@
 #include <haproxy/arg.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/htx.h>
 #include <haproxy/net_helper.h>
 #include <haproxy/pattern.h>
 #include <haproxy/payload.h>
 #include <haproxy/sample.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 
diff --git a/src/peers.c b/src/peers.c
index 88d609fed..b0ed81c8c 100644
--- a/src/peers.c
+++ b/src/peers.c
@@ -27,7 +27,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -40,6 +39,7 @@
 #include <haproxy/session-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
diff --git a/src/pool.c b/src/pool.c
index c82dbcbc2..973f8a0f2 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -19,13 +19,13 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/thread.h>
 #include <haproxy/tools.h>
 
diff --git a/src/proxy.c b/src/proxy.c
index 123f94ed7..b5b903715 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -25,7 +25,6 @@
 #include <haproxy/capture-t.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
 #include <haproxy/filters.h>
@@ -44,6 +43,7 @@
 #include <haproxy/server-t.h>
 #include <haproxy/signal.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
diff --git a/src/resolvers.c b/src/resolvers.c
index 76d94bcdb..758dbafa8 100644
--- a/src/resolvers.c
+++ b/src/resolvers.c
@@ -27,7 +27,6 @@
 #include <haproxy/channel.h>
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dns.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -42,6 +41,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tcp_rules.h>
 #include <haproxy/ticks.h>
diff --git a/src/ring.c b/src/ring.c
index d39d8b6ec..ef8887a4f 100644
--- a/src/ring.c
+++ b/src/ring.c
@@ -23,9 +23,9 @@
 #include <haproxy/applet.h>
 #include <haproxy/buf.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/ring.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/thread.h>
 
 /* context used to dump the contents of a ring via "show events" or "show errors" */
diff --git a/src/server.c b/src/server.c
index a24a9de26..df84579ba 100644
--- a/src/server.c
+++ b/src/server.c
@@ -25,7 +25,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict-t.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -41,6 +40,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/server.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
diff --git a/src/sink.c b/src/sink.c
index 1e4db7e46..d746c38d6 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -23,7 +23,6 @@
 #include <haproxy/applet.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
@@ -32,6 +31,7 @@
 #include <haproxy/sc_strm.h>
 #include <haproxy/signal.h>
 #include <haproxy/sink.h>
+#include <haproxy/stconn.h>
 #include <haproxy/time.h>
 #include <haproxy/tools.h>
 
diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index e85ddbe36..d658065cd 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -30,12 +30,12 @@
 #include <haproxy/base64.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 /* Uncommitted CKCH transaction */
diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index 6ef9ec229..e0651696e 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -23,12 +23,12 @@
 #include <haproxy/applet.h>
 #include <haproxy/channel.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/ssl_ckch.h>
 #include <haproxy/ssl_crtlist.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 
 /* CLI context for "show ssl crt-list" or "dump ssl crt-list" */
diff --git a/src/ssl_sample.c b/src/ssl_sample.c
index 9031dc498..6b5f794d9 100644
--- a/src/ssl_sample.c
+++ b/src/ssl_sample.c
@@ -25,12 +25,12 @@
 #include <haproxy/base64.h>
 #include <haproxy/buf-t.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/obj_type.h>
 #include <haproxy/openssl-compat.h>
 #include <haproxy/sample.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/tools.h>
 #include <haproxy/vars.h>
 
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 2499de63e..060269bcf 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -51,7 +51,6 @@
 #include <haproxy/chunk.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -73,6 +72,7 @@
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
diff --git a/src/stats.c b/src/stats.c
index f9d697aa2..8230956a9 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -34,7 +34,6 @@
 #include <haproxy/cli.h>
 #include <haproxy/clock.h>
 #include <haproxy/compression.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/debug.h>
 #include <haproxy/errors.h>
 #include <haproxy/fd.h>
@@ -58,6 +57,7 @@
 #include <haproxy/server.h>
 #include <haproxy/session.h>
 #include <haproxy/stats.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
 #include <haproxy/ticks.h>
diff --git a/src/conn_stream.c b/src/stconn.c
similarity index 99%
rename from src/conn_stream.c
rename to src/stconn.c
index 606b7ff7d..0ca04afd6 100644
--- a/src/conn_stream.c
+++ b/src/stconn.c
@@ -13,12 +13,12 @@
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/check.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/pipe.h>
 #include <haproxy/pool.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 
 DECLARE_POOL(pool_head_connstream, "stconn", sizeof(struct stconn));
 DECLARE_POOL(pool_head_sedesc, "sedesc", sizeof(struct sedesc));
diff --git a/src/stick_table.c b/src/stick_table.c
index f9e84b6de..e907ce10e 100644
--- a/src/stick_table.c
+++ b/src/stick_table.c
@@ -23,7 +23,6 @@
 #include <haproxy/arg.h>
 #include <haproxy/cfgparse.h>
 #include <haproxy/cli.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
@@ -38,6 +37,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
diff --git a/src/stream.c b/src/stream.c
index 97db6030d..526d67862 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -28,7 +28,6 @@
 #include <haproxy/check.h>
 #include <haproxy/cli.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dict.h>
 #include <haproxy/dynbuf.h>
 #include <haproxy/fd.h>
@@ -52,6 +51,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/session.h>
 #include <haproxy/stats-t.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream.h>
 #include <haproxy/task.h>
diff --git a/src/tcp_rules.c b/src/tcp_rules.c
index baa4ba71f..131895340 100644
--- a/src/tcp_rules.c
+++ b/src/tcp_rules.c
@@ -17,13 +17,13 @@
 #include <haproxy/cfgparse.h>
 #include <haproxy/channel.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/global.h>
 #include <haproxy/list.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
 #include <haproxy/sc_strm.h>
+#include <haproxy/stconn.h>
 #include <haproxy/stick_table.h>
 #include <haproxy/stream-t.h>
 #include <haproxy/tcp_rules.h>
diff --git a/src/tcpcheck.c b/src/tcpcheck.c
index d0012a280..62e28e2f0 100644
--- a/src/tcpcheck.c
+++ b/src/tcpcheck.c
@@ -38,7 +38,6 @@
 #include <haproxy/check.h>
 #include <haproxy/chunk.h>
 #include <haproxy/connection.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/errors.h>
 #include <haproxy/global.h>
 #include <haproxy/h1.h>
@@ -55,6 +54,7 @@
 #include <haproxy/sample.h>
 #include <haproxy/server.h>
 #include <haproxy/ssl_sock.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tcpcheck.h>
 #include <haproxy/ticks.h>
diff --git a/src/tools.c b/src/tools.c
index f9c1bd43f..74903efda 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -53,7 +53,6 @@ extern void *__elf_aux_vector;
 #include <haproxy/api.h>
 #include <haproxy/applet.h>
 #include <haproxy/chunk.h>
-#include <haproxy/conn_stream.h>
 #include <haproxy/dgram.h>
 #include <haproxy/global.h>
 #include <haproxy/hlua.h>
@@ -66,6 +65,7 @@ extern void *__elf_aux_vector;
 #include <haproxy/sock.h>
 #include <haproxy/ssl_sock.h>
 #include <haproxy/ssl_utils.h>
+#include <haproxy/stconn.h>
 #include <haproxy/task.h>
 #include <haproxy/tools.h>