diff --git a/emper/io.hpp b/emper/io.hpp
index b36b287bdb30570fe6dd88831957866200007101..db52092befe20fda4dc727551448e99b526097cc 100644
--- a/emper/io.hpp
+++ b/emper/io.hpp
@@ -645,7 +645,7 @@ struct SockOpt {
 	socklen_t val_len;
 
 	static const int ENABLE;
-	static const SockOpt ReUsePort;
+	static const SockOpt ReusePort;
 };
 
 /**
@@ -660,7 +660,7 @@ struct SockOpt {
  *
  * @return nullptr on error, otherwise the TCP listener Fiber
  */
-auto tcp_listener(std::string &host, std::string &port, const std::function<void(int)> &handler,
-									int backlog = 1024, const std::vector<SockOpt> &sockopts = std::vector<SockOpt>())
-		-> Fiber *;
+auto tcp_listener(const std::string &host, const std::string &port,
+									const std::function<void(int)> &handler, int backlog = 1024,
+									const std::vector<SockOpt> &sockopts = std::vector<SockOpt>()) -> Fiber *;
 }	 // namespace emper::io
diff --git a/emper/io/io.cpp b/emper/io/io.cpp
index bba906cd09f79cb0a91d75d2eab07817a6e2e9a7..f7ef9aa225acefd1d6e3111cc1c53e758d14b086 100644
--- a/emper/io/io.cpp
+++ b/emper/io/io.cpp
@@ -24,7 +24,7 @@ namespace fs = std::filesystem;
 namespace emper::io {
 
 const int SockOpt::ENABLE = 1;
-const SockOpt SockOpt::ReUsePort = {SOL_SOCKET, SO_REUSEPORT, &SockOpt::ENABLE,
+const SockOpt SockOpt::ReusePort = {SOL_SOCKET, SO_REUSEPORT, &SockOpt::ENABLE,
 																		sizeof(SockOpt::ENABLE)};
 
 static void recursive_directory_walk_helper(
@@ -58,8 +58,9 @@ void recursive_directory_walk(const fs::path& dirpath,
 	cps.wait();
 }
 
-auto tcp_listener(std::string& host, std::string& port, const std::function<void(int)>& handler,
-									int backlog, const std::vector<SockOpt>& sockopts) -> Fiber* {
+auto tcp_listener(const std::string& host, const std::string& port,
+									const std::function<void(int)>& handler, int backlog,
+									const std::vector<SockOpt>& sockopts) -> Fiber* {
 	int listen_socket;
 	struct addrinfo* servaddr;
 
diff --git a/tests/fixtures/network.cpp b/tests/fixtures/network.cpp
index 5bbf01ce3c250d50c26f1b9fdf0bd3657f435f41..c21cf7c3f30b2d1c30ebce01518de8bac7c782c5 100644
--- a/tests/fixtures/network.cpp
+++ b/tests/fixtures/network.cpp
@@ -48,8 +48,8 @@ void echo_serve(int client_socket) {
 	}
 }
 
-void echo_client(std::string& host, std::string& port, const std::vector<std::string>& msgs,
-								 size_t iterations) {
+void echo_client(const std::string& host, const std::string& port,
+								 const std::vector<std::string>& msgs, size_t iterations) {
 	struct addrinfo* server;
 
 	int err = getaddrinfo(host.c_str(), port.c_str(), nullptr, &server);
diff --git a/tests/fixtures/network.hpp b/tests/fixtures/network.hpp
index 8c50c1532c6d2bb5c72a384804d61af7f0146336..d5137b16d9a55255eef57803958331b69c7c0ecd 100644
--- a/tests/fixtures/network.hpp
+++ b/tests/fixtures/network.hpp
@@ -8,5 +8,5 @@
 
 void echo_serve(int client_socket);
 
-void echo_client(std::string& host, std::string& port, const std::vector<std::string>& msgs,
-								 size_t iterations = 1);
+void echo_client(const std::string& host, const std::string& port,
+								 const std::vector<std::string>& msgs, size_t iterations = 1);
diff --git a/tests/io/ConcurrentNetworkEchoTest.cpp b/tests/io/ConcurrentNetworkEchoTest.cpp
index 4f3b8d23c22557b605a5309cd71cb498c86c15e0..ee09893dfff180e3bda53a5322c03cee2cf10511 100644
--- a/tests/io/ConcurrentNetworkEchoTest.cpp
+++ b/tests/io/ConcurrentNetworkEchoTest.cpp
@@ -43,7 +43,7 @@ auto main(int argc, char* argv[]) -> int {
 	Runtime runtime;
 
 	Fiber* listener =
-			emper::io::tcp_listener(host, port, echo_serve, 1024, {emper::io::SockOpt::ReUsePort});
+			emper::io::tcp_listener(host, port, echo_serve, 1024, {emper::io::SockOpt::ReusePort});
 	if (!listener) {
 		DIE_MSG("failed to create listener");
 	}
diff --git a/tests/io/SimpleNetworkTest.cpp b/tests/io/SimpleNetworkTest.cpp
index 3040f69ba711bb9ad36bb19410658421b9e4a94c..4f1f76c4afe72210d19f11ae18132891d6bb5e39 100644
--- a/tests/io/SimpleNetworkTest.cpp
+++ b/tests/io/SimpleNetworkTest.cpp
@@ -19,7 +19,7 @@ void emperTest() {
 
 	CPS cps;
 	Fiber* listener =
-			emper::io::tcp_listener(addr, port, echo_serve, 1024, {emper::io::SockOpt::ReUsePort});
+			emper::io::tcp_listener(addr, port, echo_serve, 1024, {emper::io::SockOpt::ReusePort});
 	if (!listener) {
 		DIE_MSG("failed to create listener");
 	}