@@ -286,7 +286,7 @@ @implementation UIApplication (FIRFBI)
 + (void)load {
 // C++ constructors may not be called yet so call NSLog rather than LogDebug.
 NSLog(@"Loading UIApplication category for Firebase App");
-::firebase::util::RunOnAppDelegate(^(Class clazz) { // Renamed here
+::firebase::util::RunOnAppDelegateClasses(^(Class clazz) {
 ::firebase::invites::HookAppDelegateMethods(clazz);
 });
 }

@@ -185,10 +185,12 @@ typedef BOOL (
 id self, SEL selector_value, UIApplication *application,
 NSUserActivity *user_activity, void (^restoration_handler)(NSArray *));
 
-// Call the given block once for every Objective-C class that exists that
-// implements the UIApplicationDelegate protocol (except for those in a
-// blacklist we keep).
-void RunOnAppDelegate(void (^block)(Class));
+// Calls the given block for each unique Objective-C class that has been
+// previously passed to [UIApplication setDelegate:]. The block is executed
+// immediately for all currently known unique delegate classes.
+// Additionally, the block is queued to be executed if any new, unique
+// Objective-C class is passed to [UIApplication setDelegate:] in the future.
+void RunOnAppDelegateClasses(void (^block)(Class));
 
 // Convert a string array into an NSMutableArray.
 NSMutableArray *StringVectorToNSMutableArray(

@@ -29,7 +29,6 @@
 #define MAX_SEEN_DELEGATE_CLASSES 32
 
 static IMP g_original_setDelegate_imp = NULL;
-// static Class g_app_delegate_class = nil; // Removed
 static void (^g_pending_app_delegate_blocks[MAX_PENDING_APP_DELEGATE_BLOCKS])(Class) = {nil};
 static int g_pending_block_count = 0;
 
@@ -169,9 +168,9 @@ - (BOOL)application:(UIApplication *)application
 namespace firebase {
 namespace util {
 
-void RunOnAppDelegate(void (^block)(Class)) {
+void RunOnAppDelegateClasses(void (^block)(Class)) {
 if (g_seen_delegate_classes_count > 0) {
-NSLog(@"Firebase: RunOnAppDelegate executing block for %d already seen delegate class(es).",
+NSLog(@"Firebase: RunOnAppDelegateClasses executing block for %d already seen delegate class(es).",
 g_seen_delegate_classes_count);
 for (int i = 0; i < g_seen_delegate_classes_count; i++) {
 // Assuming classes in g_seen_delegate_classes up to count are non-nil
@@ -180,17 +179,17 @@ void RunOnAppDelegate(void (^block)(Class)) {
 }
 }
 } else {
-NSLog(@"Firebase: RunOnAppDelegate - no delegate classes seen yet. Block will be queued for future delegates.");
+NSLog(@"Firebase: RunOnAppDelegateClasses - no delegate classes seen yet. Block will be queued for future delegates.");
 }
 
 // Always try to queue the block for any future new delegate classes.
 // This block will be executed by Firebase_setDelegate if a new delegate class is set.
 if (g_pending_block_count < MAX_PENDING_APP_DELEGATE_BLOCKS) {
 g_pending_app_delegate_blocks[g_pending_block_count] = [block copy];
 g_pending_block_count++;
-NSLog(@"Firebase: RunOnAppDelegate - added block to pending list (total pending: %d). This block will run on future new delegate classes.", g_pending_block_count);
+NSLog(@"Firebase: RunOnAppDelegateClasses - added block to pending list (total pending: %d). This block will run on future new delegate classes.", g_pending_block_count);
 } else {
-NSLog(@"Firebase Error: RunOnAppDelegate - pending block queue is full (max %d). Cannot add new block for future execution. Discarding block.", MAX_PENDING_APP_DELEGATE_BLOCKS);
+NSLog(@"Firebase Error: RunOnAppDelegateClasses - pending block queue is full (max %d). Cannot add new block for future execution. Discarding block.", MAX_PENDING_APP_DELEGATE_BLOCKS);
 // Block is discarded for future execution.
 }
 }

@@ -870,7 +870,7 @@ @implementation UIApplication (FIRFCM)
 + (void)load {
 // C++ constructors may not be called yet so call NSLog rather than LogInfo.
 NSLog(@"FCM: Loading UIApplication FIRFCM category");
-::firebase::util::RunOnAppDelegate(^(Class clazz) { // Renamed here
+::firebase::util::RunOnAppDelegateClasses(^(Class clazz) {
 FirebaseMessagingHookAppDelegate(clazz);
 });
 }