diff --git a/include/proto/server.h b/include/proto/server.h
index 71c8b13..a87c8d5 100644
--- a/include/proto/server.h
+++ b/include/proto/server.h
@@ -103,13 +103,13 @@
 }
 
 /* Shutdown all connections of a server. The caller must pass a termination
- * code in <why>, which must be one of SN_ERR_* indicating the reason for the
+ * code in <why>, which must be one of SF_ERR_* indicating the reason for the
  * shutdown.
  */
 void srv_shutdown_sessions(struct server *srv, int why);
 
 /* Shutdown all connections of all backup servers of a proxy. The caller must
- * pass a termination code in <why>, which must be one of SN_ERR_* indicating
+ * pass a termination code in <why>, which must be one of SF_ERR_* indicating
  * the reason for the shutdown.
  */
 void srv_shutdown_backup_sessions(struct proxy *px, int why);
diff --git a/include/proto/stream.h b/include/proto/stream.h
index c73ad20..ba2c943 100644
--- a/include/proto/stream.h
+++ b/include/proto/stream.h
@@ -41,7 +41,7 @@
 /* perform minimal intializations, report 0 in case of error, 1 if OK. */
 int init_stream();
 
-/* kill a stream and set the termination flags to <why> (one of SN_ERR_*) */
+/* kill a stream and set the termination flags to <why> (one of SF_ERR_*) */
 void stream_shutdown(struct stream *stream, int why);
 
 void stream_process_counters(struct stream *s);
diff --git a/include/proto/stream_interface.h b/include/proto/stream_interface.h
index f96d81c..801e4d8 100644
--- a/include/proto/stream_interface.h
+++ b/include/proto/stream_interface.h
@@ -371,14 +371,14 @@
 static inline int si_connect(struct stream_interface *si)
 {
 	struct connection *conn = objt_conn(si->end);
-	int ret = SN_ERR_NONE;
+	int ret = SF_ERR_NONE;
 
 	if (unlikely(!conn || !conn->ctrl || !conn->ctrl->connect))
-		return SN_ERR_INTERNAL;
+		return SF_ERR_INTERNAL;
 
 	if (!conn_ctrl_ready(conn) || !conn_xprt_ready(conn)) {
 		ret = conn->ctrl->connect(conn, !channel_is_empty(si_oc(si)), 0);
-		if (ret != SN_ERR_NONE)
+		if (ret != SF_ERR_NONE)
 			return ret;
 
 		/* we need to be notified about connection establishment */