diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
index 3837c7d6c58fad..de3083d63f6988 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
@@ -579,7 +579,7 @@ public OutputDirectoryNamingSchemeConverter() {
 
   @Option(
       name = "experimental_output_directory_naming_scheme",
-      defaultValue = "diff_against_baseline",
+      defaultValue = "diff_against_dynamic_baseline",
       converter = OutputDirectoryNamingSchemeConverter.class,
       documentationCategory = OptionDocumentationCategory.UNDOCUMENTED,
       effectTags = {OptionEffectTag.AFFECTS_OUTPUTS},
diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
index 8e74338c4202d0..9fd0c997be9b4d 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcRuleTestCase.java
@@ -40,7 +40,6 @@
 import com.google.devtools.build.lib.analysis.config.BuildOptionsView;
 import com.google.devtools.build.lib.analysis.config.CompilationMode;
 import com.google.devtools.build.lib.analysis.config.CoreOptions;
-import com.google.devtools.build.lib.analysis.config.CoreOptions.OutputDirectoryNamingScheme;
 import com.google.devtools.build.lib.analysis.config.InvalidConfigurationException;
 import com.google.devtools.build.lib.analysis.config.transitions.SplitTransition;
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
@@ -146,8 +145,10 @@ private String configurationDir(
     String modeSegment = compilationModeFlag(compilationMode);
 
     String hash = "";
-    if (targetConfig.getOptions().get(CoreOptions.class).outputDirectoryNamingScheme
-        == OutputDirectoryNamingScheme.DIFF_AGAINST_BASELINE) {
+    if (targetConfig
+        .getOptions()
+        .get(CoreOptions.class)
+        .useBaselineForOutputDirectoryNamingScheme()) {
       PlatformType platformType = null;
       switch (configurationDistinguisher) {
         case APPLEBIN_IOS: