diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec
index a938a515833..ece8dc2acff 100644
--- a/FirebaseAuthUI.podspec
+++ b/FirebaseAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebaseAuthUI'
-  s.version      = '14.2.0'
+  s.version      = '14.2.1'
   s.summary      = 'A prebuilt authentication UI flow for Firebase Auth.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
diff --git a/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m b/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m
index c268075892f..873a54b293b 100644
--- a/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m
+++ b/FirebaseAuthUI/FirebaseAuthUITests/FUIAuthTest.m
@@ -15,6 +15,7 @@
 //
 
 @import XCTest;
+@import FirebaseAuth;
 @import FirebaseCore;
 
 #import "FUIAuth.h"
diff --git a/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h b/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h
index c1422df3bee..c6ef4fdc4cf 100644
--- a/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h
+++ b/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuth.h
@@ -20,6 +20,7 @@
 #import "FUIAuthProvider.h"
 
 @class FIRAuth;
+@class FIRAuthDataResult;
 @class FUIAuthPickerViewController;
 @class FUIAuth;
 @class FIRUser;
diff --git a/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthProvider.h b/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthProvider.h
index 16ea09b147c..df02263d89b 100644
--- a/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthProvider.h
+++ b/FirebaseAuthUI/Sources/Public/FirebaseAuthUI/FUIAuthProvider.h
@@ -15,10 +15,10 @@
 //
 
 #import <UIKit/UIKit.h>
-@import FirebaseAuth;
 
 @class FIRAuth;
 @class FIRAuthCredential;
+@class FIRUser;
 @class FIRUserInfo;
 
 typedef void (^FIRAuthResultCallback)(FIRUser *_Nullable user, NSError *_Nullable error);
diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec
index 9859ed24883..bc4968df8fa 100644
--- a/FirebasePhoneAuthUI.podspec
+++ b/FirebasePhoneAuthUI.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'FirebasePhoneAuthUI'
-  s.version      = '14.2.0'
+  s.version      = '14.2.1'
   s.summary      = 'A phone auth provider for FirebaseAuthUI.'
   s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
   s.license      = { :type => 'Apache 2.0', :file => 'LICENSE' }
diff --git a/FirebasePhoneAuthUI/Sources/FUIPhoneAuth.m b/FirebasePhoneAuthUI/Sources/FUIPhoneAuth.m
index 8b717e63d2f..b9b10590d72 100644
--- a/FirebasePhoneAuthUI/Sources/FUIPhoneAuth.m
+++ b/FirebasePhoneAuthUI/Sources/FUIPhoneAuth.m
@@ -83,7 +83,7 @@ - (instancetype)initWithAuthUI:(FUIAuth *)authUI
 #pragma mark - FUIAuthProvider
 
 - (nullable NSString *)providerID {
-  return FIRPhoneAuthProviderID;
+  return @"phone";
 }
 
 /** @fn accessToken:
@@ -147,11 +147,11 @@ - (void)signInWithDefaultValue:(nullable NSString *)defaultValue
                     completion:(nullable FUIAuthProviderSignInCompletionBlock)completion {
   _pendingSignInCallback = completion;
   
-  FUIPhoneAuth *delegate = [_authUI providerWithID:FIRPhoneAuthProviderID];
+  FUIPhoneAuth *delegate = [_authUI providerWithID:@"phone"];
   if (!delegate) {
     NSError *error = [FUIAuthErrorUtils errorWithCode:FUIAuthErrorCodeCantFindProvider
                                              userInfo:@{
-                       FUIAuthErrorUserInfoProviderIDKey : FIRPhoneAuthProviderID
+                       FUIAuthErrorUserInfoProviderIDKey : @"phone"
                      }];
     [self callbackWithCredential:nil error:error result:^(FIRUser *_Nullable user,
                                                           NSError *_Nullable error) {
diff --git a/FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m b/FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m
index 61558bdc8c3..5ef37115bb7 100755
--- a/FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m
+++ b/FirebasePhoneAuthUI/Sources/FUIPhoneEntryViewController.m
@@ -112,7 +112,7 @@ - (instancetype)initWithNibName:(nullable NSString *)nibNameOrNil
   if (self) {
     self.title = FUIPhoneAuthLocalizedString(kPAStr_EnterPhoneTitle);
     _countryCodes = countryCodes ?: [[FUICountryCodes alloc] init];
-    FUIPhoneAuth *provider = [authUI providerWithID:FIRPhoneAuthProviderID];
+    FUIPhoneAuth *provider = [authUI providerWithID:@"phone"];
     NSString *defaultCountryCode = provider.defaultCountryCode;
     _countryCodes.defaultCountryCodeInfo =
         [_countryCodes countryCodeInfoForCode:defaultCountryCode];
@@ -221,7 +221,7 @@ - (void)onNext:(NSString *)phoneNumber {
                                                                      actionHandler:nil];
         [self presentViewController:alertController animated:YES completion:nil];
         
-        FUIPhoneAuth *delegate = [self.authUI providerWithID:FIRPhoneAuthProviderID];
+        FUIPhoneAuth *delegate = [self.authUI providerWithID:@"phone"];
         [delegate callbackWithCredential:nil error:error result:nil];
         return;
       }
@@ -360,7 +360,7 @@ - (void)setCountryCodeValue {
 
 - (void)cancelAuthorization {
   NSError *error = [FUIAuthErrorUtils userCancelledSignInError];
-  FUIPhoneAuth *delegate = [self.authUI providerWithID:FIRPhoneAuthProviderID];
+  FUIPhoneAuth *delegate = [self.authUI providerWithID:@"phone"];
   [delegate callbackWithCredential:nil error:error result:^(FIRUser *_Nullable user,
                                                             NSError *_Nullable error) {
     if (!error || error.code == FUIAuthErrorCodeUserCancelledSignIn) {
diff --git a/FirebasePhoneAuthUI/Sources/FUIPhoneVerificationViewController.m b/FirebasePhoneAuthUI/Sources/FUIPhoneVerificationViewController.m
index 6ece9dd1f82..f40a7359adf 100644
--- a/FirebasePhoneAuthUI/Sources/FUIPhoneVerificationViewController.m
+++ b/FirebasePhoneAuthUI/Sources/FUIPhoneVerificationViewController.m
@@ -185,7 +185,7 @@ - (void)onNext:(NSString *)verificationCode {
   [self incrementActivity];
   [_codeField resignFirstResponder];
   self.navigationItem.rightBarButtonItem.enabled = NO;
-  FUIPhoneAuth *delegate = [self.authUI providerWithID:FIRPhoneAuthProviderID];
+  FUIPhoneAuth *delegate = [self.authUI providerWithID:@"phone"];
   [delegate callbackWithCredential:credential
                              error:nil
                             result:^(FIRUser *_Nullable user, NSError *_Nullable error) {
@@ -221,7 +221,7 @@ - (void)observeValueForKeyPath:(nullable NSString *)keyPath
 
 - (void)cancelAuthorization {
   NSError *error = [FUIAuthErrorUtils userCancelledSignInError];
-  FUIPhoneAuth *delegate = [self.authUI providerWithID:FIRPhoneAuthProviderID];
+  FUIPhoneAuth *delegate = [self.authUI providerWithID:@"phone"];
   [delegate callbackWithCredential:nil
                              error:error
                             result:^(FIRUser *_Nullable user, NSError *_Nullable error) {