diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift
index 226d0ea3416..671ecec199d 100644
--- a/FirebaseAuth/Sources/Swift/Auth/Auth.swift
+++ b/FirebaseAuth/Sources/Swift/Auth/Auth.swift
@@ -1675,17 +1675,17 @@ extension Auth: AuthInterop {
     @available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
     public func finalizePasskeySignIn(withPlatformCredential platformCredential: ASAuthorizationPlatformPublicKeyCredentialAssertion) async throws
       -> AuthDataResult {
-      let credentialID = platformCredential.credentialID.base64EncodedString()
-      let clientDataJSON = platformCredential.rawClientDataJSON.base64EncodedString()
+      let credentialId = platformCredential.credentialID.base64EncodedString()
+      let clientDataJson = platformCredential.rawClientDataJSON.base64EncodedString()
       let authenticatorData = platformCredential.rawAuthenticatorData.base64EncodedString()
       let signature = platformCredential.signature.base64EncodedString()
-      let userID = platformCredential.userID.base64EncodedString()
+      let userId = platformCredential.userID.base64EncodedString()
       let request = FinalizePasskeySignInRequest(
-        credentialID: credentialID,
-        clientDataJSON: clientDataJSON,
+        credentialID: credentialId,
+        clientDataJSON: clientDataJson,
         authenticatorData: authenticatorData,
         signature: signature,
-        userId: userID,
+        userId: userId,
         requestConfiguration: requestConfiguration
       )
       let response = try await backend.call(with: request)
diff --git a/FirebaseAuth/Sources/Swift/User/User.swift b/FirebaseAuth/Sources/Swift/User/User.swift
index c2378fcad1c..75aa3939eeb 100644
--- a/FirebaseAuth/Sources/Swift/User/User.swift
+++ b/FirebaseAuth/Sources/Swift/User/User.swift
@@ -1122,15 +1122,15 @@ extension User: NSSecureCoding {}
             "Invalid platform credential: missing credentialID, clientDataJSON, or attestationObject."]
         )
       }
-      let credentialID = platformCredential.credentialID.base64EncodedString()
-      let clientDataJSON = platformCredential.rawClientDataJSON.base64EncodedString()
+      let credentialId = platformCredential.credentialID.base64EncodedString()
+      let clientDataJson = platformCredential.rawClientDataJSON.base64EncodedString()
       let attestationObject = platformCredential.rawAttestationObject!.base64EncodedString()
 
       let request = FinalizePasskeyEnrollmentRequest(
         idToken: rawAccessToken(),
         name: passkeyName ?? defaultPasskeyName,
-        credentialID: credentialID,
-        clientDataJSON: clientDataJSON,
+        credentialID: credentialId,
+        clientDataJSON: clientDataJson,
         attestationObject: attestationObject,
         requestConfiguration: auth!.requestConfiguration
       )