diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m
index 60c3fb4dc71..c313b96ea90 100644
--- a/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m
+++ b/FirebaseDynamicLinks/Tests/Unit/FIRDLScionLoggingTest.m
@@ -19,7 +19,7 @@
 #import <OCMock/OCMock.h>
 #import "FirebaseDynamicLinks/Sources/FIRDLScionLogging.h"
 
-static const NSTimeInterval kAsyncTestTimout = 0.5;
+static const NSTimeInterval kAsyncTestTimeout = 0.5;
 
 typedef void (^FakeAnalyticsLogEventWithOriginNameParametersHandler)(NSString *origin,
                                                                      NSString *name,
@@ -113,7 +113,7 @@ - (void)testGINLogEventToScionCallsLogMethodWithFirstOpen {
       }];
 
   FIRDLLogEventToScion(FIRDLLogEventFirstOpen, nil, nil, nil, analytics);
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testGINLogEventToScionContainsCorrectNameWithFirstOpen {
@@ -126,7 +126,7 @@ - (void)testGINLogEventToScionContainsCorrectNameWithFirstOpen {
       }];
 
   FIRDLLogEventToScion(FIRDLLogEventFirstOpen, nil, nil, nil, analytics);
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testGINLogEventToScionCallsLogMethodWithAppOpen {
@@ -138,7 +138,7 @@ - (void)testGINLogEventToScionCallsLogMethodWithAppOpen {
       }];
   FIRDLLogEventToScion(FIRDLLogEventAppOpen, nil, nil, nil, analytics);
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testGINLogEventToScionContainsCorrectNameWithAppOpen {
@@ -151,7 +151,7 @@ - (void)testGINLogEventToScionContainsCorrectNameWithAppOpen {
       }];
   FIRDLLogEventToScion(FIRDLLogEventAppOpen, nil, nil, nil, analytics);
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testGINLogEventToScionLogsParametersCorrectly {
@@ -176,7 +176,7 @@ - (void)testGINLogEventToScionLogsParametersCorrectly {
 
   FIRDLLogEventToScion(FIRDLLogEventAppOpen, source, medium, campaign, analytics);
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 @end
diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m
index e6be93c6284..b93e8e92332 100644
--- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m
+++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinkNetworkingTests.m
@@ -26,7 +26,7 @@
 static NSString *const kAPIKey = @"myfakeapikey";
 const NSInteger kJSONParsingErrorCode = 3840;
 static NSString *const kURLScheme = @"gindeeplinkurl";
-static const NSTimeInterval kAsyncTestTimout = 5.0;
+static const NSTimeInterval kAsyncTestTimeout = 5.0;
 
 @interface FIRDynamicLinkNetworkingTests : XCTestCase
 
@@ -90,7 +90,7 @@ - (void)testResolveShortLinkServiceCompletionDoesntCrashWhenNilDataIsRetrieved {
                         [expectation fulfill];
                       }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   [GULSwizzler unswizzleClass:[FIRDynamicLinkNetworking class]
                      selector:executeRequestSelector
diff --git a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
index f5e829f8b33..97a06a50a84 100644
--- a/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
+++ b/FirebaseDynamicLinks/Tests/Unit/FIRDynamicLinksTest.m
@@ -47,7 +47,7 @@
     @"https://sample.page.link?link=%@&isi=585027354";
 static NSString *const kURLScheme = @"gindeeplinkurl";
 
-static const NSTimeInterval kAsyncTestTimout = 5.0;
+static const NSTimeInterval kAsyncTestTimeout = 5.0;
 
 /**
  * This string was generated by percent-encoding the Tactile URL for the Tokyo American Club in
@@ -526,7 +526,7 @@ - (void)testDynamicLinkFromUniversalLinkURLCompletionWithCustomDomainLink {
                                  @"ddl url parameter and deep link url should be the same");
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   UnswizzleDynamicLinkNetworking();
 }
@@ -567,7 +567,7 @@ - (void)testDynamicLinkFromUniversalLinkURLCompletionWithSpecialCharacters {
                                  @"ddl url parameter and deep link url should be the same");
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   UnswizzleDynamicLinkNetworking();
 }
@@ -608,7 +608,7 @@ - (void)testDynamicLinkFromUniversalLinkURLCompletionWithEncodedCharacters {
                                  @"ddl url parameter and deep link url should be the same");
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   UnswizzleDynamicLinkNetworking();
 }
@@ -657,7 +657,7 @@ - (void)testUniversalLinkWithCompletion_DeepLink {
                              XCTAssertEqualObjects(dynamicLink.url.absoluteString, deepLinkString);
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   UnswizzleDynamicLinkNetworking();
 }
@@ -707,7 +707,7 @@ - (void)testUniversalLinkWithCompletion_DeepLinkWithParameters {
                                                              parsedDeepLinkString);
                                        [expectation fulfill];
                                      }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
   UnswizzleDynamicLinkNetworking();
 }
 
@@ -745,7 +745,7 @@ - (void)testResolveLinkReturnsDLWithNilMinAppVersionWhenNotPresent {
                  [expectation fulfill];
                }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testResolveLinkReturnsDLWithMinAppVersionWhenPresent {
@@ -790,7 +790,7 @@ - (void)testResolveLinkReturnsDLWithMinAppVersionWhenPresent {
                  [expectation fulfill];
                }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testUniversalLinkWithSubdomain_NoDeepLink {
@@ -871,7 +871,7 @@ - (void)testDynamicLinkFromUniversalLinkURLCompletionReturnsDLWithNilMinimumVers
                              XCTAssertNil(minVersion, @"Min app version was not nil when not set.");
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testDynamicLinkFromUniversalLinkURLReturnsDLMinimumVersion {
@@ -948,7 +948,7 @@ - (void)testDynamicLinkFromUniversalLinkURLReturnsUTMParams {
                              [expectation fulfill];
                            }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testDynamicLinkFromUniversalLinkURLCompletionReturnsDLMinimumVersion {
@@ -976,7 +976,7 @@ - (void)testDynamicLinkFromUniversalLinkURLCompletionReturnsDLMinimumVersion {
                                                    @"Min version didn't match imv= parameter");
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testUniversalLinkWithSubdomain_DeepLink {
@@ -1022,7 +1022,7 @@ - (void)testUniversalLinkWithCompletionWithSubdomain_DeepLink {
                              XCTAssertEqualObjects(dynamicLink.url.absoluteString, deepLinkString);
                              [expectation fulfill];
                            }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   UnswizzleDynamicLinkNetworking();
 }
@@ -1067,7 +1067,7 @@ - (void)testUniversalLinkWithCompletionWithSubdomain_DeepLinkWithParameters {
                                                              parsedDeepLinkString);
                                        [expectation fulfill];
                                      }];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testResolveLinkRespectsResponseSuccessStatusCode {
@@ -1105,7 +1105,7 @@ - (void)testResolveLinkRespectsResponseSuccessStatusCode {
                         [expectation fulfill];
                       }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testResolveLinkRespectsResponseErrorStatusCode {
@@ -1152,7 +1152,7 @@ - (void)testResolveLinkRespectsResponseErrorStatusCode {
                         [expectation fulfill];
                       }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testPassMatchesShortLinkFormatForDDLDomains {
@@ -1354,7 +1354,7 @@ - (void)testHandleUniversalLinkWithShortLink {
                  [handleLinkCompletionExpectation fulfill];
                }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
   UnswizzleDynamicLinkNetworking();
 }
 
@@ -1386,7 +1386,7 @@ - (void)testHandleUniversalLinkWithLongLink {
   [self.service handleUniversalLink:[NSURL URLWithString:longLinkString]
                          completion:handleUniversalLinkBlock];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   // It is expected to call resolveLink once for logging.
   XCTAssertEqual(resolverInvocationsCount, 1,
@@ -1415,7 +1415,7 @@ - (void)testHandleUniversalLinkCallsHandleUniversalLinkResolver {
                completion:^(FIRDynamicLink *_Nullable dynamicLink, NSError *_Nullable error){
                }];
 
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 
   [GULSwizzler unswizzleClass:[FIRDynamicLinks class]
                      selector:selectorToSwizzle
@@ -1491,7 +1491,7 @@ - (void)testHandleUniversalLinkCompletionReturnsYesForValidDDL {
 
     XCTAssertTrue(handled, @"Valid DDL Universal Link was not handled");
 
-    [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+    [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
   }
 }
 
diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m
index be7eb1d97af..0d67f48197b 100644
--- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m
+++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingAnalyticsTest.m
@@ -28,7 +28,7 @@
 static NSString *const kReengagementSource = @"Firebase";
 static NSString *const kReengagementMedium = @"notification";
 static NSString *const kFIREventOriginFCM = @"fcm";
-static const NSTimeInterval kAsyncTestTimout = 0.5;
+static const NSTimeInterval kAsyncTestTimeout = 0.5;
 
 typedef void (^FakeAnalyticsLogEventHandler)(NSString *origin,
                                              NSString *name,
@@ -237,7 +237,7 @@ - (void)testNoParamsIfEmpty {
   [FIRMessagingAnalytics logEvent:kFIRIEventFirebaseCampaign
                  withNotification:notification
                       toAnalytics:analytics];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 - (void)testParamForEventAndNotification {
   NSDictionary *notification = @{
@@ -373,7 +373,7 @@ - (void)testConversionTracking {
         expectation = nil;
       }];
   [FIRMessagingAnalytics logUserPropertyForConversionTracking:notification toAnalytics:analytics];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testConversionTrackingUserProperty {
@@ -401,7 +401,7 @@ - (void)testConversionTrackingUserProperty {
         [expectation fulfill];
       }];
   [FIRMessagingAnalytics logUserPropertyForConversionTracking:notification toAnalytics:analytics];
-  [self waitForExpectationsWithTimeout:kAsyncTestTimout handler:nil];
+  [self waitForExpectationsWithTimeout:kAsyncTestTimeout handler:nil];
 }
 
 - (void)testNoConversionTracking {