diff --git a/Examples/xx-messenger/Sources/AppCore/AppDependecies.swift b/Examples/xx-messenger/Sources/AppCore/AppDependecies.swift
index d5a173cb03d121d3535be72b453498b6df291bf3..fcb72dc0ee649c5e096f6397396bbaad4e1d6194 100644
--- a/Examples/xx-messenger/Sources/AppCore/AppDependecies.swift
+++ b/Examples/xx-messenger/Sources/AppCore/AppDependecies.swift
@@ -89,7 +89,7 @@ private enum AppDependenciesKey: DependencyKey {
 }
 
 extension DependencyValues {
-  public var appDependencies: AppDependencies {
+  public var app: AppDependencies {
     get { self[AppDependenciesKey.self] }
     set { self[AppDependenciesKey.self] = newValue }
   }
diff --git a/Examples/xx-messenger/Sources/ContactLookupFeature/ContactLookupComponent.swift b/Examples/xx-messenger/Sources/ContactLookupFeature/ContactLookupComponent.swift
index 14514489b03fe562c224efe18199d9f16db7864c..3369159037a2e12d8ad4846bad9effc8da3e0e11 100644
--- a/Examples/xx-messenger/Sources/ContactLookupFeature/ContactLookupComponent.swift
+++ b/Examples/xx-messenger/Sources/ContactLookupFeature/ContactLookupComponent.swift
@@ -29,9 +29,9 @@ public struct ContactLookupComponent: ReducerProtocol {
 
   public init() {}
 
-  @Dependency(\.appDependencies.messenger) var messenger
-  @Dependency(\.appDependencies.mainQueue) var mainQueue
-  @Dependency(\.appDependencies.bgQueue) var bgQueue
+  @Dependency(\.app.messenger) var messenger
+  @Dependency(\.app.mainQueue) var mainQueue
+  @Dependency(\.app.bgQueue) var bgQueue
 
   public func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
     switch action {
diff --git a/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestComponent.swift b/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestComponent.swift
index 6bac71a26ca831b2a149cf9a43be3e35e4264f2e..f5f2e8afec9e1bf0ef52a40165221c21c538a914 100644
--- a/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestComponent.swift
+++ b/Examples/xx-messenger/Sources/SendRequestFeature/SendRequestComponent.swift
@@ -48,10 +48,10 @@ public struct SendRequestComponent: ReducerProtocol {
 
   public init() {}
 
-  @Dependency(\.appDependencies.messenger) var messenger: Messenger
-  @Dependency(\.appDependencies.dbManager.getDB) var db: DBManagerGetDB
-  @Dependency(\.appDependencies.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
-  @Dependency(\.appDependencies.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.messenger) var messenger: Messenger
+  @Dependency(\.app.dbManager.getDB) var db: DBManagerGetDB
+  @Dependency(\.app.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
 
   public var body: some ReducerProtocol<State, Action> {
     BindingReducer()
diff --git a/Examples/xx-messenger/Sources/VerifyContactFeature/VerifyContactComponent.swift b/Examples/xx-messenger/Sources/VerifyContactFeature/VerifyContactComponent.swift
index eaa2753626b1df72f6af6d89312670e281bae151..09fdb1585659abe9c77b873dd6917dcb17d75034 100644
--- a/Examples/xx-messenger/Sources/VerifyContactFeature/VerifyContactComponent.swift
+++ b/Examples/xx-messenger/Sources/VerifyContactFeature/VerifyContactComponent.swift
@@ -35,10 +35,10 @@ public struct VerifyContactComponent: ReducerProtocol {
 
   public init() {}
 
-  @Dependency(\.appDependencies.messenger) var messenger: Messenger
-  @Dependency(\.appDependencies.dbManager.getDB) var db: DBManagerGetDB
-  @Dependency(\.appDependencies.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
-  @Dependency(\.appDependencies.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.messenger) var messenger: Messenger
+  @Dependency(\.app.dbManager.getDB) var db: DBManagerGetDB
+  @Dependency(\.app.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
+  @Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
 
   public func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
     switch action {
diff --git a/Examples/xx-messenger/Tests/ContactLookupFeatureTests/ContactLookupComponentTests.swift b/Examples/xx-messenger/Tests/ContactLookupFeatureTests/ContactLookupComponentTests.swift
index dcbb362256ff65ef68af1719b5b31c7e453e1932..26f2a0f49f319f88211bc6e50d04be6f4474cf57 100644
--- a/Examples/xx-messenger/Tests/ContactLookupFeatureTests/ContactLookupComponentTests.swift
+++ b/Examples/xx-messenger/Tests/ContactLookupFeatureTests/ContactLookupComponentTests.swift
@@ -13,9 +13,9 @@ final class ContactLookupComponentTests: XCTestCase {
       initialState: ContactLookupComponent.State(id: id),
       reducer: ContactLookupComponent()
     )
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.lookupContact.run = { id in
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.lookupContact.run = { id in
       didLookupId.append(id)
       return lookedUpContact
     }
@@ -41,9 +41,9 @@ final class ContactLookupComponentTests: XCTestCase {
       initialState: ContactLookupComponent.State(id: id),
       reducer: ContactLookupComponent()
     )
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.lookupContact.run = { _ in throw failure }
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.lookupContact.run = { _ in throw failure }
 
     store.send(.lookupTapped) {
       $0.isLookingUp = true
diff --git a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestComponentTests.swift b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestComponentTests.swift
index 0de0596628ec74f3d0c5263510d8e54c08a95ea4..ee2b668f779afcfd1ede6c6e0c42799d3a0be8b8 100644
--- a/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestComponentTests.swift
+++ b/Examples/xx-messenger/Tests/SendRequestFeatureTests/SendRequestComponentTests.swift
@@ -19,9 +19,9 @@ final class SendRequestComponentTests: XCTestCase {
       ),
       reducer: SendRequestComponent()
     )
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.myContact.run = { includeFacts in
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.myContact.run = { includeFacts in
       didGetMyContact.append(includeFacts)
       return myContact
     }
@@ -43,9 +43,9 @@ final class SendRequestComponentTests: XCTestCase {
       ),
       reducer: SendRequestComponent()
     )
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.myContact.run = { _ in throw failure }
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.myContact.run = { _ in throw failure }
 
     store.send(.start)
 
@@ -87,9 +87,9 @@ final class SendRequestComponentTests: XCTestCase {
     var didBulkUpdateContacts: [DidBulkUpdateContacts] = []
     var didRequestAuthChannel: [DidRequestAuthChannel] = []
 
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.dbManager.getDB.run = {
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.dbManager.getDB.run = {
       var db: Database = .unimplemented
       db.bulkUpdateContacts.run = { query, assignments in
         didBulkUpdateContacts.append(.init(query: query, assignments: assignments))
@@ -97,7 +97,7 @@ final class SendRequestComponentTests: XCTestCase {
       }
       return db
     }
-    store.dependencies.appDependencies.messenger.e2e.get = {
+    store.dependencies.app.messenger.e2e.get = {
       var e2e: E2E = .unimplemented
       e2e.requestAuthenticatedChannel.run = { partner, myFacts in
         didRequestAuthChannel.append(.init(partner: partner, myFacts: myFacts))
@@ -156,14 +156,14 @@ final class SendRequestComponentTests: XCTestCase {
     struct Failure: Error {}
     let failure = Failure()
 
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.dbManager.getDB.run = {
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.dbManager.getDB.run = {
       var db: Database = .unimplemented
       db.bulkUpdateContacts.run = { _, _ in return 0 }
       return db
     }
-    store.dependencies.appDependencies.messenger.e2e.get = {
+    store.dependencies.app.messenger.e2e.get = {
       var e2e: E2E = .unimplemented
       e2e.requestAuthenticatedChannel.run = { _, _ in throw failure }
       return e2e
diff --git a/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactComponentTests.swift b/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactComponentTests.swift
index 5548c66cb642b244301f022129c11fe30d9bec6d..c979ceaa572be2bcf9e4c0326763cf7f285db150 100644
--- a/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactComponentTests.swift
+++ b/Examples/xx-messenger/Tests/VerifyContactFeatureTests/VerifyContactComponentTests.swift
@@ -22,13 +22,13 @@ final class VerifyContactComponentTests: XCTestCase {
     var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
     var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
 
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.verifyContact.run = { contact in
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.verifyContact.run = { contact in
       didVerifyContact.append(contact)
       return true
     }
-    store.dependencies.appDependencies.dbManager.getDB.run = {
+    store.dependencies.app.dbManager.getDB.run = {
       var db: Database = .unimplemented
       db.bulkUpdateContacts.run = { query, assignments in
         didBulkUpdateContactsWithQuery.append(query)
@@ -75,13 +75,13 @@ final class VerifyContactComponentTests: XCTestCase {
     var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
     var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
 
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.verifyContact.run = { contact in
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.verifyContact.run = { contact in
       didVerifyContact.append(contact)
       return false
     }
-    store.dependencies.appDependencies.dbManager.getDB.run = {
+    store.dependencies.app.dbManager.getDB.run = {
       var db: Database = .unimplemented
       db.bulkUpdateContacts.run = { query, assignments in
         didBulkUpdateContactsWithQuery.append(query)
@@ -130,10 +130,10 @@ final class VerifyContactComponentTests: XCTestCase {
     var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
     var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
 
-    store.dependencies.appDependencies.mainQueue = .immediate
-    store.dependencies.appDependencies.bgQueue = .immediate
-    store.dependencies.appDependencies.messenger.verifyContact.run = { _ in throw error }
-    store.dependencies.appDependencies.dbManager.getDB.run = {
+    store.dependencies.app.mainQueue = .immediate
+    store.dependencies.app.bgQueue = .immediate
+    store.dependencies.app.messenger.verifyContact.run = { _ in throw error }
+    store.dependencies.app.dbManager.getDB.run = {
       var db: Database = .unimplemented
       db.bulkUpdateContacts.run = { query, assignments in
         didBulkUpdateContactsWithQuery.append(query)