diff --git a/kb_lib/src/rpc_ws.rs b/kb_lib/src/json_rpc_ws.rs
similarity index 99%
rename from kb_lib/src/rpc_ws.rs
rename to kb_lib/src/json_rpc_ws.rs
index c4ec53b..7206ffa 100644
--- a/kb_lib/src/rpc_ws.rs
+++ b/kb_lib/src/json_rpc_ws.rs
@@ -1,4 +1,4 @@
-// file: kb_lib/src/rpc_ws.rs
+// file: kb_lib/src/json_rpc_ws.rs
 
 //! Generic JSON-RPC 2.0 WebSocket helpers.
 //!
diff --git a/kb_lib/src/lib.rs b/kb_lib/src/lib.rs
index 47b990b..79d47a6 100644
--- a/kb_lib/src/lib.rs
+++ b/kb_lib/src/lib.rs
@@ -12,11 +12,11 @@ mod config;
 mod constants;
 mod error;
 mod http_client;
-mod rpc_ws;
 mod tracing;
 mod types;
 mod ws_client;
-mod rpc_ws_solana;
+mod json_rpc_ws;
+mod solana_pubsub_ws;
 mod http_pool;
 mod db;
 mod detect;
@@ -32,16 +32,6 @@ pub use crate::config::KbDatabaseConfig;
 pub use crate::config::KbSqliteDatabaseConfig;
 pub use crate::constants::*;
 pub use crate::error::KbError;
-pub use crate::rpc_ws::KbJsonRpcWsErrorObject;
-pub use crate::rpc_ws::KbJsonRpcWsErrorResponse;
-pub use crate::rpc_ws::KbJsonRpcWsIncomingMessage;
-pub use crate::rpc_ws::KbJsonRpcWsNotification;
-pub use crate::rpc_ws::KbJsonRpcWsNotificationParams;
-pub use crate::rpc_ws::KbJsonRpcWsRequest;
-pub use crate::rpc_ws::KbJsonRpcWsSuccessResponse;
-pub use crate::rpc_ws::kb_is_probable_json_rpc_object_text;
-pub use crate::rpc_ws::parse_kb_json_rpc_ws_incoming_text;
-pub use crate::rpc_ws::parse_kb_json_rpc_ws_incoming_value;
 pub use crate::http_client::HttpClient;
 pub use crate::http_client::KbJsonRpcHttpErrorObject;
 pub use crate::http_client::KbJsonRpcHttpErrorResponse;
@@ -59,9 +49,19 @@ pub use crate::ws_client::WsClient;
 pub use crate::ws_client::WsEvent;
 pub use crate::ws_client::WsOutgoingMessage;
 pub use crate::ws_client::WsSubscriptionInfo;
-pub use crate::rpc_ws_solana::KbSolanaWsTypedNotification;
-pub use crate::rpc_ws_solana::parse_kb_solana_ws_typed_notification;
-pub use crate::rpc_ws_solana::parse_kb_solana_ws_typed_notification_from_event;
+pub use crate::json_rpc_ws::KbJsonRpcWsErrorObject;
+pub use crate::json_rpc_ws::KbJsonRpcWsErrorResponse;
+pub use crate::json_rpc_ws::KbJsonRpcWsIncomingMessage;
+pub use crate::json_rpc_ws::KbJsonRpcWsNotification;
+pub use crate::json_rpc_ws::KbJsonRpcWsNotificationParams;
+pub use crate::json_rpc_ws::KbJsonRpcWsRequest;
+pub use crate::json_rpc_ws::KbJsonRpcWsSuccessResponse;
+pub use crate::json_rpc_ws::kb_is_probable_json_rpc_object_text;
+pub use crate::json_rpc_ws::parse_kb_json_rpc_ws_incoming_text;
+pub use crate::json_rpc_ws::parse_kb_json_rpc_ws_incoming_value;
+pub use crate::solana_pubsub_ws::KbSolanaWsTypedNotification;
+pub use crate::solana_pubsub_ws::parse_kb_solana_ws_typed_notification;
+pub use crate::solana_pubsub_ws::parse_kb_solana_ws_typed_notification_from_event;
 pub use crate::http_pool::HttpEndpointPool;
 pub use crate::http_pool::KbHttpPoolClientSnapshot;
 pub use crate::db::KbDatabase;
diff --git a/kb_lib/src/rpc_ws_solana.rs b/kb_lib/src/solana_pubsub_ws.rs
similarity index 99%
rename from kb_lib/src/rpc_ws_solana.rs
rename to kb_lib/src/solana_pubsub_ws.rs
index e01c609..31bcdbd 100644
--- a/kb_lib/src/rpc_ws_solana.rs
+++ b/kb_lib/src/solana_pubsub_ws.rs
@@ -1,4 +1,4 @@
-// file: kb_lib/src/rpc_ws_solana.rs
+// file: kb_lib/src/solana_pubsub_ws.rs
 
 //! Typed Solana WebSocket PubSub helpers built on top of the generic JSON-RPC
 //! transport.