diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
index 42d56389e74e523a87208ebe11185fe6107d946d..e5dddd8a038f9c16fe9e9b6f562b95048cfee78a 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerRegisterReceiveFileCallback.swift
@@ -12,7 +12,7 @@ public struct MessengerRegisterReceiveFileCallback {
 extension MessengerRegisterReceiveFileCallback {
   public static func live(_ env: MessengerEnvironment) -> MessengerRegisterReceiveFileCallback {
     MessengerRegisterReceiveFileCallback { callback in
-      env.receiveFileCallbacksRegistry.register(callback)
+      env.receiveFileCallbacks.register(callback)
     }
   }
 }
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
index 2ce92adfa7c193c92cb32b735a893f2e306aef6f..11dfd35a4cca4cb15e7fb3d3e8f27b85501b322f 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerStartFileTransfer.swift
@@ -25,7 +25,7 @@ extension MessengerStartFileTransfer {
           e2eFileTransferParamsJSON: env.getE2EFileTransferParams(),
           fileTransferParamsJSON: env.getFileTransferParams()
         ),
-        callback: env.receiveFileCallbacksRegistry.registered()
+        callback: env.receiveFileCallbacks.registered()
       )
       env.fileTransfer.set(fileTransfer)
     }
diff --git a/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift b/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
index dcb706d46dc6761f6a6c09414fdf6a3695fdd0f1..a1ab1517817248c93ce78bb435ceb621d5449fa6 100644
--- a/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
+++ b/Sources/XXMessengerClient/Messenger/MessengerEnvironment.swift
@@ -33,7 +33,7 @@ public struct MessengerEnvironment {
   public var newOrLoadUd: NewOrLoadUd
   public var newUdManagerFromBackup: NewUdManagerFromBackup
   public var passwordStorage: PasswordStorage
-  public var receiveFileCallbacksRegistry: ReceiveFileCallbacksRegistry
+  public var receiveFileCallbacks: ReceiveFileCallbacksRegistry
   public var registerForNotifications: RegisterForNotifications
   public var registerLogWriter: RegisterLogWriter
   public var resumeBackup: ResumeBackup
@@ -84,7 +84,7 @@ extension MessengerEnvironment {
       newOrLoadUd: .live,
       newUdManagerFromBackup: .live,
       passwordStorage: .keychain,
-      receiveFileCallbacksRegistry: .live(),
+      receiveFileCallbacks: .live(),
       registerForNotifications: .live,
       registerLogWriter: .live,
       resumeBackup: .live,
@@ -130,7 +130,7 @@ extension MessengerEnvironment {
     newOrLoadUd: .unimplemented,
     newUdManagerFromBackup: .unimplemented,
     passwordStorage: .unimplemented,
-    receiveFileCallbacksRegistry: .unimplemented,
+    receiveFileCallbacks: .unimplemented,
     registerForNotifications: .unimplemented,
     registerLogWriter: .unimplemented,
     resumeBackup: .unimplemented,
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
index c30bb10afee600165089682c948c2539395992e4..95a6cabcacb1f53f30bf5c25b26f6843928e9034 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRegisterReceiveFileCallbackTests.swift
@@ -10,7 +10,7 @@ final class MessengerRegisterReceiveFileCallbackTests: XCTestCase {
     var didCancelRegisteredCallback = 0
 
     var env: MessengerEnvironment = .unimplemented
-    env.receiveFileCallbacksRegistry.register = { callback in
+    env.receiveFileCallbacks.register = { callback in
       registeredCallbacks.append(callback)
       return Cancellable { didCancelRegisteredCallback += 1 }
     }
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
index f0da2047a5f18d3aae27ecb68c74edafe23d3719..8e6d352880f7c2bbd27700f79fa0cef54c120cf1 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerStartFileTransferTests.swift
@@ -34,7 +34,7 @@ final class MessengerStartFileTransferTests: XCTestCase {
     env.fileTransfer.set = {
       didSetFileTransfer.append($0)
     }
-    env.receiveFileCallbacksRegistry.registered = {
+    env.receiveFileCallbacks.registered = {
       ReceiveFileCallback { result in
         didReceiveFile.append(result)
       }