diff --git a/src/lib/arch/IArchNetwork.h b/src/lib/arch/IArchNetwork.h
index b4b5a11ef..91ded5389 100644
--- a/src/lib/arch/IArchNetwork.h
+++ b/src/lib/arch/IArchNetwork.h
@@ -61,10 +61,10 @@ public:
   };
 
   //! Supported socket types
-  enum ESocketType
+  enum class SocketType : uint8_t
   {
-    kDGRAM,
-    kSTREAM
+    DataGram,
+    Stream
   };
 
   //! Events for \c poll()
@@ -105,7 +105,7 @@ public:
   /*!
   The socket is an opaque data type.
   */
-  virtual ArchSocket newSocket(AddressFamily, ESocketType) = 0;
+  virtual ArchSocket newSocket(AddressFamily, SocketType) = 0;
 
   //! Copy a socket object
   /*!
diff --git a/src/lib/arch/unix/ArchNetworkBSD.cpp b/src/lib/arch/unix/ArchNetworkBSD.cpp
index 75cf335cf..a1e7d40a0 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.cpp
+++ b/src/lib/arch/unix/ArchNetworkBSD.cpp
@@ -95,10 +95,10 @@ void ArchNetworkBSD::init()
   // do nothing
 }
 
-ArchSocket ArchNetworkBSD::newSocket(AddressFamily family, ESocketType type)
+ArchSocket ArchNetworkBSD::newSocket(AddressFamily family, SocketType type)
 {
   // create socket
-  int fd = socket(s_family[static_cast<int>(family)], s_type[type], 0);
+  int fd = socket(s_family[static_cast<int>(family)], s_type[static_cast<int>(type)], 0);
   if (fd == -1) {
     throwError(errno);
   }
diff --git a/src/lib/arch/unix/ArchNetworkBSD.h b/src/lib/arch/unix/ArchNetworkBSD.h
index d693b8644..ce3d844f8 100644
--- a/src/lib/arch/unix/ArchNetworkBSD.h
+++ b/src/lib/arch/unix/ArchNetworkBSD.h
@@ -71,7 +71,7 @@ public:
   void init() override;
 
   // IArchNetwork overrides
-  ArchSocket newSocket(AddressFamily, ESocketType) override;
+  ArchSocket newSocket(AddressFamily, SocketType) override;
   ArchSocket copySocket(ArchSocket s) override;
   void closeSocket(ArchSocket s) override;
   void closeSocketForRead(ArchSocket s) override;
diff --git a/src/lib/arch/win32/ArchNetworkWinsock.cpp b/src/lib/arch/win32/ArchNetworkWinsock.cpp
index d6d6df299..09f23d791 100644
--- a/src/lib/arch/win32/ArchNetworkWinsock.cpp
+++ b/src/lib/arch/win32/ArchNetworkWinsock.cpp
@@ -192,10 +192,10 @@ void ArchNetworkWinsock::initModule(HMODULE module)
   s_networkModule = module;
 }
 
-ArchSocket ArchNetworkWinsock::newSocket(AddressFamily family, ESocketType type)
+ArchSocket ArchNetworkWinsock::newSocket(AddressFamily family, SocketType type)
 {
   // create socket
-  SOCKET fd = socket_winsock(s_family[static_cast<int>(family)], s_type[type], 0);
+  SOCKET fd = socket_winsock(s_family[static_cast<int>(family)], s_type[static_cast<int>(type)], 0);
   if (fd == INVALID_SOCKET) {
     throwError(getsockerror_winsock());
   }
diff --git a/src/lib/arch/win32/ArchNetworkWinsock.h b/src/lib/arch/win32/ArchNetworkWinsock.h
index 4c1cd7b9b..c0f15a8ae 100644
--- a/src/lib/arch/win32/ArchNetworkWinsock.h
+++ b/src/lib/arch/win32/ArchNetworkWinsock.h
@@ -58,7 +58,7 @@ public:
   void init() override;
 
   // IArchNetwork overrides
-  ArchSocket newSocket(AddressFamily, ESocketType) override;
+  ArchSocket newSocket(AddressFamily, SocketType) override;
   ArchSocket copySocket(ArchSocket s) override;
   void closeSocket(ArchSocket s) override;
   void closeSocketForRead(ArchSocket s) override;
diff --git a/src/lib/net/TCPListenSocket.cpp b/src/lib/net/TCPListenSocket.cpp
index dba818bd0..e48e43255 100644
--- a/src/lib/net/TCPListenSocket.cpp
+++ b/src/lib/net/TCPListenSocket.cpp
@@ -29,7 +29,7 @@ TCPListenSocket::TCPListenSocket(
       m_socketMultiplexer(socketMultiplexer)
 {
   try {
-    m_socket = ARCH->newSocket(family, IArchNetwork::kSTREAM);
+    m_socket = ARCH->newSocket(family, IArchNetwork::SocketType::Stream);
   } catch (XArchNetwork &e) {
     throw XSocketCreate(e.what());
   }
diff --git a/src/lib/net/TCPSocket.cpp b/src/lib/net/TCPSocket.cpp
index 2056e0afe..f4487fc1b 100644
--- a/src/lib/net/TCPSocket.cpp
+++ b/src/lib/net/TCPSocket.cpp
@@ -34,7 +34,7 @@ TCPSocket::TCPSocket(IEventQueue *events, SocketMultiplexer *socketMultiplexer,
       m_socketMultiplexer(socketMultiplexer)
 {
   try {
-    m_socket = ARCH->newSocket(family, IArchNetwork::kSTREAM);
+    m_socket = ARCH->newSocket(family, IArchNetwork::SocketType::Stream);
   } catch (const XArchNetwork &e) {
     throw XSocketCreate(e.what());
   }