Skylark -> Starlark for various methods, variables, constants, etc.

PiperOrigin-RevId: 312298717
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
index 78d7c6a..5a03634 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AnalysisUtils.java
@@ -93,10 +93,10 @@
    */
   public static <T extends Info> List<T> getProviders(
       Iterable<? extends TransitiveInfoCollection> prerequisites,
-      final NativeProvider<T> skylarkKey) {
+      final NativeProvider<T> starlarkKey) {
     ImmutableList.Builder<T> result = ImmutableList.builder();
     for (TransitiveInfoCollection prerequisite : prerequisites) {
-      T prerequisiteProvider = prerequisite.get(skylarkKey);
+      T prerequisiteProvider = prerequisite.get(starlarkKey);
       if (prerequisiteProvider != null) {
         result.add(prerequisiteProvider);
       }
@@ -110,10 +110,10 @@
    */
   public static <T extends Info> List<T> getProviders(
       Iterable<? extends TransitiveInfoCollection> prerequisites,
-      final BuiltinProvider<T> skylarkKey) {
+      final BuiltinProvider<T> starlarkKey) {
     ImmutableList.Builder<T> result = ImmutableList.builder();
     for (TransitiveInfoCollection prerequisite : prerequisites) {
-      T prerequisiteProvider = prerequisite.get(skylarkKey);
+      T prerequisiteProvider = prerequisite.get(starlarkKey);
       if (prerequisiteProvider != null) {
         result.add(prerequisiteProvider);
       }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index 76f5c89..1bde506 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -322,9 +322,9 @@
             bzlFileLoadLikeString = bzlFileLoadLikeString + ".bzl";
           }
         }
-        Label skylarkFileLabel;
+        Label starlarkFileLabel;
         try {
-          skylarkFileLabel =
+          starlarkFileLabel =
               Label.parseAbsolute(
                   bzlFileLoadLikeString, /* repositoryMapping= */ ImmutableMap.of());
         } catch (LabelSyntaxException e) {
@@ -332,7 +332,7 @@
               String.format("Invalid aspect '%s': %s", aspect, e.getMessage()), e);
         }
 
-        String skylarkFunctionName = aspect.substring(delimiterPosition + 1);
+        String starlarkFunctionName = aspect.substring(delimiterPosition + 1);
         for (TargetAndConfiguration targetSpec : topLevelTargetsWithConfigs) {
           if (targetSpec.getConfiguration() != null
               && targetSpec.getConfiguration().trimConfigurationsRetroactively()) {
@@ -348,8 +348,8 @@
                   // aspect and the base target while the top-level configuration is untrimmed.
                   targetSpec.getConfiguration(),
                   targetSpec.getConfiguration(),
-                  skylarkFileLabel,
-                  skylarkFunctionName));
+                  starlarkFileLabel,
+                  starlarkFunctionName));
         }
       } else {
         final NativeAspectClass aspectFactoryClass =
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
index b6bbc08..e508767 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfiguredAspect.java
@@ -98,8 +98,8 @@
 
   @Override
   public Object get(String legacyKey) {
-    if (OutputGroupInfo.SKYLARK_NAME.equals(legacyKey)) {
-      return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey());
+    if (OutputGroupInfo.STARLARK_NAME.equals(legacyKey)) {
+      return get(OutputGroupInfo.STARLARK_CONSTRUCTOR.getKey());
     }
     return providers.get(legacyKey);
   }
@@ -226,7 +226,7 @@
           outputGroups.put(entry.getKey(), entry.getValue().build());
         }
 
