diff --git a/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift b/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
index 574b5417dab..98bb15b8860 100644
--- a/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
+++ b/Firestore/Swift/Source/Codable/DocumentReference+Codable.swift
@@ -50,4 +50,4 @@ extension CodableDocumentReference {
   }
 }
 
-extension DocumentReference: CodableDocumentReference {}
+extension FirebaseFirestore.DocumentReference: FirebaseFirestore.CodableDocumentReference {}
diff --git a/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift b/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift
index 974b09c4cf1..cfa50a0c081 100644
--- a/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift
+++ b/Firestore/Swift/Source/Codable/FieldValue+Encodable.swift
@@ -21,7 +21,7 @@
 #endif // SWIFT_PACKAGE
 
 /** Extends FieldValue to conform to Encodable. */
-extension FieldValue: Encodable {
+extension FirebaseFirestore.FieldValue: Swift.Encodable {
   /// Encoding a FieldValue will throw by default unless the encoder implementation
   /// explicitly handles it, which is what Firestore.Encoder does.
   public func encode(to encoder: Encoder) throws {
diff --git a/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift b/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
index fb312d118ce..a92e4baf160 100644
--- a/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
+++ b/Firestore/Swift/Source/Codable/GeoPoint+Codable.swift
@@ -63,4 +63,4 @@ extension CodableGeoPoint {
 }
 
 /** Extends GeoPoint to conform to Codable. */
-extension GeoPoint: CodableGeoPoint {}
+extension FirebaseFirestore.GeoPoint: FirebaseFirestore.CodableGeoPoint {}
diff --git a/Firestore/Swift/Source/Codable/Timestamp+Codable.swift b/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
index 37a513c77e3..37d9b479733 100644
--- a/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
+++ b/Firestore/Swift/Source/Codable/Timestamp+Codable.swift
@@ -59,4 +59,4 @@ extension CodableTimestamp {
 }
 
 /** Extends Timestamp to conform to Codable. */
-extension Timestamp: CodableTimestamp {}
+extension FirebaseCore.Timestamp: FirebaseFirestore.CodableTimestamp {}
diff --git a/Firestore/Swift/Source/Codable/VectorValue+Codable.swift b/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
index 57d544af3b7..45f3176a74a 100644
--- a/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
+++ b/Firestore/Swift/Source/Codable/VectorValue+Codable.swift
@@ -58,4 +58,4 @@ extension CodableVectorValue {
 }
 
 /** Extends VectorValue to conform to Codable. */
-extension VectorValue: CodableVectorValue {}
+extension FirebaseFirestore.VectorValue: FirebaseFirestore.CodableVectorValue {}