diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
index 9d16d8f5fb18510ca0d794dfd4fd3933cf5faa4e..84c78195209c839f51b3d0771a41aad23a10659f 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchFeature.swift
@@ -95,7 +95,7 @@ public let userSearchReducer = Reducer<UserSearchState, UserSearchAction, UserSe
     state.failure = nil
     state.results = IdentifiedArray(uniqueElements: contacts.compactMap { contact in
       guard let id = try? contact.getId() else { return nil }
-      return UserSearchResultState(id: id, contact: contact)
+      return UserSearchResultState(id: id, xxContact: contact)
     })
     return .none
 
diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
index a224384b193b02a9de6ada2b132ad0d9ae8603a3..f4c0f8564d7f66de95a6414229c10edf48279939 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultFeature.swift
@@ -6,20 +6,20 @@ import XXClient
 public struct UserSearchResultState: Equatable, Identifiable {
   public init(
     id: Data,
-    contact: Contact,
+    xxContact: Contact,
     username: String? = nil,
     email: String? = nil,
     phone: String? = nil
   ) {
     self.id = id
-    self.contact = contact
+    self.xxContact = xxContact
     self.username = username
     self.email = email
     self.phone = phone
   }
 
   public var id: Data
-  public var contact: XXClient.Contact
+  public var xxContact: XXClient.Contact
   public var username: String?
   public var email: String?
   public var phone: String?
@@ -43,7 +43,7 @@ public let userSearchResultReducer = Reducer<UserSearchResultState, UserSearchRe
 { state, action, env in
   switch action {
   case .start:
-    let facts = (try? state.contact.getFacts()) ?? []
+    let facts = (try? state.xxContact.getFacts()) ?? []
     state.username = facts.first(where: { $0.type == 0 })?.fact
     state.email = facts.first(where: { $0.type == 1 })?.fact
     state.phone = facts.first(where: { $0.type == 2 })?.fact
diff --git a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
index b1a6e267d68e0a823ed6ce5cc2bfa36bf973e7bb..129081fe0d68661de84ffae3649fdfbedb66f9c5 100644
--- a/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
+++ b/Examples/xx-messenger/Sources/UserSearchFeature/UserSearchResultView.swift
@@ -53,7 +53,7 @@ public struct UserSearchResultView_Previews: PreviewProvider {
     UserSearchResultView(store: Store(
       initialState: UserSearchResultState(
         id: "contact-id".data(using: .utf8)!,
-        contact: .unimplemented("contact-data".data(using: .utf8)!)
+        xxContact: .unimplemented("contact-data".data(using: .utf8)!)
       ),
       reducer: .empty,
       environment: ()
diff --git a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
index a96afd9590cfdd4532f2c93716c6f5237a9c2096..4311b515ccc209d9f84738bc5b57d7f1a8d7620e 100644
--- a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchFeatureTests.swift
@@ -53,9 +53,9 @@ final class UserSearchFeatureTests: XCTestCase {
       $0.isSearching = false
       $0.failure = nil
       $0.results = [
-        .init(id: "contact-1-id".data(using: .utf8)!, contact: contact1),
-        .init(id: "contact-2-id".data(using: .utf8)!, contact: contact2),
-        .init(id: "contact-4-id".data(using: .utf8)!, contact: contact4)
+        .init(id: "contact-1-id".data(using: .utf8)!, xxContact: contact1),
+        .init(id: "contact-2-id".data(using: .utf8)!, xxContact: contact2),
+        .init(id: "contact-4-id".data(using: .utf8)!, xxContact: contact4)
       ]
     }
   }
diff --git a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
index b4f68452568a668d3323be8e9d4634ff73e63610..c9efe0c7d4eac039c2aa465fbdb921b8749b3182 100644
--- a/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
+++ b/Examples/xx-messenger/Tests/UserSearchFeatureTests/UserSearchResultFeatureTests.swift
@@ -17,7 +17,7 @@ final class UserSearchResultFeatureTests: XCTestCase {
     let store = TestStore(
       initialState: UserSearchResultState(
         id: "contact-id".data(using: .utf8)!,
-        contact: contact
+        xxContact: contact
       ),
       reducer: userSearchResultReducer,
       environment: .unimplemented