-        if (providers.contains(OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey())) {
+        if (providers.contains(OutputGroupInfo.STARLARK_CONSTRUCTOR.getKey())) {
           throw new IllegalStateException(
               "OutputGroupInfo was provided explicitly; do not use addOutputGroup");
         }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
index f75e72a..351511c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/FilesToRunProvider.java
@@ -31,7 +31,7 @@
 public final class FilesToRunProvider
     implements TransitiveInfoProvider, FilesToRunProviderApi<Artifact> {
   /** The name of the field in Starlark used to access this class. */
-  public static final String SKYLARK_NAME = "files_to_run";
+  public static final String STARLARK_NAME = "files_to_run";
 
   public static final FilesToRunProvider EMPTY =
       new FilesToRunProvider(NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER), null, null);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
index 6e544d3..f4fa960 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/OutputGroupInfo.java
@@ -61,9 +61,9 @@
 @AutoCodec
 public final class OutputGroupInfo extends StructImpl
     implements StarlarkIndexable, StarlarkIterable<String>, OutputGroupInfoApi {
-  public static final String SKYLARK_NAME = "output_groups";
+  public static final String STARLARK_NAME = "output_groups";
 
-  public static final OutputGroupInfoProvider SKYLARK_CONSTRUCTOR = new OutputGroupInfoProvider();
+  public static final OutputGroupInfoProvider STARLARK_CONSTRUCTOR = new OutputGroupInfoProvider();
 
   /**
    * Prefix for output groups that are not reported to the user on the terminal output of Blaze when
@@ -137,7 +137,7 @@
   private final ImmutableMap<String, NestedSet<Artifact>> outputGroups;
 
   public OutputGroupInfo(ImmutableMap<String, NestedSet<Artifact>> outputGroups) {
-    super(SKYLARK_CONSTRUCTOR, Location.BUILTIN);
+    super(STARLARK_CONSTRUCTOR, Location.BUILTIN);
     this.outputGroups = outputGroups;
   }
 
@@ -148,7 +148,7 @@
 
   @Nullable
   public static OutputGroupInfo get(ProviderCollection collection) {
-    return collection.get(SKYLARK_CONSTRUCTOR);
+    return collection.get(STARLARK_CONSTRUCTOR);
   }
 
   /** Return the artifacts in a particular output group.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
index 0dbf1dc..f941685 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ProviderCollection.java
@@ -22,7 +22,7 @@
 import javax.annotation.Nullable;
 
 /**
- * Interface to mark classes that could contain transitive information added using the Skylark
+ * Interface to mark classes that could contain transitive information added using the Starlark
  * framework.
  */
 public interface ProviderCollection {
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
index 658e0a8..59494db 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleConfiguredTargetBuilder.java
@@ -226,7 +226,7 @@
       // If the target is an analysis test that returned AnalysisTestResultInfo, register a
       // test pass/fail action on behalf of the target.
       AnalysisTestResultInfo testResultInfo =
-          providers.get(AnalysisTestResultInfo.SKYLARK_CONSTRUCTOR);
+          providers.get(AnalysisTestResultInfo.STARLARK_CONSTRUCTOR);
 
       if (testResultInfo == null) {
         ruleContext.ruleError(
@@ -319,7 +319,7 @@
 
         for (OutputGroupInfo outputGroup :
             ruleContext.getPrerequisites(
-                attributeName, TransitionMode.DONT_CHECK, OutputGroupInfo.SKYLARK_CONSTRUCTOR)) {
+                attributeName, TransitionMode.DONT_CHECK, OutputGroupInfo.STARLARK_CONSTRUCTOR)) {
 
           NestedSet<Artifact> validationArtifacts =
               outputGroup.getOutputGroup(OutputGroupInfo.VALIDATION);
@@ -485,7 +485,7 @@
       throw new EvalException(constructor.getLocation(),
           "All providers must be top level values");
     }
-    if (OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey().equals(constructor.getKey())) {
+    if (OutputGroupInfo.STARLARK_CONSTRUCTOR.getKey().equals(constructor.getKey())) {
       OutputGroupInfo outputGroupInfo = (OutputGroupInfo) provider;
       for (String outputGroup : outputGroupInfo) {
         addOutputGroup(outputGroup, outputGroupInfo.getOutputGroup(outputGroup));
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index f404e1c3..14bb223 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -77,7 +77,7 @@
 public final class BuildOptions implements Cloneable, Serializable {
   private static final Comparator<Class<? extends FragmentOptions>>
       lexicalFragmentOptionsComparator = Comparator.comparing(Class::getName);
-  private static final Comparator<Label> skylarkOptionsComparator = Ordering.natural();
+  private static final Comparator<Label> starlarkOptionsComparator = Ordering.natural();
   private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
 
   public static Map<Label, Object> labelizeStarlarkOptions(Map<String, Object> starlarkOptions) {
@@ -103,7 +103,7 @@
     for (FragmentOptions options : fragmentOptionsMap.values()) {
       builder.addFragmentOptions(options.getHost());
     }
-    return builder.addStarlarkOptions(skylarkOptionsMap).build();
+    return builder.addStarlarkOptions(starlarkOptionsMap).build();
   }
 
   /**
@@ -130,7 +130,7 @@
     for (FragmentOptions options : retainedOptions) {
       builder.addFragmentOptions(options);
     }
-    return builder.addStarlarkOptions(skylarkOptionsMap).build();
+    return builder.addStarlarkOptions(starlarkOptionsMap).build();
   }
 
   /**
@@ -171,8 +171,8 @@
    * Returns a BuildOptions class that only has Starlark options.
    */
   @VisibleForTesting
-  public static BuildOptions of(Map<Label, Object> skylarkOptions) {
-    return builder().addStarlarkOptions(skylarkOptions).build();
+  public static BuildOptions of(Map<Label, Object> starlarkOptions) {
+    return builder().addStarlarkOptions(starlarkOptions).build();
   }
 
   /** Returns the actual instance of a FragmentOptions class. */
@@ -195,7 +195,7 @@
     }
     keyBuilder.append(
         OptionsBase.mapToCacheKey(
-            skylarkOptionsMap.entrySet().stream()
+            starlarkOptionsMap.entrySet().stream()
                 .collect(Collectors.toMap(e -> e.getKey().toString(), Map.Entry::getValue))));
     return keyBuilder.toString();
   }
@@ -225,7 +225,7 @@
   }
 
   public ImmutableMap<Label, Object> getStarlarkOptions() {
-    return skylarkOptionsMap;
+    return starlarkOptionsMap;
   }
 
   /**
@@ -240,7 +240,7 @@
         fragmentOptionsMap.entrySet()) {
       nativeOptionsBuilder.put(entry.getKey(), entry.getValue().clone());
     }
-    return new BuildOptions(nativeOptionsBuilder.build(), ImmutableMap.copyOf(skylarkOptionsMap));
+    return new BuildOptions(nativeOptionsBuilder.build(), ImmutableMap.copyOf(starlarkOptionsMap));
   }
 
   private boolean fingerprintAndHashCodeInitialized() {
@@ -270,7 +270,7 @@
         fingerprint.addString(entry.getKey().getName());
         fingerprint.addString(entry.getValue().cacheKey());
       }
-      for (Map.Entry<Label, Object> entry : skylarkOptionsMap.entrySet()) {
+      for (Map.Entry<Label, Object> entry : starlarkOptionsMap.entrySet()) {
         fingerprint.addString(entry.getKey().toString());
         fingerprint.addString(entry.getValue().toString());
       }
@@ -307,14 +307,14 @@
   /** Maps options class definitions to FragmentOptions objects. */
   private final ImmutableMap<Class<? extends FragmentOptions>, FragmentOptions> fragmentOptionsMap;
   /** Maps Starlark options names to Starlark options values. */
-  private final ImmutableMap<Label, Object> skylarkOptionsMap;
+  private final ImmutableMap<Label, Object> starlarkOptionsMap;
 
   @AutoCodec.VisibleForSerialization
   BuildOptions(
       ImmutableMap<Class<? extends FragmentOptions>, FragmentOptions> fragmentOptionsMap,
-      ImmutableMap<Label, Object> skylarkOptionsMap) {
+      ImmutableMap<Label, Object> starlarkOptionsMap) {
     this.fragmentOptionsMap = fragmentOptionsMap;
-    this.skylarkOptionsMap = skylarkOptionsMap;
+    this.starlarkOptionsMap = starlarkOptionsMap;
   }
 
   public BuildOptions applyDiff(OptionsDiffForReconstruction optionsDiff) {
@@ -340,19 +340,19 @@
       builder.addFragmentOptions(extraSecondFragment);
     }
 
-    Map<Label, Object> skylarkOptions = new HashMap<>();
-    for (Map.Entry<Label, Object> buildSettingAndValue : skylarkOptionsMap.entrySet()) {
+    Map<Label, Object> starlarkOptions = new HashMap<>();
+    for (Map.Entry<Label, Object> buildSettingAndValue : starlarkOptionsMap.entrySet()) {
       Label buildSetting = buildSettingAndValue.getKey();
       if (optionsDiff.extraFirstStarlarkOptions.contains(buildSetting)) {
         continue;
       } else if (optionsDiff.differingStarlarkOptions.containsKey(buildSetting)) {
-        skylarkOptions.put(buildSetting, optionsDiff.differingStarlarkOptions.get(buildSetting));
+        starlarkOptions.put(buildSetting, optionsDiff.differingStarlarkOptions.get(buildSetting));
       } else {
-        skylarkOptions.put(buildSetting, skylarkOptionsMap.get(buildSetting));
+        starlarkOptions.put(buildSetting, starlarkOptionsMap.get(buildSetting));
       }
     }
-    skylarkOptions.putAll(optionsDiff.extraSecondStarlarkOptions);
-    reconstructedOptions = builder.addStarlarkOptions(skylarkOptions).build();
+    starlarkOptions.putAll(optionsDiff.extraSecondStarlarkOptions);
+    reconstructedOptions = builder.addStarlarkOptions(starlarkOptions).build();
     optionsDiff.cachedReconstructed = new SoftReference<>(reconstructedOptions);
     return reconstructedOptions;
   }
@@ -384,7 +384,7 @@
       }
     }
 
-    Map<Label, Object> starlarkOptions = new HashMap<>(skylarkOptionsMap);
+    Map<Label, Object> starlarkOptions = new HashMap<>(starlarkOptionsMap);
     Map<Label, Object> parsedStarlarkOptions =
         labelizeStarlarkOptions(parsingResult.getStarlarkOptions());
     for (Map.Entry<Label, Object> starlarkOption : parsedStarlarkOptions.entrySet()) {
@@ -467,7 +467,7 @@
     Map<Label, Object> starlarkOptions =
         labelizeStarlarkOptions(parsingResult.getStarlarkOptions());
     MapDifference<Label, Object> starlarkDifference =
-        Maps.difference(skylarkOptionsMap, starlarkOptions);
+        Maps.difference(starlarkOptionsMap, starlarkOptions);
     if (starlarkDifference.entriesInCommon().size() < starlarkOptions.size()) {
       return false;
     }
@@ -552,7 +552,7 @@
     public BuildOptions build() {
       return new BuildOptions(
           ImmutableSortedMap.copyOf(fragmentOptions, lexicalFragmentOptionsComparator),
-          ImmutableSortedMap.copyOf(starlarkOptions, skylarkOptionsComparator));
+          ImmutableSortedMap.copyOf(starlarkOptions, starlarkOptionsComparator));
     }
 
     private final Map<Class<? extends FragmentOptions>, FragmentOptions> fragmentOptions;
@@ -634,16 +634,16 @@
     }
 
     // Compare Starlark options for the two classes.
-    Map<Label, Object> skylarkFirst = first.getStarlarkOptions();
-    Map<Label, Object> skylarkSecond = second.getStarlarkOptions();
-    for (Label buildSetting : Sets.union(skylarkFirst.keySet(), skylarkSecond.keySet())) {
-      if (skylarkFirst.get(buildSetting) == null) {
-        diff.addExtraSecondStarlarkOption(buildSetting, skylarkSecond.get(buildSetting));
-      } else if (skylarkSecond.get(buildSetting) == null) {
+    Map<Label, Object> starlarkFirst = first.getStarlarkOptions();
+    Map<Label, Object> starlarkSecond = second.getStarlarkOptions();
+    for (Label buildSetting : Sets.union(starlarkFirst.keySet(), starlarkSecond.keySet())) {
+      if (starlarkFirst.get(buildSetting) == null) {
+        diff.addExtraSecondStarlarkOption(buildSetting, starlarkSecond.get(buildSetting));
+      } else if (starlarkSecond.get(buildSetting) == null) {
         diff.addExtraFirstStarlarkOption(buildSetting);
-      } else if (!skylarkFirst.get(buildSetting).equals(skylarkSecond.get(buildSetting))) {
+      } else if (!starlarkFirst.get(buildSetting).equals(starlarkSecond.get(buildSetting))) {
         diff.putStarlarkDiff(
-            buildSetting, skylarkFirst.get(buildSetting), skylarkSecond.get(buildSetting));
+            buildSetting, starlarkFirst.get(buildSetting), starlarkSecond.get(buildSetting));
       }
     }
     return diff;
@@ -727,7 +727,7 @@
             Comparator.comparing(o -> o.getClass().getName()), diff.extraSecondFragments),
         first.fingerprint,
         second.computeChecksum(),
-        diff.skylarkSecond,
+        diff.starlarkSecond,
         diff.extraStarlarkOptionsFirst,
         diff.extraStarlarkOptionsSecond,
         second);
@@ -751,10 +751,10 @@
     private final Set<Class<? extends FragmentOptions>> extraFirstFragments = new HashSet<>();
     private final Set<FragmentOptions> extraSecondFragments = new HashSet<>();
 
-    private final Map<Label, Object> skylarkFirst = new LinkedHashMap<>();
+    private final Map<Label, Object> starlarkFirst = new LinkedHashMap<>();
     // TODO(b/112041323): This should also be multimap but we don't diff multiple times with
     // Starlark options anywhere yet so add that feature when necessary.
-    private final Map<Label, Object> skylarkSecond = new LinkedHashMap<>();
+    private final Map<Label, Object> starlarkSecond = new LinkedHashMap<>();
 
     private final List<Label> extraStarlarkOptionsFirst = new ArrayList<>();
     private final Map<Label, Object> extraStarlarkOptionsSecond = new HashMap<>();
@@ -798,8 +798,8 @@
     }
 
     private void putStarlarkDiff(Label buildSetting, Object firstValue, Object secondValue) {
-      skylarkFirst.put(buildSetting, firstValue);
-      skylarkSecond.put(buildSetting, secondValue);
+      starlarkFirst.put(buildSetting, firstValue);
+      starlarkSecond.put(buildSetting, secondValue);
       hasStarlarkOptions = true;
     }
 
@@ -819,8 +819,8 @@
      */
     public Set<Label> getChangedStarlarkOptions() {
       return ImmutableSet.<Label>builder()
-          .addAll(skylarkFirst.keySet())
-          .addAll(skylarkSecond.keySet())
+          .addAll(starlarkFirst.keySet())
+          .addAll(starlarkSecond.keySet())
           .addAll(extraStarlarkOptionsFirst)
           .addAll(extraStarlarkOptionsSecond.keySet())
           .build();
@@ -828,12 +828,12 @@
 
     @VisibleForTesting
     Map<Label, Object> getStarlarkFirstForTesting() {
-      return skylarkFirst;
+      return starlarkFirst;
     }
 
     @VisibleForTesting
     Map<Label, Object> getStarlarkSecondForTesting() {
-      return skylarkSecond;
+      return starlarkSecond;
     }
 
     @VisibleForTesting
@@ -856,8 +856,8 @@
           && extraSecondFragments.isEmpty()
           && extraFirstFragments.isEmpty()
           && differingOptions.isEmpty()
-          && skylarkFirst.isEmpty()
-          && skylarkSecond.isEmpty()
+          && starlarkFirst.isEmpty()
+          && starlarkSecond.isEmpty()
           && extraStarlarkOptionsFirst.isEmpty()
           && extraStarlarkOptionsSecond.isEmpty();
     }
@@ -875,8 +875,8 @@
       first.forEach(
           (option, value) ->
               toReturn.add(option.getOptionName() + ":" + value + " -> " + second.get(option)));
-      skylarkFirst.forEach(
-          (option, value) -> toReturn.add(option + ":" + value + skylarkSecond.get(option)));
+      starlarkFirst.forEach(
+          (option, value) -> toReturn.add(option + ":" + value + starlarkSecond.get(option)));
       return toReturn;
     }
   }
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 1a38cc4..7d04a83 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
@@ -728,7 +728,7 @@
       help =
           "Add or remove keys from an action's execution info based on action mnemonic.  "
               + "Applies only to actions which support execution info. Many common actions "
