diff --git a/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift b/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift
index 4397eea906e..7e418fb6c13 100644
--- a/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift
+++ b/FirebaseDatabase/Swift/Sources/SPMSwiftHeaderWorkaround.swift
@@ -17,10 +17,10 @@
 
   // This is a trick to force generate a `FirebaseDatabase-Swift.h`
   // header that re-exports `FirebaseDatabaseInternal` for Objective-C
-  // clients. It is important for the below code to reference a Remote
-  // Config symbol defined in Objective-C as that will import the symbol's
+  // clients. It is important for the below code to reference a Database
+  // symbol defined in Objective-C as that will import the symbol's
   // module (`FirebaseDatabaseInternal`) in the generated header. This
-  // allows Objective-C clients to import Remote Config's Objective-C API
+  // allows Objective-C clients to import Database's Objective-C API
   // using `@import FirebaseDatabase;`. This API is not needed for Swift
   // clients and is therefore unavailable in a Swift context.
   @available(*, unavailable)
diff --git a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift
index bc130b67b0b..c84084917f3 100644
--- a/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift
+++ b/FirebaseInAppMessaging/Swift/Source/SPMSwiftHeaderWorkaround.swift
@@ -17,10 +17,10 @@
 
   // This is a trick to force generate a `FirebaseInAppMessaging-Swift.h`
   // header that re-exports `FirebaseInAppMessagingInternal` for Objective-C
-  // clients. It is important for the below code to reference a Remote
-  // Config symbol defined in Objective-C as that will import the symbol's
+  // clients. It is important for the below code to reference an In App
+  // Messaging symbol defined in Objective-C as that will import the symbol's
   // module (`FirebaseInAppMessagingInternal`) in the generated header. This
-  // allows Objective-C clients to import Remote Config's Objective-C API
+  // allows Objective-C clients to import In App Messaging's Objective-C API
   // using `@import FirebaseInAppMessaging;`. This API is not needed for Swift
   // clients and is therefore unavailable in a Swift context.
   @available(*, unavailable)
diff --git a/Firestore/Example/Podfile b/Firestore/Example/Podfile
index 6ac7eead24b..2a538fd37e6 100644
--- a/Firestore/Example/Podfile
+++ b/Firestore/Example/Podfile
@@ -56,7 +56,7 @@ end
 # required.
 def configure_local_pods()
   # Firestore is always local; that's what's under development here.
-  pod 'FirebaseFirestore', :path => '../../'
+  pod 'FirebaseFirestore', :path => '../..'
 
   # FirebaseCore must always be a local pod so that CI builds that make changes
   # to its podspec can still function. See Firestore-*-xcodebuild in
diff --git a/Firestore/Swift/Source/SwiftHeaderWorkaround.swift b/Firestore/Swift/Source/SwiftHeaderWorkaround.swift
index 3ef3235272f..253beeae2bf 100644
--- a/Firestore/Swift/Source/SwiftHeaderWorkaround.swift
+++ b/Firestore/Swift/Source/SwiftHeaderWorkaround.swift
@@ -20,8 +20,8 @@
 
 // This is a trick to force generate a `FirebaseFirestore-Swift.h`
 // header that re-exports `FirebaseFirestoreInternal` for Objective-C
-// clients. It is important for the below code to reference a Remote
-// Config symbol defined in Objective-C as that will import the symbol's
+// clients. It is important for the below code to reference a Firestore
+// symbol defined in Objective-C as that will import the symbol's
 // module (`FirebaseFirestoreInternal`) in the generated header. This
 // allows Objective-C clients to import Firestore's Objective-C API
 // using `@import FirebaseFirestore;`. This API is not needed for Swift
diff --git a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift
index dca0dfad634..5dbdc636546 100755
--- a/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift
+++ b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift
@@ -47,7 +47,7 @@ struct ModuleMapBuilder {
 
       """
 
-      if module == "FirebaseFirestore" {
+      if module == "FirebaseFirestoreInternal" {
         content += """
           link framework "BoringSSL-GRPC"
           link framework "gRPC-Core"