diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
index 2e892bb4882b43ddab7d91ab81d15c007e561a87..f39353a78db32d57a1429d8f8a0b6e5fb46260e0 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
@@ -41,7 +41,7 @@ public struct UserSearchState: Equatable {
 
   public init(
     focusedField: Field? = nil,
-    query: MessengerSearchUsers.Query = .init(),
+    query: MessengerSearchContacts.Query = .init(),
     isSearching: Bool = false,
     failure: String? = nil,
     results: IdentifiedArrayOf<Result> = [],
@@ -56,7 +56,7 @@ public struct UserSearchState: Equatable {
   }
 
   @BindableState public var focusedField: Field?
-  @BindableState public var query: MessengerSearchUsers.Query
+  @BindableState public var query: MessengerSearchContacts.Query
   public var isSearching: Bool
   public var failure: String?
   public var results: IdentifiedArrayOf<Result>
@@ -113,7 +113,7 @@ public let userSearchReducer = Reducer<UserSearchState, UserSearchAction, UserSe
     state.failure = nil
     return .result { [query = state.query] in
       do {
-        return .success(.didSucceed(try env.messenger.searchUsers(query: query)))
+        return .success(.didSucceed(try env.messenger.searchContacts(query: query)))
       } catch {
         return .success(.didFail(error.localizedDescription))
       }
diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift
index b3a1f0a48be3ca73751906bd5c72e88363234535..328ff98c2e0f79907da76927ce254322022ea07a 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchView.swift
@@ -14,7 +14,7 @@ public struct UserSearchView: View {
 
   struct ViewState: Equatable {
     var focusedField: UserSearchState.Field?
-    var query: MessengerSearchUsers.Query
+    var query: MessengerSearchContacts.Query
     var isSearching: Bool
     var failure: String?
     var results: IdentifiedArrayOf<UserSearchState.Result>
diff --git a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
index f8f482f6c49d236f511239a6722cc357ec48ab77..44731c1f16d41e0b95ab3ff1675f654d1ab2fcd5 100644
--- a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
@@ -13,7 +13,7 @@ final class UserSearchFeatureTests: XCTestCase {
       environment: .unimplemented
     )
 
-    var didSearchWithQuery: [MessengerSearchUsers.Query] = []
+    var didSearchWithQuery: [MessengerSearchContacts.Query] = []
 
     struct GetIdFromContactError: Error {}
     struct GetFactsFromContactError: Error {}
@@ -44,7 +44,7 @@ final class UserSearchFeatureTests: XCTestCase {
 
     store.environment.bgQueue = .immediate
     store.environment.mainQueue = .immediate
-    store.environment.messenger.searchUsers.run = { query in
+    store.environment.messenger.searchContacts.run = { query in
       didSearchWithQuery.append(query)
       return contacts
     }
@@ -100,7 +100,7 @@ final class UserSearchFeatureTests: XCTestCase {
 
     store.environment.bgQueue = .immediate
     store.environment.mainQueue = .immediate
-    store.environment.messenger.searchUsers.run = { _ in throw failure }
+    store.environment.messenger.searchContacts.run = { _ in throw failure }
 
     store.send(.searchTapped) {
       $0.focusedField = nil