-              + "support execution info, e.g. Genrule, CppCompile, Javac, SkylarkAction, "
+              + "support execution info, e.g. Genrule, CppCompile, Javac, StarlarkAction, "
               + "TestRunner. When specifying multiple values, order matters because "
               + "many regexes may apply to the same mnemonic.\n\n"
               + "Syntax: \"regex=[+-]key,[+-]key,...\".\n\n"
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
index 5d6951c..ab7cf51 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/AbstractConfiguredTarget.java
@@ -75,8 +75,8 @@
           FILES_FIELD,
           DEFAULT_RUNFILES_FIELD,
           DATA_RUNFILES_FIELD,
-          FilesToRunProvider.SKYLARK_NAME,
-          OutputGroupInfo.SKYLARK_NAME,
+          FilesToRunProvider.STARLARK_NAME,
+          OutputGroupInfo.STARLARK_NAME,
           ACTIONS_FIELD_NAME);
 
   public AbstractConfiguredTarget(Label label, BuildConfigurationValue.Key configurationKey) {
@@ -192,21 +192,21 @@
   @Override
   public final ImmutableCollection<String> getFieldNames() {
     ImmutableList.Builder<String> result = ImmutableList.builder();
-    result.addAll(ImmutableList.of(
-        DATA_RUNFILES_FIELD,
-        DEFAULT_RUNFILES_FIELD,
-        LABEL_FIELD,
-        FILES_FIELD,
-        FilesToRunProvider.SKYLARK_NAME));
-    if (get(OutputGroupInfo.SKYLARK_CONSTRUCTOR) != null) {
-      result.add(OutputGroupInfo.SKYLARK_NAME);
+    result.addAll(
+        ImmutableList.of(
+            DATA_RUNFILES_FIELD,
+            DEFAULT_RUNFILES_FIELD,
+            LABEL_FIELD,
+            FILES_FIELD,
+            FilesToRunProvider.STARLARK_NAME));
+    if (get(OutputGroupInfo.STARLARK_CONSTRUCTOR) != null) {
+      result.add(OutputGroupInfo.STARLARK_NAME);
     }
-    addExtraSkylarkKeys(result::add);
+    addExtraStarlarkKeys(result::add);
     return result.build();
   }
 
-  protected void addExtraSkylarkKeys(Consumer<String> result) {
-  }
+  protected void addExtraStarlarkKeys(Consumer<String> result) {}
 
   private DefaultInfo getDefaultProvider() {
     if (defaultProvider.get() == null) {
@@ -248,10 +248,10 @@
         return getDefaultProvider().getDefaultRunfiles();
       case DATA_RUNFILES_FIELD:
         return getDefaultProvider().getDataRunfiles();
-      case FilesToRunProvider.SKYLARK_NAME:
+      case FilesToRunProvider.STARLARK_NAME:
         return getDefaultProvider().getFilesToRun();
-      case OutputGroupInfo.SKYLARK_NAME:
-        return get(OutputGroupInfo.SKYLARK_CONSTRUCTOR);
+      case OutputGroupInfo.STARLARK_NAME:
+        return get(OutputGroupInfo.STARLARK_CONSTRUCTOR);
       default:
         return rawGetStarlarkProvider(providerKey);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
index 6578ba3..68eb7d2 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/MergedConfiguredTarget.java
@@ -78,9 +78,9 @@
   }
 
   @Override
-  protected void addExtraSkylarkKeys(Consumer<String> result) {
+  protected void addExtraStarlarkKeys(Consumer<String> result) {
     if (base instanceof AbstractConfiguredTarget) {
-      ((AbstractConfiguredTarget) base).addExtraSkylarkKeys(result);
+      ((AbstractConfiguredTarget) base).addExtraStarlarkKeys(result);
     }
     for (int i = 0; i < nonBaseProviders.getProviderCount(); i++) {
       Object classAt = nonBaseProviders.getProviderKeyAt(i);
@@ -159,7 +159,7 @@
       TransitiveInfoProviderMap providers = aspect.getProviders();
       for (int i = 0; i < providers.getProviderCount(); ++i) {
         Object providerKey = providers.getProviderKeyAt(i);
-        if (OutputGroupInfo.SKYLARK_CONSTRUCTOR.getKey().equals(providerKey)
+        if (OutputGroupInfo.STARLARK_CONSTRUCTOR.getKey().equals(providerKey)
             || ExtraActionArtifactsProvider.class.equals(providerKey)
             || RequiredConfigFragmentsProvider.class.equals(providerKey)) {
           continue;
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
index 95a879c..8ba3006 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/OutputFileConfiguredTarget.java
@@ -74,7 +74,7 @@
         artifact,
         instrumentedFilesInfo(generatingRule),
         generatingRule.getProvider(RequiredConfigFragmentsProvider.class),
-        Preconditions.checkNotNull(generatingRule).get(OutputGroupInfo.SKYLARK_CONSTRUCTOR));
+        Preconditions.checkNotNull(generatingRule).get(OutputGroupInfo.STARLARK_CONSTRUCTOR));
 
     this.artifact = artifact;
     this.generatingRule = Preconditions.checkNotNull(generatingRule);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
index e02f660..7281ede 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/configuredtargets/RuleConfiguredTarget.java
@@ -103,7 +103,7 @@
     Preconditions.checkState(providerBuilder.contains(FileProvider.class), label);
     Preconditions.checkState(providerBuilder.contains(FilesToRunProvider.class), label);
 
-    // Initialize every SkylarkApiProvider
+    // Initialize every StarlarkApiProvider
     for (int i = 0; i < providers.getProviderCount(); i++) {
       Object obj = providers.getProviderInstanceAt(i);
       if (obj instanceof StarlarkApiProvider) {
@@ -184,7 +184,7 @@
   }
 
   @Override
-  protected void addExtraSkylarkKeys(Consumer<String> result) {
+  protected void addExtraStarlarkKeys(Consumer<String> result) {
     for (int i = 0; i < providers.getProviderCount(); i++) {
       Object classAt = providers.getProviderKeyAt(i);
       if (classAt instanceof String) {
@@ -223,14 +223,14 @@
     // Provider key names might potentially be *private* information, and thus a comprehensive
     // list of provider keys should not be exposed in any way other than for debug information.
     printer.append("<target " + getLabel() + ", keys:[");
-    ImmutableList.Builder<String> skylarkProviderKeyStrings = ImmutableList.builder();
+    ImmutableList.Builder<String> starlarkProviderKeyStrings = ImmutableList.builder();
     for (int providerIndex = 0; providerIndex < providers.getProviderCount(); providerIndex++) {
       Object providerKey = providers.getProviderKeyAt(providerIndex);
       if (providerKey instanceof Provider.Key) {
-        skylarkProviderKeyStrings.add(providerKey.toString());
+        starlarkProviderKeyStrings.add(providerKey.toString());
       }
     }
-    printer.append(Joiner.on(", ").join(skylarkProviderKeyStrings.build()));
+    printer.append(Joiner.on(", ").join(starlarkProviderKeyStrings.build()));
     printer.append("]>");
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
index ebd7f90..b52fa9e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/Args.java
@@ -382,18 +382,18 @@
         throws EvalException {
       StarlarkCustomCommandLine.VectorArg.Builder vectorArg;
       if (value instanceof Depset) {
-        Depset skylarkNestedSet = (Depset) value;
-        NestedSet<?> nestedSet = skylarkNestedSet.getSet();
+        Depset starlarkNestedSet = (Depset) value;
+        NestedSet<?> nestedSet = starlarkNestedSet.getSet();
         if (expandDirectories) {
           potentialDirectoryArtifacts.add(nestedSet);
         }
         vectorArg = new StarlarkCustomCommandLine.VectorArg.Builder(nestedSet);
       } else {
-        Sequence<?> skylarkList = (Sequence) value;
+        Sequence<?> starlarkList = (Sequence) value;
         if (expandDirectories) {
-          scanForDirectories(skylarkList);
+          scanForDirectories(starlarkList);
         }
-        vectorArg = new StarlarkCustomCommandLine.VectorArg.Builder(skylarkList);
+        vectorArg = new StarlarkCustomCommandLine.VectorArg.Builder(starlarkList);
       }
       validateFormatString("format_each", formatEach);
       validateFormatString("format_joined", formatJoined);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java
index 05f615b..4e94932 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkLateBoundDefault.java
@@ -41,7 +41,7 @@
  * 'label') specifically by Starlark configuration fragment name and field name, as registered by
  * {@link StarlarkConfigurationField}.
  *
- * <p>For example, a SkylarkLateBoundDefault on "java" and "toolchain" would require a valid
+ * <p>For example, a StarlarkLateBoundDefault on "java" and "toolchain" would require a valid
  * configuration fragment named "java" with a method annotated with {@link
  * StarlarkConfigurationField} of name "toolchain". This {@link LateBoundDefault} would provide a
  * late-bound dependency (defined by the label returned by that configuration field) in the current
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java
index c2adbeb..05ab97f 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/StarlarkModules.java
@@ -37,7 +37,7 @@
           new StarlarkNativeModule(),
           new StarlarkRuleClassFunctions(),
           StructProvider.STRUCT,
-          OutputGroupInfo.SKYLARK_CONSTRUCTOR,
+          OutputGroupInfo.STARLARK_CONSTRUCTOR,
           ActionsProvider.INSTANCE,
           DefaultInfo.PROVIDER);
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
index f485d48..2643fcd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/AnalysisTestResultInfo.java
@@ -24,11 +24,8 @@
  */
 public class AnalysisTestResultInfo implements Info, AnalysisTestResultInfoApi {
 
-  /**
-   * Singleton provider instance for {@link AnalysisTestResultInfo}.
-   */
-  public static final TestResultInfoProvider SKYLARK_CONSTRUCTOR =
-      new TestResultInfoProvider();
+  /** Singleton provider instance for {@link AnalysisTestResultInfo}. */
+  public static final TestResultInfoProvider STARLARK_CONSTRUCTOR = new TestResultInfoProvider();
 
   private final Boolean success;
   private final String message;
@@ -40,7 +37,7 @@
 
   @Override
   public TestResultInfoProvider getProvider() {
-    return SKYLARK_CONSTRUCTOR;
+    return STARLARK_CONSTRUCTOR;
   }
 
   @Override