diff --git a/matrix_sdk_base/src/base_client.rs b/matrix_sdk_base/src/client.rs
similarity index 100%
rename from matrix_sdk_base/src/base_client.rs
rename to matrix_sdk_base/src/client.rs
diff --git a/matrix_sdk_base/src/lib.rs b/matrix_sdk_base/src/lib.rs
index fdc5173b..4d78b258 100644
--- a/matrix_sdk_base/src/lib.rs
+++ b/matrix_sdk_base/src/lib.rs
@@ -30,14 +30,14 @@ pub use crate::{error::Error, error::Result, session::Session};
 pub use matrix_sdk_common::*;
 pub use reqwest::header::InvalidHeaderValue;
 
-mod base_client;
+mod client;
 mod error;
 mod event_emitter;
 mod models;
 mod session;
 mod state;
 
-pub use base_client::{Client, RoomState, RoomStateType};
+pub use client::{Client, RoomState, RoomStateType};
 pub use event_emitter::EventEmitter;
 #[cfg(feature = "encryption")]
 pub use matrix_sdk_crypto::{Device, TrustState};
diff --git a/matrix_sdk_base/src/state/mod.rs b/matrix_sdk_base/src/state/mod.rs
index f0d436d8..d6a3bf1a 100644
--- a/matrix_sdk_base/src/state/mod.rs
+++ b/matrix_sdk_base/src/state/mod.rs
@@ -19,7 +19,7 @@ use std::collections::HashMap;
 pub mod state_store;
 pub use state_store::JsonStore;
 
-use crate::base_client::{Client as BaseClient, Token};
+use crate::client::{Client as BaseClient, Token};
 use crate::events::push_rules::Ruleset;
 use crate::identifiers::{RoomId, UserId};
 use crate::{Result, Room, Session};