--- dyld/dyld-1340/common/OptimizerSwift.cpp
+++ dyld/dyld-1235.2/common/OptimizerSwift.cpp
@@ -133,7 +133,7 @@
 #if BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
 using cache_builder::BuilderConfig;
 using cache_builder::CacheDylib;
-using cache_builder::SwiftOptimizer;
+using cache_builder::SwiftProtocolConformanceOptimizer;
 #endif
 
 // Tracks which types conform to which protocols
@@ -955,7 +955,7 @@
     }
 }
 
-static void emitHeader(const BuilderConfig& config, SwiftOptimizer& opt)
+static void emitHeader(const BuilderConfig& config, SwiftProtocolConformanceOptimizer& opt)
 {
     CacheVMAddress cacheBaseAddress = config.layout.cacheBaseAddress;
     VMOffset typeOffset = opt.typeConformancesHashTable->cacheVMAddress - cacheBaseAddress;
@@ -1132,7 +1132,7 @@
         return VMOffset(0ull);
 
     if ( !bindTarget.has_value() ) {
-        diag.error("__swift_prespecializationsData symbol not found in %s", prespecializedDylib->inputHdr->installName());
+        diag.error("__swift_prespecializationsData symbol not found in %s", prespecializedDylib->inputMF->installName());
         return VMOffset(0ull);
     }
 
@@ -1151,7 +1151,7 @@
                           const void* headerInfoRO, const void* headerInfoRW,
                           CacheVMAddress headerInfoROUnslidVMAddr,
                           cache_builder::CacheDylib* prespecializedDylib,
-                          SwiftOptimizer& swiftOptimizer)
+                          SwiftProtocolConformanceOptimizer& swiftProtocolConformanceOptimizer)
 {
     STACK_ALLOCATOR(allocator, 0);
     lsl::Vector<SwiftTypeProtocolConformanceLocation> foundTypeProtocolConformances(allocator);
@@ -1180,31 +1180,31 @@
     // We have all the conformances.  Now build the hash tables
     emitTypeHashTable(diag, allocator,
                       foundTypeProtocolConformances,
-                      swiftOptimizer.typeConformancesHashTable);
+                      swiftProtocolConformanceOptimizer.typeConformancesHashTable);
     if ( diag.hasError() )
         return;
     emitMetadataHashTable(diag, allocator,
                           foundMetadataProtocolConformances,
-                          swiftOptimizer.metadataConformancesHashTable);
+                          swiftProtocolConformanceOptimizer.metadataConformancesHashTable);
     if ( diag.hasError() )
         return;
     emitForeignTypeHashTable(diag, allocator,
                              foundForeignTypeProtocolConformances,
                              foundForeignNames,
-                             swiftOptimizer.foreignTypeConformancesHashTable);
+                             swiftProtocolConformanceOptimizer.foreignTypeConformancesHashTable);
     if ( diag.hasError() )
         return;
 
-    if ( prespecializedDylib && !swiftOptimizer.prespecializedMetadataHashTables.empty() ) {
+    if ( prespecializedDylib && !swiftProtocolConformanceOptimizer.prespecializedMetadataHashTables.empty() ) {
         emitPrespecializedMetadataHashTables(diag, allocator, config.layout.cacheBaseAddress,
-                                            swiftOptimizer.prespecializedMetadataHashTables,
+                                            swiftProtocolConformanceOptimizer.prespecializedMetadataHashTables,
                                             *prespecializedDylib,
                                             prespecializedDylib->makeCacheSwiftVisitor(config, extraRegions));
         if ( diag.hasError() )
             return;
     }
 
-    swiftOptimizer.prespecializedDataOffset =
+    swiftProtocolConformanceOptimizer.prespecializedDataOffset =
         findPrespecializedDataOffset(config, diag, prespecializedDylib);
     if ( diag.hasError() )
         return;
@@ -1212,10 +1212,10 @@
     // Make sure the hash tables work
     checkHashTables();
     if ( prespecializedDylib )
-        checkPointerHashTables(prespecializedDylib->makeCacheSwiftVisitor(config, extraRegions), swiftOptimizer.prespecializedMetadataHashTables, config);
+        checkPointerHashTables(prespecializedDylib->makeCacheSwiftVisitor(config, extraRegions), swiftProtocolConformanceOptimizer.prespecializedMetadataHashTables, config);
 
     // Emit the header to point to everything else
-    emitHeader(config, swiftOptimizer);
+    emitHeader(config, swiftProtocolConformanceOptimizer);
 }
 
 #endif // BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS