diff --git a/gateway/src/node/client_handling/websocket/shared_state.rs b/gateway/src/node/client_handling/websocket/common_state.rs
similarity index 94%
rename from gateway/src/node/client_handling/websocket/shared_state.rs
rename to gateway/src/node/client_handling/websocket/common_state.rs
index 1f19476e97..e112997e57 100644
--- a/gateway/src/node/client_handling/websocket/shared_state.rs
+++ b/gateway/src/node/client_handling/websocket/common_state.rs
@@ -8,7 +8,7 @@ use std::sync::Arc;
 
 // I can see this being possible expanded with say storage or client store
 #[derive(Clone)]
-pub(crate) struct SharedHandlerState {
+pub(crate) struct CommonHandlerState {
     pub(crate) coconut_verifier: Arc<CoconutVerifier>,
     pub(crate) local_identity: Arc<identity::KeyPair>,
     pub(crate) only_coconut_credentials: bool,
diff --git a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
index aaf8e39518..947e22a292 100644
--- a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
+++ b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs
@@ -25,8 +25,8 @@ use thiserror::Error;
 use tokio::io::{AsyncRead, AsyncWrite};
 use tokio_tungstenite::tungstenite::{protocol::Message, Error as WsError};
 
+use crate::node::client_handling::websocket::common_state::CommonHandlerState;
 use crate::node::client_handling::websocket::connection_handler::AvailableBandwidth;
-use crate::node::client_handling::websocket::shared_state::SharedHandlerState;
 use crate::node::{
     client_handling::{
         active_clients::ActiveClientsStore,
@@ -89,7 +89,7 @@ impl InitialAuthenticationError {
 
 pub(crate) struct FreshHandler<R, S, St> {
     rng: R,
-    pub(crate) shared_state: SharedHandlerState,
+    pub(crate) shared_state: CommonHandlerState,
     pub(crate) active_clients_store: ActiveClientsStore,
     pub(crate) outbound_mix_sender: MixForwardingSender,
     pub(crate) socket_connection: SocketStream<S>,
@@ -115,7 +115,7 @@ where
         outbound_mix_sender: MixForwardingSender,
         storage: St,
         active_clients_store: ActiveClientsStore,
-        shared_state: SharedHandlerState,
+        shared_state: CommonHandlerState,
     ) -> Self {
         FreshHandler {
             rng,
diff --git a/gateway/src/node/client_handling/websocket/listener.rs b/gateway/src/node/client_handling/websocket/listener.rs
index 9b073dbc5c..a33f6a0fb5 100644
--- a/gateway/src/node/client_handling/websocket/listener.rs
+++ b/gateway/src/node/client_handling/websocket/listener.rs
@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 use crate::node::client_handling::active_clients::ActiveClientsStore;
+use crate::node::client_handling::websocket::common_state::CommonHandlerState;
 use crate::node::client_handling::websocket::connection_handler::FreshHandler;
-use crate::node::client_handling::websocket::shared_state::SharedHandlerState;
 use crate::node::storage::Storage;
 use log::*;
 use nym_mixnet_client::forwarder::MixForwardingSender;
@@ -14,11 +14,11 @@ use tokio::task::JoinHandle;
 
 pub(crate) struct Listener {
     address: SocketAddr,
-    shared_state: SharedHandlerState,
+    shared_state: CommonHandlerState,
 }
 
 impl Listener {
-    pub(crate) fn new(address: SocketAddr, shared_state: SharedHandlerState) -> Self {
+    pub(crate) fn new(address: SocketAddr, shared_state: CommonHandlerState) -> Self {
         Listener {
             address,
             shared_state,
diff --git a/gateway/src/node/client_handling/websocket/mod.rs b/gateway/src/node/client_handling/websocket/mod.rs
index 6d0a990956..12c252feca 100644
--- a/gateway/src/node/client_handling/websocket/mod.rs
+++ b/gateway/src/node/client_handling/websocket/mod.rs
@@ -3,9 +3,9 @@
 
 pub(crate) use listener::Listener;
 
+pub(crate) mod common_state;
 pub(crate) mod connection_handler;
 pub(crate) mod listener;
 pub(crate) mod message_receiver;
-pub(crate) mod shared_state;
 
-pub(crate) use shared_state::SharedHandlerState;
+pub(crate) use common_state::CommonHandlerState;
diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs
index 5f5f57e164..c3aa3b5969 100644
--- a/gateway/src/node/mod.rs
+++ b/gateway/src/node/mod.rs
@@ -254,7 +254,7 @@ impl<St> Gateway<St> {
             self.config.gateway.clients_port,
         );
 
-        let shared_state = websocket::SharedHandlerState {
+        let shared_state = websocket::CommonHandlerState {
             coconut_verifier,
             local_identity: Arc::clone(&self.identity_keypair),
             only_coconut_credentials: self.config.gateway.only_coconut_credentials,