diff --git a/Cargo.toml b/Cargo.toml
index 509fb55..ed76dd1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,8 +32,6 @@ chat-sqlite = { path = "core/sqlite" }
 components = { path = "extensions/components" }
 crypto = { path = "core/crypto" }
 libchat = { path = "core/conversations" }
-logoschat_components = { package = "components", path = "extensions/components" } # TODO: Remove alias 
-sqlite = { package = "chat-sqlite", path = "core/sqlite" } # TODO: remove alias
 storage = { path = "core/storage" }
 
 # External Workspace dependency declarations (sorted)
diff --git a/core/conversations/Cargo.toml b/core/conversations/Cargo.toml
index f91ae8d..eff4823 100644
--- a/core/conversations/Cargo.toml
+++ b/core/conversations/Cargo.toml
@@ -9,8 +9,8 @@ crate-type = ["rlib","staticlib"]
 [dependencies]
 # Workspace dependencies (sorted)
 blake2 = { workspace = true }
+chat-sqlite = { workspace = true }
 crypto = { workspace = true }
-sqlite = { workspace = true }
 storage = { workspace = true }
 
 # External dependencies (sorted)
diff --git a/core/conversations/src/conversation/privatev1.rs b/core/conversations/src/conversation/privatev1.rs
index b7736d8..f4f39e5 100644
--- a/core/conversations/src/conversation/privatev1.rs
+++ b/core/conversations/src/conversation/privatev1.rs
@@ -281,8 +281,8 @@ impl<S: ConversationStore + RatchetStore> Debug for PrivateV1Convo<S> {
 
 #[cfg(test)]
 mod tests {
+    use chat_sqlite::{ChatStorage, StorageConfig};
     use crypto::PrivateKey;
-    use sqlite::{ChatStorage, StorageConfig};
 
     use super::*;
 
diff --git a/core/conversations/src/inbox/handler.rs b/core/conversations/src/inbox/handler.rs
index 9b90ac3..ca02240 100644
--- a/core/conversations/src/inbox/handler.rs
+++ b/core/conversations/src/inbox/handler.rs
@@ -260,7 +260,7 @@ mod tests {
     use std::cell::RefCell;
 
     use super::*;
-    use sqlite::{ChatStorage, StorageConfig};
+    use chat_sqlite::{ChatStorage, StorageConfig};
 
     #[test]
     fn test_invite_privatev1_roundtrip() {
diff --git a/core/conversations/src/lib.rs b/core/conversations/src/lib.rs
index 4f855f6..b48e521 100644
--- a/core/conversations/src/lib.rs
+++ b/core/conversations/src/lib.rs
@@ -11,11 +11,11 @@ mod types;
 mod utils;
 
 pub use account::LogosAccount;
+pub use chat_sqlite::ChatStorage;
+pub use chat_sqlite::StorageConfig;
 pub use context::{Context, ConversationId, ConversationIdOwned, Introduction};
 pub use conversation::GroupConvo;
 pub use errors::ChatError;
 pub use service_traits::{DeliveryService, RegistrationService};
-pub use sqlite::ChatStorage;
-pub use sqlite::StorageConfig;
 pub use types::{AccountId, AddressedEnvelope, ContentData};
 pub use utils::hex_trunc;
diff --git a/core/double-ratchets/Cargo.toml b/core/double-ratchets/Cargo.toml
index e9d48e7..ded93b4 100644
--- a/core/double-ratchets/Cargo.toml
+++ b/core/double-ratchets/Cargo.toml
@@ -23,7 +23,7 @@ zeroize = "1.8.2"
 
 [dev-dependencies]
 # Workspace dependencies (sorted)
-sqlite = { workspace = true }
+chat-sqlite = { workspace = true }
 
 # External dependencies (sorted)
 tempfile = "3"
diff --git a/core/double-ratchets/examples/out_of_order_demo.rs b/core/double-ratchets/examples/out_of_order_demo.rs
index b01de57..beef652 100644
--- a/core/double-ratchets/examples/out_of_order_demo.rs
+++ b/core/double-ratchets/examples/out_of_order_demo.rs
@@ -2,8 +2,8 @@
 //!
 //! Run with: cargo run --example out_of_order_demo -p double-ratchets
 
+use chat_sqlite::{ChatStorage, StorageConfig};
 use double_ratchets::{InstallationKeyPair, RatchetSession};
-use sqlite::{ChatStorage, StorageConfig};
 use tempfile::NamedTempFile;
 
 fn main() {
diff --git a/core/double-ratchets/examples/storage_demo.rs b/core/double-ratchets/examples/storage_demo.rs
index 258d655..5222538 100644
--- a/core/double-ratchets/examples/storage_demo.rs
+++ b/core/double-ratchets/examples/storage_demo.rs
@@ -2,8 +2,8 @@
 //!
 //! Run with: cargo run --example storage_demo -p double-ratchets
 
+use chat_sqlite::{ChatStorage, StorageConfig};
 use double_ratchets::{InstallationKeyPair, RatchetSession};
-use sqlite::{ChatStorage, StorageConfig};
 use tempfile::NamedTempFile;
 
 fn main() {
diff --git a/core/double-ratchets/src/storage/session.rs b/core/double-ratchets/src/storage/session.rs
index 069ba4d..99ea7f5 100644
--- a/core/double-ratchets/src/storage/session.rs
+++ b/core/double-ratchets/src/storage/session.rs
@@ -168,7 +168,7 @@ fn save_state<S: RatchetStore, D: HkdfInfo>(
 mod tests {
     use super::*;
     use crate::hkdf::DefaultDomain;
-    use sqlite::ChatStorage;
+    use chat_sqlite::ChatStorage;
 
     fn create_test_storage() -> ChatStorage {
         ChatStorage::in_memory()
diff --git a/core/integration_tests_core/Cargo.toml b/core/integration_tests_core/Cargo.toml
index 7b90b0a..dec26c4 100644
--- a/core/integration_tests_core/Cargo.toml
+++ b/core/integration_tests_core/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2024"
 # Workspace dependencies (sorted)
 components = { workspace = true }
 libchat = { workspace = true }
-sqlite = { workspace = true }
+chat-sqlite = { workspace = true }
 storage = { workspace = true }
 
 # External dependencies (sorted)
diff --git a/core/integration_tests_core/tests/private_integration.rs b/core/integration_tests_core/tests/private_integration.rs
index 90d2a9b..165ba76 100644
--- a/core/integration_tests_core/tests/private_integration.rs
+++ b/core/integration_tests_core/tests/private_integration.rs
@@ -1,5 +1,5 @@
+use chat_sqlite::{ChatStorage, StorageConfig};
 use libchat::{Context, Introduction};
-use sqlite::{ChatStorage, StorageConfig};
 use storage::{ConversationStore, IdentityStore};
 use tempfile::tempdir;
 
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index eea2e3b..a8fda67 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -9,8 +9,8 @@ crate-type = ["rlib"]
 [dependencies]
 # Workspace dependencies (sorted)
 chat-sqlite = { workspace = true }
+components = { workspace = true} 
 libchat = { workspace = true }
-logoschat_components = { workspace = true} 
 
 # External dependencies (sorted)
 thiserror = "2"
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 97870f9..ad63606 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -3,7 +3,7 @@ use libchat::{
     DeliveryService, Introduction, StorageConfig,
 };
 
-use logoschat_components::EphemeralRegistry;
+use components::EphemeralRegistry;
 
 use crate::errors::ClientError;