diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
index d5c027f3ba9411..ce49a4d4a7bb48 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RuleContext.java
@@ -1279,7 +1279,7 @@ private ImmutableTable<String, String, String> parseExecProperties(
       return ImmutableTable.of();
     } else {
       return parseExecProperties(
-          execProperties, toolchainContexts == null ? null : toolchainContexts.getExecGroups());
+          execProperties, toolchainContexts == null ? null : toolchainContexts.getExecGroupNames());
     }
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java
index 5961ca7bded1aa..0465daf8e55995 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ToolchainCollection.java
@@ -55,7 +55,7 @@ public ImmutableSet<Label> getResolvedToolchains() {
         .collect(toImmutableSet());
   }
 
-  public ImmutableSet<String> getExecGroups() {
+  public ImmutableSet<String> getExecGroupNames() {
     return getContextMap().keySet();
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkExecGroupCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkExecGroupCollection.java
index 506d9e5fc8250c..12789943e99f9b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkExecGroupCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkExecGroupCollection.java
@@ -62,7 +62,7 @@ public static boolean isValidGroupName(String execGroupName) {
   public boolean containsKey(StarlarkSemantics semantics, Object key) throws EvalException {
     String group = castGroupName(key);
     return !DEFAULT_EXEC_GROUP_NAME.equals(group)
-        && toolchainCollection().getExecGroups().contains(group);
+        && toolchainCollection().getExecGroupNames().contains(group);
   }
 
   /**
@@ -104,7 +104,7 @@ public void repr(Printer printer) {
   }
 
   private List<String> getScrubbedExecGroups() {
-    return toolchainCollection().getExecGroups().stream()
+    return toolchainCollection().getExecGroupNames().stream()
         .filter(group -> !DEFAULT_EXEC_GROUP_NAME.equals(group))
         .sorted()
         .collect(Collectors.toList());