Remove `@InlineMe`-annotated getters after unknown commit PiperOrigin-RevId: 696985671 Change-Id: I2bd694ed13abb99e018ce35c2455e002e6fcb3c3

diff --git a/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputSymlink.java b/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputSymlink.java
index 1b2d877..83d4e7b 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputSymlink.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputSymlink.java

@@ -20,7 +20,6 @@
 import com.google.devtools.build.lib.actions.Artifact.SpecialArtifact;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.errorprone.annotations.InlineMe;
 import javax.annotation.Nullable;
 
 /**
@@ -59,32 +58,6 @@
     requireNonNull(metadata, "metadata");
   }
 
-  @InlineMe(replacement = "this.name()")
-  public PathFragment getName() {
-    return name();
-  }
-
-  @InlineMe(replacement = "this.targetPath()")
-  public PathFragment getTargetPath() {
-    return targetPath();
-  }
-
-  @InlineMe(replacement = "this.metadata()")
-  public HasDigest getMetadata() {
-    return metadata();
-  }
-
-  @InlineMe(replacement = "this.relativeToExecRoot()")
-  public boolean isRelativeToExecRoot() {
-    return relativeToExecRoot();
-  }
-
-  @InlineMe(replacement = "this.enclosingTreeArtifactExecPath()")
-  @Nullable
-  public PathFragment getEnclosingTreeArtifactExecPath() {
-    return enclosingTreeArtifactExecPath();
-  }
-
   /**
    * Reconstitutes the original target path of this symlink.
    *
@@ -92,19 +65,18 @@
    * execution root was stripped originally, it is re-prepended.
    */
   public final PathFragment reconstituteTargetPath(PathFragment execRoot) {
-    return isRelativeToExecRoot() ? execRoot.getRelative(getTargetPath()) : getTargetPath();
+    return relativeToExecRoot() ? execRoot.getRelative(targetPath()) : targetPath();
   }
 
   @Override
   public final String toString() {
-    if (getMetadata() == HasDigest.EMPTY) {
+    if (metadata() == HasDigest.EMPTY) {
       return String.format(
-          "FilesetOutputSymlink(%s -> %s)",
-          getName().getPathString(), getTargetPath().getPathString());
+          "FilesetOutputSymlink(%s -> %s)", name().getPathString(), targetPath().getPathString());
     } else {
       return String.format(
           "FilesetOutputSymlink(%s -> %s | metadataHash=%s)",
-          getName().getPathString(), getTargetPath().getPathString(), getMetadata());
+          name().getPathString(), targetPath().getPathString(), metadata());
     }
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java b/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java
index 9872627..7502716 100644
--- a/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java
+++ b/src/main/java/com/google/devtools/build/lib/actions/FilesetOutputTree.java

@@ -111,9 +111,9 @@
       for (FilesetOutputSymlink symlink : symlinks) {
         if (!isRelativeSymlink(symlink)) {
           visitor.acceptSymlink(
-              symlink.getName(),
-              symlink.getTargetPath(),
-              symlink.getMetadata() instanceof FileArtifactValue metadata ? metadata : null);
+              symlink.name(),
+              symlink.targetPath(),
+              symlink.metadata() instanceof FileArtifactValue metadata ? metadata : null);
         }
       }
       return;
@@ -127,14 +127,14 @@
     Map<String, FileArtifactValue> artifactValues = new HashMap<>();
 
     for (FilesetOutputSymlink outputSymlink : symlinks) {
-      PathFragment name = outputSymlink.getName();
-      String targetPath = outputSymlink.getTargetPath().getPathString();
+      PathFragment name = outputSymlink.name();
+      String targetPath = outputSymlink.targetPath().getPathString();
       var map = isRelativeSymlink(outputSymlink) ? relativeLinks : resolvedLinks;
 
       // Symlinks are already deduplicated by name in SkyframeFilesetManifestAction.
       checkState(map.put(name, targetPath) == null, "Duplicate fileset entry at %s", name);
 
-      if (outputSymlink.getMetadata() instanceof FileArtifactValue metadata) {
+      if (outputSymlink.metadata() instanceof FileArtifactValue metadata) {
         artifactValues.put(targetPath, metadata);
       }
     }
@@ -218,7 +218,7 @@
   }
 
   private static boolean isRelativeSymlink(FilesetOutputSymlink symlink) {
-    return !symlink.getTargetPath().isAbsolute() && !symlink.isRelativeToExecRoot();
+    return !symlink.targetPath().isAbsolute() && !symlink.relativeToExecRoot();
   }
 
   /** Fully resolves relative symlinks, including internal directory symlinks. */
@@ -320,7 +320,7 @@
     private ForbiddenRelativeSymlinkException(FilesetOutputSymlink relativeLink) {
       super(
           "Fileset symlink %s -> %s is not absolute"
-              .formatted(relativeLink.getName(), relativeLink.getTargetPath()));
+              .formatted(relativeLink.name(), relativeLink.targetPath()));
     }
   }
 }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java
index 9b24e43..9689cdb 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectCollection.java

@@ -24,7 +24,6 @@
 import com.google.devtools.build.lib.skyframe.AspectKeyCreator.AspectKey;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetKey;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -210,16 +209,6 @@
       requireNonNull(usedAspects, "usedAspects");
     }
 
-    @InlineMe(replacement = "this.aspect()")
-    public AspectDescriptor getAspect() {
-      return aspect();
-    }
-
-    @InlineMe(replacement = "this.usedAspects()")
-    public ImmutableList<AspectDeps> getUsedAspects() {
-      return usedAspects();
-    }
-
     private static AspectDeps create(
         AspectDescriptor aspect, ImmutableList<AspectDeps> usedAspects) {
       return new AspectDeps(aspect, usedAspects);
@@ -242,13 +231,13 @@
       AspectDeps aspectDeps,
       Map<AspectDescriptor, AspectKey> visited,
       ConfiguredTargetKey baseKey) {
-    AspectDescriptor aspect = aspectDeps.getAspect();
+    AspectDescriptor aspect = aspectDeps.aspect();
     AspectKey aspectKey = visited.get(aspect);
     if (aspectKey != null) {
       return aspectKey;
     }
 
-    ImmutableList<AspectDeps> usedAspects = aspectDeps.getUsedAspects();
+    ImmutableList<AspectDeps> usedAspects = aspectDeps.usedAspects();
     var usedAspectKeys = ImmutableList.<AspectKey>builderWithExpectedSize(usedAspects.size());
     for (AspectCollection.AspectDeps usedAspect : usedAspects) {
       usedAspectKeys.add(buildAspectKey(usedAspect, visited, baseKey));

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectContext.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectContext.java
index 42d0399..3cd8113 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectContext.java

@@ -93,7 +93,7 @@
   /** Returns the labels of default the toolchain types that aspects have propagated. */
   public ImmutableSet<Label> getRequestedToolchainTypesLabels() {
     if (targetUsesAutoExecGroups) {
-      return baseTargetToolchainContexts.getContextMap().entrySet().stream()
+      return baseTargetToolchainContexts.contextMap().entrySet().stream()
           .filter(e -> isAutomaticExecGroup(e.getKey()))
           .flatMap(e -> e.getValue().requestedToolchainTypeLabels().keySet().stream())
           .collect(toImmutableSet());
@@ -115,7 +115,7 @@
     var execGroupContext = baseTargetToolchainContexts.getDefaultToolchainContext();
     if (targetUsesAutoExecGroups) {
       execGroupContext =
-          baseTargetToolchainContexts.getContextMap().entrySet().stream()
+          baseTargetToolchainContexts.contextMap().entrySet().stream()
               .filter(
                   e ->
                       isAutomaticExecGroup(e.getKey())

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
index 9615d0b..cac280c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/CachingAnalysisEnvironment.java

@@ -380,7 +380,7 @@
       // analysis phase.
       throw new MissingDepException("Restart due to missing main repository mapping");
     }
-    return mainRepoMapping.getRepositoryMapping();
+    return mainRepoMapping.repositoryMapping();
   }
 
   @Override

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
index 1dc8ead..b6ea376 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/ConfigurationMakeVariableContext.java

@@ -55,7 +55,7 @@
     if (ruleContext.getToolchainContexts() != null) {
       ruleContext
           .getToolchainContexts()
-          .getContextMap()
+          .contextMap()
           .values()
           .forEach(context -> providers.addAll(context.templateVariableProviders()));
     }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolutionHelpers.java b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolutionHelpers.java
index 2099962..940eada 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolutionHelpers.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/DependencyResolutionHelpers.java

@@ -335,8 +335,7 @@
       ToolchainCollection<ToolchainContext> toolchainContexts,
       OrderedSetMultimap<DependencyKind, Label> outgoingLabels) {
     if (toolchainContexts != null) {
-      for (Map.Entry<String, ToolchainContext> entry :
-          toolchainContexts.getContextMap().entrySet()) {
+      for (Map.Entry<String, ToolchainContext> entry : toolchainContexts.contextMap().entrySet()) {
         outgoingLabels.putAll(
             DependencyKind.forExecGroup(entry.getKey()),
             entry.getValue().resolvedToolchainLabels());
@@ -351,7 +350,7 @@
       return;
     }
     for (Map.Entry<String, UnloadedToolchainContext> execGroup :
-        toolchainContexts.getContextMap().entrySet()) {
+        toolchainContexts.contextMap().entrySet()) {
       for (var toolchainTypeToResolved :
           execGroup.getValue().toolchainTypeToResolved().asMap().entrySet()) {
         // map entries from (exec group, toolchain type) to resolved toolchain labels. We need to

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/LabelAndLocation.java b/src/main/java/com/google/devtools/build/lib/analysis/LabelAndLocation.java
index f071478..d9279b4 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/LabelAndLocation.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/LabelAndLocation.java

@@ -19,7 +19,6 @@
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Target;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.errorprone.annotations.InlineMe;
 import net.starlark.java.syntax.Location;
 
 /**
@@ -35,16 +34,6 @@
     requireNonNull(location, "location");
   }
 
-  @InlineMe(replacement = "this.label()")
-  public Label getLabel() {
-    return label();
-  }
-
-  @InlineMe(replacement = "this.location()")
-  public Location getLocation() {
-    return location();
-  }
-
   public static LabelAndLocation of(Target target) {
     return new LabelAndLocation(target.getLabel(), target.getLocation());
   }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsProvider.java b/src/main/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsProvider.java
index 9e2dcf6..d1f67a2 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsProvider.java

@@ -29,7 +29,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import com.google.devtools.build.lib.util.ClassName;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -57,26 +56,6 @@
     requireNonNull(starlarkOptions, "starlarkOptions");
   }
 
-  @InlineMe(replacement = "this.optionsClasses()")
-  public ImmutableSet<Class<? extends FragmentOptions>> getOptionsClasses() {
-    return optionsClasses();
-  }
-
-  @InlineMe(replacement = "this.fragmentClasses()")
-  public ImmutableSet<Class<? extends Fragment>> getFragmentClasses() {
-    return fragmentClasses();
-  }
-
-  @InlineMe(replacement = "this.defines()")
-  public ImmutableSet<String> getDefines() {
-    return defines();
-  }
-
-  @InlineMe(replacement = "this.starlarkOptions()")
-  public ImmutableSet<Label> getStarlarkOptions() {
-    return starlarkOptions();
-  }
-
   private static final Interner<RequiredConfigFragmentsProvider> interner =
       BlazeInterners.newWeakInterner();
 
@@ -90,12 +69,12 @@
     return MoreObjects.toStringHelper(RequiredConfigFragmentsProvider.class)
         .add(
             "optionsClasses",
-            Collections2.transform(getOptionsClasses(), ClassName::getSimpleNameWithOuter))
+            Collections2.transform(optionsClasses(), ClassName::getSimpleNameWithOuter))
         .add(
             "fragmentClasses",
-            Collections2.transform(getFragmentClasses(), ClassName::getSimpleNameWithOuter))
-        .add("defines", getDefines())
-        .add("starlarkOptions", getStarlarkOptions())
+            Collections2.transform(fragmentClasses(), ClassName::getSimpleNameWithOuter))
+        .add("defines", defines())
+        .add("starlarkOptions", starlarkOptions())
         .toString();
   }
 
@@ -188,10 +167,10 @@
     @CanIgnoreReturnValue
     public Builder merge(RequiredConfigFragmentsProvider provider) {
       if (provider != null) {
-        optionsClasses = appendAll(optionsClasses, provider.getOptionsClasses());
-        fragmentClasses = appendAll(fragmentClasses, provider.getFragmentClasses());
-        defines = appendAll(defines, provider.getDefines());
-        starlarkOptions = appendAll(starlarkOptions, provider.getStarlarkOptions());
+        optionsClasses = appendAll(optionsClasses, provider.optionsClasses());
+        fragmentClasses = appendAll(fragmentClasses, provider.fragmentClasses());
+        defines = appendAll(defines, provider.defines());
+        starlarkOptions = appendAll(starlarkOptions, provider.starlarkOptions());
       }
       return this;
     }

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 752e4ad..755cc35 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

@@ -2107,7 +2107,7 @@
 
       // Validate toolchains.
       if (toolchainContexts != null) {
-        for (var toolchainContext : toolchainContexts.getContextMap().values()) {
+        for (var toolchainContext : toolchainContexts.contextMap().values()) {
           for (var prerequisite : toolchainContext.prerequisiteTargets()) {
             validateDirectPrerequisite(TOOLCHAIN_ATTRIBUTE, prerequisite);
           }

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 d89619b..c8e44f4 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

@@ -25,7 +25,6 @@
 import com.google.devtools.build.lib.packages.ExecGroup;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -42,31 +41,26 @@
     requireNonNull(contextMap, "contextMap");
   }
 
-  @InlineMe(replacement = "this.contextMap()")
-  public ImmutableMap<String, T> getContextMap() {
-    return contextMap();
-  }
-
   public T getDefaultToolchainContext() {
-    return getContextMap().get(ExecGroup.DEFAULT_EXEC_GROUP_NAME);
+    return contextMap().get(ExecGroup.DEFAULT_EXEC_GROUP_NAME);
   }
 
   public boolean hasToolchainContext(String execGroup) {
-    return getContextMap().containsKey(execGroup);
+    return contextMap().containsKey(execGroup);
   }
 
   public T getToolchainContext(String execGroup) {
-    return getContextMap().get(execGroup);
+    return contextMap().get(execGroup);
   }
 
   public ImmutableSet<Label> getResolvedToolchains() {
-    return getContextMap().values().stream()
+    return contextMap().values().stream()
         .flatMap(c -> c.resolvedToolchainLabels().stream())
         .collect(toImmutableSet());
   }
 
   public ImmutableSet<String> getExecGroupNames() {
-    return getContextMap().keySet();
+    return contextMap().keySet();
   }
 
   /**

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/Util.java b/src/main/java/com/google/devtools/build/lib/analysis/Util.java
index de000d59..110c76a 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/Util.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/Util.java

@@ -113,7 +113,7 @@
     ToolchainCollection<ResolvedToolchainContext> toolchainContexts =
         ruleContext.getToolchainContexts();
     if (toolchainContexts != null) {
-      for (ResolvedToolchainContext toolchainContext : toolchainContexts.getContextMap().values()) {
+      for (ResolvedToolchainContext toolchainContext : toolchainContexts.contextMap().values()) {
         if (toolchainContext != null) {
           // This logic should stay up to date with the dep creation logic in
           // DependencyResolver#partiallyResolveDependencies.

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentFactory.java
index e207cff..123e8a0 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentFactory.java

@@ -20,7 +20,6 @@
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
 import com.google.common.collect.ImmutableSet;
-import com.google.errorprone.annotations.InlineMe;
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.CompletionException;
 import javax.annotation.Nullable;
@@ -96,16 +95,6 @@
       requireNonNull(fragmentClass, "fragmentClass");
     }
 
-    @InlineMe(replacement = "this.buildOptions()")
-    BuildOptions getBuildOptions() {
-      return buildOptions();
-    }
-
-    @InlineMe(replacement = "this.fragmentClass()")
-    Class<? extends Fragment> getFragmentClass() {
-      return fragmentClass();
-    }
-
     private static FragmentKey create(
         BuildOptions buildOptions, Class<? extends Fragment> fragmentClass) {
       return new FragmentKey(buildOptions, fragmentClass);
@@ -114,8 +103,8 @@
 
   private static Fragment makeFragment(FragmentKey fragmentKey)
       throws InvalidConfigurationException {
-    BuildOptions buildOptions = fragmentKey.getBuildOptions();
-    Class<? extends Fragment> fragmentClass = fragmentKey.getFragmentClass();
+    BuildOptions buildOptions = fragmentKey.buildOptions();
+    Class<? extends Fragment> fragmentClass = fragmentKey.fragmentClass();
     String noConstructorPattern = "%s lacks constructor(BuildOptions)";
     try {
       Fragment fragment =

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java b/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java
index 4f538d7..95e099c 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/constraints/RuleContextConstraintSemantics.java

@@ -592,13 +592,11 @@
       Label currentTarget, Label environment, RemovedEnvironmentCulprit reason) {
     LabelAndLocation culprit = reason.culprit();
     Label targetToExplore =
-        currentTarget.equals(culprit.getLabel())
-            ? reason.selectedDepForCulprit()
-            : culprit.getLabel();
+        currentTarget.equals(culprit.label()) ? reason.selectedDepForCulprit() : culprit.label();
 
     return new StringJoiner("\n")
         .add("  environment: " + environment)
-        .add("    removed by: " + culprit.getLabel() + " (" + culprit.getLocation() + ")")
+        .add("    removed by: " + culprit.label() + " (" + culprit.location() + ")")
         .add("    because of a select() that chooses dep: " + reason.selectedDepForCulprit())
         .add("    which lacks: " + environment)
         .add("")

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformFunction.java b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformFunction.java
index 41f5230..719e82b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/platform/PlatformFunction.java

@@ -112,7 +112,7 @@
     var parsedFlagsKey =
         ParsedFlagsValue.Key.create(
             platformInfo.flags(),
-            PackageContext.of(pkgId, repoMappingValue.getRepositoryMapping()),
+            PackageContext.of(pkgId, repoMappingValue.repositoryMapping()),
             // Include default values so that any flags explicitly reset to the default are kept.
             /* includeDefaultValues= */ true);
     var parsedFlagsValue = (ParsedFlagsValue) env.getValue(parsedFlagsKey);

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/producers/ConfiguredAspectProducer.java b/src/main/java/com/google/devtools/build/lib/analysis/producers/ConfiguredAspectProducer.java
index 14d8935..cd47a85 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/producers/ConfiguredAspectProducer.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/producers/ConfiguredAspectProducer.java

@@ -102,7 +102,7 @@
 
     var configuredAspects = new ArrayList<ConfiguredAspect>(usedAspects.size());
     for (AspectCollection.AspectDeps depAspect : usedAspects) {
-      var value = aspectValues.get(depAspect.getAspect());
+      var value = aspectValues.get(depAspect.aspect());
       if (value == ConfiguredAspect.NonApplicableAspect.INSTANCE) {
         continue;
       }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
index b33ce8d..60d263d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkActionFactory.java

@@ -120,7 +120,7 @@
   private static void checkToolchainParameterIsSet(
       RuleContext ruleContext, Object toolchainUnchecked) throws EvalException {
     if ((ruleContext.getToolchainContexts() == null
-            || ruleContext.getToolchainContexts().getContextMap().size() > 1)
+            || ruleContext.getToolchainContexts().contextMap().size() > 1)
         && toolchainUnchecked == Starlark.UNBOUND) {
       throw Starlark.errorf(
           "Couldn't identify if tools are from implicit dependencies or a toolchain. Please"

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 b09ac1d..d4aef46 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

@@ -72,7 +72,7 @@
   @VisibleForTesting
   public ImmutableMap<String, ? extends ResolvedToolchainsDataInterface<?>>
       getToolchainCollectionForTesting() {
-    return toolchainCollection().getContextMap();
+    return toolchainCollection().contextMap();
   }
 
   public static boolean isValidGroupName(String execGroupName) {

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
index c7249bb..11f180d 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleClassFunctions.java

@@ -116,7 +116,6 @@
 import com.google.devtools.build.lib.util.FileTypeSet;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.errorprone.annotations.FormatMethod;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.errorprone.annotations.Keep;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -1882,16 +1881,6 @@
       requireNonNull(name, "name");
     }
 
-    @InlineMe(replacement = "this.label()")
-    Label getLabel() {
-      return label();
-    }
-
-    @InlineMe(replacement = "this.name()")
-    String getName() {
-      return name();
-    }
-
     private static AnalysisTestKey create(Label label, String name) {
       return new AnalysisTestKey(label, name);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
index 99a052d..37064dd 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/test/TestRunnerAction.java

@@ -72,7 +72,6 @@
 import com.google.devtools.build.lib.vfs.Symlinks;
 import com.google.devtools.build.lib.view.test.TestStatus.TestResultData;
 import com.google.devtools.common.options.TriState;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.protobuf.ExtensionRegistry;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -1224,8 +1223,8 @@
               .getEventHandler()
               .post(new SpawnExecutedEvent.ChangePhase(this));
 
-          testRunnerSpawn = nextRunnerAndAttempts.getSpawn();
-          maxAttempts = nextRunnerAndAttempts.getMaxAttempts();
+          testRunnerSpawn = nextRunnerAndAttempts.spawn();
+          maxAttempts = nextRunnerAndAttempts.maxAttempts();
           continue;
         }
       }
@@ -1289,16 +1288,6 @@
       requireNonNull(spawn, "spawn");
     }
 
-    @InlineMe(replacement = "this.spawn()")
-    TestRunnerSpawn getSpawn() {
-      return spawn();
-    }
-
-    @InlineMe(replacement = "this.maxAttempts()")
-    int getMaxAttempts() {
-      return maxAttempts();
-    }
-
     public static TestRunnerSpawnAndMaxAttempts create(TestRunnerSpawn spawn, int maxAttempts) {
       return new TestRunnerSpawnAndMaxAttempts(spawn, maxAttempts);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java
index ac29257..d2f2c16 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/AuthAndTLSOptions.java

@@ -26,7 +26,6 @@
 import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParsingException;
-import com.google.errorprone.annotations.InlineMe;
 import java.net.IDN;
 import java.time.Duration;
 import java.util.List;
@@ -201,15 +200,6 @@
       requireNonNull(path, "path");
     }
 
-    @InlineMe(replacement = "this.scope()")
-    public Optional<String> getScope() {
-      return scope();
-    }
-
-    @InlineMe(replacement = "this.path()")
-    public String getPath() {
-      return path();
-    }
   }
 
   /** A {@link Converter} for the `--credential_helper` flag. */

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java b/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
index d8274d6..1f70b71 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/GoogleAuthUtils.java

@@ -267,10 +267,10 @@
       // Fallback to .netrc if it exists.
       try {
         fallbackCredentials =
-            newCredentialsFromNetrc(credentialHelperEnvironment.getClientEnvironment(), fileSystem);
+            newCredentialsFromNetrc(credentialHelperEnvironment.clientEnvironment(), fileSystem);
       } catch (IOException e) {
         // TODO(yannic): Make this fail the build.
-        credentialHelperEnvironment.getEventReporter().handle(Event.warn(e.getMessage()));
+        credentialHelperEnvironment.eventReporter().handle(Event.warn(e.getMessage()));
       }
     }
 
@@ -382,8 +382,8 @@
 
     CredentialHelperProvider.Builder builder = CredentialHelperProvider.builder();
     for (AuthAndTLSOptions.CredentialHelperOption helper : helpers) {
-      Optional<String> scope = helper.getScope();
-      Path path = pathFactory.create(environment.getClientEnvironment(), helper.getPath());
+      Optional<String> scope = helper.scope();
+      Path path = pathFactory.create(environment.clientEnvironment(), helper.path());
       if (scope.isPresent()) {
         builder.add(scope.get(), path);
       } else {

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialCacheExpiry.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialCacheExpiry.java
index 7a3d098..225dea0 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialCacheExpiry.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialCacheExpiry.java

@@ -35,7 +35,7 @@
   private Duration getExpirationTime(GetCredentialsResponse response, Instant currentTime) {
     Preconditions.checkNotNull(response);
 
-    var expires = response.getExpires();
+    var expires = response.expires();
     if (expires.isEmpty()) {
       return defaultCacheDuration;
     }

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelper.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelper.java
index e080874..f6962af 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelper.java

@@ -165,11 +165,9 @@
     return new SubprocessBuilder()
         .setArgv(ImmutableList.<String>builder().add(path.getPathString()).add(args).build())
         .setWorkingDirectory(
-            environment.getWorkspacePath() != null
-                ? environment.getWorkspacePath().getPathFile()
-                : null)
-        .setEnv(environment.getClientEnvironment())
-        .setTimeoutMillis(environment.getHelperExecutionTimeout().toMillis())
+            environment.workspacePath() != null ? environment.workspacePath().getPathFile() : null)
+        .setEnv(environment.clientEnvironment())
+        .setTimeoutMillis(environment.helperExecutionTimeout().toMillis())
         .start();
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperCredentials.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperCredentials.java
index 602490e..e7e9bc9 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperCredentials.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperCredentials.java

@@ -81,7 +81,7 @@
       throw e.getWrapped();
     }
     if (response != null) {
-      return (Map) response.getHeaders();
+      return (Map) response.headers();
     }
 
     if (fallbackCredentials.isPresent()) {

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperEnvironment.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperEnvironment.java
index 472a377..6277d72 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperEnvironment.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperEnvironment.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.vfs.Path;
-import com.google.errorprone.annotations.InlineMe;
 import java.time.Duration;
 import javax.annotation.Nullable;
 
@@ -48,27 +47,6 @@
     requireNonNull(helperExecutionTimeout, "helperExecutionTimeout");
   }
 
-  @InlineMe(replacement = "this.eventReporter()")
-  public Reporter getEventReporter() {
-    return eventReporter();
-  }
-
-  @InlineMe(replacement = "this.workspacePath()")
-  @Nullable
-  public Path getWorkspacePath() {
-    return workspacePath();
-  }
-
-  @InlineMe(replacement = "this.clientEnvironment()")
-  public ImmutableMap<String, String> getClientEnvironment() {
-    return clientEnvironment();
-  }
-
-  @InlineMe(replacement = "this.helperExecutionTimeout()")
-  public Duration getHelperExecutionTimeout() {
-    return helperExecutionTimeout();
-  }
-
   /** Returns a new builder for {@link CredentialHelperEnvironment}. */
   public static CredentialHelperEnvironment.Builder newBuilder() {
     return new AutoBuilder_CredentialHelperEnvironment_Builder();

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequest.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequest.java
index ff5f704..a1b7a13 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequest.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequest.java

@@ -20,7 +20,6 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
 import com.google.errorprone.annotations.Immutable;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
@@ -46,11 +45,6 @@
     requireNonNull(uri, "uri");
   }
 
-  @InlineMe(replacement = "this.uri()")
-  public URI getUri() {
-    return uri();
-  }
-
   /** Returns a new builder for {@link GetCredentialsRequest}. */
   public static Builder newBuilder() {
     return new AutoBuilder_GetCredentialsRequest_Builder();
@@ -74,7 +68,7 @@
       Preconditions.checkNotNull(value);
 
       writer.beginObject();
-      writer.name("uri").value(value.getUri().toString());
+      writer.name("uri").value(value.uri().toString());
       writer.endObject();
     }
 

diff --git a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponse.java b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponse.java
index cea25c9..6002b5c 100644
--- a/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponse.java
+++ b/src/main/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponse.java

@@ -22,7 +22,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.errorprone.annotations.Immutable;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
 import com.google.gson.annotations.JsonAdapter;
@@ -61,16 +60,6 @@
     requireNonNull(expires, "expires");
   }
 
-  @InlineMe(replacement = "this.headers()")
-  public ImmutableMap<String, ImmutableList<String>> getHeaders() {
-    return headers();
-  }
-
-  @InlineMe(replacement = "this.expires()")
-  public Optional<Instant> getExpires() {
-    return expires();
-  }
-
   public static final DateTimeFormatter RFC_3339_FORMATTER =
       DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX")
           .withZone(ZoneId.from(ZoneOffset.UTC))
@@ -101,7 +90,7 @@
 
       writer.beginObject();
 
-      ImmutableMap<String, ImmutableList<String>> headers = response.getHeaders();
+      ImmutableMap<String, ImmutableList<String>> headers = response.headers();
       if (!headers.isEmpty()) {
         writer.name("headers");
         writer.beginObject();
@@ -117,7 +106,7 @@
         writer.endObject();
       }
 
-      var expires = response.getExpires();
+      var expires = response.expires();
       if (expires.isPresent()) {
         writer.name("expires");
         writer.value(RFC_3339_FORMATTER.format(expires.get()));

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ArchiveOverride.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ArchiveOverride.java
index d80b37d..6186651 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ArchiveOverride.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ArchiveOverride.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleInspectorValue.AugmentedModule.ResolutionReason;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Specifies that a module should be retrieved from an archive.
@@ -49,36 +48,6 @@
     requireNonNull(stripPrefix, "stripPrefix");
   }
 
-  @InlineMe(replacement = "this.urls()")
-  public ImmutableList<String> getUrls() {
-    return urls();
-  }
-
-  @InlineMe(replacement = "this.patches()")
-  public ImmutableList<Label> getPatches() {
-    return patches();
-  }
-
-  @InlineMe(replacement = "this.patchCmds()")
-  public ImmutableList<String> getPatchCmds() {
-    return patchCmds();
-  }
-
-  @InlineMe(replacement = "this.integrity()")
-  public String getIntegrity() {
-    return integrity();
-  }
-
-  @InlineMe(replacement = "this.stripPrefix()")
-  public String getStripPrefix() {
-    return stripPrefix();
-  }
-
-  @InlineMe(replacement = "this.patchStrip()")
-  public int getPatchStrip() {
-    return patchStrip();
-  }
-
   public static ArchiveOverride create(
       ImmutableList<String> urls,
       ImmutableList<Label> patches,
@@ -93,12 +62,12 @@
   @Override
   public RepoSpec getRepoSpec() {
     return new ArchiveRepoSpecBuilder()
-        .setUrls(getUrls())
-        .setIntegrity(getIntegrity())
-        .setStripPrefix(getStripPrefix())
-        .setPatches(getPatches())
-        .setPatchCmds(getPatchCmds())
-        .setPatchStrip(getPatchStrip())
+        .setUrls(urls())
+        .setIntegrity(integrity())
+        .setStripPrefix(stripPrefix())
+        .setPatches(patches())
+        .setPatchCmds(patchCmds())
+        .setPatchStrip(patchStrip())
         .build();
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java
index e646090..009b0cd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java

@@ -117,12 +117,12 @@
               "invalid label for module extension found at %s",
               usage.getProxies().getFirst().getLocation());
         }
-        if (!moduleExtensionId.getBzlFileLabel().getRepository().isVisible()) {
+        if (!moduleExtensionId.bzlFileLabel().getRepository().isVisible()) {
           throw ExternalDepsException.withMessage(
               Code.BAD_MODULE,
               "invalid label for module extension found at %s: no repo visible as '@%s' here",
               usage.getProxies().getFirst().getLocation(),
-              moduleExtensionId.getBzlFileLabel().getRepository().getName());
+              moduleExtensionId.bzlFileLabel().getRepository().getName());
         }
         extensionUsagesTableBuilder.put(moduleExtensionId, module.getKey(), usage);
       }
@@ -183,8 +183,8 @@
     String extensionNameDisambiguator = attempt == 1 ? "" : String.valueOf(attempt);
     // An innate extension name is of the form @repo//path/to/defs.bzl%repo_rule_name, which cannot
     // be part of a valid repo name.
-    String extensionName = id.isInnate() ? "_repo_rules" : id.getExtensionName();
-    return id.getIsolationKey()
+    String extensionName = id.isInnate() ? "_repo_rules" : id.extensionName();
+    return id.isolationKey()
         .map(
             isolationKey ->
                 String.format(
@@ -193,14 +193,14 @@
                     // Extension names are identified by their Starlark identifier, which in the
                     // case of an exported symbol cannot start with "_".
                     "%s+_%s%s+%s+%s+%s",
-                    id.getBzlFileLabel().getRepository().getName(),
+                    id.bzlFileLabel().getRepository().getName(),
                     extensionName,
                     extensionNameDisambiguator,
-                    isolationKey.getModule().name(),
-                    isolationKey.getModule().version(),
-                    isolationKey.getUsageExportedName()))
+                    isolationKey.module().name(),
+                    isolationKey.module().version(),
+                    isolationKey.usageExportedName()))
         .orElse(
-            id.getBzlFileLabel().getRepository().getName()
+            id.bzlFileLabel().getRepository().getName()
                 + "+"
                 + extensionName
                 + extensionNameDisambiguator);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllFunction.java
index 0a4beae..29899db 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllFunction.java

@@ -66,7 +66,7 @@
       if (singleExtensionValue == null) {
         return null;
       }
-      reposToFetch.addAll(singleExtensionValue.getCanonicalRepoNameToInternalNames().keySet());
+      reposToFetch.addAll(singleExtensionValue.canonicalRepoNameToInternalNames().keySet());
     }
 
     // 3. If this is fetch configure, get repo rules and only collect repos marked as configure

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllValue.java
index 27bf869..51542aa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelFetchAllValue.java

@@ -26,7 +26,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Empty result of running Bazel fetch all dependencies, to indicate that all repos have been
@@ -37,11 +36,6 @@
     requireNonNull(reposToVendor, "reposToVendor");
   }
 
-  @InlineMe(replacement = "this.reposToVendor()")
-  public ImmutableList<RepositoryName> getReposToVendor() {
-    return reposToVendor();
-  }
-
   /** Creates a key from the given repository name. */
   public static BazelFetchAllValue.Key key(Boolean configureEnabled) {
     return BazelFetchAllValue.Key.create(configureEnabled);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
index fb5399e..87e3c3f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelLockFileModule.java

@@ -106,7 +106,7 @@
                   && entry.getKey() instanceof SingleExtensionValue.EvalKey key
                   // entry.getValue() can be null if the extension evaluation failed.
                   && entry.getValue() instanceof SingleExtensionValue value) {
-                newExtensionInfos.put(key.argument(), value.getLockFileInfo().get());
+                newExtensionInfos.put(key.argument(), value.lockFileInfo().get());
               }
             });
     var combinedExtensionInfos =

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModTidyFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModTidyFunction.java
index 7c9d20d..43a1cf9 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModTidyFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModTidyFunction.java

@@ -69,7 +69,7 @@
               // label that works on all platforms.
               "@buildozer_binary//:buildozer.exe",
               Label.RepoContext.of(
-                  RepositoryName.BAZEL_TOOLS, bazelToolsRepoMapping.getRepositoryMapping()));
+                  RepositoryName.BAZEL_TOOLS, bazelToolsRepoMapping.repositoryMapping()));
     } catch (LabelSyntaxException e) {
       throw new IllegalStateException(e);
     }
@@ -107,7 +107,7 @@
         return null;
       }
       if (result.get(extension) instanceof SingleExtensionValue evalValue) {
-        evalValue.getFixup().ifPresent(fixups::add);
+        evalValue.fixup().ifPresent(fixups::add);
       }
     }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorFunction.java
index b94a076..772633d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorFunction.java

@@ -79,8 +79,8 @@
             depGraph.values().stream()
                 .collect(
                     Collectors.groupingBy(
-                        AugmentedModule::getName,
-                        Collectors.mapping(AugmentedModule::getKey, toImmutableSet()))));
+                        AugmentedModule::name,
+                        Collectors.mapping(AugmentedModule::key, toImmutableSet()))));
 
     return BazelModuleInspectorValue.create(
         depGraph,
@@ -214,7 +214,7 @@
         return null;
       }
       extensionToRepoInternalNames.putAll(
-          singleExtensionKey.argument(), singleExtensionValue.getGeneratedRepoSpecs().keySet());
+          singleExtensionKey.argument(), singleExtensionValue.generatedRepoSpecs().keySet());
     }
     return new ExtensionRepos(extensionToRepoInternalNames.build(), errors.build());
   }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorValue.java
index 504ad1c..c7f5b76 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleInspectorValue.java

@@ -30,7 +30,6 @@
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -66,31 +65,6 @@
     requireNonNull(errors, "errors");
   }
 
-  @InlineMe(replacement = "this.depGraph()")
-  public ImmutableMap<ModuleKey, AugmentedModule> getDepGraph() {
-    return depGraph();
-  }
-
-  @InlineMe(replacement = "this.modulesIndex()")
-  public ImmutableMap<String, ImmutableSet<ModuleKey>> getModulesIndex() {
-    return modulesIndex();
-  }
-
-  @InlineMe(replacement = "this.extensionToRepoInternalNames()")
-  public ImmutableSetMultimap<ModuleExtensionId, String> getExtensionToRepoInternalNames() {
-    return extensionToRepoInternalNames();
-  }
-
-  @InlineMe(replacement = "this.moduleKeyToCanonicalNames()")
-  public ImmutableMap<ModuleKey, RepositoryName> getModuleKeyToCanonicalNames() {
-    return moduleKeyToCanonicalNames();
-  }
-
-  @InlineMe(replacement = "this.errors()")
-  public ImmutableList<ExternalDepsException> getErrors() {
-    return errors();
-  }
-
   @SerializationConstant
   public static final SkyKey KEY = () -> SkyFunctions.BAZEL_MODULE_INSPECTION;
 
@@ -152,74 +126,24 @@
       requireNonNull(depReasons, "depReasons");
     }
 
-    @InlineMe(replacement = "this.name()")
-    public String getName() {
-      return name();
-    }
-
-    @InlineMe(replacement = "this.version()")
-    public Version getVersion() {
-      return version();
-    }
-
-    @InlineMe(replacement = "this.key()")
-    public ModuleKey getKey() {
-      return key();
-    }
-
-    @InlineMe(replacement = "this.repoName()")
-    public String getRepoName() {
-      return repoName();
-    }
-
-    @InlineMe(replacement = "this.dependants()")
-    public ImmutableSet<ModuleKey> getDependants() {
-      return dependants();
-    }
-
-    @InlineMe(replacement = "this.originalDependants()")
-    public ImmutableSet<ModuleKey> getOriginalDependants() {
-      return originalDependants();
-    }
-
-    @InlineMe(replacement = "this.deps()")
-    public ImmutableBiMap<String, ModuleKey> getDeps() {
-      return deps();
-    }
-
-    @InlineMe(replacement = "this.unusedDeps()")
-    public ImmutableBiMap<String, ModuleKey> getUnusedDeps() {
-      return unusedDeps();
-    }
-
-    @InlineMe(replacement = "this.depReasons()")
-    public ImmutableMap<String, ResolutionReason> getDepReasons() {
-      return depReasons();
-    }
-
-    @InlineMe(replacement = "this.loaded()")
-    public boolean isLoaded() {
-      return loaded();
-    }
-
     /**
      * Shortcut for retrieving the sorted union of both used and unused deps based on the unused
      * flag.
      */
     public ImmutableSortedMap<ModuleKey, String> getAllDeps(boolean unused) {
       if (!unused) {
-        return ImmutableSortedMap.copyOf(getDeps().inverse(), ModuleKey.LEXICOGRAPHIC_COMPARATOR);
+        return ImmutableSortedMap.copyOf(deps().inverse(), ModuleKey.LEXICOGRAPHIC_COMPARATOR);
       } else {
         Map<ModuleKey, String> map = new HashMap<>();
-        map.putAll(getDeps().inverse());
-        map.putAll(getUnusedDeps().inverse());
+        map.putAll(deps().inverse());
+        map.putAll(unusedDeps().inverse());
         return ImmutableSortedMap.copyOf(map, ModuleKey.LEXICOGRAPHIC_COMPARATOR);
       }
     }
 
     /** Flag for checking whether the module is present in the resolved dep graph. */
     public boolean isUsed() {
-      return getKey().equals(ModuleKey.ROOT) || !getDependants().isEmpty();
+      return key().equals(ModuleKey.ROOT) || !dependants().isEmpty();
     }
 
     /** Returns a new {@link AugmentedModule.Builder} with {@code key} set. */

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunction.java
index f5bb363..fbc00fd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelModuleResolutionFunction.java

@@ -113,7 +113,7 @@
     SequencedMap<String, Optional<Checksum>> registryFileHashes =
         new LinkedHashMap<>(state.discoverAndSelectResult.registryFileHashes);
     ImmutableSet<RepoSpecKey> repoSpecKeys =
-        state.discoverAndSelectResult.selectionResult.getResolvedDepGraph().values().stream()
+        state.discoverAndSelectResult.selectionResult.resolvedDepGraph().values().stream()
             // Modules with a null registry have a non-registry override. We don't need to
             // fetch or store the repo spec in this case.
             .filter(module -> module.getRegistry() != null)
@@ -126,7 +126,7 @@
       if (repoSpecValue == null) {
         return null;
       }
-      remoteRepoSpecs.put(repoSpecKey.getModuleKey(), repoSpecValue.repoSpec());
+      remoteRepoSpecs.put(repoSpecKey.moduleKey(), repoSpecValue.repoSpec());
       registryFileHashes.putAll(repoSpecValue.registryFileHashes());
     }
 
@@ -135,14 +135,14 @@
         Profiler.instance().profile(ProfilerTask.BZLMOD, "compute final dep graph")) {
       finalDepGraph =
           computeFinalDepGraph(
-              state.discoverAndSelectResult.selectionResult.getResolvedDepGraph(),
+              state.discoverAndSelectResult.selectionResult.resolvedDepGraph(),
               root.getOverrides(),
               remoteRepoSpecs.buildOrThrow());
     }
 
     return BazelModuleResolutionValue.create(
         finalDepGraph,
-        state.discoverAndSelectResult.selectionResult.getUnprunedDepGraph(),
+        state.discoverAndSelectResult.selectionResult.unprunedDepGraph(),
         ImmutableMap.copyOf(registryFileHashes),
         state.discoverAndSelectResult.selectedYankedVersions);
   }
@@ -171,7 +171,7 @@
     } catch (ExternalDepsException e) {
       throw new BazelModuleResolutionFunctionException(e, Transience.PERSISTENT);
     }
-    ImmutableMap<ModuleKey, InterimModule> resolvedDepGraph = selectionResult.getResolvedDepGraph();
+    ImmutableMap<ModuleKey, InterimModule> resolvedDepGraph = selectionResult.resolvedDepGraph();
 
     ImmutableMap<ModuleKey, YankedVersionsValue> yankedVersionsValues;
     try (SilentCloseable c =

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Discovery.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Discovery.java
index f42c2ee..6b24d6c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Discovery.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Discovery.java

@@ -80,7 +80,7 @@
           }
           predecessors.putIfAbsent(depSpec.toModuleKey(), module.getKey());
           unexpandedSkyKeys.add(
-              ModuleFileValue.key(depSpec.toModuleKey(), overrides.get(depSpec.getName())));
+              ModuleFileValue.key(depSpec.toModuleKey(), overrides.get(depSpec.name())));
         }
       }
       SkyframeLookupResult result = env.getValuesAndExceptions(unexpandedSkyKeys);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GitOverride.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GitOverride.java
index 0010881..78ba775 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GitOverride.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GitOverride.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleInspectorValue.AugmentedModule.ResolutionReason;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Specifies that a module should be retrieved from a Git repository.
@@ -51,41 +50,6 @@
     requireNonNull(stripPrefix, "stripPrefix");
   }
 
-  @InlineMe(replacement = "this.remote()")
-  public String getRemote() {
-    return remote();
-  }
-
-  @InlineMe(replacement = "this.commit()")
-  public String getCommit() {
-    return commit();
-  }
-
-  @InlineMe(replacement = "this.patches()")
-  public ImmutableList<Label> getPatches() {
-    return patches();
-  }
-
-  @InlineMe(replacement = "this.patchCmds()")
-  public ImmutableList<String> getPatchCmds() {
-    return patchCmds();
-  }
-
-  @InlineMe(replacement = "this.patchStrip()")
-  public int getPatchStrip() {
-    return patchStrip();
-  }
-
-  @InlineMe(replacement = "this.initSubmodules()")
-  public boolean getInitSubmodules() {
-    return initSubmodules();
-  }
-
-  @InlineMe(replacement = "this.stripPrefix()")
-  public String getStripPrefix() {
-    return stripPrefix();
-  }
-
   public static GitOverride create(
       String remote,
       String commit,
@@ -102,13 +66,13 @@
   @Override
   public RepoSpec getRepoSpec() {
     return new GitRepoSpecBuilder()
-        .setRemote(getRemote())
-        .setCommit(getCommit())
-        .setPatches(getPatches())
-        .setPatchCmds(getPatchCmds())
-        .setPatchArgs(ImmutableList.of("-p" + getPatchStrip()))
-        .setInitSubmodules(getInitSubmodules())
-        .setStripPrefix(getStripPrefix())
+        .setRemote(remote())
+        .setCommit(commit())
+        .setPatches(patches())
+        .setPatchCmds(patchCmds())
+        .setPatchArgs(ImmutableList.of("-p" + patchStrip()))
+        .setInitSubmodules(initSubmodules())
+        .setStripPrefix(stripPrefix())
         .build();
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java
index 9ed846e..bff23e1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/GsonTypeAdapterUtil.java

@@ -124,12 +124,9 @@
       new TypeAdapter<>() {
         @Override
         public void write(JsonWriter jsonWriter, ModuleExtensionId moduleExtId) throws IOException {
-          String isolationKeyPart = moduleExtId.getIsolationKey().map(key -> "%" + key).orElse("");
+          String isolationKeyPart = moduleExtId.isolationKey().map(key -> "%" + key).orElse("");
           jsonWriter.value(
-              moduleExtId.getBzlFileLabel()
-                  + "%"
-                  + moduleExtId.getExtensionName()
-                  + isolationKeyPart);
+              moduleExtId.bzlFileLabel() + "%" + moduleExtId.extensionName() + isolationKeyPart);
         }
 
         @Override

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java
index 20febdc..b472437 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InnateRunnableExtension.java

@@ -105,7 +105,7 @@
     Label.RepoContext repoContext = Label.RepoContext.of(repoMapping.ownerRepo(), repoMapping);
 
     // The name of the extension is of the form "<bzl_file_label>%<rule_name>".
-    Iterator<String> parts = Splitter.on('%').split(extensionId.getExtensionName()).iterator();
+    Iterator<String> parts = Splitter.on('%').split(extensionId.extensionName()).iterator();
     Location location = tags.getFirst().getLocation();
     Label bzlLabel;
     try {
@@ -205,7 +205,7 @@
       try {
         ruleInstance =
             BzlmodRepoRuleCreator.createRule(
-                extensionId.getBzlFileLabel().getPackageIdentifier(),
+                extensionId.bzlFileLabel().getPackageIdentifier(),
                 usagesValue.getRepoMappings().get(moduleKey),
                 directories,
                 starlarkSemantics,

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModule.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModule.java
index d4486fa..755c4fd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModule.java

@@ -23,7 +23,6 @@
 import com.google.common.collect.Maps;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 import java.util.function.UnaryOperator;
 import javax.annotation.Nullable;
@@ -60,21 +59,6 @@
       requireNonNull(version, "version");
     }
 
-    @InlineMe(replacement = "this.name()")
-    public String getName() {
-      return name();
-    }
-
-    @InlineMe(replacement = "this.version()")
-    public Version getVersion() {
-      return version();
-    }
-
-    @InlineMe(replacement = "this.maxCompatibilityLevel()")
-    public int getMaxCompatibilityLevel() {
-      return maxCompatibilityLevel();
-    }
-
     public static DepSpec create(String name, Version version, int maxCompatibilityLevel) {
       return new DepSpec(name, version, maxCompatibilityLevel);
     }
@@ -84,7 +68,7 @@
     }
 
     public final ModuleKey toModuleKey() {
-      return new ModuleKey(getName(), getVersion());
+      return new ModuleKey(name(), version());
     }
   }
 
@@ -232,14 +216,14 @@
     if (!(override instanceof SingleVersionOverride singleVersion)) {
       return repoSpec;
     }
-    if (singleVersion.getPatches().isEmpty()) {
+    if (singleVersion.patches().isEmpty()) {
       return repoSpec;
     }
     ImmutableMap.Builder<String, Object> attrBuilder = ImmutableMap.builder();
     attrBuilder.putAll(repoSpec.attributes().attributes());
-    attrBuilder.put("patches", singleVersion.getPatches());
-    attrBuilder.put("patch_cmds", singleVersion.getPatchCmds());
-    attrBuilder.put("patch_args", ImmutableList.of("-p" + singleVersion.getPatchStrip()));
+    attrBuilder.put("patches", singleVersion.patches());
+    attrBuilder.put("patch_cmds", singleVersion.patchCmds());
+    attrBuilder.put("patch_args", ImmutableList.of("-p" + singleVersion.patchStrip()));
     return RepoSpec.builder()
         .setBzlFile(repoSpec.bzlFile())
         .setRuleClassName(repoSpec.ruleClassName())
@@ -250,22 +234,22 @@
   static UnaryOperator<DepSpec> applyOverrides(
       ImmutableMap<String, ModuleOverride> overrides, String rootModuleName) {
     return depSpec -> {
-      if (rootModuleName.equals(depSpec.getName())) {
+      if (rootModuleName.equals(depSpec.name())) {
         return DepSpec.fromModuleKey(ModuleKey.ROOT);
       }
 
-      Version newVersion = depSpec.getVersion();
-      @Nullable ModuleOverride override = overrides.get(depSpec.getName());
+      Version newVersion = depSpec.version();
+      @Nullable ModuleOverride override = overrides.get(depSpec.name());
       if (override instanceof NonRegistryOverride) {
         newVersion = Version.EMPTY;
       } else if (override instanceof SingleVersionOverride singleVersionOverride) {
-        Version overrideVersion = singleVersionOverride.getVersion();
+        Version overrideVersion = singleVersionOverride.version();
         if (!overrideVersion.isEmpty()) {
           newVersion = overrideVersion;
         }
       }
 
-      return DepSpec.create(depSpec.getName(), newVersion, depSpec.getMaxCompatibilityLevel());
+      return DepSpec.create(depSpec.name(), newVersion, depSpec.maxCompatibilityLevel());
     };
   }
 }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LocalPathOverride.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LocalPathOverride.java
index b088e63..8ad7b24 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LocalPathOverride.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/LocalPathOverride.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.bazel.bzlmod.BazelModuleInspectorValue.AugmentedModule.ResolutionReason;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Specifies that a module should be retrieved from a local directory.
@@ -33,11 +32,6 @@
     requireNonNull(path, "path");
   }
 
-  @InlineMe(replacement = "this.path()")
-  public String getPath() {
-    return path();
-  }
-
   public static LocalPathOverride create(String path) {
     return new LocalPathOverride(path);
   }
@@ -47,7 +41,7 @@
   public RepoSpec getRepoSpec() {
     return RepoSpec.builder()
         .setRuleClassName("local_repository")
-        .setAttributes(AttributeValues.create(ImmutableMap.of("path", getPath())))
+        .setAttributes(AttributeValues.create(ImmutableMap.of("path", path())))
         .build();
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java
index 1d07452..4008c6f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtension.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 import net.starlark.java.eval.StarlarkCallable;
 import net.starlark.java.eval.StarlarkValue;
@@ -54,46 +53,6 @@
     requireNonNull(envVariables, "envVariables");
   }
 
-  @InlineMe(replacement = "this.implementation()")
-  public StarlarkCallable getImplementation() {
-    return implementation();
-  }
-
-  @InlineMe(replacement = "this.tagClasses()")
-  public ImmutableMap<String, TagClass> getTagClasses() {
-    return tagClasses();
-  }
-
-  @InlineMe(replacement = "this.doc()")
-  public Optional<String> getDoc() {
-    return doc();
-  }
-
-  @InlineMe(replacement = "this.definingBzlFileLabel()")
-  public Label getDefiningBzlFileLabel() {
-    return definingBzlFileLabel();
-  }
-
-  @InlineMe(replacement = "this.location()")
-  public Location getLocation() {
-    return location();
-  }
-
-  @InlineMe(replacement = "this.envVariables()")
-  public ImmutableList<String> getEnvVariables() {
-    return envVariables();
-  }
-
-  @InlineMe(replacement = "this.osDependent()")
-  public boolean getOsDependent() {
-    return osDependent();
-  }
-
-  @InlineMe(replacement = "this.archDependent()")
-  public boolean getArchDependent() {
-    return archDependent();
-  }
-
   public static Builder builder() {
     return new AutoBuilder_ModuleExtension_Builder();
   }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionContext.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionContext.java
index ec2eae8..f595954 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionContext.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionContext.java

@@ -142,7 +142,7 @@
       structField = true,
       enableOnlyWithFlag = "-experimental_isolated_extension_usages")
   public boolean isIsolated() {
-    return extensionId.getIsolationKey().isPresent();
+    return extensionId.isolationKey().isPresent();
   }
 
   @StarlarkMethod(

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java
index 0208001..a16db5d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvaluationProgress.java

@@ -26,17 +26,16 @@
   public static String moduleExtensionEvaluationContextString(ModuleExtensionId extensionId) {
     String suffix =
         extensionId
-            .getIsolationKey()
+            .isolationKey()
             .map(
                 isolationKey ->
                     String.format(
-                        " for %s in %s",
-                        isolationKey.getUsageExportedName(), isolationKey.getModule()))
+                        " for %s in %s", isolationKey.usageExportedName(), isolationKey.module()))
             .orElse("");
     return String.format(
         "module extension %s in %s%s",
-        extensionId.getExtensionName(),
-        extensionId.getBzlFileLabel().getUnambiguousCanonicalForm(),
+        extensionId.extensionName(),
+        extensionId.bzlFileLabel().getUnambiguousCanonicalForm(),
         suffix);
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java
index c727bf9..f5f3e3f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionId.java

@@ -22,7 +22,6 @@
 import com.google.common.base.Splitter;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -37,27 +36,11 @@
     requireNonNull(isolationKey, "isolationKey");
   }
 
-  @InlineMe(replacement = "this.bzlFileLabel()")
-  public Label getBzlFileLabel() {
-    return bzlFileLabel();
-  }
-
-  @InlineMe(replacement = "this.extensionName()")
-  public String getExtensionName() {
-    return extensionName();
-  }
-
-  @InlineMe(replacement = "this.isolationKey()")
-  public Optional<IsolationKey> getIsolationKey() {
-    return isolationKey();
-  }
-
   public static final Comparator<ModuleExtensionId> LEXICOGRAPHIC_COMPARATOR =
-      comparing(ModuleExtensionId::getBzlFileLabel)
-          .thenComparing(ModuleExtensionId::getExtensionName)
+      comparing(ModuleExtensionId::bzlFileLabel)
+          .thenComparing(ModuleExtensionId::extensionName)
           .thenComparing(
-              ModuleExtensionId::getIsolationKey,
-              emptiesFirst(IsolationKey.LEXICOGRAPHIC_COMPARATOR));
+              ModuleExtensionId::isolationKey, emptiesFirst(IsolationKey.LEXICOGRAPHIC_COMPARATOR));
 
   /**
    * A unique identifier for a single isolated usage of a fixed module extension.
@@ -71,19 +54,9 @@
       requireNonNull(usageExportedName, "usageExportedName");
     }
 
-    @InlineMe(replacement = "this.module()")
-    ModuleKey getModule() {
-      return module();
-    }
-
-    @InlineMe(replacement = "this.usageExportedName()")
-    String getUsageExportedName() {
-      return usageExportedName();
-    }
-
     static final Comparator<IsolationKey> LEXICOGRAPHIC_COMPARATOR =
-        comparing(IsolationKey::getModule, ModuleKey.LEXICOGRAPHIC_COMPARATOR)
-            .thenComparing(IsolationKey::getUsageExportedName);
+        comparing(IsolationKey::module, ModuleKey.LEXICOGRAPHIC_COMPARATOR)
+            .thenComparing(IsolationKey::usageExportedName);
 
     public static IsolationKey create(ModuleKey module, String usageExportedName) {
       return new IsolationKey(module, usageExportedName);
@@ -91,7 +64,7 @@
 
     @Override
     public final String toString() {
-      return getModule() + "+" + getUsageExportedName();
+      return module() + "+" + usageExportedName();
     }
 
     public static IsolationKey fromString(String s) throws Version.ParseException {
@@ -107,13 +80,13 @@
   }
 
   public final boolean isInnate() {
-    return getExtensionName().contains("%");
+    return extensionName().contains("%");
   }
 
   public String asTargetString() {
-    String isolationKeyPart = getIsolationKey().map(key -> "%" + key).orElse("");
+    String isolationKeyPart = isolationKey().map(key -> "%" + key).orElse("");
     return String.format(
         "%s%%%s%s",
-        getBzlFileLabel().getUnambiguousCanonicalForm(), getExtensionName(), isolationKeyPart);
+        bzlFileLabel().getUnambiguousCanonicalForm(), extensionName(), isolationKeyPart);
   }
 }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesFunction.java
index 8e400bc..cb72ee7 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesFunction.java

@@ -65,7 +65,7 @@
     ModuleKey moduleKey =
         bazelDepGraphValue
             .getCanonicalRepoNameLookup()
-            .get(extensionId.getBzlFileLabel().getRepository());
+            .get(extensionId.bzlFileLabel().getRepository());
     // NOTE(wyv): This means that if "foo" has a bazel_dep with the repo name "bar", and the
     // extension generates an internal repo name "bar", then within a repo generated by the
     // extension, "bar" will refer to the latter. We should explore a way to differentiate between
@@ -73,7 +73,7 @@
     // LINT.IfChange
     ImmutableMap.Builder<String, RepositoryName> entries = ImmutableMap.builder();
     entries.putAll(bazelDepGraphValue.getFullRepoMapping(moduleKey).entries());
-    entries.putAll(extensionEvalValue.getCanonicalRepoNameToInternalNames().inverse());
+    entries.putAll(extensionEvalValue.canonicalRepoNameToInternalNames().inverse());
     entries.putAll(bazelDepGraphValue.getRepoOverrides().row(extensionId));
     return ModuleExtensionRepoMappingEntriesValue.create(entries.buildKeepingLast(), moduleKey);
     // LINT.ThenChange(//src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionEvalStarlarkThreadContext.java)

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesValue.java
index 6d5f23b..6b2657f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionRepoMappingEntriesValue.java

@@ -26,7 +26,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 
 /** The value for {@link ModuleExtensionRepoMappingEntriesFunction}. */
 @AutoCodec
@@ -37,16 +36,6 @@
     requireNonNull(moduleKey, "moduleKey");
   }
 
-  @InlineMe(replacement = "this.entries()")
-  public ImmutableMap<String, RepositoryName> getEntries() {
-    return entries();
-  }
-
-  @InlineMe(replacement = "this.moduleKey()")
-  public ModuleKey getModuleKey() {
-    return moduleKey();
-  }
-
   @AutoCodec.Instantiator
   public static ModuleExtensionRepoMappingEntriesValue create(
       ImmutableMap<String, RepositoryName> entries, ModuleKey moduleKey) {

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java
index 048e000..44a0322 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleFileFunction.java

@@ -721,7 +721,7 @@
       return moduleFile;
     }
     var patchesInMainRepo =
-        singleVersionOverride.getPatches().stream()
+        singleVersionOverride.patches().stream()
             .filter(label -> label.getRepository().isMain())
             .collect(toImmutableList());
     if (patchesInMainRepo.isEmpty()) {
@@ -787,10 +787,7 @@
       for (var patchPath : patchPaths) {
         try {
           PatchUtil.applyToSingleFile(
-              patchPath.asPath(),
-              singleVersionOverride.getPatchStrip(),
-              moduleRoot,
-              moduleFilePath);
+              patchPath.asPath(), singleVersionOverride.patchStrip(), moduleRoot, moduleFilePath);
         } catch (PatchFailedException e) {
           throw errorf(
               Code.BAD_MODULE,

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/MultipleVersionOverride.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/MultipleVersionOverride.java
index 6634d24..ee8026c 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/MultipleVersionOverride.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/MultipleVersionOverride.java

@@ -19,7 +19,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Specifies that the module should still come from a registry, but multiple versions of it should
@@ -35,12 +34,6 @@
     requireNonNull(registry, "registry");
   }
 
-  @InlineMe(replacement = "this.versions()")
-  public ImmutableList<Version> getVersions() {
-    return versions();
-  }
-
-  @InlineMe(replacement = "this.registry()")
   @Override
   public String getRegistry() {
     return registry();

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryFunction.java
index 836c19e..6d0ef0f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryFunction.java

@@ -72,7 +72,7 @@
     RegistryKey key = (RegistryKey) skyKey.argument();
     try {
       return registryFactory.createRegistry(
-          key.getUrl().replace("%workspace%", workspaceRoot.getPathString()),
+          key.url().replace("%workspace%", workspaceRoot.getPathString()),
           lockfileMode,
           lockfile.getRegistryFileHashes(),
           lockfile.getSelectedYankedVersions(),
@@ -83,7 +83,7 @@
               FailureDetails.ExternalDeps.Code.INVALID_REGISTRY_URL,
               e,
               "Invalid registry URL: %s",
-              key.getUrl()));
+              key.url()));
     }
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryKey.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryKey.java
index fd7ebb7..f163e44 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryKey.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegistryKey.java

@@ -21,7 +21,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
-import com.google.errorprone.annotations.InlineMe;
 
 /** The key for {@link RegistryFunction}. */
 @AutoCodec
@@ -30,11 +29,6 @@
     requireNonNull(url, "url");
   }
 
-  @InlineMe(replacement = "this.url()")
-  String getUrl() {
-    return url();
-  }
-
   private static final SkyKeyInterner<RegistryKey> interner = SkyKey.newInterner();
 
   @AutoCodec.Instantiator

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java
index 259356a..0dd2a8a 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RegularRunnableExtension.java

@@ -150,7 +150,7 @@
     ModuleExtensionUsage sampleUsage = usagesValue.getExtensionUsages().values().iterator().next();
     Location sampleUsageLocation = sampleUsage.getProxies().getFirst().getLocation();
     BzlLoadValue bzlLoadValue =
-        loadBzlFile(extensionId.getBzlFileLabel(), sampleUsageLocation, starlarkSemantics, env);
+        loadBzlFile(extensionId.bzlFileLabel(), sampleUsageLocation, starlarkSemantics, env);
     if (bzlLoadValue == null) {
       return null;
     }
@@ -160,7 +160,7 @@
     // that may be created by b/237658764.
 
     // Check that the .bzl file actually exports a module extension by our name.
-    Object exported = bzlLoadValue.getModule().getGlobal(extensionId.getExtensionName());
+    Object exported = bzlLoadValue.getModule().getGlobal(extensionId.extensionName());
     if (!(exported instanceof ModuleExtension extension)) {
       ImmutableSet<String> exportedExtensions =
           bzlLoadValue.getModule().getGlobals().entrySet().stream()
@@ -170,14 +170,14 @@
       throw ExternalDepsException.withMessage(
           Code.BAD_MODULE,
           "%s does not export a module extension called %s, yet its use is requested at %s%s",
-          extensionId.getBzlFileLabel(),
-          extensionId.getExtensionName(),
+          extensionId.bzlFileLabel(),
+          extensionId.extensionName(),
           sampleUsageLocation,
-          SpellChecker.didYouMean(extensionId.getExtensionName(), exportedExtensions));
+          SpellChecker.didYouMean(extensionId.extensionName(), exportedExtensions));
     }
 
     ImmutableMap<String, Optional<String>> envVars =
-        RepositoryFunction.getEnvVarValues(env, ImmutableSet.copyOf(extension.getEnvVariables()));
+        RepositoryFunction.getEnvVarValues(env, ImmutableSet.copyOf(extension.envVariables()));
     if (envVars == null) {
       return null;
     }
@@ -196,8 +196,8 @@
   @Override
   public ModuleExtensionEvalFactors getEvalFactors() {
     return ModuleExtensionEvalFactors.create(
-        extension.getOsDependent() ? OS.getCurrent().toString() : "",
-        extension.getArchDependent() ? OS_ARCH.value() : "");
+        extension.osDependent() ? OS.getCurrent().toString() : "",
+        extension.archDependent() ? OS_ARCH.value() : "");
   }
 
   @Override
@@ -255,7 +255,7 @@
         new ModuleExtensionEvalStarlarkThreadContext(
             extensionId,
             usagesValue.getExtensionUniqueName() + "+",
-            extensionId.getBzlFileLabel().getPackageIdentifier(),
+            extensionId.bzlFileLabel().getPackageIdentifier(),
             BazelModuleContext.of(bzlLoadValue.getModule()).repoMapping(),
             usagesValue.getRepoOverrides(),
             mainRepositoryMapping,
@@ -286,14 +286,14 @@
                   () -> "evaluate module extension: " + extensionId.asTargetString())) {
         Object returnValue =
             Starlark.fastcall(
-                thread, extension.getImplementation(), new Object[] {moduleContext}, new Object[0]);
+                thread, extension.implementation(), new Object[] {moduleContext}, new Object[0]);
         if (returnValue != Starlark.NONE && !(returnValue instanceof ModuleExtensionMetadata)) {
           throw ExternalDepsException.withMessage(
               ExternalDeps.Code.BAD_MODULE,
               "expected module extension %s in %s to return None or extension_metadata, got"
                   + " %s",
-              extensionId.getExtensionName(),
-              extensionId.getBzlFileLabel(),
+              extensionId.extensionName(),
+              extensionId.bzlFileLabel(),
               Starlark.type(returnValue));
         }
         if (returnValue instanceof ModuleExtensionMetadata retMetadata) {
@@ -319,8 +319,8 @@
       throw ExternalDepsException.withMessage(
           ExternalDeps.Code.BAD_MODULE,
           "error evaluating module extension %s in %s",
-          extensionId.getExtensionName(),
-          extensionId.getBzlFileLabel());
+          extensionId.extensionName(),
+          extensionId.bzlFileLabel());
     } catch (IOException e) {
       throw ExternalDepsException.withCauseAndMessage(
           ExternalDeps.Code.EXTERNAL_DEPS_UNKNOWN,

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecFunction.java
index 7484813..fc4a18e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecFunction.java

@@ -41,7 +41,7 @@
       throws InterruptedException, RepoSpecException {
     RepoSpecKey key = (RepoSpecKey) skyKey.argument();
 
-    Registry registry = (Registry) env.getValue(RegistryKey.create(key.getRegistryUrl()));
+    Registry registry = (Registry) env.getValue(RegistryKey.create(key.registryUrl()));
     if (registry == null) {
       return null;
     }
@@ -50,15 +50,15 @@
     RepoSpec repoSpec;
     try (SilentCloseable c =
         Profiler.instance()
-            .profile(ProfilerTask.BZLMOD, () -> "compute repo spec: " + key.getModuleKey())) {
-      repoSpec = registry.getRepoSpec(key.getModuleKey(), downloadEvents, this.downloadManager);
+            .profile(ProfilerTask.BZLMOD, () -> "compute repo spec: " + key.moduleKey())) {
+      repoSpec = registry.getRepoSpec(key.moduleKey(), downloadEvents, this.downloadManager);
     } catch (IOException e) {
       throw new RepoSpecException(
           ExternalDepsException.withCauseAndMessage(
               FailureDetails.ExternalDeps.Code.ERROR_ACCESSING_REGISTRY,
               e,
               "Unable to get module repo spec for %s from registry",
-              key.getModuleKey()));
+              key.moduleKey()));
     }
     downloadEvents.replayOn(env.getListener());
     return RepoSpecValue.create(

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecKey.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecKey.java
index 75a4967..c525948 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecKey.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RepoSpecKey.java

@@ -22,7 +22,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
-import com.google.errorprone.annotations.InlineMe;
 
 /** The key for {@link RepoSpecFunction}. */
 @AutoCodec
@@ -32,16 +31,6 @@
     requireNonNull(registryUrl, "registryUrl");
   }
 
-  @InlineMe(replacement = "this.moduleKey()")
-  ModuleKey getModuleKey() {
-    return moduleKey();
-  }
-
-  @InlineMe(replacement = "this.registryUrl()")
-  String getRegistryUrl() {
-    return registryUrl();
-  }
-
   private static final SkyKeyInterner<RepoSpecKey> interner = SkyKey.newInterner();
 
   static RepoSpecKey of(InterimModule module) {

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RootModuleFileFixup.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RootModuleFileFixup.java
index bef0e3b..b745bf0 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RootModuleFileFixup.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/RootModuleFileFixup.java

@@ -40,7 +40,7 @@
             key ->
                 String.format(
                     "Updated use_repo calls for isolated usage '%s' of %s",
-                    key.getUsageExportedName(), extensionId))
+                    key.usageExportedName(), extensionId))
         .orElseGet(() -> String.format("Updated use_repo calls for %s", extensionId));
   }
 }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Selection.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Selection.java
index 7609eb8..e6aab83 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Selection.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/Selection.java

@@ -30,7 +30,6 @@
 import com.google.common.collect.Maps;
 import com.google.devtools.build.lib.bazel.bzlmod.InterimModule.DepSpec;
 import com.google.devtools.build.lib.server.FailureDetails.ExternalDeps.Code;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -104,16 +103,6 @@
       requireNonNull(unprunedDepGraph, "unprunedDepGraph");
     }
 
-    @InlineMe(replacement = "this.resolvedDepGraph()")
-    ImmutableMap<ModuleKey, InterimModule> getResolvedDepGraph() {
-      return resolvedDepGraph();
-    }
-
-    @InlineMe(replacement = "this.unprunedDepGraph()")
-    ImmutableMap<ModuleKey, InterimModule> getUnprunedDepGraph() {
-      return unprunedDepGraph();
-    }
-
     static Result create(
         ImmutableMap<ModuleKey, InterimModule> resolvedDepGraph,
         ImmutableMap<ModuleKey, InterimModule> unprunedDepGraph) {
@@ -132,21 +121,6 @@
       requireNonNull(targetAllowedVersion, "targetAllowedVersion");
     }
 
-    @InlineMe(replacement = "this.moduleName()")
-    String getModuleName() {
-      return moduleName();
-    }
-
-    @InlineMe(replacement = "this.compatibilityLevel()")
-    int getCompatibilityLevel() {
-      return compatibilityLevel();
-    }
-
-    @InlineMe(replacement = "this.targetAllowedVersion()")
-    Version getTargetAllowedVersion() {
-      return targetAllowedVersion();
-    }
-
     static SelectionGroup create(
         String moduleName, int compatibilityLevel, Version targetAllowedVersion) {
       return new SelectionGroup(moduleName, compatibilityLevel, targetAllowedVersion);
@@ -160,18 +134,6 @@
       requireNonNull(moduleName, "moduleName");
     }
 
-    @InlineMe(replacement = "this.moduleName()")
-    @SuppressWarnings("unused")
-    String getModuleName() {
-      return moduleName();
-    }
-
-    @InlineMe(replacement = "this.compatibilityLevel()")
-    @SuppressWarnings("unused")
-    int getCompatibilityLevel() {
-      return compatibilityLevel();
-    }
-
     static ModuleNameAndCompatibilityLevel create(String moduleName, int compatibilityLevel) {
       return new ModuleNameAndCompatibilityLevel(moduleName, compatibilityLevel);
     }
@@ -194,7 +156,7 @@
       if (!(override instanceof MultipleVersionOverride)) {
         continue;
       }
-      ImmutableList<Version> allowedVersions = ((MultipleVersionOverride) override).getVersions();
+      ImmutableList<Version> allowedVersions = ((MultipleVersionOverride) override).versions();
       for (Version allowedVersion : allowedVersions) {
         InterimModule allowedVersionModule =
             depGraph.get(new ModuleKey(moduleName, allowedVersion));
@@ -258,19 +220,19 @@
       DepSpec depSpec,
       ImmutableMap<ModuleKey, SelectionGroup> selectionGroups,
       Map<SelectionGroup, Version> selectedVersions) {
-    int minCompatibilityLevel = selectionGroups.get(depSpec.toModuleKey()).getCompatibilityLevel();
+    int minCompatibilityLevel = selectionGroups.get(depSpec.toModuleKey()).compatibilityLevel();
     int maxCompatibilityLevel =
-        depSpec.getMaxCompatibilityLevel() < 0
+        depSpec.maxCompatibilityLevel() < 0
             ? minCompatibilityLevel
-            : depSpec.getMaxCompatibilityLevel();
+            : depSpec.maxCompatibilityLevel();
     // First find the selection groups that this DepSpec could use.
     return Maps.filterKeys(
             selectedVersions,
             group ->
-                group.getModuleName().equals(depSpec.getName())
-                    && group.getCompatibilityLevel() >= minCompatibilityLevel
-                    && group.getCompatibilityLevel() <= maxCompatibilityLevel
-                    && group.getTargetAllowedVersion().compareTo(depSpec.getVersion()) >= 0)
+                group.moduleName().equals(depSpec.name())
+                    && group.compatibilityLevel() >= minCompatibilityLevel
+                    && group.compatibilityLevel() <= maxCompatibilityLevel
+                    && group.targetAllowedVersion().compareTo(depSpec.version()) >= 0)
         .entrySet()
         .stream()
         // Collect into an ImmutableSortedMap so that:
@@ -281,12 +243,12 @@
         .collect(
             toImmutableSortedMap(
                 naturalOrder(),
-                e -> e.getKey().getCompatibilityLevel(),
+                e -> e.getKey().compatibilityLevel(),
                 e -> e.getValue(),
                 Comparators::min))
         .values()
         .stream()
-        .map(v -> new ModuleKey(depSpec.getName(), v))
+        .map(v -> new ModuleKey(depSpec.name(), v))
         .collect(toImmutableList());
   }
 
@@ -445,13 +407,13 @@
       known.add(ModuleKey.ROOT);
       while (!toVisit.isEmpty()) {
         ModuleKeyAndDependent moduleKeyAndDependent = toVisit.remove();
-        ModuleKey key = moduleKeyAndDependent.getModuleKey();
+        ModuleKey key = moduleKeyAndDependent.moduleKey();
         InterimModule module =
             oldDepGraph
                 .get(key)
                 .withDepSpecsTransformed(
                     depSpec -> DepSpec.fromModuleKey(resolutionStrategy.apply(depSpec)));
-        visit(key, module, moduleKeyAndDependent.getDependent(), moduleByName);
+        visit(key, module, moduleKeyAndDependent.dependent(), moduleByName);
 
         for (DepSpec depSpec : module.getDeps().values()) {
           if (known.add(depSpec.toModuleKey())) {
@@ -470,7 +432,7 @@
         HashMap<String, ExistingModule> moduleByName)
         throws ExternalDepsException {
       if (overrides.get(key.name()) instanceof MultipleVersionOverride override) {
-        if (selectionGroups.get(key).getTargetAllowedVersion().isEmpty()) {
+        if (selectionGroups.get(key).targetAllowedVersion().isEmpty()) {
           // This module has no target allowed version, which means that there's no allowed version
           // higher than its version at the same compatibility level.
           Preconditions.checkState(
@@ -482,7 +444,7 @@
               from,
               key,
               key.name(),
-              JOINER.join(override.getVersions()));
+              JOINER.join(override.versions()));
         }
       } else {
         ExistingModule existingModuleWithSameName =
@@ -492,7 +454,7 @@
           // This has to mean that a module with the same name but a different compatibility level
           // was also selected.
           Preconditions.checkState(
-              from != null && existingModuleWithSameName.getDependent() != null,
+              from != null && existingModuleWithSameName.dependent() != null,
               "the root module cannot possibly exist more than once in the dep graph");
           throw ExternalDepsException.withMessage(
               Code.VERSION_RESOLUTION_ERROR,
@@ -501,9 +463,9 @@
               from,
               key,
               module.getCompatibilityLevel(),
-              existingModuleWithSameName.getDependent(),
-              existingModuleWithSameName.getModuleKey(),
-              existingModuleWithSameName.getCompatibilityLevel());
+              existingModuleWithSameName.dependent(),
+              existingModuleWithSameName.moduleKey(),
+              existingModuleWithSameName.compatibilityLevel());
         }
       }
 
@@ -533,17 +495,6 @@
         requireNonNull(moduleKey, "moduleKey");
       }
 
-      @InlineMe(replacement = "this.moduleKey()")
-      ModuleKey getModuleKey() {
-        return moduleKey();
-      }
-
-      @InlineMe(replacement = "this.dependent()")
-      @Nullable
-      ModuleKey getDependent() {
-        return dependent();
-      }
-
       static ModuleKeyAndDependent create(ModuleKey moduleKey, @Nullable ModuleKey dependent) {
         return new ModuleKeyAndDependent(moduleKey, dependent);
       }
@@ -555,22 +506,6 @@
         requireNonNull(moduleKey, "moduleKey");
       }
 
-      @InlineMe(replacement = "this.moduleKey()")
-      ModuleKey getModuleKey() {
-        return moduleKey();
-      }
-
-      @InlineMe(replacement = "this.compatibilityLevel()")
-      int getCompatibilityLevel() {
-        return compatibilityLevel();
-      }
-
-      @InlineMe(replacement = "this.dependent()")
-      @Nullable
-      ModuleKey getDependent() {
-        return dependent();
-      }
-
       static ExistingModule create(
           ModuleKey moduleKey, int compatibilityLevel, ModuleKey dependent) {
         return new ExistingModule(moduleKey, compatibilityLevel, dependent);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
index 1b497eb..1dd67ad 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java

@@ -175,7 +175,7 @@
               usagesValue,
               starlarkSemantics,
               extensionId,
-              mainRepoMappingValue.getRepositoryMapping());
+              mainRepoMappingValue.repositoryMapping());
     } catch (ExternalDepsException e) {
       throw new SingleExtensionEvalFunctionException(e);
     }
@@ -412,7 +412,7 @@
       // case.
       if (repoMappingValue.equals(RepositoryMappingValue.NOT_FOUND_VALUE)
           || !cell.getValue()
-              .equals(repoMappingValue.getRepositoryMapping().get(cell.getColumnKey()))) {
+              .equals(repoMappingValue.repositoryMapping().get(cell.getColumnKey()))) {
         // Wee woo wee woo -- diff detected!
         return true;
       }
@@ -467,8 +467,8 @@
             ExternalDepsException.withMessage(
                 Code.BAD_MODULE,
                 "error evaluating module extension %s in %s",
-                extensionId.getExtensionName(),
-                extensionId.getBzlFileLabel()));
+                extensionId.extensionName(),
+                extensionId.bzlFileLabel()));
       }
     }
 

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionFunction.java
index fbce3df..bfef390 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionFunction.java

@@ -52,20 +52,20 @@
     for (ModuleExtensionUsage usage : usagesValue.getExtensionUsages().values()) {
       for (ModuleExtensionUsage.Proxy proxy : usage.getProxies()) {
         for (Entry<String, String> repoImport : proxy.getImports().entrySet()) {
-          if (!evalOnlyValue.getGeneratedRepoSpecs().containsKey(repoImport.getValue())
+          if (!evalOnlyValue.generatedRepoSpecs().containsKey(repoImport.getValue())
               && !usagesValue.getRepoOverrides().containsKey(repoImport.getValue())) {
             throw new SingleExtensionFunctionException(
                 ExternalDepsException.withMessage(
                     Code.INVALID_EXTENSION_IMPORT,
                     "module extension \"%s\" from \"%s\" does not generate repository \"%s\", yet"
                         + " it is imported as \"%s\" in the usage at %s%s",
-                    extensionId.getExtensionName(),
-                    extensionId.getBzlFileLabel(),
+                    extensionId.extensionName(),
+                    extensionId.bzlFileLabel(),
                     repoImport.getValue(),
                     repoImport.getKey(),
                     proxy.getLocation(),
                     SpellChecker.didYouMean(
-                        repoImport.getValue(), evalOnlyValue.getGeneratedRepoSpecs().keySet())),
+                        repoImport.getValue(), evalOnlyValue.generatedRepoSpecs().keySet())),
                 Transience.PERSISTENT);
           }
         }
@@ -75,7 +75,7 @@
     // Check that repo overrides apply as declared.
     for (ModuleExtensionUsage usage : usagesValue.getExtensionUsages().values()) {
       for (var override : usage.getRepoOverrides().entrySet()) {
-        boolean repoExists = evalOnlyValue.getGeneratedRepoSpecs().containsKey(override.getKey());
+        boolean repoExists = evalOnlyValue.generatedRepoSpecs().containsKey(override.getKey());
         if (repoExists && !override.getValue().mustExist()) {
           throw new SingleExtensionFunctionException(
               ExternalDepsException.withMessage(
@@ -83,8 +83,8 @@
                   "module extension \"%s\" from \"%s\" generates repository \"%s\", yet"
                       + " it is injected via inject_repo() at %s. Use override_repo() instead to"
                       + " override an existing repository.",
-                  extensionId.getExtensionName(),
-                  extensionId.getBzlFileLabel(),
+                  extensionId.extensionName(),
+                  extensionId.bzlFileLabel(),
                   override.getKey(),
                   override.getValue().location()),
               Transience.PERSISTENT);
@@ -95,8 +95,8 @@
                   "module extension \"%s\" from \"%s\" does not generate repository \"%s\", yet"
                       + " it is overridden via override_repo() at %s. Use inject_repo() instead to"
                       + " inject a new repository.",
-                  extensionId.getExtensionName(),
-                  extensionId.getBzlFileLabel(),
+                  extensionId.extensionName(),
+                  extensionId.bzlFileLabel(),
                   override.getKey(),
                   override.getValue().location()),
               Transience.PERSISTENT);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionValue.java
index 3ba541d..192c87d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionValue.java

@@ -28,7 +28,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 
 /**
@@ -58,26 +57,6 @@
     requireNonNull(fixup, "fixup");
   }
 
-  @InlineMe(replacement = "this.generatedRepoSpecs()")
-  public ImmutableMap<String, RepoSpec> getGeneratedRepoSpecs() {
-    return generatedRepoSpecs();
-  }
-
-  @InlineMe(replacement = "this.canonicalRepoNameToInternalNames()")
-  public ImmutableBiMap<RepositoryName, String> getCanonicalRepoNameToInternalNames() {
-    return canonicalRepoNameToInternalNames();
-  }
-
-  @InlineMe(replacement = "this.lockFileInfo()")
-  public Optional<LockFileModuleExtension.WithFactors> getLockFileInfo() {
-    return lockFileInfo();
-  }
-
-  @InlineMe(replacement = "this.fixup()")
-  public Optional<RootModuleFileFixup> getFixup() {
-    return fixup();
-  }
-
   @AutoCodec.Instantiator
   public static SingleExtensionValue create(
       ImmutableMap<String, RepoSpec> generatedRepoSpecs,

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleVersionOverride.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleVersionOverride.java
index 29da44b..87b9c54 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleVersionOverride.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleVersionOverride.java

@@ -19,7 +19,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.errorprone.annotations.InlineMe;
 
 /**
  * Specifies that the module should:
@@ -51,32 +50,11 @@
     requireNonNull(patchCmds, "patchCmds");
   }
 
-  @InlineMe(replacement = "this.version()")
-  public Version getVersion() {
-    return version();
-  }
-
-  @InlineMe(replacement = "this.registry()")
   @Override
   public String getRegistry() {
     return registry();
   }
 
-  @InlineMe(replacement = "this.patches()")
-  public ImmutableList<Label> getPatches() {
-    return patches();
-  }
-
-  @InlineMe(replacement = "this.patchCmds()")
-  public ImmutableList<String> getPatchCmds() {
-    return patchCmds();
-  }
-
-  @InlineMe(replacement = "this.patchStrip()")
-  public int getPatchStrip() {
-    return patchStrip();
-  }
-
   public static SingleVersionOverride create(
       Version version,
       String registry,

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModule.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModule.java
index 3096964..d9098d1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/StarlarkBazelModule.java

@@ -115,20 +115,20 @@
             repoMapping);
     ImmutableList<Tag> tags = usage == null ? ImmutableList.of() : usage.getTags();
     HashMap<String, ArrayList<TypeCheckedTag>> typeCheckedTags = new HashMap<>();
-    for (String tagClassName : extension.getTagClasses().keySet()) {
+    for (String tagClassName : extension.tagClasses().keySet()) {
       typeCheckedTags.put(tagClassName, new ArrayList<>());
     }
     for (Tag tag : tags) {
-      TagClass tagClass = extension.getTagClasses().get(tag.getTagName());
+      TagClass tagClass = extension.tagClasses().get(tag.getTagName());
       if (tagClass == null) {
         throw ExternalDepsException.withMessage(
             Code.BAD_MODULE,
             "The module extension defined at %s does not have a tag class named %s, but its use is"
                 + " attempted at %s%s",
-            extension.getLocation(),
+            extension.location(),
             tag.getTagName(),
             tag.getLocation(),
-            SpellChecker.didYouMean(tag.getTagName(), extension.getTagClasses().keySet()));
+            SpellChecker.didYouMean(tag.getTagName(), extension.tagClasses().keySet()));
       }
 
       // Now we need to type-check the attribute values and convert them into "build language types"

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TagClass.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TagClass.java
index 91312ba..3cfb728 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TagClass.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TagClass.java

@@ -20,7 +20,6 @@
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.packages.Attribute;
 import com.google.devtools.build.lib.starlarkbuildapi.repository.RepositoryModuleApi.TagClassApi;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 
 /**
@@ -42,21 +41,6 @@
     requireNonNull(attributeIndices, "attributeIndices");
   }
 
-  @InlineMe(replacement = "this.attributes()")
-  public ImmutableList<Attribute> getAttributes() {
-    return attributes();
-  }
-
-  @InlineMe(replacement = "this.doc()")
-  public Optional<String> getDoc() {
-    return doc();
-  }
-
-  @InlineMe(replacement = "this.attributeIndices()")
-  public ImmutableMap<String, Integer> getAttributeIndices() {
-    return attributeIndices();
-  }
-
   public static TagClass create(ImmutableList<Attribute> attributes, Optional<String> doc) {
     ImmutableMap.Builder<String, Integer> attributeIndicesBuilder =
         ImmutableMap.builderWithExpectedSize(attributes.size());

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TypeCheckedTag.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TypeCheckedTag.java
index 0b0ecd3..1170bfd 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TypeCheckedTag.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/TypeCheckedTag.java

@@ -60,18 +60,18 @@
   public static TypeCheckedTag create(
       TagClass tagClass, Tag tag, LabelConverter labelConverter, String moduleDisplayString)
       throws ExternalDepsException {
-    Object[] attrValues = new Object[tagClass.getAttributes().size()];
+    Object[] attrValues = new Object[tagClass.attributes().size()];
     for (Map.Entry<String, Object> attrValue : tag.getAttributeValues().attributes().entrySet()) {
-      Integer attrIndex = tagClass.getAttributeIndices().get(attrValue.getKey());
+      Integer attrIndex = tagClass.attributeIndices().get(attrValue.getKey());
       if (attrIndex == null) {
         throw ExternalDepsException.withMessage(
             Code.BAD_MODULE,
             "in tag at %s, unknown attribute %s provided%s",
             tag.getLocation(),
             attrValue.getKey(),
-            SpellChecker.didYouMean(attrValue.getKey(), tagClass.getAttributeIndices().keySet()));
+            SpellChecker.didYouMean(attrValue.getKey(), tagClass.attributeIndices().keySet()));
       }
-      Attribute attr = tagClass.getAttributes().get(attrIndex);
+      Attribute attr = tagClass.attributes().get(attrIndex);
       Object nativeValue;
       try {
         nativeValue =
@@ -101,7 +101,7 @@
     // Check that all mandatory attributes have been specified, and fill in default values.
     // Along the way, verify that labels in the attribute values refer to visible repos only.
     for (int i = 0; i < attrValues.length; i++) {
-      Attribute attr = tagClass.getAttributes().get(i);
+      Attribute attr = tagClass.attributes().get(i);
       if (attr.isMandatory() && attrValues[i] == null) {
         throw ExternalDepsException.withMessage(
             Code.BAD_MODULE,
@@ -143,7 +143,7 @@
   @Nullable
   @Override
   public Object getValue(String name) throws EvalException {
-    Integer attrIndex = tagClass.getAttributeIndices().get(name);
+    Integer attrIndex = tagClass.attributeIndices().get(name);
     if (attrIndex == null) {
       return null;
     }
@@ -152,7 +152,7 @@
 
   @Override
   public ImmutableCollection<String> getFieldNames() {
-    return tagClass.getAttributeIndices().keySet();
+    return tagClass.attributeIndices().keySet();
   }
 
   @Nullable

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/VendorFileValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/VendorFileValue.java
index b7d7317..769d612 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/VendorFileValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/VendorFileValue.java

@@ -22,7 +22,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 
 /** Represent the parsed VENDOR.bazel file */
 public record VendorFileValue(
@@ -33,16 +32,6 @@
     requireNonNull(pinnedRepos, "pinnedRepos");
   }
 
-  @InlineMe(replacement = "this.ignoredRepos()")
-  public ImmutableList<RepositoryName> getIgnoredRepos() {
-    return ignoredRepos();
-  }
-
-  @InlineMe(replacement = "this.pinnedRepos()")
-  public ImmutableList<RepositoryName> getPinnedRepos() {
-    return pinnedRepos();
-  }
-
   @SerializationConstant public static final SkyKey KEY = () -> SkyFunctions.VENDOR_FILE;
 
   public static VendorFileValue create(

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsFunction.java
index 8117dd1..95d2ffa 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsFunction.java

@@ -39,24 +39,23 @@
   public SkyValue compute(SkyKey skyKey, Environment env) throws InterruptedException {
     var key = (YankedVersionsValue.Key) skyKey.argument();
 
-    Registry registry = (Registry) env.getValue(RegistryKey.create(key.getRegistryUrl()));
+    Registry registry = (Registry) env.getValue(RegistryKey.create(key.registryUrl()));
     if (registry == null) {
       return null;
     }
 
     try (SilentCloseable c =
         Profiler.instance()
-            .profile(
-                ProfilerTask.BZLMOD, () -> "getting yanked versions: " + key.getModuleName())) {
+            .profile(ProfilerTask.BZLMOD, () -> "getting yanked versions: " + key.moduleName())) {
       return YankedVersionsValue.create(
-          registry.getYankedVersions(key.getModuleName(), env.getListener(), downloadManager));
+          registry.getYankedVersions(key.moduleName(), env.getListener(), downloadManager));
     } catch (IOException e) {
       env.getListener()
           .handle(
               Event.warn(
                   String.format(
                       "Could not read metadata file for module %s from registry %s: %s",
-                      key.getModuleName(), key.getRegistryUrl(), e.getMessage())));
+                      key.moduleName(), key.registryUrl(), e.getMessage())));
       // This is failing open: If we can't read the metadata file, we allow yanked modules to be
       // fetched.
       return YankedVersionsValue.create(Optional.empty());

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsValue.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsValue.java
index 81bd9c9..0c5936f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsValue.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/YankedVersionsValue.java

@@ -22,7 +22,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 
 /** A class holding information about the versions of a particular module that have been yanked. */
@@ -48,16 +47,6 @@
       requireNonNull(registryUrl, "registryUrl");
     }
 
-    @InlineMe(replacement = "this.moduleName()")
-    String getModuleName() {
-      return moduleName();
-    }
-
-    @InlineMe(replacement = "this.registryUrl()")
-    String getRegistryUrl() {
-      return registryUrl();
-    }
-
     private static final SkyKeyInterner<Key> interner = SkyKey.newInterner();
 
     @AutoCodec.Instantiator

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java
index 464726d..9b472f5 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/GraphvizOutputFormatter.java

@@ -62,7 +62,7 @@
       String sourceId = toId(key);
 
       if (key.equals(ModuleKey.ROOT)) {
-        String rootLabel = String.format("<root> (%s@%s)", module.getName(), module.getVersion());
+        String rootLabel = String.format("<root> (%s@%s)", module.name(), module.version());
         str.append(String.format("  \"<root>\" [ label=\"%s\" ]\n", rootLabel));
       } else if (node.isTarget() || !module.isUsed()) {
         String shapeString = node.isTarget() ? "diamond" : "box";
@@ -157,7 +157,7 @@
     if (explanation == null) {
       return "";
     }
-    String label = explanation.getResolutionReason().getLabel();
+    String label = explanation.resolutionReason().getLabel();
     if (!label.isEmpty()) {
       return String.format("label=%s", label);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java
index 0b10264..05cba03 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/JsonOutputFormatter.java

@@ -95,15 +95,15 @@
     AugmentedModule module = depGraph.get(key);
     JsonObject json = new JsonObject();
     json.addProperty("key", printKey(key));
-    json.addProperty("name", module.getName());
-    json.addProperty("version", module.getVersion().toString());
+    json.addProperty("name", module.name());
+    json.addProperty("version", module.version().toString());
     String apparentName;
     if (parent != null) {
       // The apparent repository name under which parent refers to key.
-      apparentName = depGraph.get(parent).getDeps().inverse().get(key);
+      apparentName = depGraph.get(parent).deps().inverse().get(key);
     } else {
       // The apparent repository name under which key refers to itself.
-      apparentName = module.getRepoName();
+      apparentName = module.repoName();
     }
     json.addProperty("apparentName", apparentName);
 
@@ -112,14 +112,14 @@
       if (explanation != null) {
         if (!module.isUsed()) {
           json.addProperty("unused", true);
-          json.addProperty("resolvedVersion", explanation.getChangedVersion().toString());
+          json.addProperty("resolvedVersion", explanation.changedVersion().toString());
         } else {
-          json.addProperty("originalVersion", explanation.getChangedVersion().toString());
+          json.addProperty("originalVersion", explanation.changedVersion().toString());
         }
-        json.addProperty("resolutionReason", explanation.getChangedVersion().toString());
-        if (explanation.getRequestedByModules() != null) {
+        json.addProperty("resolutionReason", explanation.changedVersion().toString());
+        if (explanation.requestedByModules() != null) {
           JsonArray requestedBy = new JsonArray();
-          explanation.getRequestedByModules().forEach(k -> requestedBy.add(printKey(k)));
+          explanation.requestedByModules().forEach(k -> requestedBy.add(printKey(k)));
           json.add("resolvedRequestedBy", requestedBy);
         }
       }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java
index 8d679fa..a0cac1e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModExecutor.java

@@ -411,9 +411,9 @@
     while (!toVisit.isEmpty()) {
       ModuleKey key = toVisit.pop();
       AugmentedModule module = depGraph.get(key);
-      Set<ModuleKey> parents = new HashSet<>(module.getDependants());
+      Set<ModuleKey> parents = new HashSet<>(module.dependants());
       if (options.includeUnused) {
-        parents.addAll(module.getOriginalDependants());
+        parents.addAll(module.originalDependants());
       }
       for (ModuleKey parent : parents) {
         if (isBuiltin(parent) && !options.includeBuiltin) {
@@ -510,14 +510,14 @@
       for (Tag tag : usage.getTags()) {
         printer.printf(
             "%s.%s(%s)\n",
-            extension.getExtensionName(),
+            extension.extensionName(),
             tag.getTagName(),
             tag.getAttributeValues().attributes().entrySet().stream()
                 .map(e -> String.format("%s=%s", e.getKey(), Starlark.repr(e.getValue())))
                 .collect(joining(", ")));
       }
       printer.printf("use_repo(\n");
-      printer.printf("  %s,\n", extension.getExtensionName());
+      printer.printf("  %s,\n", extension.extensionName());
       for (ModuleExtensionUsage.Proxy proxy : usage.getProxies()) {
         for (Entry<String, String> repo : proxy.getImports().entrySet()) {
           printer.printf(

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModuleArg.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModuleArg.java
index 3682327..5befea1 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModuleArg.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/ModuleArg.java

@@ -309,7 +309,7 @@
         throws InvalidArgumentException {
       Optional<AugmentedModule> mod =
           depGraph.values().stream()
-              .filter(m -> repoName().equals(moduleKeyToCanonicalNames.get(m.getKey())))
+              .filter(m -> repoName().equals(moduleKeyToCanonicalNames.get(m.key())))
               .findAny();
       if (mod.isPresent() && !includeUnused && warnUnused && !mod.get().isUsed()) {
         // Warn the user when unused modules are allowed and the specified version exists, but the
@@ -318,7 +318,7 @@
             String.format(
                 "Module version %s is unused as a result of module resolution. Use the"
                     + " --include_unused flag to include it.",
-                mod.get().getKey()),
+                mod.get().key()),
             Code.INVALID_ARGUMENTS);
       }
       if (mod.isEmpty() || (!includeUnused && !mod.get().isUsed())) {
@@ -330,7 +330,7 @@
                 repoName().getName()),
             Code.INVALID_ARGUMENTS);
       }
-      return ImmutableSet.of(mod.get().getKey());
+      return ImmutableSet.of(mod.get().key());
     }
 
     @Override

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/OutputFormatters.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/OutputFormatters.java
index 63f1755..4f8170b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/OutputFormatters.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/OutputFormatters.java

@@ -28,7 +28,6 @@
 import com.google.devtools.build.lib.bazel.bzlmod.Version;
 import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModExecutor.ResultNode;
 import com.google.devtools.build.lib.bazel.bzlmod.modcommand.ModOptions.OutputFormat;
-import com.google.errorprone.annotations.InlineMe;
 import java.io.PrintWriter;
 import javax.annotation.Nullable;
 
@@ -79,22 +78,6 @@
         requireNonNull(resolutionReason, "resolutionReason");
       }
 
-      @InlineMe(replacement = "this.changedVersion()")
-      Version getChangedVersion() {
-        return changedVersion();
-      }
-
-      @InlineMe(replacement = "this.resolutionReason()")
-      ResolutionReason getResolutionReason() {
-        return resolutionReason();
-      }
-
-      @InlineMe(replacement = "this.requestedByModules()")
-      @Nullable
-      ImmutableSet<ModuleKey> getRequestedByModules() {
-        return requestedByModules();
-      }
-
       static Explanation create(
           Version version, ResolutionReason reason, ImmutableSet<ModuleKey> requestedByModules) {
         return new Explanation(version, reason, requestedByModules);
@@ -106,12 +89,12 @@
        */
       String toExplanationString(boolean unused) {
         String changedVersionLabel =
-            getChangedVersion().equals(Version.EMPTY) ? "_" : getChangedVersion().toString();
+            changedVersion().equals(Version.EMPTY) ? "_" : changedVersion().toString();
         String toOrWasString = unused ? "to" : "was";
         String reasonString =
-            getRequestedByModules() != null
-                ? getRequestedByModules().stream().map(ModuleKey::toString).collect(joining(", "))
-                : Ascii.toLowerCase(getResolutionReason().toString());
+            requestedByModules() != null
+                ? requestedByModules().stream().map(ModuleKey::toString).collect(joining(", "))
+                : Ascii.toLowerCase(resolutionReason().toString());
         return String.format("(%s %s, cause %s)", toOrWasString, changedVersionLabel, reasonString);
       }
     }
@@ -166,18 +149,18 @@
       String repoName = parentModule.getAllDeps(options.includeUnused).get(key);
       Version changedVersion;
       ImmutableSet<ModuleKey> changedByModules = null;
-      ResolutionReason reason = parentModule.getDepReasons().get(repoName);
+      ResolutionReason reason = parentModule.depReasons().get(repoName);
       AugmentedModule replacement =
-          module.isUsed() ? module : depGraph.get(parentModule.getDeps().get(repoName));
+          module.isUsed() ? module : depGraph.get(parentModule.deps().get(repoName));
       if (reason != ResolutionReason.ORIGINAL) {
         if (!module.isUsed()) {
-          changedVersion = replacement.getVersion();
+          changedVersion = replacement.version();
         } else {
-          AugmentedModule old = depGraph.get(parentModule.getUnusedDeps().get(repoName));
-          changedVersion = old.getVersion();
+          AugmentedModule old = depGraph.get(parentModule.unusedDeps().get(repoName));
+          changedVersion = old.version();
         }
         if (reason == ResolutionReason.MINIMAL_VERSION_SELECTION) {
-          changedByModules = replacement.getOriginalDependants();
+          changedByModules = replacement.originalDependants();
         }
         return Explanation.create(changedVersion, reason, changedByModules);
       }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java
index 7413e42..2742870 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/modcommand/TextOutputFormatter.java

@@ -154,8 +154,8 @@
       str.append(
           String.format(
               "<root> (%s@%s)",
-              rootModule.getName(),
-              rootModule.getVersion().equals(Version.EMPTY) ? "_" : rootModule.getVersion()));
+              rootModule.name(),
+              rootModule.version().equals(Version.EMPTY) ? "_" : rootModule.version()));
     } else {
       str.append(key).append(" ");
     }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/ModCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/ModCommand.java
index 86242df..882bde3 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/ModCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/ModCommand.java

@@ -273,15 +273,15 @@
     // Extract and check the --base_module argument first to use it when parsing the other args.
     // Can only be a TargetModule or a repoName relative to the ROOT.
     ModuleKey baseModuleKey;
-    AugmentedModule rootModule = moduleInspector.getDepGraph().get(ModuleKey.ROOT);
+    AugmentedModule rootModule = moduleInspector.depGraph().get(ModuleKey.ROOT);
     try {
       ImmutableSet<ModuleKey> keys =
           modOptions.baseModule.resolveToModuleKeys(
-              moduleInspector.getModulesIndex(),
-              moduleInspector.getDepGraph(),
-              moduleInspector.getModuleKeyToCanonicalNames(),
-              rootModule.getDeps(),
-              rootModule.getUnusedDeps(),
+              moduleInspector.modulesIndex(),
+              moduleInspector.depGraph(),
+              moduleInspector.moduleKeyToCanonicalNames(),
+              rootModule.deps(),
+              rootModule.unusedDeps(),
               false,
               false);
       if (keys.size() > 1) {
@@ -309,7 +309,7 @@
     ImmutableMap<String, RepositoryName> argsAsRepos = null;
 
     AugmentedModule baseModule =
-        Objects.requireNonNull(moduleInspector.getDepGraph().get(baseModuleKey));
+        Objects.requireNonNull(moduleInspector.depGraph().get(baseModuleKey));
     RepositoryMapping baseModuleMapping = depGraphValue.getFullRepoMapping(baseModuleKey);
     try {
       switch (subcommand) {
@@ -329,9 +329,9 @@
                   ModuleArgConverter.INSTANCE
                       .convert(arg)
                       .resolveToRepoNames(
-                          moduleInspector.getModulesIndex(),
-                          moduleInspector.getDepGraph(),
-                          moduleInspector.getModuleKeyToCanonicalNames(),
+                          moduleInspector.modulesIndex(),
+                          moduleInspector.depGraph(),
+                          moduleInspector.moduleKeyToCanonicalNames(),
                           baseModuleMapping));
             } catch (InvalidArgumentException | OptionsParsingException e) {
               throw new InvalidArgumentException(
@@ -353,11 +353,11 @@
                   ExtensionArgConverter.INSTANCE
                       .convert(arg)
                       .resolveToExtensionId(
-                          moduleInspector.getModulesIndex(),
-                          moduleInspector.getDepGraph(),
-                          moduleInspector.getModuleKeyToCanonicalNames(),
-                          baseModule.getDeps(),
-                          baseModule.getUnusedDeps()));
+                          moduleInspector.modulesIndex(),
+                          moduleInspector.depGraph(),
+                          moduleInspector.moduleKeyToCanonicalNames(),
+                          baseModule.deps(),
+                          baseModule.unusedDeps()));
             } catch (InvalidArgumentException | OptionsParsingException e) {
               throw new InvalidArgumentException(
                   String.format("In extension argument %s: %s", arg, e.getMessage()),
@@ -375,11 +375,11 @@
                   ModuleArgConverter.INSTANCE
                       .convert(arg)
                       .resolveToModuleKeys(
-                          moduleInspector.getModulesIndex(),
-                          moduleInspector.getDepGraph(),
-                          moduleInspector.getModuleKeyToCanonicalNames(),
-                          baseModule.getDeps(),
-                          baseModule.getUnusedDeps(),
+                          moduleInspector.modulesIndex(),
+                          moduleInspector.depGraph(),
+                          moduleInspector.moduleKeyToCanonicalNames(),
+                          baseModule.deps(),
+                          baseModule.unusedDeps(),
                           modOptions.includeUnused,
                           /* warnUnused= */ true));
             } catch (InvalidArgumentException | OptionsParsingException e) {
@@ -401,11 +401,11 @@
       fromKeys =
           moduleArgListToKeys(
               modOptions.modulesFrom,
-              moduleInspector.getModulesIndex(),
-              moduleInspector.getDepGraph(),
-              moduleInspector.getModuleKeyToCanonicalNames(),
-              baseModule.getDeps(),
-              baseModule.getUnusedDeps(),
+              moduleInspector.modulesIndex(),
+              moduleInspector.depGraph(),
+              moduleInspector.moduleKeyToCanonicalNames(),
+              baseModule.deps(),
+              baseModule.unusedDeps(),
               modOptions.includeUnused);
     } catch (InvalidArgumentException e) {
       return reportAndCreateFailureResult(
@@ -418,11 +418,11 @@
       usageKeys =
           moduleArgListToKeys(
               modOptions.extensionUsages,
-              moduleInspector.getModulesIndex(),
-              moduleInspector.getDepGraph(),
-              moduleInspector.getModuleKeyToCanonicalNames(),
-              baseModule.getDeps(),
-              baseModule.getUnusedDeps(),
+              moduleInspector.modulesIndex(),
+              moduleInspector.depGraph(),
+              moduleInspector.moduleKeyToCanonicalNames(),
+              baseModule.deps(),
+              baseModule.unusedDeps(),
               modOptions.includeUnused);
     } catch (InvalidArgumentException e) {
       return reportAndCreateFailureResult(
@@ -446,11 +446,11 @@
                   MaybeCompleteSet.copyOf(
                       extensionArgListToIds(
                           modOptions.extensionFilter,
-                          moduleInspector.getModulesIndex(),
-                          moduleInspector.getDepGraph(),
-                          moduleInspector.getModuleKeyToCanonicalNames(),
-                          baseModule.getDeps(),
-                          baseModule.getUnusedDeps())));
+                          moduleInspector.modulesIndex(),
+                          moduleInspector.depGraph(),
+                          moduleInspector.moduleKeyToCanonicalNames(),
+                          baseModule.deps(),
+                          baseModule.unusedDeps())));
         } catch (InvalidArgumentException e) {
           return reportAndCreateFailureResult(
               env,
@@ -515,9 +515,9 @@
 
     ModExecutor modExecutor =
         new ModExecutor(
-            moduleInspector.getDepGraph(),
+            moduleInspector.depGraph(),
             depGraphValue.getExtensionUsagesTable(),
-            moduleInspector.getExtensionToRepoInternalNames(),
+            moduleInspector.extensionToRepoInternalNames(),
             filterExtensions,
             modOptions,
             new OutputStreamWriter(
@@ -538,15 +538,14 @@
       return reportAndCreateFailureResult(env, e.getMessage(), Code.INVALID_ARGUMENTS);
     }
 
-    if (moduleInspector.getErrors().isEmpty()) {
+    if (moduleInspector.errors().isEmpty()) {
       return BlazeCommandResult.success();
     } else {
       return reportAndCreateFailureResult(
           env,
           String.format(
               "Results may be incomplete as %d extension%s failed.",
-              moduleInspector.getErrors().size(),
-              moduleInspector.getErrors().size() == 1 ? "" : "s"),
+              moduleInspector.errors().size(), moduleInspector.errors().size() == 1 ? "" : "s"),
           Code.ERROR_DURING_GRAPH_INSPECTION);
     }
   }
@@ -577,7 +576,7 @@
     } catch (InterruptedException | CommandException | IOException e) {
       String suffix = "";
       if (e instanceof AbnormalTerminationException abnormalTerminationException) {
-        if (abnormalTerminationException.getResult().getTerminationStatus().getRawExitCode() == 3) {
+        if (abnormalTerminationException.getResult().terminationStatus().getRawExitCode() == 3) {
           // Buildozer exits with exit code 3 if it didn't make any changes.
           return reportAndCreateTidyResult(env, modTidyValue);
         }
@@ -688,7 +687,7 @@
       JsonWriter jsonWriter = gson.newJsonWriter(writer);
       jsonWriter.beginObject();
       for (Entry<String, RepositoryName> entry :
-          repoMapping.getRepositoryMapping().entries().entrySet()) {
+          repoMapping.repositoryMapping().entries().entrySet()) {
         jsonWriter.name(entry.getKey());
         jsonWriter.value(entry.getValue().getName());
       }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/commands/VendorCommand.java b/src/main/java/com/google/devtools/build/lib/bazel/commands/VendorCommand.java
index 01f8bbd..d58277e 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/commands/VendorCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/commands/VendorCommand.java

@@ -234,7 +234,7 @@
 
     BazelFetchAllValue fetchAllValue = (BazelFetchAllValue) evaluationResult.get(fetchKey);
     env.getReporter().handle(Event.info("Vendoring all external repositories..."));
-    vendor(env, fetchAllValue.getReposToVendor());
+    vendor(env, fetchAllValue.reposToVendor());
     env.getReporter().handle(Event.info("All external dependencies vendored successfully."));
     return BlazeCommandResult.success();
   }

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkExecutionResult.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkExecutionResult.java
index 7bd40f9..cf1d10d 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkExecutionResult.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkExecutionResult.java

@@ -214,23 +214,24 @@
         CommandResult result =
             command.execute(delegator.getOutputStream(), delegator.getErrorStream());
         return new StarlarkExecutionResult(
-            result.getTerminationStatus().getExitCode(),
+            result.terminationStatus().getExitCode(),
             recorder.outAsLatin1(),
             recorder.errAsLatin1());
       } catch (BadExitStatusException e) {
         return new StarlarkExecutionResult(
-            e.getResult().getTerminationStatus().getExitCode(), recorder.outAsLatin1(),
+            e.getResult().terminationStatus().getExitCode(),
+            recorder.outAsLatin1(),
             recorder.errAsLatin1());
       } catch (AbnormalTerminationException e) {
-        TerminationStatus status = e.getResult().getTerminationStatus();
+        TerminationStatus status = e.getResult().terminationStatus();
         if (status.timedOut()) {
           // Signal a timeout by an exit code outside the normal range
           return new StarlarkExecutionResult(256, "", e.getMessage());
         } else if (status.exited()) {
           return new StarlarkExecutionResult(
               status.getExitCode(),
-              toString(e.getResult().getStdoutStream()),
-              toString(e.getResult().getStderrStream()));
+              toString(e.getResult().stdoutStream()),
+              toString(e.getResult().stderrStream()));
         } else if (status.getTerminatingSignal() == 15) {
           // We have a bit of a problem here: we cannot distingusih between the case where
           // the SIGTERM was sent by something that the calling rule wants to legitimately handle,
@@ -243,8 +244,8 @@
         } else {
           return new StarlarkExecutionResult(
               status.getRawExitCode(),
-              toString(e.getResult().getStdoutStream()),
-              toString(e.getResult().getStderrStream()));
+              toString(e.getResult().stdoutStream()),
+              toString(e.getResult().stderrStream()));
         }
       } catch (CommandException e) {
         // 256 is outside of the standard range for exit code on Unixes. We are not guaranteed that

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java
index 03752be..15c7f0b 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/repository/starlark/StarlarkRepositoryFunction.java

@@ -212,7 +212,7 @@
       if (mainRepoMappingValue == null) {
         return null;
       }
-      mainRepoMapping = mainRepoMappingValue.getRepositoryMapping();
+      mainRepoMapping = mainRepoMappingValue.repositoryMapping();
     } else {
       mainRepoMapping = rule.getPackage().getRepositoryMapping();
     }

diff --git a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
index d23aa9a..84b357d 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/SymlinkTreeHelper.java

@@ -272,7 +272,7 @@
     PathFragment root = PathFragment.create(workspaceName);
     var symlinks = ImmutableMap.<PathFragment, PathFragment>builderWithExpectedSize(links.size());
     for (FilesetOutputSymlink symlink : links) {
-      symlinks.put(root.getRelative(symlink.getName()), symlink.reconstituteTargetPath(execRoot));
+      symlinks.put(root.getRelative(symlink.name()), symlink.reconstituteTargetPath(execRoot));
     }
     // Fileset links are already deduplicated by name in SkyframeFilesetManifestAction.
     return symlinks.buildOrThrow();

diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
index 5903dab..49fc381 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java

@@ -132,7 +132,7 @@
 
       return new String(xcrunResult.getStdout(), StandardCharsets.UTF_8).trim();
     } catch (AbnormalTerminationException e) {
-      TerminationStatus terminationStatus = e.getResult().getTerminationStatus();
+      TerminationStatus terminationStatus = e.getResult().terminationStatus();
 
       if (terminationStatus.exited()) {
         throw new IOException(
@@ -152,7 +152,7 @@
       String message =
           String.format(
               "xcrun failed.\n" + "%s\n" + "stdout: %s\n" + "stderr: %s",
-              e.getResult().getTerminationStatus(),
+              e.getResult().terminationStatus(),
               new String(e.getResult().getStdout(), StandardCharsets.UTF_8),
               new String(e.getResult().getStderr(), StandardCharsets.UTF_8));
       throw new IOException(message, e);
@@ -232,10 +232,10 @@
 
       return new String(xcodeLocatorResult.getStdout(), StandardCharsets.UTF_8).trim();
     } catch (AbnormalTerminationException e) {
-      TerminationStatus terminationStatus = e.getResult().getTerminationStatus();
+      TerminationStatus terminationStatus = e.getResult().terminationStatus();
 
       String message;
-      if (e.getResult().getTerminationStatus().exited()) {
+      if (e.getResult().terminationStatus().exited()) {
         message =
             String.format(
                 "Running '%s %s' failed with code %s.\n"
@@ -257,7 +257,7 @@
                 "Running '%s %s' failed.\n" + "%s\n" + "stdout: %s\n" + "stderr: %s",
                 xcodeLocatorPath,
                 version,
-                e.getResult().getTerminationStatus(),
+                e.getResult().terminationStatus(),
                 new String(e.getResult().getStdout(), StandardCharsets.UTF_8),
                 new String(e.getResult().getStderr(), StandardCharsets.UTF_8));
       }

diff --git a/src/main/java/com/google/devtools/build/lib/metrics/ResourceSnapshot.java b/src/main/java/com/google/devtools/build/lib/metrics/ResourceSnapshot.java
index 0c1fa09..be86bfb 100644
--- a/src/main/java/com/google/devtools/build/lib/metrics/ResourceSnapshot.java
+++ b/src/main/java/com/google/devtools/build/lib/metrics/ResourceSnapshot.java

@@ -17,7 +17,6 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.errorprone.annotations.InlineMe;
 import java.time.Instant;
 
 /**
@@ -34,16 +33,6 @@
     requireNonNull(collectionTime, "collectionTime");
   }
 
-  @InlineMe(replacement = "this.pidToMemoryInKb()")
-  public ImmutableMap<Long, Integer> getPidToMemoryInKb() {
-    return pidToMemoryInKb();
-  }
-
-  @InlineMe(replacement = "this.collectionTime()")
-  public Instant getCollectionTime() {
-    return collectionTime();
-  }
-
   public static ResourceSnapshot create(
       ImmutableMap<Long, Integer> pidToMemoryInKb, Instant collectionTime) {
     return new ResourceSnapshot(pidToMemoryInKb, collectionTime);

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java b/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java
index cc603f4e..5005e75 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AutoloadSymbols.java

@@ -38,7 +38,6 @@
 import com.google.devtools.build.lib.skyframe.PrecomputedValue.Precomputed;
 import com.google.devtools.build.lib.skyframe.RepositoryMappingValue;
 import com.google.devtools.build.skyframe.SkyFunction;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -207,7 +206,7 @@
     }
     for (String symbol : partiallyRemovedSymbols) {
       ImmutableList<String> unsatisfiedRdeps =
-          AUTOLOAD_CONFIG.get(symbol).getRdeps().stream()
+          AUTOLOAD_CONFIG.get(symbol).rdeps().stream()
               .filter(allAvailableSymbols::contains)
               .collect(toImmutableList());
       if (!unsatisfiedRdeps.isEmpty()) {
@@ -293,14 +292,14 @@
         convertNativeStructToMap((StarlarkInfo) envBuilder.remove("native"));
 
     for (Map.Entry<String, Object> symbol : add.entrySet()) {
-      if (AUTOLOAD_CONFIG.get(symbol.getKey()).isRule()) {
+      if (AUTOLOAD_CONFIG.get(symbol.getKey()).rule()) {
         nativeBindings.put(symbol.getKey(), symbol.getValue());
       } else {
         envBuilder.put(symbol.getKey(), symbol.getValue());
       }
     }
     for (String symbol : remove) {
-      if (AUTOLOAD_CONFIG.get(symbol).isRule()) {
+      if (AUTOLOAD_CONFIG.get(symbol).rule()) {
         nativeBindings.remove(symbol);
       } else {
         if (symbol.equals("proto_common_do_not_use")) {
@@ -367,12 +366,12 @@
     }
     Map<String, Object> envBuilder = new LinkedHashMap<>(originalEnv);
     for (Map.Entry<String, Object> symbol : add.entrySet()) {
-      if (AUTOLOAD_CONFIG.get(symbol.getKey()).isRule()) {
+      if (AUTOLOAD_CONFIG.get(symbol.getKey()).rule()) {
         envBuilder.put(symbol.getKey(), symbol.getValue());
       }
     }
     for (String symbol : removedSymbols) {
-      if (AUTOLOAD_CONFIG.get(symbol).isRule()) {
+      if (AUTOLOAD_CONFIG.get(symbol).rule()) {
         envBuilder.remove(symbol);
       }
     }
@@ -391,7 +390,7 @@
 
   private ImmutableList<String> getAllSymbols(String repository, String prefix) {
     return AUTOLOAD_CONFIG.entrySet().stream()
-        .filter(entry -> entry.getValue().getLoadLabel().startsWith(repository + "//"))
+        .filter(entry -> entry.getValue().loadLabel().startsWith(repository + "//"))
         .map(entry -> prefix + entry.getKey())
         .collect(toImmutableList());
   }
@@ -456,7 +455,7 @@
           Label.RepoContext.of(
               RepositoryName.MAIN,
               RepositoryMapping.createAllowingFallback(
-                  repositoryMappingValue.getRepositoryMapping().entries()));
+                  repositoryMappingValue.repositoryMapping().entries()));
     }
 
     // Inject loads for rules and symbols removed from Bazel
@@ -537,7 +536,7 @@
       String symbol = autoload.getKey();
       // Check if the symbol is named differently in the bzl file than natively. Renames are rare:
       // Example is renaming native.ProguardSpecProvider to ProguardSpecInfo.
-      String newName = AUTOLOAD_CONFIG.get(symbol).getNewName();
+      String newName = AUTOLOAD_CONFIG.get(symbol).newName();
       if (newName == null) {
         newName = symbol;
       }
@@ -548,7 +547,7 @@
             String.format(
                 "The toplevel symbol '%s' set by --incompatible_load_symbols_externally couldn't"
                     + " be loaded. '%s' not found in auto loaded '%s'.%s",
-                symbol, newName, AUTOLOAD_CONFIG.get(symbol).getLoadLabel(), workspaceWarning));
+                symbol, newName, AUTOLOAD_CONFIG.get(symbol).loadLabel(), workspaceWarning));
       }
       newSymbols.put(symbol, symbolValue); // Exposed as old name
     }
@@ -569,7 +568,7 @@
                   throws EvalException {
                 throw Starlark.errorf(
                     "Couldn't auto load '%s' from '%s'.",
-                    getName(), AUTOLOAD_CONFIG.get(getName()).getLoadLabel());
+                    getName(), AUTOLOAD_CONFIG.get(getName()).loadLabel());
               }
             });
       }
@@ -614,33 +613,13 @@
       requireNonNull(rdeps, "rdeps");
     }
 
-    @InlineMe(replacement = "this.loadLabel()")
-    public String getLoadLabel() {
-      return loadLabel();
-    }
-
-    @InlineMe(replacement = "this.rule()")
-    public boolean isRule() {
-      return rule();
-    }
-
-    @InlineMe(replacement = "this.newName()")
-    public @Nullable String getNewName() {
-      return newName();
-    }
-
-    @InlineMe(replacement = "this.rdeps()")
-    public ImmutableSet<String> getRdeps() {
-      return rdeps();
-    }
-
     String getModuleName() throws InterruptedException {
-      return Label.parseCanonicalUnchecked(getLoadLabel()).getRepository().getName();
+      return Label.parseCanonicalUnchecked(loadLabel()).getRepository().getName();
     }
 
     Label getLabel(RepoContext repoContext) throws InterruptedException {
       try {
-        return Label.parseWithRepoContext(getLoadLabel(), repoContext);
+        return Label.parseWithRepoContext(loadLabel(), repoContext);
       } catch (LabelSyntaxException e) {
         throw new IllegalStateException(e);
       }

diff --git a/src/main/java/com/google/devtools/build/lib/profiler/MemoryProfiler.java b/src/main/java/com/google/devtools/build/lib/profiler/MemoryProfiler.java
index 48b9125..60747ea 100644
--- a/src/main/java/com/google/devtools/build/lib/profiler/MemoryProfiler.java
+++ b/src/main/java/com/google/devtools/build/lib/profiler/MemoryProfiler.java

@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.util.HeapOffsetHelper;
 import com.google.devtools.build.lib.util.Pair;
 import com.google.devtools.common.options.OptionsParsingException;
-import com.google.errorprone.annotations.InlineMe;
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.lang.management.ManagementFactory;
@@ -97,7 +96,7 @@
           prepareBeanAndGetLocalMinUsage(
               nextPhase, bean, (duration) -> Thread.sleep(duration.toMillis()));
       String name = currentPhase.description;
-      MemoryUsage memoryUsage = memoryUsages.getHeap();
+      MemoryUsage memoryUsage = memoryUsages.heap();
       var usedMemory = memoryUsage.getUsed();
       // TODO(b/311665999) Remove the subtraction of FillerArray once we figure out an alternative.
       if (nextPhase == ProfilePhase.FINISH) {
@@ -111,7 +110,7 @@
       memoryProfile.println(name + ":heap:commited:" + memoryUsage.getCommitted());
       memoryProfile.println(name + ":heap:max:" + memoryUsage.getMax());
 
-      memoryUsage = memoryUsages.getNonHeap();
+      memoryUsage = memoryUsages.nonHeap();
       memoryProfile.println(name + ":non-heap:init:" + memoryUsage.getInit());
       memoryProfile.println(name + ":non-heap:used:" + memoryUsage.getUsed());
       memoryProfile.println(name + ":non-heap:commited:" + memoryUsage.getCommitted());
@@ -232,16 +231,6 @@
       requireNonNull(nonHeap, "nonHeap");
     }
 
-    @InlineMe(replacement = "this.heap()")
-    MemoryUsage getHeap() {
-      return heap();
-    }
-
-    @InlineMe(replacement = "this.nonHeap()")
-    MemoryUsage getNonHeap() {
-      return nonHeap();
-    }
-
     static HeapAndNonHeap create(MemoryUsage heap, MemoryUsage nonHeap) {
       return new HeapAndNonHeap(heap, nonHeap);
     }

diff --git a/src/main/java/com/google/devtools/build/lib/query2/cquery/LabelAndConfigurationOutputFormatterCallback.java b/src/main/java/com/google/devtools/build/lib/query2/cquery/LabelAndConfigurationOutputFormatterCallback.java
index b9a411e..e1d3b3e 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/cquery/LabelAndConfigurationOutputFormatterCallback.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/cquery/LabelAndConfigurationOutputFormatterCallback.java

@@ -90,12 +90,12 @@
     return ImmutableSortedSet.<String>naturalOrder()
         .addAll(
             Iterables.transform(
-                requiredFragments.getOptionsClasses(), ClassName::getSimpleNameWithOuter))
+                requiredFragments.optionsClasses(), ClassName::getSimpleNameWithOuter))
         .addAll(
             Iterables.transform(
-                requiredFragments.getFragmentClasses(), ClassName::getSimpleNameWithOuter))
-        .addAll(Iterables.transform(requiredFragments.getDefines(), define -> "--define:" + define))
-        .addAll(Iterables.transform(requiredFragments.getStarlarkOptions(), Label::toString))
+                requiredFragments.fragmentClasses(), ClassName::getSimpleNameWithOuter))
+        .addAll(Iterables.transform(requiredFragments.defines(), define -> "--define:" + define))
+        .addAll(Iterables.transform(requiredFragments.starlarkOptions(), Label::toString))
         .build();
   }
 }

diff --git a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java
index 4fddaa7..692ba9b 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/AbstractActionInputPrefetcher.java

@@ -54,7 +54,6 @@
 import com.google.devtools.build.lib.vfs.OutputPermissions;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
-import com.google.errorprone.annotations.InlineMe;
 import io.reactivex.rxjava3.core.Completable;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -191,16 +190,6 @@
       checkArgument(!linkExecPath.equals(targetExecPath));
     }
 
-    @InlineMe(replacement = "this.linkExecPath()")
-    PathFragment getLinkExecPath() {
-      return linkExecPath();
-    }
-
-    @InlineMe(replacement = "this.targetExecPath()")
-    PathFragment getTargetExecPath() {
-      return targetExecPath();
-    }
-
     static Symlink of(PathFragment linkExecPath, PathFragment targetExecPath) {
       return new Symlink(linkExecPath, targetExecPath);
     }
@@ -356,9 +345,9 @@
       @Nullable Symlink symlink = maybeGetSymlink(action, input, metadata, metadataSupplier);
 
       if (symlink != null) {
-        checkState(execPath.startsWith(symlink.getLinkExecPath()));
+        checkState(execPath.startsWith(symlink.linkExecPath()));
         execPath =
-            symlink.getTargetExecPath().getRelative(execPath.relativeTo(symlink.getLinkExecPath()));
+            symlink.targetExecPath().getRelative(execPath.relativeTo(symlink.linkExecPath()));
       }
 
       @Nullable PathFragment treeRootExecPath = maybeGetTreeRoot(action, input, metadataSupplier);
@@ -628,11 +617,11 @@
 
   private Completable plantSymlink(Symlink symlink) {
     return downloadCache.executeIfNot(
-        execRoot.getRelative(symlink.getLinkExecPath()),
+        execRoot.getRelative(symlink.linkExecPath()),
         Completable.defer(
             () -> {
-              Path link = execRoot.getRelative(symlink.getLinkExecPath());
-              Path target = execRoot.getRelative(symlink.getTargetExecPath());
+              Path link = execRoot.getRelative(symlink.linkExecPath());
+              Path target = execRoot.getRelative(symlink.targetExecPath());
               // Delete the link path if it already exists. This is the case for tree artifacts,
               // whose root directory is created before the action runs.
               link.delete();

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
index 6e4793e..24f4137 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java

@@ -1192,7 +1192,7 @@
           && !credentials.getRequestMetadata(new URI(remoteOptions.remoteCache)).isEmpty()) {
         // TODO(yannic): Make this a error aborting the build.
         credentialHelperEnvironment
-            .getEventReporter()
+            .eventReporter()
             .handle(
                 Event.warn(
                     "Credentials are transmitted in plaintext to "

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureSpecification.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureSpecification.java
index d157057..643ec93 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureSpecification.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/FeatureSpecification.java

@@ -16,7 +16,6 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.errorprone.annotations.InlineMe;
 
 /** Object encapsulating which additional toolchain features should be enabled and/or disabled. */
 public record FeatureSpecification(
@@ -26,16 +25,6 @@
     requireNonNull(unsupportedFeatures, "unsupportedFeatures");
   }
 
-  @InlineMe(replacement = "this.requestedFeatures()")
-  public ImmutableSet<String> getRequestedFeatures() {
-    return requestedFeatures();
-  }
-
-  @InlineMe(replacement = "this.unsupportedFeatures()")
-  public ImmutableSet<String> getUnsupportedFeatures() {
-    return unsupportedFeatures();
-  }
-
   public static final FeatureSpecification EMPTY =
       create(ImmutableSet.<String>of(), ImmutableSet.<String>of());
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
index cc15ac1..1fa2e1c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/genquery/GenQuery.java

@@ -312,7 +312,7 @@
               new TargetPattern.Parser(
                   PathFragment.EMPTY_FRAGMENT,
                   RepositoryName.MAIN,
-                  repositoryMappingValue.getRepositoryMapping()),
+                  repositoryMappingValue.repositoryMapping()),
               PathFragment.EMPTY_FRAGMENT,
               /* keepGoing= */ false,
               ruleContext.attributes().get("strict", Type.BOOLEAN),

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java
index 2bdd258..b3ea2ee 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCcInfoProvider.java

@@ -27,7 +27,6 @@
 import com.google.devtools.build.lib.rules.cpp.LibraryToLink;
 import com.google.devtools.build.lib.rules.java.JavaInfo.JavaInfoInternalProvider;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Collection;
 import javax.annotation.Nullable;
 import net.starlark.java.eval.EvalException;
@@ -40,11 +39,6 @@
     requireNonNull(ccInfo, "ccInfo");
   }
 
-  @InlineMe(replacement = "this.ccInfo()")
-  public CcInfo getCcInfo() {
-    return ccInfo();
-  }
-
   // TODO(b/183579145): Replace CcInfo with only linking information.
 
   public static JavaCcInfoProvider create(CcInfo ccInfo) {
@@ -59,7 +53,7 @@
   /** Merges several JavaCcInfoProvider providers into one. */
   public static JavaCcInfoProvider merge(Collection<JavaCcInfoProvider> providers) {
     ImmutableList<CcInfo> ccInfos =
-        providers.stream().map(JavaCcInfoProvider::getCcInfo).collect(toImmutableList());
+        providers.stream().map(JavaCcInfoProvider::ccInfo).collect(toImmutableList());
     return create(CcInfo.merge(ccInfos));
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java
index b8f2cee..8fe7964 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCompilationArgsProvider.java

@@ -28,7 +28,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Iterator;
 import javax.annotation.Nullable;
 import net.starlark.java.eval.EvalException;
@@ -74,36 +73,6 @@
     requireNonNull(compileTimeJavaDependencyArtifacts, "compileTimeJavaDependencyArtifacts");
   }
 
-  @InlineMe(replacement = "this.runtimeJars()")
-  public NestedSet<Artifact> getRuntimeJars() {
-    return runtimeJars();
-  }
-
-  @InlineMe(replacement = "this.directCompileTimeJars()")
-  public NestedSet<Artifact> getDirectCompileTimeJars() {
-    return directCompileTimeJars();
-  }
-
-  @InlineMe(replacement = "this.transitiveCompileTimeJars()")
-  public NestedSet<Artifact> getTransitiveCompileTimeJars() {
-    return transitiveCompileTimeJars();
-  }
-
-  @InlineMe(replacement = "this.directFullCompileTimeJars()")
-  public NestedSet<Artifact> getDirectFullCompileTimeJars() {
-    return directFullCompileTimeJars();
-  }
-
-  @InlineMe(replacement = "this.transitiveFullCompileTimeJars()")
-  public NestedSet<Artifact> getTransitiveFullCompileTimeJars() {
-    return transitiveFullCompileTimeJars();
-  }
-
-  @InlineMe(replacement = "this.compileTimeJavaDependencyArtifacts()")
-  public NestedSet<Artifact> getCompileTimeJavaDependencyArtifacts() {
-    return compileTimeJavaDependencyArtifacts();
-  }
-
   @SerializationConstant
   public static final JavaCompilationArgsProvider EMPTY =
       create(
@@ -152,9 +121,9 @@
     // so there's nothing to prune, and reading jdeps at compile-time isn't free.
     return builder()
         .addDirectCompileTimeJars(
-            /* interfaceJars= */ args.getTransitiveCompileTimeJars(),
-            /* fullJars= */ args.getTransitiveFullCompileTimeJars())
-        .addRuntimeJars(args.getRuntimeJars())
+            /* interfaceJars= */ args.transitiveCompileTimeJars(),
+            /* fullJars= */ args.transitiveFullCompileTimeJars())
+        .addRuntimeJars(args.runtimeJars())
         .build();
   }
 
@@ -288,16 +257,16 @@
         JavaCompilationArgsProvider args, ClasspathType type, boolean recursive) {
       if (!ClasspathType.RUNTIME_ONLY.equals(type)) {
         if (recursive) {
-          directCompileTimeJarsBuilder.addTransitive(args.getDirectCompileTimeJars());
-          directFullCompileTimeJarsBuilder.addTransitive(args.getDirectFullCompileTimeJars());
+          directCompileTimeJarsBuilder.addTransitive(args.directCompileTimeJars());
+          directFullCompileTimeJarsBuilder.addTransitive(args.directFullCompileTimeJars());
           compileTimeJavaDependencyArtifactsBuilder.addTransitive(
-              args.getCompileTimeJavaDependencyArtifacts());
+              args.compileTimeJavaDependencyArtifacts());
         }
-        transitiveCompileTimeJarsBuilder.addTransitive(args.getTransitiveCompileTimeJars());
-        transitiveFullCompileTimeJarsBuilder.addTransitive(args.getTransitiveFullCompileTimeJars());
+        transitiveCompileTimeJarsBuilder.addTransitive(args.transitiveCompileTimeJars());
+        transitiveFullCompileTimeJarsBuilder.addTransitive(args.transitiveFullCompileTimeJars());
       }
       if (!ClasspathType.COMPILE_ONLY.equals(type)) {
-        runtimeJarsBuilder.addTransitive(args.getRuntimeJars());
+        runtimeJarsBuilder.addTransitive(args.runtimeJars());
       }
       return this;
     }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
index 7418bf4..a65f56c 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java

@@ -119,7 +119,7 @@
   public static CcInfo ccInfo(TransitiveInfoCollection target) throws RuleErrorException {
     JavaInfo javaInfo = JavaInfo.getJavaInfo(target);
     if (javaInfo != null && javaInfo.providerJavaCcInfo != null) {
-      return javaInfo.providerJavaCcInfo.getCcInfo();
+      return javaInfo.providerJavaCcInfo.ccInfo();
     }
     return CcInfo.EMPTY;
   }
@@ -322,7 +322,7 @@
     return Depset.of(
         Artifact.class,
         getProviderAsNestedSet(
-            JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::getRuntimeJars));
+            JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::runtimeJars));
   }
 
   @Override
@@ -331,15 +331,14 @@
         Artifact.class,
         getProviderAsNestedSet(
             JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getTransitiveCompileTimeJars));
+            JavaCompilationArgsProvider::transitiveCompileTimeJars));
   }
 
   @Override
   public Depset /*<Artifact>*/ getCompileTimeJars() {
     NestedSet<Artifact> compileTimeJars =
         getProviderAsNestedSet(
-            JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getDirectCompileTimeJars);
+            JavaCompilationArgsProvider.class, JavaCompilationArgsProvider::directCompileTimeJars);
     return Depset.of(Artifact.class, compileTimeJars);
   }
 
@@ -348,7 +347,7 @@
     NestedSet<Artifact> fullCompileTimeJars =
         getProviderAsNestedSet(
             JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getDirectFullCompileTimeJars);
+            JavaCompilationArgsProvider::directFullCompileTimeJars);
     return Depset.of(Artifact.class, fullCompileTimeJars);
   }
 
@@ -356,9 +355,7 @@
   public Sequence<Artifact> getSourceJars() {
     // TODO(#4221) change return type to NestedSet<Artifact>
     ImmutableList<Artifact> sourceJars =
-        providerJavaSourceJars == null
-            ? ImmutableList.of()
-            : providerJavaSourceJars.getSourceJars();
+        providerJavaSourceJars == null ? ImmutableList.of() : providerJavaSourceJars.sourceJars();
     return StarlarkList.immutableCopyOf(sourceJars);
   }
 
@@ -372,7 +369,7 @@
   public ImmutableList<JavaOutput> getJavaOutputs() {
     return providerJavaRuleOutputJars == null
         ? ImmutableList.of()
-        : providerJavaRuleOutputJars.getJavaOutputs();
+        : providerJavaRuleOutputJars.javaOutputs();
   }
 
   @Override
@@ -399,14 +396,14 @@
     return Depset.of(
         Artifact.class,
         getProviderAsNestedSet(
-            JavaSourceJarsProvider.class, JavaSourceJarsProvider::getTransitiveSourceJars));
+            JavaSourceJarsProvider.class, JavaSourceJarsProvider::transitiveSourceJars));
   }
 
   /** Returns the transitive set of CC native libraries required by the target. */
   public NestedSet<LibraryToLink> getTransitiveNativeLibraries() {
     return getProviderAsNestedSet(
         JavaCcInfoProvider.class,
-        x -> x.getCcInfo().getCcNativeLibraryInfo().getTransitiveCcNativeLibraries());
+        x -> x.ccInfo().getCcNativeLibraryInfo().getTransitiveCcNativeLibraries());
   }
 
   @Override
@@ -416,7 +413,7 @@
 
   @Override
   public CcInfoApi<Artifact> getCcLinkParamInfo() {
-    return providerJavaCcInfo != null ? providerJavaCcInfo.getCcInfo() : CcInfo.EMPTY;
+    return providerJavaCcInfo != null ? providerJavaCcInfo.ccInfo() : CcInfo.EMPTY;
   }
 
   @Override
@@ -430,7 +427,7 @@
         Artifact.class,
         getProviderAsNestedSet(
             JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getTransitiveFullCompileTimeJars));
+            JavaCompilationArgsProvider::transitiveFullCompileTimeJars));
   }
 
   @Override
@@ -439,7 +436,7 @@
         Artifact.class,
         getProviderAsNestedSet(
             JavaCompilationArgsProvider.class,
-            JavaCompilationArgsProvider::getCompileTimeJavaDependencyArtifacts));
+            JavaCompilationArgsProvider::compileTimeJavaDependencyArtifacts));
   }
 
   @Override

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleOutputJarsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleOutputJarsProvider.java
index 55bff3c..0dc7fda 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleOutputJarsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaRuleOutputJarsProvider.java

@@ -38,7 +38,6 @@
 import com.google.devtools.build.lib.starlarkbuildapi.java.JavaOutputApi;
 import com.google.devtools.build.lib.starlarkbuildapi.java.JavaRuleOutputJarsProviderApi;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Collection;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -57,7 +56,6 @@
     requireNonNull(javaOutputs, "javaOutputs");
   }
 
-  @InlineMe(replacement = "this.javaOutputs()")
   @Override
   public ImmutableList<JavaOutput> getJavaOutputs() {
     return javaOutputs();
@@ -90,66 +88,53 @@
       requireNonNull(sourceJars, "sourceJars");
     }
 
-    @InlineMe(replacement = "this.classJar()")
     @Override
     public Artifact getClassJar() {
       return classJar();
     }
 
-    @InlineMe(replacement = "this.compileJar()")
     @Nullable
     @Override
     public Artifact getCompileJar() {
       return compileJar();
     }
 
-    @InlineMe(replacement = "this.compileJdeps()")
     @Nullable
     @Override
     public Artifact getCompileJdeps() {
       return compileJdeps();
     }
 
-    @InlineMe(replacement = "this.generatedClassJar()")
     @Nullable
     @Override
     public Artifact getGeneratedClassJar() {
       return generatedClassJar();
     }
 
-    @InlineMe(replacement = "this.generatedSourceJar()")
     @Nullable
     @Override
     public Artifact getGeneratedSourceJar() {
       return generatedSourceJar();
     }
 
-    @InlineMe(replacement = "this.nativeHeadersJar()")
     @Nullable
     @Override
     public Artifact getNativeHeadersJar() {
       return nativeHeadersJar();
     }
 
-    @InlineMe(replacement = "this.manifestProto()")
     @Nullable
     @Override
     public Artifact getManifestProto() {
       return manifestProto();
     }
 
-    @InlineMe(replacement = "this.jdeps()")
     @Nullable
     @Override
     public Artifact getJdeps() {
       return jdeps();
     }
 
-    @InlineMe(replacement = "this.sourceJars()")
-    public NestedSet<Artifact> getSourceJars() {
-      return sourceJars();
-    }
-
     /**
      * Translates a collection of {@link JavaOutput} for use in native code.
      *
@@ -184,7 +169,7 @@
     @Deprecated
     @Override
     public Artifact getIJar() {
-      return getCompileJar();
+      return compileJar();
     }
 
     @Nullable
@@ -195,13 +180,13 @@
     }
 
     public ImmutableList<Artifact> getSourceJarsAsList() {
-      return getSourceJars().toList();
+      return sourceJars().toList();
     }
 
     @Nullable
     @Override
     public Depset getSrcJarsStarlark(StarlarkSemantics semantics) {
-      return Depset.of(Artifact.class, getSourceJars());
+      return Depset.of(Artifact.class, sourceJars());
     }
 
     public static JavaOutput fromStarlarkJavaOutput(StructImpl struct) throws EvalException {
@@ -304,12 +289,12 @@
 
   /** Collects all class output jars from {@link #getJavaOutputs} */
   public Iterable<Artifact> getAllClassOutputJars() {
-    return getJavaOutputs().stream().map(JavaOutput::getClassJar).collect(Collectors.toList());
+    return javaOutputs().stream().map(JavaOutput::classJar).collect(Collectors.toList());
   }
 
   /** Collects all source output jars from {@link #getJavaOutputs} */
   public ImmutableList<Artifact> getAllSrcOutputJars() {
-    return getJavaOutputs().stream()
+    return javaOutputs().stream()
         .map(JavaOutput::getSourceJarsAsList)
         .flatMap(ImmutableList::stream)
         .collect(toImmutableList());
@@ -320,8 +305,8 @@
   @Deprecated
   public Artifact getJdeps() {
     ImmutableList<Artifact> jdeps =
-        getJavaOutputs().stream()
-            .map(JavaOutput::getJdeps)
+        javaOutputs().stream()
+            .map(JavaOutput::jdeps)
             .filter(Objects::nonNull)
             .collect(toImmutableList());
     return jdeps.size() == 1 ? jdeps.get(0) : null;
@@ -332,8 +317,8 @@
   @Deprecated
   public Artifact getNativeHeaders() {
     ImmutableList<Artifact> nativeHeaders =
-        getJavaOutputs().stream()
-            .map(JavaOutput::getNativeHeadersJar)
+        javaOutputs().stream()
+            .map(JavaOutput::nativeHeadersJar)
             .filter(Objects::nonNull)
             .collect(toImmutableList());
     return nativeHeaders.size() == 1 ? nativeHeaders.get(0) : null;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceJarsProvider.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceJarsProvider.java
index 43207b2..d1c0c24 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceJarsProvider.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaSourceJarsProvider.java

@@ -31,7 +31,6 @@
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Collection;
 import net.starlark.java.eval.EvalException;
 import net.starlark.java.eval.Sequence;
@@ -55,16 +54,6 @@
     requireNonNull(sourceJars, "sourceJars");
   }
 
-  @InlineMe(replacement = "this.transitiveSourceJars()")
-  public NestedSet<Artifact> getTransitiveSourceJars() {
-    return transitiveSourceJars();
-  }
-
-  @InlineMe(replacement = "this.sourceJars()")
-  public ImmutableList<Artifact> getSourceJars() {
-    return sourceJars();
-  }
-
   @SerializationConstant
   public static final JavaSourceJarsProvider EMPTY =
       create(NestedSetBuilder.emptySet(Order.STABLE_ORDER), ImmutableList.of());

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
index a6f7e6e..64694b4 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaTargetAttributes.java

@@ -105,8 +105,8 @@
     @CanIgnoreReturnValue
     public Builder merge(JavaCompilationArgsProvider context) {
       Preconditions.checkArgument(!built);
-      addCompileTimeClassPathEntries(context.getTransitiveCompileTimeJars());
-      addRuntimeClassPathEntries(context.getRuntimeJars());
+      addCompileTimeClassPathEntries(context.transitiveCompileTimeJars());
+      addRuntimeClassPathEntries(context.runtimeJars());
       return this;
     }
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepoRecordedInput.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepoRecordedInput.java
index 9a08866..32c7ade 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepoRecordedInput.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepoRecordedInput.java

@@ -699,7 +699,7 @@
       try {
         return repoMappingValue != RepositoryMappingValue.NOT_FOUND_VALUE
             && RepositoryName.create(oldValue)
-                .equals(repoMappingValue.getRepositoryMapping().get(apparentName));
+                .equals(repoMappingValue.repositoryMapping().get(apparentName));
       } catch (LabelSyntaxException e) {
         // malformed old value causes refetch
         return false;

diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
index 5fbe831..f49e78a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryDelegatorFunction.java

@@ -185,7 +185,7 @@
           return null;
         }
         boolean excludeRepoByDefault = isRepoExcludedFromVendoringByDefault(handler, rule);
-        if (!excludeRepoByDefault && !vendorFile.getIgnoredRepos().contains(repositoryName)) {
+        if (!excludeRepoByDefault && !vendorFile.ignoredRepos().contains(repositoryName)) {
           RepositoryDirectoryValue repositoryDirectoryValue =
               tryGettingValueUsingVendoredRepo(
                   env, rule, repoRoot, repositoryName, handler, digestWriter, vendorFile);
@@ -198,8 +198,8 @@
         }
         excludeRepoFromVendoring =
             excludeRepoByDefault
-                || vendorFile.getIgnoredRepos().contains(repositoryName)
-                || vendorFile.getPinnedRepos().contains(repositoryName);
+                || vendorFile.ignoredRepos().contains(repositoryName)
+                || vendorFile.pinnedRepos().contains(repositoryName);
       }
 
       if (shouldUseCachedRepos(env, handler, repoRoot, rule)) {
@@ -286,7 +286,7 @@
     Path vendorRepoPath = vendorPath.getRelative(repositoryName.getName());
     if (vendorRepoPath.exists()) {
       Path vendorMarker = vendorPath.getChild(repositoryName.getMarkerFileName());
-      if (vendorFile.getPinnedRepos().contains(repositoryName)) {
+      if (vendorFile.pinnedRepos().contains(repositoryName)) {
         // pinned repos are used as they are without checking their marker file
         try {
           // delete the marker as it may become out-of-date while it's pinned (old version or
@@ -330,7 +330,7 @@
                             + " in the vendor directory, run the bazel vendor command",
                         rule.getName())));
       }
-    } else if (vendorFile.getPinnedRepos().contains(repositoryName)) {
+    } else if (vendorFile.pinnedRepos().contains(repositoryName)) {
       throw new RepositoryFunctionException(
           new IOException(
               "Pinned repository "

diff --git a/src/main/java/com/google/devtools/build/lib/rules/starlarkdocextract/StarlarkDocExtract.java b/src/main/java/com/google/devtools/build/lib/rules/starlarkdocextract/StarlarkDocExtract.java
index 6e7232f..a1c24f2 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/starlarkdocextract/StarlarkDocExtract.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/starlarkdocextract/StarlarkDocExtract.java

@@ -82,7 +82,7 @@
   public ConfiguredTarget create(RuleContext ruleContext)
       throws ActionConflictException, InterruptedException, RuleErrorException {
     RepositoryMappingValue mainRepositoryMappingValue = getMainRepositoryMappingValue(ruleContext);
-    RepositoryMapping repositoryMapping = mainRepositoryMappingValue.getRepositoryMapping();
+    RepositoryMapping repositoryMapping = mainRepositoryMappingValue.repositoryMapping();
     Module module = loadModule(ruleContext, repositoryMapping);
     if (module == null) {
       // Skyframe restart
@@ -94,7 +94,7 @@
     verifyModuleDeps(ruleContext, module, repositoryMapping);
     Optional<String> mainRepoName = Optional.empty();
     if (ruleContext.attributes().get(RENDER_MAIN_REPO_NAME, BOOLEAN)) {
-      mainRepoName = mainRepositoryMappingValue.getAssociatedModuleName();
+      mainRepoName = mainRepositoryMappingValue.associatedModuleName();
       if (mainRepoName.isEmpty()) {
         mainRepoName = Optional.of(ruleContext.getWorkspaceName());
       }

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/UiOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/UiOptions.java
index 1e916cd..6fcd998 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/UiOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/UiOptions.java

@@ -28,7 +28,6 @@
 import com.google.devtools.common.options.OptionMetadataTag;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParsingException;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.HashSet;
 import java.util.List;
 
@@ -61,16 +60,6 @@
         requireNonNull(unfilteredEventKinds, "unfilteredEventKinds");
       }
 
-      @InlineMe(replacement = "this.filteredEventKinds()")
-      public ImmutableSet<EventKind> getFilteredEventKinds() {
-        return filteredEventKinds();
-      }
-
-      @InlineMe(replacement = "this.unfilteredEventKinds()")
-      public ImmutableSet<EventKind> getUnfilteredEventKinds() {
-        return unfilteredEventKinds();
-      }
-
       public static EventKindFilters from(
           ImmutableSet<EventKind> filtered, ImmutableSet<EventKind> unfiltered) {
         return new EventKindFilters(filtered, unfiltered);
@@ -296,8 +285,8 @@
   public ImmutableSet<EventKind> getFilteredEventKinds() {
     HashSet<EventKind> filtered = new HashSet<>();
     for (EventFiltersConverter.EventKindFilters filters : eventKindFilters) {
-      filtered.addAll(filters.getFilteredEventKinds());
-      filtered.removeAll(filters.getUnfilteredEventKinds());
+      filtered.addAll(filters.filteredEventKinds());
+      filtered.removeAll(filters.unfilteredEventKinds());
     }
     return ImmutableSet.copyOf(filtered);
   }

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
index d539771..48d7fbd 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/CleanCommand.java

@@ -209,7 +209,7 @@
             .setWorkingDir(tempPath.getParentDirectory())
             .build()
             .execute();
-    logger.atInfo().log("Shell command status: %s", result.getTerminationStatus());
+    logger.atInfo().log("Shell command status: %s", result.terminationStatus());
   }
 
   private static BlazeCommandResult actuallyClean(

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
index b236556..772eb89 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/mobileinstall/MobileInstallCommand.java

@@ -351,13 +351,13 @@
       // catch BadExitStatusException.
       command
           .execute(outErr.getOutputStream(), outErr.getErrorStream())
-          .getTerminationStatus()
+          .terminationStatus()
           .getExitCode();
       return null;
     } catch (BadExitStatusException e) {
       String message =
           "Non-zero return code '"
-              + e.getResult().getTerminationStatus().getExitCode()
+              + e.getResult().terminationStatus().getExitCode()
               + "' from command: "
               + e.getMessage();
       env.getReporter().handle(Event.error(message));

diff --git a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
index d03492e..454cb81 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java

@@ -20,7 +20,6 @@
 import com.google.common.flogger.GoogleLogger;
 import com.google.common.flogger.LazyArgs;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.io.ByteArrayOutputStream;
 import java.time.Duration;
 import java.util.Optional;
@@ -55,36 +54,6 @@
     requireNonNull(systemExecutionTime, "systemExecutionTime");
   }
 
-  @InlineMe(replacement = "this.stdoutStream()")
-  public ByteArrayOutputStream getStdoutStream() {
-    return stdoutStream();
-  }
-
-  @InlineMe(replacement = "this.stderrStream()")
-  public ByteArrayOutputStream getStderrStream() {
-    return stderrStream();
-  }
-
-  @InlineMe(replacement = "this.terminationStatus()")
-  public TerminationStatus getTerminationStatus() {
-    return terminationStatus();
-  }
-
-  @InlineMe(replacement = "this.wallExecutionTime()")
-  public Optional<Duration> getWallExecutionTime() {
-    return wallExecutionTime();
-  }
-
-  @InlineMe(replacement = "this.userExecutionTime()")
-  public Optional<Duration> getUserExecutionTime() {
-    return userExecutionTime();
-  }
-
-  @InlineMe(replacement = "this.systemExecutionTime()")
-  public Optional<Duration> getSystemExecutionTime() {
-    return systemExecutionTime();
-  }
-
   private static final GoogleLogger logger = GoogleLogger.forEnclosingClass();
 
   private static final byte[] NO_BYTES = new byte[0];
@@ -115,7 +84,7 @@
    * @throws IllegalStateException if output was not collected
    */
   public byte[] getStdout() {
-    return getStdoutStream().toByteArray();
+    return stdoutStream().toByteArray();
   }
 
   /**
@@ -126,13 +95,13 @@
    * @throws IllegalStateException if output was not collected
    */
   public byte[] getStderr() {
-    return getStderrStream().toByteArray();
+    return stderrStream().toByteArray();
   }
 
   void logThis() {
-    logger.atFiner().log("%s", LazyArgs.lazy(() -> getTerminationStatus()));
+    logger.atFiner().log("%s", LazyArgs.lazy(() -> terminationStatus()));
 
-    if (getStdoutStream() == NO_OUTPUT_COLLECTED) {
+    if (stdoutStream() == NO_OUTPUT_COLLECTED) {
       return;
     }
     logger.atFiner().log("Stdout: %s", LazyArgs.lazy(() -> LogUtil.toTruncatedString(getStdout())));

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactConflictFinder.java b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactConflictFinder.java
index 2a50d80..2d800e7 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactConflictFinder.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ArtifactConflictFinder.java

@@ -29,7 +29,6 @@
 import com.google.devtools.build.lib.concurrent.ExecutorUtil;
 import com.google.devtools.build.lib.concurrent.Sharder;
 import com.google.devtools.build.lib.skyframe.PrecomputedValue.Precomputed;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -161,16 +160,6 @@
       requireNonNull(conflicts, "conflicts");
     }
 
-    @InlineMe(replacement = "this.conflicts()")
-    ImmutableMap<ActionAnalysisMetadata, ActionConflictException> getConflicts() {
-      return conflicts();
-    }
-
-    @InlineMe(replacement = "this.outputArtifactCount()")
-    int getOutputArtifactCount() {
-      return outputArtifactCount();
-    }
-
     static ActionConflictsAndStats create(
         ImmutableMap<ActionAnalysisMetadata, ActionConflictException> conflicts,
         int artifactCount) {

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
index 0a36e2d..c5b1752 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/AspectFunction.java

@@ -453,7 +453,7 @@
         ToolchainCollection.Builder<ResolvedToolchainContext> contextsBuilder =
             ToolchainCollection.builder();
         for (Map.Entry<String, UnloadedToolchainContext> unloadedContext :
-            unloadedToolchainContexts.getContextMap().entrySet()) {
+            unloadedToolchainContexts.contextMap().entrySet()) {
           ImmutableSet<ConfiguredTargetAndData> toolchainDependencies =
               ImmutableSet.copyOf(
                   depValueMap.get(DependencyKind.forExecGroup(unloadedContext.getKey())));
@@ -547,7 +547,7 @@
         ToolchainCollection.builder();
 
     for (Map.Entry<String, UnloadedToolchainContext> unloadedContext :
-        baseTargetUnloadedToolchainContexts.getContextMap().entrySet()) {
+        baseTargetUnloadedToolchainContexts.contextMap().entrySet()) {
       // For each requested toolchain type, collect the targets of its resolved toolchains. If
       // multiple types are resolved to the same toolchain, the `ConfiguredTargetAndData`
       // of the toolchain can be different for each of them depending on the aspects

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
index 18a1abd..bca4a6c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildDriverFunction.java

@@ -645,7 +645,7 @@
     if (localRef == null) {
       return ImmutableMap.of();
     }
-    return localRef.findArtifactConflicts(actionLookupKey).getConflicts();
+    return localRef.findArtifactConflicts(actionLookupKey).conflicts();
   }
 
   private void addExtraActionsIfRequested(

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BuildTopLevelAspectsDetailsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BuildTopLevelAspectsDetailsFunction.java
index ba6a57e..b3fbaa8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BuildTopLevelAspectsDetailsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BuildTopLevelAspectsDetailsFunction.java

@@ -171,17 +171,16 @@
 
   private static AspectDetails buildAspectDetails(
       AspectCollection.AspectDeps aspectDeps, Map<AspectDescriptor, AspectDetails> result) {
-    if (result.containsKey(aspectDeps.getAspect())) {
-      return result.get(aspectDeps.getAspect());
+    if (result.containsKey(aspectDeps.aspect())) {
+      return result.get(aspectDeps.aspect());
     }
 
     ImmutableList.Builder<AspectDetails> dependentAspects = ImmutableList.builder();
-    for (AspectCollection.AspectDeps path : aspectDeps.getUsedAspects()) {
+    for (AspectCollection.AspectDeps path : aspectDeps.usedAspects()) {
       dependentAspects.add(buildAspectDetails(path, result));
     }
 
-    AspectDetails aspectDetails =
-        new AspectDetails(dependentAspects.build(), aspectDeps.getAspect());
+    AspectDetails aspectDetails = new AspectDetails(dependentAspects.build(), aspectDeps.aspect());
     result.put(aspectDetails.getAspectDescriptor(), aspectDetails);
     return aspectDetails;
   }

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadCycleReporter.java
index da7d5d2..bdd6ae8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadCycleReporter.java

@@ -109,7 +109,7 @@
             ModuleExtensionId id = (ModuleExtensionId) input.argument();
             return String.format(
                 "extension '%s' defined in %s",
-                id.getExtensionName(), id.getBzlFileLabel().getCanonicalForm());
+                id.extensionName(), id.bzlFileLabel().getCanonicalForm());
           };
 
       StringBuilder cycleMessage =

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java
index 944de513..a88865f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlLoadFunction.java

@@ -980,7 +980,7 @@
       if (rootModuleMappingValue == null) {
         return null;
       }
-      return pureWorkspaceMapping.composeWith(rootModuleMappingValue.getRepositoryMapping());
+      return pureWorkspaceMapping.composeWith(rootModuleMappingValue.repositoryMapping());
     }
 
     if (key instanceof BzlLoadValue.KeyForBzlmod) {
@@ -1003,7 +1003,7 @@
         if (repositoryMappingValue == null) {
           return null;
         }
-        return repositoryMappingValue.getRepositoryMapping();
+        return repositoryMappingValue.repositoryMapping();
       }
     }
 
@@ -1014,7 +1014,7 @@
     if (repositoryMappingValue == null) {
       return null;
     }
-    return repositoryMappingValue.getRepositoryMapping();
+    return repositoryMappingValue.repositoryMapping();
   }
 
   @Nullable
@@ -1040,7 +1040,7 @@
     if (mainRepositoryMappingValue == null) {
       return null;
     }
-    return mainRepositoryMappingValue.getRepositoryMapping();
+    return mainRepositoryMappingValue.repositoryMapping();
   }
 
   /**

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java
index 78a9f55..8e58c1e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoCycleReporter.java

@@ -158,7 +158,7 @@
             } else if (input.argument() instanceof ModuleExtensionId id) {
               return String.format(
                   "extension '%s' defined in %s",
-                  id.getExtensionName(), id.getBzlFileLabel().getCanonicalForm());
+                  id.extensionName(), id.bzlFileLabel().getCanonicalForm());
             } else if (input.argument() instanceof RepositoryMappingValue.Key key) {
               if (key == RepositoryMappingValue.KEY_FOR_ROOT_MODULE_WITHOUT_WORKSPACE_REPOS) {
                 return "repository mapping of @@ without WORKSPACE repos";

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java
index 11dcd0d..ae85bce 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java

@@ -129,11 +129,11 @@
       return null;
     }
 
-    String internalRepo = extensionValue.getCanonicalRepoNameToInternalNames().get(repositoryName);
+    String internalRepo = extensionValue.canonicalRepoNameToInternalNames().get(repositoryName);
     if (internalRepo == null) {
       return BzlmodRepoRuleValue.REPO_RULE_NOT_FOUND_VALUE;
     }
-    RepoSpec extRepoSpec = extensionValue.getGeneratedRepoSpecs().get(internalRepo);
+    RepoSpec extRepoSpec = extensionValue.generatedRepoSpecs().get(internalRepo);
     return createRuleFromSpec(extRepoSpec, repositoryName, starlarkSemantics, env);
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageFunction.java
index 32a1d61..3687ce9 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageFunction.java

@@ -40,7 +40,7 @@
       throws SkyFunctionException, InterruptedException {
     CollectTargetsInPackageValue.CollectTargetsInPackageKey argument =
         (CollectTargetsInPackageValue.CollectTargetsInPackageKey) skyKey.argument();
-    PackageIdentifier packageId = argument.getPackageId();
+    PackageIdentifier packageId = argument.packageId();
     PackageValue packageValue;
     try {
       packageValue = (PackageValue) env.getValueOrThrow(packageId, NoSuchPackageException.class);
@@ -62,7 +62,7 @@
     return GraphTraversingHelper.declareDependenciesAndCheckIfValuesMissing(
             env,
             Iterables.transform(
-                TargetPatternResolverUtil.resolvePackageTargets(pkg, argument.getFilteringPolicy()),
+                TargetPatternResolverUtil.resolvePackageTargets(pkg, argument.filteringPolicy()),
                 TO_TRANSITIVE_TRAVERSAL_KEY))
         ? null
         : CollectTargetsInPackageValue.INSTANCE;

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageValue.java
index 601b406..d0fa634 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/CollectTargetsInPackageValue.java

@@ -23,7 +23,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 
 /** Singleton result of {@link CollectTargetsInPackageFunction}. */
 public class CollectTargetsInPackageValue implements SkyValue {
@@ -50,16 +49,6 @@
       requireNonNull(filteringPolicy, "filteringPolicy");
     }
 
-    @InlineMe(replacement = "this.packageId()")
-    public PackageIdentifier getPackageId() {
-      return packageId();
-    }
-
-    @InlineMe(replacement = "this.filteringPolicy()")
-    public FilteringPolicy getFilteringPolicy() {
-      return filteringPolicy();
-    }
-
     private static final SkyKeyInterner<CollectTargetsInPackageKey> interner = SkyKey.newInterner();
 
     @VisibleForSerialization

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
index c99b8c8..6613acc 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/ConfiguredTargetFunction.java

@@ -356,7 +356,7 @@
         ToolchainCollection.Builder<ResolvedToolchainContext> contextsBuilder =
             ToolchainCollection.builder();
         for (Map.Entry<String, UnloadedToolchainContext> unloadedContext :
-            prereqs.getUnloadedToolchainContexts().getContextMap().entrySet()) {
+            prereqs.getUnloadedToolchainContexts().contextMap().entrySet()) {
           ImmutableSet<ConfiguredTargetAndData> toolchainDependencies =
               ImmutableSet.copyOf(
                   prereqs

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
index 1f0a726..c793159 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PackageFunction.java

@@ -1015,8 +1015,8 @@
     }
 
     String workspaceName = workspaceNameValue.getName();
-    RepositoryMapping repositoryMapping = repositoryMappingValue.getRepositoryMapping();
-    RepositoryMapping mainRepositoryMapping = mainRepositoryMappingValue.getRepositoryMapping();
+    RepositoryMapping repositoryMapping = repositoryMappingValue.repositoryMapping();
+    RepositoryMapping mainRepositoryMapping = mainRepositoryMappingValue.repositoryMapping();
     Label preludeLabel = null;
 
     // Load (optional) prelude, which determines environment.
@@ -1159,8 +1159,8 @@
               packageId,
               buildFileRootedPath,
               workspaceName,
-              repositoryMappingValue.getAssociatedModuleName(),
-              repositoryMappingValue.getAssociatedModuleVersion(),
+              repositoryMappingValue.associatedModuleName(),
+              repositoryMappingValue.associatedModuleVersion(),
               starlarkBuiltinsValue.starlarkSemantics,
               repositoryMapping,
               mainRepositoryMapping,

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java
index 55b6177..c610550 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/PrepareDepsOfPatternsFunction.java

@@ -100,7 +100,7 @@
     if (repositoryMappingValue == null) {
       return null;
     }
-    RepositoryMapping mainRepoMapping = repositoryMappingValue.getRepositoryMapping();
+    RepositoryMapping mainRepoMapping = repositoryMappingValue.repositoryMapping();
     ImmutableList<SkyKey> skyKeys = getSkyKeys(skyKey, eventHandler, mainRepoMapping);
 
     SkyframeLookupResult tokensByKey = env.getValuesAndExceptions(skyKeys);

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RepoPackageArgsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RepoPackageArgsFunction.java
index c517ee8..0fa80a6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RepoPackageArgsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RepoPackageArgsFunction.java

@@ -113,14 +113,13 @@
     }
 
     String repoDisplayName =
-        RepoFileFunction.getDisplayNameForRepo(
-            repositoryName, mainRepoMapping.getRepositoryMapping());
+        RepoFileFunction.getDisplayNameForRepo(repositoryName, mainRepoMapping.repositoryMapping());
 
     PackageArgs.Builder pkgArgsBuilder = PackageArgs.builder();
     LabelConverter labelConverter =
         new LabelConverter(
             PackageIdentifier.create(repositoryName, PathFragment.EMPTY_FRAGMENT),
-            repositoryMappingValue.getRepositoryMapping());
+            repositoryMappingValue.repositoryMapping());
     try {
       for (Map.Entry<String, Object> kwarg : repoFileValue.packageArgsMap().entrySet()) {
         PackageArgs.processParam(

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunction.java
index 798aa18..1d9a3cf 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunction.java

@@ -117,7 +117,7 @@
                         "",
                         RepositoryName.MAIN),
                     StarlarkBuiltinsValue.BUILTINS_REPO)
-                .withAdditionalMappings(bazelToolsMapping.getRepositoryMapping()),
+                .withAdditionalMappings(bazelToolsMapping.repositoryMapping()),
             // The "associated module" doesn't exist here (@_builtins doesn't come from a module),
             // so we just supply dummy values.
             "",
@@ -181,9 +181,9 @@
           return null;
         }
         return RepositoryMappingValue.createForBzlmodRepo(
-            RepositoryMapping.create(repoMappingEntriesValue.getEntries(), repositoryName),
-            repoMappingEntriesValue.getModuleKey().name(),
-            repoMappingEntriesValue.getModuleKey().version());
+            RepositoryMapping.create(repoMappingEntriesValue.entries(), repositoryName),
+            repoMappingEntriesValue.moduleKey().name(),
+            repoMappingEntriesValue.moduleKey().version());
       }
     }
 
@@ -202,7 +202,7 @@
       RepositoryMapping rootModuleRepoMapping =
           rootModuleRepoMappingValue == null
               ? null
-              : rootModuleRepoMappingValue.getRepositoryMapping();
+              : rootModuleRepoMappingValue.repositoryMapping();
       return computeFromWorkspace(repositoryName, externalPackageValue, rootModuleRepoMapping);
     }
 

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java
index ccb15d0..8bb8ce8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/RepositoryMappingValue.java

@@ -27,7 +27,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Map;
 import java.util.Optional;
 import javax.annotation.Nullable;
@@ -74,22 +73,6 @@
     requireNonNull(associatedModuleVersion, "associatedModuleVersion");
   }
 
-  @InlineMe(replacement = "this.repositoryMapping()")
-  @Nullable
-  public RepositoryMapping getRepositoryMapping() {
-    return repositoryMapping();
-  }
-
-  @InlineMe(replacement = "this.associatedModuleName()")
-  public Optional<String> getAssociatedModuleName() {
-    return associatedModuleName();
-  }
-
-  @InlineMe(replacement = "this.associatedModuleVersion()")
-  public Optional<String> getAssociatedModuleVersion() {
-    return associatedModuleVersion();
-  }
-
   public static final Key KEY_FOR_ROOT_MODULE_WITHOUT_WORKSPACE_REPOS =
       Key.create(RepositoryName.MAIN, /* rootModuleShouldSeeWorkspaceRepos= */ false);
 
@@ -127,9 +110,9 @@
    */
   public final RepositoryMappingValue withAdditionalMappings(Map<String, RepositoryName> mappings) {
     return new RepositoryMappingValue(
-        getRepositoryMapping().withAdditionalMappings(mappings),
-        getAssociatedModuleName(),
-        getAssociatedModuleVersion());
+        repositoryMapping().withAdditionalMappings(mappings),
+        associatedModuleName(),
+        associatedModuleVersion());
   }
 
   /**
@@ -138,9 +121,9 @@
    */
   public final RepositoryMappingValue withCachedInverseMap() {
     return new RepositoryMappingValue(
-        getRepositoryMapping().withCachedInverseMap(),
-        getAssociatedModuleName(),
-        getAssociatedModuleVersion());
+        repositoryMapping().withCachedInverseMap(),
+        associatedModuleName(),
+        associatedModuleVersion());
   }
 
   /** Returns the {@link Key} for {@link RepositoryMappingValue}s. */

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
index f7e11bf..428df15 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeBuildView.java

@@ -449,10 +449,10 @@
         BuildGraphMetrics buildGraphMetrics =
             analysisTraversalResult
                 .getMetrics()
-                .setOutputArtifactCount(conflictsAndStats.getOutputArtifactCount())
+                .setOutputArtifactCount(conflictsAndStats.outputArtifactCount())
                 .build();
         eventBus.post(new AnalysisGraphStatsEvent(buildGraphMetrics));
-        interTargetConflicts = conflictsAndStats.getConflicts();
+        interTargetConflicts = conflictsAndStats.conflicts();
         someActionLookupValueEvaluated = false;
       }
     }

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
index 370e1db..2f8cc42 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/SkyframeExecutor.java

@@ -1666,7 +1666,7 @@
     RepositoryMappingValue mainRepositoryMappingValue =
         (RepositoryMappingValue) mainRepoMappingResult.get(mainRepositoryMappingKey);
     RepoContext mainRepoContext =
-        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.getRepositoryMapping());
+        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.repositoryMapping());
 
     // Parse the options.
     PackageContext rootPackage = mainRepoContext.rootPackage();
@@ -3028,7 +3028,7 @@
                   .build()),
           e);
     }
-    return evalResult.get(mainRepoMappingKey).getRepositoryMapping();
+    return evalResult.get(mainRepoMappingKey).repositoryMapping();
   }
 
   @Nullable

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
index a9f1bc7..964c05e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/TargetPatternPhaseFunction.java

@@ -83,8 +83,7 @@
     // Determine targets to build:
     List<String> failedPatterns = new ArrayList<>();
     List<ExpandedPattern> expandedPatterns =
-        getTargetsToBuild(
-            env, options, repositoryMappingValue.getRepositoryMapping(), failedPatterns);
+        getTargetsToBuild(env, options, repositoryMappingValue.repositoryMapping(), failedPatterns);
     ResolvedTargets<Target> targets =
         env.valuesMissing()
             ? null
@@ -101,7 +100,7 @@
               env,
               options.getTargetPatterns(),
               options.getOffset(),
-              repositoryMappingValue.getRepositoryMapping(),
+              repositoryMappingValue.repositoryMapping(),
               options.getTestFilter());
       Preconditions.checkState(env.valuesMissing() || (testTargets != null));
     }
@@ -240,7 +239,7 @@
             new LoadingPhaseCompleteEvent(
                 result.getTargetLabels(),
                 removedTargetLabels,
-                repositoryMappingValue.getRepositoryMapping()));
+                repositoryMappingValue.repositoryMapping()));
     return result;
   }
 

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
index b53825f..0593501 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/WorkspaceFileFunction.java

@@ -296,7 +296,7 @@
       if (rootModuleMapping == null) {
         return null;
       }
-      repoMapping = repoMapping.composeWith(rootModuleMapping.getRepositoryMapping());
+      repoMapping = repoMapping.composeWith(rootModuleMapping.repositoryMapping());
     }
 
     // The default 'workspace name' is "__main__". Note that this is different from the "workspace

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunction.java
index ffd8159..086da0e 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/config/FlagSetFunction.java

@@ -269,7 +269,7 @@
       return null;
     }
     RepoContext mainRepoContext =
-        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.getRepositoryMapping());
+        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.repositoryMapping());
     return (ParsedFlagsValue)
         env.getValue(
             ParsedFlagsValue.Key.create(

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingFunction.java
index 6d1825e..4a4e4e0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/config/PlatformMappingFunction.java

@@ -79,7 +79,7 @@
       return null;
     }
     RepoContext mainRepoContext =
-        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.getRepositoryMapping());
+        RepoContext.of(RepositoryName.MAIN, mainRepositoryMappingValue.repositoryMapping());
 
     PathPackageLocator pkgLocator = PrecomputedValue.PATH_PACKAGE_LOCATOR.get(env);
     if (pkgLocator == null) {

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
index 3d70aa9..40b273c 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/packages/AbstractPackageLoader.java

@@ -444,7 +444,7 @@
       RepositoryMappingValue mainRepositoryMappingValue = evalResult.get(key);
       // We always set up a repository mapping function
       checkState(evalResult.getError(key) == null && mainRepositoryMappingValue != null);
-      return mainRepositoryMappingValue.getRepositoryMapping();
+      return mainRepositoryMappingValue.repositoryMapping();
     }
 
     private static StarlarkModuleLoadingException starlarkModuleLoadingExceptionFromErrorInfo(

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredExecutionPlatformsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredExecutionPlatformsFunction.java
index ca3cd0f..41896e0 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredExecutionPlatformsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredExecutionPlatformsFunction.java

@@ -88,9 +88,7 @@
 
     TargetPattern.Parser mainRepoParser =
         new TargetPattern.Parser(
-            PathFragment.EMPTY_FRAGMENT,
-            RepositoryName.MAIN,
-            mainRepoMapping.getRepositoryMapping());
+            PathFragment.EMPTY_FRAGMENT, RepositoryName.MAIN, mainRepoMapping.repositoryMapping());
     ImmutableList.Builder<SignedTargetPattern> targetPatternBuilder = new ImmutableList.Builder<>();
 
     // Get the execution platforms from the configuration.

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredToolchainsFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredToolchainsFunction.java
index e7bd0f6..b35ad1f 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredToolchainsFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/toolchains/RegisteredToolchainsFunction.java

@@ -83,9 +83,7 @@
 
     TargetPattern.Parser mainRepoParser =
         new TargetPattern.Parser(
-            PathFragment.EMPTY_FRAGMENT,
-            RepositoryName.MAIN,
-            mainRepoMapping.getRepositoryMapping());
+            PathFragment.EMPTY_FRAGMENT, RepositoryName.MAIN, mainRepoMapping.repositoryMapping());
     ImmutableList.Builder<SignedTargetPattern> targetPatternBuilder = new ImmutableList.Builder<>();
 
     // Get the toolchains from the configuration.

diff --git a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
index 0d18edf..186f89f 100644
--- a/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java
+++ b/src/main/java/com/google/devtools/build/lib/starlarkdocextract/ModuleInfoExtractor.java

@@ -438,15 +438,15 @@
               // make ModuleExtension a StarlarkExportable (partially reverting cl/513213080).
               // Alternatively, we'd need to search the defining module's globals, similarly to what
               // we do in FunctionUtil#getFunctionOriginKey.
-              .setFile(context.labelRenderer().render(moduleExtension.getDefiningBzlFileLabel())));
-      moduleExtension.getDoc().ifPresent(moduleExtensionInfoBuilder::setDocString);
-      for (Map.Entry<String, TagClass> entry : moduleExtension.getTagClasses().entrySet()) {
+              .setFile(context.labelRenderer().render(moduleExtension.definingBzlFileLabel())));
+      moduleExtension.doc().ifPresent(moduleExtensionInfoBuilder::setDocString);
+      for (Map.Entry<String, TagClass> entry : moduleExtension.tagClasses().entrySet()) {
         ModuleExtensionTagClassInfo.Builder tagClassInfoBuilder =
             ModuleExtensionTagClassInfo.newBuilder();
         tagClassInfoBuilder.setTagName(entry.getKey());
-        entry.getValue().getDoc().ifPresent(tagClassInfoBuilder::setDocString);
+        entry.getValue().doc().ifPresent(tagClassInfoBuilder::setDocString);
         AttributeInfoExtractor.addDocumentableAttributes(
-            context, entry.getValue().getAttributes(), tagClassInfoBuilder::addAttribute);
+            context, entry.getValue().attributes(), tagClassInfoBuilder::addAttribute);
         moduleExtensionInfoBuilder.addTagClass(tagClassInfoBuilder);
       }
       moduleInfoBuilder.addModuleExtensionInfo(moduleExtensionInfoBuilder);

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java b/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java
index aefae38..33c8063 100644
--- a/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/vfs/FileSystemUtils.java

@@ -23,7 +23,6 @@
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ConditionallyThreadSafe;
 import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
 import com.google.devtools.build.lib.util.StringEncoding;
-import com.google.errorprone.annotations.InlineMe;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -625,23 +624,9 @@
   }
 
   /**
-   * Attempts to create a directory with the name of the given path, creating ancestors as
-   * necessary.
-   *
-   * <p>Deprecated. Prefer to call {@link Path#createDirectoryAndParents()} directly.
-   */
-  @Deprecated
-  @ThreadSafe
-  @InlineMe(replacement = "dir.createDirectoryAndParents()")
-  public static void createDirectoryAndParents(Path dir) throws IOException {
-    dir.createDirectoryAndParents();
-  }
-
-  /**
-   * Attempts to remove a relative chain of directories under a given base.
-   * Returns {@code true} if the removal was successful, and returns {@code
-   * false} if the removal fails because a directory was not empty. An
-   * {@link IOException} is thrown for any other errors.
+   * Attempts to remove a relative chain of directories under a given base. Returns {@code true} if
+   * the removal was successful, and returns {@code false} if the removal fails because a directory
+   * was not empty. An {@link IOException} is thrown for any other errors.
    */
   @ThreadSafe
   public static boolean removeDirectoryAndParents(Path base, PathFragment toRemove) {

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerProcessMetricsCollector.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerProcessMetricsCollector.java
index 74b050f..adc992e 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerProcessMetricsCollector.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerProcessMetricsCollector.java

@@ -131,9 +131,9 @@
   public ImmutableList<WorkerProcessMetrics> collectMetrics() {
     ResourceSnapshot resourceSnapshot = collectResourceUsage();
 
-    ImmutableMap<Long, Integer> pidToMemoryInKb = resourceSnapshot.getPidToMemoryInKb();
+    ImmutableMap<Long, Integer> pidToMemoryInKb = resourceSnapshot.pidToMemoryInKb();
 
-    Instant collectionTime = resourceSnapshot.getCollectionTime();
+    Instant collectionTime = resourceSnapshot.collectionTime();
 
     ImmutableList.Builder<WorkerProcessMetrics> workerMetrics = new ImmutableList.Builder<>();
     for (Map.Entry<Long, WorkerProcessMetrics> entry : pidToWorkerProcessMetrics.entrySet()) {

diff --git a/src/test/java/com/google/devtools/build/lib/actions/FilesetOutputSymlinkTest.java b/src/test/java/com/google/devtools/build/lib/actions/FilesetOutputSymlinkTest.java
index 7375b5d..9e34411 100644
--- a/src/test/java/com/google/devtools/build/lib/actions/FilesetOutputSymlinkTest.java
+++ b/src/test/java/com/google/devtools/build/lib/actions/FilesetOutputSymlinkTest.java

@@ -34,7 +34,7 @@
   @Test
   public void stripsExecRootFromTarget() {
     FilesetOutputSymlink symlink = createSymlinkTo("/example/execroot/some/path");
-    PathFragment targetPath = symlink.getTargetPath();
+    PathFragment targetPath = symlink.targetPath();
     assertThat(targetPath.getPathString()).isEqualTo("some/path");
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java
index 725ea8f..9e0e4ec 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectCollectionTest.java

@@ -258,7 +258,7 @@
       ImmutableList<Aspect> expectedUsedAspects,
       Pair<Aspect, ImmutableList<Aspect>>... expectedPaths) {
 
-    assertThat(Iterables.transform(collection.getUsedAspects(), AspectDeps::getAspect))
+    assertThat(Iterables.transform(collection.getUsedAspects(), AspectDeps::aspect))
         .containsExactlyElementsIn(Iterables.transform(expectedUsedAspects, Aspect::getDescriptor))
         .inOrder();
     validateAspectPaths(
@@ -279,7 +279,7 @@
     for (Pair<Aspect, ImmutableList<Aspect>> expected : expectedList) {
       assertThat(allPaths).containsKey(expected.first.getDescriptor());
       AspectDeps aspectPath = allPaths.get(expected.first.getDescriptor());
-      assertThat(Iterables.transform(aspectPath.getUsedAspects(), AspectDeps::getAspect))
+      assertThat(Iterables.transform(aspectPath.usedAspects(), AspectDeps::aspect))
           .containsExactlyElementsIn(Iterables.transform(expected.second, Aspect::getDescriptor))
           .inOrder();
       expectedKeys.add(expected.first.getDescriptor());
@@ -295,14 +295,14 @@
    */
   private static void collectAndValidateAspectDeps(AspectDeps aspectDeps,
       HashMap<AspectDescriptor, AspectDeps> allDeps) {
-    if (allDeps.containsKey(aspectDeps.getAspect())) {
-      assertWithMessage(String.format("Two different deps for aspect %s", aspectDeps.getAspect()))
-          .that(allDeps.get(aspectDeps.getAspect()))
+    if (allDeps.containsKey(aspectDeps.aspect())) {
+      assertWithMessage(String.format("Two different deps for aspect %s", aspectDeps.aspect()))
+          .that(allDeps.get(aspectDeps.aspect()))
           .isSameInstanceAs(aspectDeps);
       return;
     }
-    allDeps.put(aspectDeps.getAspect(), aspectDeps);
-    for (AspectDeps path : aspectDeps.getUsedAspects()) {
+    allDeps.put(aspectDeps.aspect(), aspectDeps);
+    for (AspectDeps path : aspectDeps.usedAspects()) {
       collectAndValidateAspectDeps(path, allDeps);
     }
   }

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java
index 5ee06d3..bbf9d6c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AutoExecGroupsTest.java

@@ -755,7 +755,7 @@
 
     ConfiguredTarget target = getConfiguredTarget("//test:custom_rule_name");
     ImmutableSet<String> toolchainContextsKeys =
-        getRuleContext(target).getToolchainContexts().getContextMap().keySet();
+        getRuleContext(target).getToolchainContexts().contextMap().keySet();
 
     assertThat(toolchainContextsKeys)
         .containsExactly(

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderIntegrationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderIntegrationTest.java
index 0131da3..c45bb6f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderIntegrationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/LocationExpanderIntegrationTest.java

@@ -17,7 +17,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
-import com.google.devtools.build.lib.vfs.FileSystemUtils;
 import com.google.devtools.build.lib.vfs.ModifiedFileSet;
 import com.google.devtools.build.lib.vfs.Root;
 import org.junit.Before;
@@ -216,7 +215,7 @@
         .invalidateFilesUnderPathForTesting(
             reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory));
 
-    FileSystemUtils.createDirectoryAndParents(scratch.resolve("/foo/bar"));
+    scratch.resolve("/foo/bar").createDirectoryAndParents();
     scratch.file("/r/MODULE.bazel", "module(name = 'r')");
     scratch.file("/r/p/BUILD", "genrule(name='foo', outs=['foo.txt'], cmd='never executed')");
 
@@ -249,7 +248,7 @@
         .invalidateFilesUnderPathForTesting(
             reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory));
 
-    FileSystemUtils.createDirectoryAndParents(scratch.resolve("/foo/bar"));
+    scratch.resolve("/foo/bar").createDirectoryAndParents();
     scratch.file("/r/MODULE.bazel", "module(name = 'r')");
     scratch.file("/r/p/BUILD", "genrule(name='foo', outs=['foo.txt'], cmd='never executed')");
 
@@ -283,7 +282,7 @@
         .invalidateFilesUnderPathForTesting(
             reporter, ModifiedFileSet.EVERYTHING_MODIFIED, Root.fromPath(rootDirectory));
 
-    FileSystemUtils.createDirectoryAndParents(scratch.resolve("/foo/bar"));
+    scratch.resolve("/foo/bar").createDirectoryAndParents();
     scratch.file("/r/MODULE.bazel", "module(name = 'r')");
     scratch.file("/r/p/BUILD", "genrule(name='foo', outs=['foo.txt'], cmd='never executed')");
 

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsTest.java
index 861a9d2..6b4c427 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/RequiredConfigFragmentsTest.java

@@ -123,7 +123,7 @@
 
     RequiredConfigFragmentsProvider aTransitiveFragments =
         getConfiguredTarget("//a:a").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(aTransitiveFragments.getFragmentClasses())
+    assertThat(aTransitiveFragments.fragmentClasses())
         .containsAtLeast(TestFragmentA.class, TestFragmentB.class);
   }
 
@@ -147,12 +147,12 @@
     assertThat(
             getConfiguredTarget("//a:config_on_a")
                 .getProvider(RequiredConfigFragmentsProvider.class)
-                .getOptionsClasses())
+                .optionsClasses())
         .contains(AOptions.class);
     assertThat(
             getConfiguredTarget("//a:config_on_native")
                 .getProvider(RequiredConfigFragmentsProvider.class)
-                .getOptionsClasses())
+                .optionsClasses())
         .doesNotContain(AOptions.class);
   }
 
@@ -172,8 +172,8 @@
 
     RequiredConfigFragmentsProvider aDirectFragments =
         getConfiguredTarget("//a:a").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(aDirectFragments.getFragmentClasses()).contains(TestFragmentA.class);
-    assertThat(aDirectFragments.getFragmentClasses()).doesNotContain(TestFragmentB.class);
+    assertThat(aDirectFragments.fragmentClasses()).contains(TestFragmentA.class);
+    assertThat(aDirectFragments.fragmentClasses()).doesNotContain(TestFragmentB.class);
   }
 
   @Test
@@ -196,12 +196,12 @@
     assertThat(
             getConfiguredTarget("//a:config_on_a")
                 .getProvider(RequiredConfigFragmentsProvider.class)
-                .getOptionsClasses())
+                .optionsClasses())
         .contains(AOptions.class);
     assertThat(
             getConfiguredTarget("//a:config_on_native")
                 .getProvider(RequiredConfigFragmentsProvider.class)
-                .getOptionsClasses())
+                .optionsClasses())
         .doesNotContain(AOptions.class);
   }
 
@@ -220,7 +220,7 @@
         """);
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:myrule").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getDefines()).containsExactly("myvar");
+    assertThat(requiredFragments.defines()).containsExactly("myvar");
   }
 
   @Test
@@ -246,7 +246,7 @@
         """);
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:simple").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getDefines()).containsExactly("myvar");
+    assertThat(requiredFragments.defines()).containsExactly("myvar");
   }
 
   @Test
@@ -283,7 +283,7 @@
         """);
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:simple").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getDefines()).containsExactly("required_var");
+    assertThat(requiredFragments.defines()).containsExactly("required_var");
   }
 
   /**
@@ -370,9 +370,9 @@
     useConfiguration("--include_config_fragments_provider=transitive");
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:parent").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getFragmentClasses())
+    assertThat(requiredFragments.fragmentClasses())
         .contains(AspectWithConfigFragmentRequirements.REQUIRED_FRAGMENT);
-    assertThat(requiredFragments.getDefines())
+    assertThat(requiredFragments.defines())
         .containsExactly(AspectWithConfigFragmentRequirements.REQUIRED_DEFINE);
   }
 
@@ -437,8 +437,8 @@
     useConfiguration("--include_config_fragments_provider=direct");
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:cctarget").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getOptionsClasses()).contains(CppOptions.class);
-    assertThat(requiredFragments.getOptionsClasses()).doesNotContain(JavaOptions.class);
+    assertThat(requiredFragments.optionsClasses()).contains(CppOptions.class);
+    assertThat(requiredFragments.optionsClasses()).doesNotContain(JavaOptions.class);
   }
 
   @Test
@@ -467,8 +467,8 @@
     useConfiguration("--include_config_fragments_provider=direct");
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:javatarget").getProvider(RequiredConfigFragmentsProvider.class);
-    assertThat(requiredFragments.getOptionsClasses()).contains(JavaOptions.class);
-    assertThat(requiredFragments.getOptionsClasses()).doesNotContain(CppOptions.class);
+    assertThat(requiredFragments.optionsClasses()).contains(JavaOptions.class);
+    assertThat(requiredFragments.optionsClasses()).doesNotContain(CppOptions.class);
   }
 
   @Test
@@ -509,9 +509,9 @@
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:javaparent").getProvider(RequiredConfigFragmentsProvider.class);
     // We consider the attribute transition over the parent -> child edge a property of the parent.
-    assertThat(requiredFragments.getOptionsClasses()).contains(JavaOptions.class);
+    assertThat(requiredFragments.optionsClasses()).contains(JavaOptions.class);
     // But not the child's rule transition.
-    assertThat(requiredFragments.getOptionsClasses()).doesNotContain(CppOptions.class);
+    assertThat(requiredFragments.optionsClasses()).doesNotContain(CppOptions.class);
   }
 
   @Test
@@ -565,9 +565,9 @@
         getAspect("//a:defs.bzl%a1").getProvider(RequiredConfigFragmentsProvider.class);
 
     if (setting == IncludeConfigFragmentsEnum.TRANSITIVE) {
-      assertThat(requiredFragments.getFragmentClasses()).contains(JavaConfiguration.class);
+      assertThat(requiredFragments.fragmentClasses()).contains(JavaConfiguration.class);
     } else {
-      assertThat(requiredFragments.getFragmentClasses()).doesNotContain(JavaConfiguration.class);
+      assertThat(requiredFragments.fragmentClasses()).doesNotContain(JavaConfiguration.class);
     }
   }
 
@@ -627,9 +627,9 @@
         getAspect("//a:defs.bzl%a2").getProvider(RequiredConfigFragmentsProvider.class);
 
     if (setting == IncludeConfigFragmentsEnum.TRANSITIVE) {
-      assertThat(requiredFragments.getDefines()).contains("my_var");
+      assertThat(requiredFragments.defines()).contains("my_var");
     } else {
-      assertThat(requiredFragments.getDefines()).doesNotContain("my_var");
+      assertThat(requiredFragments.defines()).doesNotContain("my_var");
     }
   }
 
@@ -655,7 +655,7 @@
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:example").getProvider(RequiredConfigFragmentsProvider.class);
 
-    assertThat(requiredFragments.getFragmentClasses()).contains(JavaConfiguration.class);
+    assertThat(requiredFragments.fragmentClasses()).contains(JavaConfiguration.class);
   }
 
   @Test
@@ -697,7 +697,7 @@
     RequiredConfigFragmentsProvider requiredFragments =
         getAspect("//a:defs.bzl%error_aspect").getProvider(RequiredConfigFragmentsProvider.class);
 
-    assertThat(requiredFragments.getDefines()).containsExactly("FAIL_MESSAGE");
+    assertThat(requiredFragments.defines()).containsExactly("FAIL_MESSAGE");
   }
 
   @Test
@@ -725,7 +725,7 @@
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:error").getProvider(RequiredConfigFragmentsProvider.class);
 
-    assertThat(requiredFragments.getDefines()).containsExactly("FAIL_MESSAGE");
+    assertThat(requiredFragments.defines()).containsExactly("FAIL_MESSAGE");
   }
 
   @Test
@@ -764,6 +764,6 @@
     RequiredConfigFragmentsProvider requiredFragments =
         getConfiguredTarget("//a:gen").getProvider(RequiredConfigFragmentsProvider.class);
 
-    assertThat(requiredFragments.getDefines()).containsExactly("x");
+    assertThat(requiredFragments.defines()).containsExactly("x");
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
index 9e72a6a..acdcca8 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/FileWriteActionTestCase.java

@@ -54,7 +54,7 @@
   public final void createAction() throws Exception {
     outputArtifact = getBinArtifactWithNoOwner("destination.txt");
     output = outputArtifact.getPath();
-    FileSystemUtils.createDirectoryAndParents(output.getParentDirectory());
+    output.getParentDirectory().createDirectoryAndParents();
     action = createAction(NULL_ACTION_OWNER, outputArtifact, "Hello World", false);
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/actions/PathMappersTest.java b/src/test/java/com/google/devtools/build/lib/analysis/actions/PathMappersTest.java
index 80b135e..a58f055 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/actions/PathMappersTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/actions/PathMappersTest.java

@@ -78,7 +78,7 @@
     ConfiguredTarget configuredTarget = getConfiguredTarget("//java/com/google/test:a");
     Artifact compiledArtifact =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, configuredTarget)
-            .getDirectCompileTimeJars()
+            .directCompileTimeJars()
             .toList()
             .get(0);
     SpawnAction action = (SpawnAction) getGeneratingAction(compiledArtifact);

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactoryTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactoryTest.java
index 2ea0e26..1002edc 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactoryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/transitions/ComposingTransitionFactoryTest.java

@@ -259,7 +259,7 @@
         RequiredConfigFragmentsProvider.builder();
     ConfigurationTransition transition = composed.create(new StubData());
     transition.addRequiredFragments(requiredFragments, null);
-    assertThat(requiredFragments.build().getOptionsClasses())
+    assertThat(requiredFragments.build().optionsClasses())
         .containsExactly(CppOptions.class, JavaOptions.class);
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrTransitionProviderTest.java
index 2ba914f..f9ef04f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrTransitionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkAttrTransitionProviderTest.java

@@ -2960,7 +2960,7 @@
         RequiredConfigFragmentsProvider.builder();
     attrTransition.addRequiredFragments(
         requiredFragments, ct.getConfiguration().getBuildOptionDetails());
-    assertThat(requiredFragments.build().getOptionsClasses()).containsExactly(CppOptions.class);
+    assertThat(requiredFragments.build().optionsClasses()).containsExactly(CppOptions.class);
   }
 
   /**

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProviderTest.java b/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProviderTest.java
index 56bc15f..18c8b4d 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProviderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleTransitionProviderTest.java

@@ -1792,7 +1792,7 @@
         RequiredConfigFragmentsProvider.builder();
     ruleTransition.addRequiredFragments(
         requiredFragments, ct.getConfiguration().getBuildOptionDetails());
-    assertThat(requiredFragments.build().getOptionsClasses()).containsExactly(CppOptions.class);
+    assertThat(requiredFragments.build().optionsClasses()).containsExactly(CppOptions.class);
   }
 
   /**

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
index 116fbcb..2e4a27b 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/BuildViewForTesting.java

@@ -385,7 +385,7 @@
     ToolchainCollection.Builder<ResolvedToolchainContext> resolvedToolchainContext =
         ToolchainCollection.builder();
     for (Map.Entry<String, UnloadedToolchainContext> unloadedToolchainContext :
-        unloadedToolchainCollection.getContextMap().entrySet()) {
+        unloadedToolchainCollection.contextMap().entrySet()) {
       ResolvedToolchainContext toolchainContext =
           ResolvedToolchainContext.load(
               unloadedToolchainContext.getValue(),

diff --git a/src/test/java/com/google/devtools/build/lib/authandtls/CredentialHelperOptionConverterTest.java b/src/test/java/com/google/devtools/build/lib/authandtls/CredentialHelperOptionConverterTest.java
index 212ebf6..f601479 100644
--- a/src/test/java/com/google/devtools/build/lib/authandtls/CredentialHelperOptionConverterTest.java
+++ b/src/test/java/com/google/devtools/build/lib/authandtls/CredentialHelperOptionConverterTest.java

@@ -33,52 +33,52 @@
   public void exactScope() throws Exception {
     CredentialHelperOption helper1 =
         CredentialHelperOptionConverter.INSTANCE.convert("example.com=foo");
-    assertThat(helper1.getScope()).hasValue("example.com");
-    assertThat(helper1.getPath()).isEqualTo("foo");
+    assertThat(helper1.scope()).hasValue("example.com");
+    assertThat(helper1.path()).isEqualTo("foo");
   }
 
   @Test
   public void wildcardScope() throws Exception {
     CredentialHelperOption helper1 =
         CredentialHelperOptionConverter.INSTANCE.convert("*.example.com=foo");
-    assertThat(helper1.getScope()).hasValue("*.example.com");
-    assertThat(helper1.getPath()).isEqualTo("foo");
+    assertThat(helper1.scope()).hasValue("*.example.com");
+    assertThat(helper1.path()).isEqualTo("foo");
   }
 
   @Test
   public void punycodeScope() throws Exception {
     CredentialHelperOption helper1 =
         CredentialHelperOptionConverter.INSTANCE.convert("münchen.de=foo");
-    assertThat(helper1.getScope()).hasValue("xn--mnchen-3ya.de");
-    assertThat(helper1.getPath()).isEqualTo("foo");
+    assertThat(helper1.scope()).hasValue("xn--mnchen-3ya.de");
+    assertThat(helper1.path()).isEqualTo("foo");
 
     CredentialHelperOption helper2 =
         CredentialHelperOptionConverter.INSTANCE.convert("*.köln.de=foo");
-    assertThat(helper2.getScope()).hasValue("*.xn--kln-sna.de");
-    assertThat(helper2.getPath()).isEqualTo("foo");
+    assertThat(helper2.scope()).hasValue("*.xn--kln-sna.de");
+    assertThat(helper2.path()).isEqualTo("foo");
   }
 
   @Test
   public void absolutePath() throws Exception {
     CredentialHelperOption helper1 =
         CredentialHelperOptionConverter.INSTANCE.convert("/absolute/path");
-    assertThat(helper1.getScope()).isEmpty();
-    assertThat(helper1.getPath()).isEqualTo("/absolute/path");
+    assertThat(helper1.scope()).isEmpty();
+    assertThat(helper1.path()).isEqualTo("/absolute/path");
   }
 
   @Test
   public void rootRelativePath() throws Exception {
     CredentialHelperOption helper1 =
         CredentialHelperOptionConverter.INSTANCE.convert("%workspace%/path");
-    assertThat(helper1.getScope()).isEmpty();
-    assertThat(helper1.getPath()).isEqualTo("%workspace%/path");
+    assertThat(helper1.scope()).isEmpty();
+    assertThat(helper1.path()).isEqualTo("%workspace%/path");
   }
 
   @Test
   public void pathLookup() throws Exception {
     CredentialHelperOption helper1 = CredentialHelperOptionConverter.INSTANCE.convert("foo");
-    assertThat(helper1.getScope()).isEmpty();
-    assertThat(helper1.getPath()).isEqualTo("foo");
+    assertThat(helper1.scope()).isEmpty();
+    assertThat(helper1.path()).isEqualTo("foo");
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperTest.java b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperTest.java
index c7707b5..9b21314 100644
--- a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/CredentialHelperTest.java

@@ -80,14 +80,14 @@
   @Test
   public void knownUriWithSingleHeader() throws Exception {
     GetCredentialsResponse response = getCredentialsFromHelper("https://singleheader.example.com");
-    assertThat(response.getHeaders()).containsExactly("header1", ImmutableList.of("value1"));
+    assertThat(response.headers()).containsExactly("header1", ImmutableList.of("value1"));
   }
 
   @Test
   public void knownUriWithMultipleHeaders() throws Exception {
     GetCredentialsResponse response =
         getCredentialsFromHelper("https://multipleheaders.example.com");
-    assertThat(response.getHeaders())
+    assertThat(response.headers())
         .containsExactly(
             "header1",
             ImmutableList.of("value1"),
@@ -120,13 +120,13 @@
   @Test
   public void credentialHelperOutputsExtraFields() throws Exception {
     GetCredentialsResponse response = getCredentialsFromHelper("https://extrafields.example.com");
-    assertThat(response.getHeaders()).containsExactly("header1", ImmutableList.of("value1"));
+    assertThat(response.headers()).containsExactly("header1", ImmutableList.of("value1"));
   }
 
   @Test
   public void helperRunsInWorkspace() throws Exception {
     GetCredentialsResponse response = getCredentialsFromHelper("https://cwd.example.com");
-    ImmutableMap<String, ImmutableList<String>> headers = response.getHeaders();
+    ImmutableMap<String, ImmutableList<String>> headers = response.headers();
     assertThat(PathFragment.create(headers.get("cwd").get(0))).isEqualTo(TEST_WORKSPACE_PATH);
   }
 
@@ -135,7 +135,7 @@
     GetCredentialsResponse response =
         getCredentialsFromHelper(
             "https://env.example.com", ImmutableMap.of("FOO", "BAR!", "BAR", "123"));
-    assertThat(response.getHeaders())
+    assertThat(response.headers())
         .containsExactly(
             "foo", ImmutableList.of("BAR!"),
             "bar", ImmutableList.of("123"));
@@ -177,7 +177,6 @@
     // a deadlock and timeout. This verifies that the pipe is sufficiently large.
     // See https://github.com/bazelbuild/bazel/issues/21287.
     GetCredentialsResponse response = getCredentialsFromHelper("https://hugepayload.example.com");
-    assertThat(response.getHeaders())
-        .containsExactly("huge", ImmutableList.of("x".repeat(63 * 1024)));
+    assertThat(response.headers()).containsExactly("huge", ImmutableList.of("x".repeat(63 * 1024)));
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequestTest.java b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequestTest.java
index 0e0939e..0966618 100644
--- a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequestTest.java
+++ b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsRequestTest.java

@@ -32,25 +32,20 @@
   @Test
   public void parseValid() {
     assertThat(
-            GSON.fromJson("{\"uri\": \"http://example.com\"}", GetCredentialsRequest.class)
-                .getUri())
+            GSON.fromJson("{\"uri\": \"http://example.com\"}", GetCredentialsRequest.class).uri())
         .isEqualTo(URI.create("http://example.com"));
     assertThat(
-            GSON.fromJson("{\"uri\": \"https://example.com\"}", GetCredentialsRequest.class)
-                .getUri())
+            GSON.fromJson("{\"uri\": \"https://example.com\"}", GetCredentialsRequest.class).uri())
         .isEqualTo(URI.create("https://example.com"));
     assertThat(
-            GSON.fromJson("{\"uri\": \"grpc://example.com\"}", GetCredentialsRequest.class)
-                .getUri())
+            GSON.fromJson("{\"uri\": \"grpc://example.com\"}", GetCredentialsRequest.class).uri())
         .isEqualTo(URI.create("grpc://example.com"));
     assertThat(
-            GSON.fromJson("{\"uri\": \"grpcs://example.com\"}", GetCredentialsRequest.class)
-                .getUri())
+            GSON.fromJson("{\"uri\": \"grpcs://example.com\"}", GetCredentialsRequest.class).uri())
         .isEqualTo(URI.create("grpcs://example.com"));
 
     assertThat(
-            GSON.fromJson("{\"uri\": \"uri-without-protocol\"}", GetCredentialsRequest.class)
-                .getUri())
+            GSON.fromJson("{\"uri\": \"uri-without-protocol\"}", GetCredentialsRequest.class).uri())
         .isEqualTo(URI.create("uri-without-protocol"));
   }
 
@@ -93,24 +88,24 @@
     assertThat(
             GSON.fromJson(
                     "{\"uri\": \"http://example.com\", \"foo\": 1}", GetCredentialsRequest.class)
-                .getUri())
+                .uri())
         .isEqualTo(URI.create("http://example.com"));
     assertThat(
             GSON.fromJson(
                     "{\"foo\": 1, \"uri\": \"http://example.com\"}", GetCredentialsRequest.class)
-                .getUri())
+                .uri())
         .isEqualTo(URI.create("http://example.com"));
     assertThat(
             GSON.fromJson(
                     "{\"uri\": \"http://example.com\", \"foo\": 1, \"bar\": {}}",
                     GetCredentialsRequest.class)
-                .getUri())
+                .uri())
         .isEqualTo(URI.create("http://example.com"));
     assertThat(
             GSON.fromJson(
                     "{\"foo\": 1, \"uri\": \"http://example.com\", \"bar\": []}",
                     GetCredentialsRequest.class)
-                .getUri())
+                .uri())
         .isEqualTo(URI.create("http://example.com"));
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponseTest.java b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponseTest.java
index 34b17c7..949d977 100644
--- a/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponseTest.java
+++ b/src/test/java/com/google/devtools/build/lib/authandtls/credentialhelper/GetCredentialsResponseTest.java

@@ -32,8 +32,8 @@
 
   @Test
   public void parseValid() {
-    assertThat(GSON.fromJson("{}", GetCredentialsResponse.class).getHeaders()).isEmpty();
-    assertThat(GSON.fromJson("{\"headers\": {}}", GetCredentialsResponse.class).getHeaders())
+    assertThat(GSON.fromJson("{}", GetCredentialsResponse.class).headers()).isEmpty();
+    assertThat(GSON.fromJson("{\"headers\": {}}", GetCredentialsResponse.class).headers())
         .isEmpty();
 
     GetCredentialsResponse.Builder expectedResponseBuilder = GetCredentialsResponse.newBuilder();
@@ -51,10 +51,8 @@
 
   @Test
   public void parseWithExtraFields() {
-    assertThat(GSON.fromJson("{\"foo\": 123}", GetCredentialsResponse.class).getHeaders())
-        .isEmpty();
-    assertThat(
-            GSON.fromJson("{\"foo\": 123, \"bar\": []}", GetCredentialsResponse.class).getHeaders())
+    assertThat(GSON.fromJson("{\"foo\": 123}", GetCredentialsResponse.class).headers()).isEmpty();
+    assertThat(GSON.fromJson("{\"foo\": 123, \"bar\": []}", GetCredentialsResponse.class).headers())
         .isEmpty();
 
     GetCredentialsResponse.Builder expectedResponseBuilder = GetCredentialsResponse.newBuilder();
@@ -143,22 +141,22 @@
   public void parseExpires() {
     assertThat(
             GSON.fromJson("{\"expires\": \"1970-09-29T11:46:29Z\"}", GetCredentialsResponse.class)
-                .getExpires())
+                .expires())
         .hasValue(Instant.ofEpochSecond(23456789));
     assertThat(
             GSON.fromJson(
                     "{\"expires\": \"1970-09-29T11:46:29+00:00\"}", GetCredentialsResponse.class)
-                .getExpires())
+                .expires())
         .hasValue(Instant.ofEpochSecond(23456789));
     assertThat(
             GSON.fromJson(
                     "{\"expires\": \"1970-09-29T13:46:29+02:00\"}", GetCredentialsResponse.class)
-                .getExpires())
+                .expires())
         .hasValue(Instant.ofEpochSecond(23456789));
     assertThat(
             GSON.fromJson(
                     "{\"expires\": \"1970-09-28T23:46:29-12:00\"}", GetCredentialsResponse.class)
-                .getExpires())
+                .expires())
         .hasValue(Instant.ofEpochSecond(23456789));
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
index 0600056..27b49ba 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/DiscoveryTest.java

@@ -71,7 +71,6 @@
 import com.google.devtools.build.skyframe.SkyFunctionName;
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
@@ -100,16 +99,6 @@
       requireNonNull(registryFileHashes, "registryFileHashes");
     }
 
-    @InlineMe(replacement = "this.depGraph()")
-    ImmutableMap<ModuleKey, InterimModule> getDepGraph() {
-      return depGraph();
-    }
-
-    @InlineMe(replacement = "this.registryFileHashes()")
-    ImmutableMap<String, Optional<String>> getRegistryFileHashes() {
-      return registryFileHashes();
-    }
-
     static final SkyFunctionName FUNCTION_NAME = SkyFunctionName.createHermetic("test_discovery");
     static final SkyKey KEY = () -> FUNCTION_NAME;
 
@@ -281,7 +270,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -297,7 +286,7 @@
                 .setRegistry(registry)
                 .buildEntry(),
             InterimModuleBuilder.create("ddd", "3.0").setRegistry(registry).buildEntry());
-    assertThat(discoveryValue.getRegistryFileHashes())
+    assertThat(discoveryValue.registryFileHashes())
         .containsExactly(
             registry.getUrl() + "/modules/bbb/1.0/MODULE.bazel",
             Optional.of("3f48e6d8694e0aa0d16617fd97b7d84da0e17ee9932c18cbc71888c12563372d"),
@@ -332,7 +321,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -369,7 +358,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -401,7 +390,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -438,7 +427,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -474,7 +463,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -516,7 +505,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -558,7 +547,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "0.1")
                 .setKey(ModuleKey.ROOT)
@@ -572,7 +561,7 @@
             InterimModuleBuilder.create("ccc", "2.0")
                 .setKey(createModuleKey("ccc", ""))
                 .buildEntry());
-    assertThat(discoveryValue.getRegistryFileHashes())
+    assertThat(discoveryValue.registryFileHashes())
         .containsExactly(
             registry.getUrl() + "/modules/bbb/0.1/MODULE.bazel",
             Optional.of("3f9e1a600b4adeee1c1a92b92df9d086eca4bbdde656c122872f48f8f3b874a3"))
@@ -613,7 +602,7 @@
       fail(result.getError().toString());
     }
     DiscoveryValue discoveryValue = result.get(DiscoveryValue.KEY);
-    assertThat(discoveryValue.getDepGraph().entrySet())
+    assertThat(discoveryValue.depGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("", "")
                 .addDep("bazel_tools", createModuleKey("bazel_tools", ""))
@@ -640,7 +629,7 @@
                 .setRegistry(registry)
                 .buildEntry());
 
-    assertThat(discoveryValue.getRegistryFileHashes())
+    assertThat(discoveryValue.registryFileHashes())
         .containsExactly(
             registry.getUrl() + "/modules/foo/2.0/MODULE.bazel",
             Optional.of("76ecb05b455aecab4ec958c1deb17e4cbbe6e708d9c4e85fceda2317f6c86d7b"),

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModuleTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModuleTest.java
index d903da3..5d7abae 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModuleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/InterimModuleTest.java

@@ -38,8 +38,8 @@
                     depSpec ->
                         DepSpec.fromModuleKey(
                             createModuleKey(
-                                depSpec.getName() + "_new",
-                                depSpec.getVersion().getNormalized() + ".1"))))
+                                depSpec.name() + "_new",
+                                depSpec.version().getNormalized() + ".1"))))
         .isEqualTo(
             InterimModuleBuilder.create("", "")
                 .addDep("dep_foo", createModuleKey("foo_new", "1.0.1"))

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
index f23653b..8cc9fe2 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/ModuleExtensionResolutionTest.java

@@ -1433,7 +1433,8 @@
         \t\tdata_repo(name='ext',data='@not_other_repo//:foo')
         Error in repository_rule: no repository visible as '@not_other_repo' in \
         the extension '@@//:defs.bzl%ext', but referenced by label \
-        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.""");
+        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.\
+        """);
   }
 
   @Test
@@ -1478,7 +1479,8 @@
         \t\tdata_repo(name='ext',data='@not_other_repo//:foo')
         Error in repository_rule: no repository visible as '@not_other_repo' in the extension \
         '@@ext_module+//:defs.bzl%ext', but referenced by label '@not_other_repo//:foo' in \
-        attribute 'data' of data_repo 'ext'.""");
+        attribute 'data' of data_repo 'ext'.\
+        """);
   }
 
   @Test
@@ -1557,7 +1559,8 @@
         \t\tdata_repo(name='ext',data=['@not_other_repo//:foo'])
         Error in repository_rule: no repository visible as '@not_other_repo' \
         in the extension '@@//:defs.bzl%ext', but referenced by label \
-        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.""");
+        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.\
+        """);
   }
 
   @Test
@@ -1594,7 +1597,8 @@
         \t\tdata_repo(name='ext',data={'@not_other_repo//:foo':'bar'})
         Error in repository_rule: no repository visible as '@not_other_repo' \
         in the extension '@@//:defs.bzl%ext', but referenced by label \
-        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.""");
+        '@not_other_repo//:foo' in attribute 'data' of data_repo 'ext'.\
+        """);
   }
 
   @Test
@@ -2131,8 +2135,8 @@
                     SingleExtensionValue.evalKey(
                         ModuleExtensionId.create(
                             Label.parseCanonical("@@ext+//:defs.bzl"), "ext", Optional.empty())));
-    assertThat(evalValue.getFixup()).isPresent();
-    assertThat(evalValue.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(evalValue.fixup()).isPresent();
+    assertThat(evalValue.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"),
             "use_repo_add ext missing_direct_dep non_dev_as_dev_dep",
@@ -2142,7 +2146,7 @@
             "use_repo_add ext_dev dev_as_non_dev_dep missing_direct_dev_dep",
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext_dev indirect_dev_dep invalid_dev_dep non_dev_as_dev_dep");
-    assertThat(evalValue.getFixup().get().getSuccessMessage())
+    assertThat(evalValue.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for @ext//:defs.bzl%ext");
   }
 
@@ -2248,7 +2252,8 @@
         Imported, but reported as indirect dependencies by the extension:
             indirect_dep, indirect_dev_dep
 
-        Fix the use_repo calls by running 'bazel mod tidy'.""",
+        Fix the use_repo calls by running 'bazel mod tidy'.\
+        """,
         ImmutableSet.of(EventKind.WARNING));
     SingleExtensionValue evalValue =
         (SingleExtensionValue)
@@ -2258,8 +2263,8 @@
                     SingleExtensionValue.evalKey(
                         ModuleExtensionId.create(
                             Label.parseCanonical("@@ext+//:defs.bzl"), "ext", Optional.empty())));
-    assertThat(evalValue.getFixup()).isPresent();
-    assertThat(evalValue.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(evalValue.fixup()).isPresent();
+    assertThat(evalValue.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("firstProd.MODULE.bazel"),
             "use_repo_add ext missing_direct_dep non_dev_as_dev_dep",
@@ -2273,7 +2278,7 @@
             "use_repo_remove ext_dev indirect_dev_dep invalid_dev_dep non_dev_as_dev_dep",
             PathFragment.create("second.MODULE.bazel"),
             "use_repo_remove ext_dev invalid_dev_dep2");
-    assertThat(evalValue.getFixup().get().getSuccessMessage())
+    assertThat(evalValue.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for @ext//:defs.bzl%ext");
   }
 
@@ -2357,8 +2362,8 @@
                     SingleExtensionValue.evalKey(
                         ModuleExtensionId.create(
                             Label.parseCanonical("@@ext+//:defs.bzl"), "ext", Optional.empty())));
-    assertThat(evalValue.getFixup()).isPresent();
-    assertThat(evalValue.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(evalValue.fixup()).isPresent();
+    assertThat(evalValue.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"),
             "use_repo_add ext direct_dev_dep indirect_dev_dep missing_direct_dep"
@@ -2367,7 +2372,7 @@
             "use_repo_remove ext invalid_dep",
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext_dev direct_dev_dep indirect_dev_dep invalid_dev_dep");
-    assertThat(evalValue.getFixup().get().getSuccessMessage())
+    assertThat(evalValue.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for @ext//:defs.bzl%ext");
   }
 
@@ -2453,8 +2458,8 @@
                     SingleExtensionValue.evalKey(
                         ModuleExtensionId.create(
                             Label.parseCanonical("@@ext+//:defs.bzl"), "ext", Optional.empty())));
-    assertThat(evalValue.getFixup()).isPresent();
-    assertThat(evalValue.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(evalValue.fixup()).isPresent();
+    assertThat(evalValue.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext direct_dep indirect_dep invalid_dep",
@@ -2463,7 +2468,7 @@
                 + " missing_direct_dev_dep",
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext_dev invalid_dev_dep");
-    assertThat(evalValue.getFixup().get().getSuccessMessage())
+    assertThat(evalValue.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for @ext//:defs.bzl%ext");
   }
 
@@ -2519,7 +2524,7 @@
                     SingleExtensionValue.evalKey(
                         ModuleExtensionId.create(
                             Label.parseCanonical("@@ext+//:defs.bzl"), "ext", Optional.empty())));
-    assertThat(evalValue.getFixup()).isEmpty();
+    assertThat(evalValue.fixup()).isEmpty();
   }
 
   @Test
@@ -2608,14 +2613,14 @@
                             "ext",
                             Optional.of(
                                 ModuleExtensionId.IsolationKey.create(ModuleKey.ROOT, "ext1")))));
-    assertThat(ext1Value.getFixup()).isPresent();
-    assertThat(ext1Value.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(ext1Value.fixup()).isPresent();
+    assertThat(ext1Value.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"),
             "use_repo_add ext1 direct_dep missing_direct_dep",
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext1 indirect_dep");
-    assertThat(ext1Value.getFixup().get().getSuccessMessage())
+    assertThat(ext1Value.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for isolated usage 'ext1' of @ext//:defs.bzl%ext");
     SingleExtensionValue ext2Value =
         (SingleExtensionValue)
@@ -2628,11 +2633,11 @@
                             "ext",
                             Optional.of(
                                 ModuleExtensionId.IsolationKey.create(ModuleKey.ROOT, "ext2")))));
-    assertThat(ext2Value.getFixup()).isPresent();
-    assertThat(ext2Value.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(ext2Value.fixup()).isPresent();
+    assertThat(ext2Value.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"), "use_repo_add ext2 missing_direct_dep");
-    assertThat(ext2Value.getFixup().get().getSuccessMessage())
+    assertThat(ext2Value.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for isolated usage 'ext2' of @ext//:defs.bzl%ext");
   }
 
@@ -2722,14 +2727,14 @@
                             "ext",
                             Optional.of(
                                 ModuleExtensionId.IsolationKey.create(ModuleKey.ROOT, "ext1")))));
-    assertThat(ext1Value.getFixup()).isPresent();
-    assertThat(ext1Value.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(ext1Value.fixup()).isPresent();
+    assertThat(ext1Value.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"),
             "use_repo_add ext1 direct_dep missing_direct_dep",
             PathFragment.create("MODULE.bazel"),
             "use_repo_remove ext1 indirect_dep");
-    assertThat(ext1Value.getFixup().get().getSuccessMessage())
+    assertThat(ext1Value.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for isolated usage 'ext1' of @ext//:defs.bzl%ext");
     SingleExtensionValue ext2Value =
         (SingleExtensionValue)
@@ -2742,11 +2747,11 @@
                             "ext",
                             Optional.of(
                                 ModuleExtensionId.IsolationKey.create(ModuleKey.ROOT, "ext2")))));
-    assertThat(ext2Value.getFixup()).isPresent();
-    assertThat(ext2Value.getFixup().get().moduleFilePathToBuildozerCommands())
+    assertThat(ext2Value.fixup()).isPresent();
+    assertThat(ext2Value.fixup().get().moduleFilePathToBuildozerCommands())
         .containsExactly(
             PathFragment.create("MODULE.bazel"), "use_repo_add ext2 missing_direct_dep");
-    assertThat(ext2Value.getFixup().get().getSuccessMessage())
+    assertThat(ext2Value.fixup().get().getSuccessMessage())
         .isEqualTo("Updated use_repo calls for isolated usage 'ext2' of @ext//:defs.bzl%ext");
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java
index 5cc7c3b..7b2b681 100644
--- a/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/bazel/bzlmod/SelectionTest.java

@@ -54,7 +54,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -71,7 +71,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 1).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -112,7 +112,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -129,7 +129,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 1).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -170,7 +170,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -188,7 +188,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 1).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -236,7 +236,7 @@
             .build();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -253,7 +253,7 @@
             InterimModuleBuilder.create("ddd", "2.0").buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -299,7 +299,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -315,7 +315,7 @@
         .inOrder();
     // D is completely gone.
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -421,7 +421,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -438,7 +438,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 2).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -478,7 +478,7 @@
             .buildOrThrow();
 
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -495,7 +495,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 2).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -585,7 +585,7 @@
     //        \-> ddd 1.0 -> bbb 1.1
     //         \-> eee 1.0 -> ccc 1.1
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "1.0")
                 .setKey(ModuleKey.ROOT)
@@ -606,7 +606,7 @@
                 .buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "1.0")
                 .setKey(ModuleKey.ROOT)
@@ -672,7 +672,7 @@
     //        \-> ddd 1.0 -> bbb 1.1
     //         \-> eee 1.0 -> ccc 1.1
     Selection.Result selectionResult = Selection.run(depGraph, /* overrides= */ ImmutableMap.of());
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "1.0")
                 .setKey(ModuleKey.ROOT)
@@ -693,7 +693,7 @@
                 .buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", "1.0")
                 .setKey(ModuleKey.ROOT)
@@ -769,7 +769,7 @@
                 ImmutableList.of(Version.parse("1.0"), Version.parse("2.0")), ""));
 
     Selection.Result selectionResult = Selection.run(depGraph, overrides);
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -780,8 +780,7 @@
             InterimModuleBuilder.create("bbb", "2.0").buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph())
-        .isEqualTo(selectionResult.getResolvedDepGraph());
+    assertThat(selectionResult.unprunedDepGraph()).isEqualTo(selectionResult.resolvedDepGraph());
   }
 
   @Test
@@ -842,7 +841,7 @@
                 ImmutableList.of(Version.parse("1.0"), Version.parse("2.0")), ""));
 
     Selection.Result selectionResult = Selection.run(depGraph, overrides);
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -859,8 +858,7 @@
             InterimModuleBuilder.create("ddd", "2.0", 2).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph())
-        .isEqualTo(selectionResult.getResolvedDepGraph());
+    assertThat(selectionResult.unprunedDepGraph()).isEqualTo(selectionResult.resolvedDepGraph());
   }
 
   @Test
@@ -891,7 +889,7 @@
                 ImmutableList.of(Version.parse("1.0"), Version.parse("2.0")), ""));
 
     Selection.Result selectionResult = Selection.run(depGraph, overrides);
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -908,8 +906,7 @@
             InterimModuleBuilder.create("ddd", "2.0").buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph())
-        .isEqualTo(selectionResult.getResolvedDepGraph());
+    assertThat(selectionResult.unprunedDepGraph()).isEqualTo(selectionResult.resolvedDepGraph());
   }
 
   @Test
@@ -969,7 +966,7 @@
     //     \-> bbb4@1.0 -> ccc@1.7  [allowed]
     //     \-> bbb5@1.0 -> ccc@2.0  [allowed]
     Selection.Result selectionResult = Selection.run(depGraph, overrides);
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -1001,7 +998,7 @@
             InterimModuleBuilder.create("ccc", "2.0", 2).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -1182,7 +1179,7 @@
     //     \-> bbb4@1.1
     // ccc@1.5 and ccc@3.0, the versions violating the allowlist, are gone.
     Selection.Result selectionResult = Selection.run(depGraph, overrides);
-    assertThat(selectionResult.getResolvedDepGraph().entrySet())
+    assertThat(selectionResult.resolvedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)
@@ -1207,7 +1204,7 @@
             InterimModuleBuilder.create("ccc", "2.0", 2).buildEntry())
         .inOrder();
 
-    assertThat(selectionResult.getUnprunedDepGraph().entrySet())
+    assertThat(selectionResult.unprunedDepGraph().entrySet())
         .containsExactly(
             InterimModuleBuilder.create("aaa", Version.EMPTY)
                 .setKey(ModuleKey.ROOT)

diff --git a/src/test/java/com/google/devtools/build/lib/buildtool/SubcommandEventTest.java b/src/test/java/com/google/devtools/build/lib/buildtool/SubcommandEventTest.java
index 8128e85..1a43838 100644
--- a/src/test/java/com/google/devtools/build/lib/buildtool/SubcommandEventTest.java
+++ b/src/test/java/com/google/devtools/build/lib/buildtool/SubcommandEventTest.java

@@ -77,7 +77,7 @@
     assertThat(
             new Command(new String[] {"/bin/sh", "-c", command})
                 .execute(new ByteArrayOutputStream(), new ByteArrayOutputStream())
-                .getTerminationStatus()
+                .terminationStatus()
                 .success())
         .isTrue();
     assertThat(helloOut.isFile()).isTrue();

diff --git a/src/test/java/com/google/devtools/build/lib/metrics/CgroupsInfoCollectorTest.java b/src/test/java/com/google/devtools/build/lib/metrics/CgroupsInfoCollectorTest.java
index d84c81b..cedf2a4 100644
--- a/src/test/java/com/google/devtools/build/lib/metrics/CgroupsInfoCollectorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/metrics/CgroupsInfoCollectorTest.java

@@ -55,7 +55,7 @@
         CgroupsInfoCollector.instance()
             .collectResourceUsage(
                 ImmutableMap.of(1L, cgroupsInfo1, 2L, cgroupsInfo2, 3L, cgroupsInfo3), clock);
-    assertThat(snapshot.getPidToMemoryInKb()).containsExactly(1L, 1000, 3L, 3000);
+    assertThat(snapshot.pidToMemoryInKb()).containsExactly(1L, 1000, 3L, 3000);
   }
 
   @Test
@@ -78,6 +78,6 @@
         CgroupsInfoCollector.instance().collectResourceUsage(pidToCgroups.buildOrThrow(), clock);
 
     // Results from cgroups 2 should not be in the snapshot since it doesn't exist.
-    assertThat(snapshot.getPidToMemoryInKb()).containsExactly(1L, 1000, 3L, 3000);
+    assertThat(snapshot.pidToMemoryInKb()).containsExactly(1L, 1000, 3L, 3000);
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/metrics/PsInfoCollectorTest.java b/src/test/java/com/google/devtools/build/lib/metrics/PsInfoCollectorTest.java
index acffcb9..e7ded2c 100644
--- a/src/test/java/com/google/devtools/build/lib/metrics/PsInfoCollectorTest.java
+++ b/src/test/java/com/google/devtools/build/lib/metrics/PsInfoCollectorTest.java

@@ -90,6 +90,6 @@
 
     ImmutableMap<Long, Integer> expectedMemoryUsageByPid =
         ImmutableMap.of(1L, 3216 + 1234 + 2345 + 3456, 2L, 4232 + 1001 + 1032, 5L, 40000);
-    assertThat(resourceSnapshot.getPidToMemoryInKb()).isEqualTo(expectedMemoryUsageByPid);
+    assertThat(resourceSnapshot.pidToMemoryInKb()).isEqualTo(expectedMemoryUsageByPid);
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/profiler/MemoryProfilerTest.java b/src/test/java/com/google/devtools/build/lib/profiler/MemoryProfilerTest.java
index 56e2f3f..aee991c 100644
--- a/src/test/java/com/google/devtools/build/lib/profiler/MemoryProfilerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/profiler/MemoryProfilerTest.java

@@ -55,8 +55,8 @@
     RecordingSleeper sleeper = new RecordingSleeper();
     MemoryProfiler.HeapAndNonHeap result =
         profiler.prepareBeanAndGetLocalMinUsage(ProfilePhase.ANALYZE, bean, sleeper);
-    assertThat(result.getHeap()).isSameInstanceAs(heapUsage);
-    assertThat(result.getNonHeap()).isSameInstanceAs(nonHeapUsage);
+    assertThat(result.heap()).isSameInstanceAs(heapUsage);
+    assertThat(result.nonHeap()).isSameInstanceAs(nonHeapUsage);
     assertThat(sleeper.sleeps).isEmpty();
     verify(bean, times(1)).gc();
     profiler.prepareBeanAndGetLocalMinUsage(ProfilePhase.FINISH, bean, sleeper);
@@ -78,8 +78,8 @@
     RecordingSleeper sleeper = new RecordingSleeper();
     MemoryProfiler.HeapAndNonHeap result =
         profiler.prepareBeanAndGetLocalMinUsage(ProfilePhase.ANALYZE, bean, sleeper);
-    assertThat(result.getHeap()).isSameInstanceAs(emptyHeap);
-    assertThat(result.getNonHeap()).isSameInstanceAs(emptyNonHeap);
+    assertThat(result.heap()).isSameInstanceAs(emptyHeap);
+    assertThat(result.nonHeap()).isSameInstanceAs(emptyNonHeap);
     assertThat(sleeper.sleeps).isEmpty();
     verify(bean, times(1)).gc();
     verify(bean, times(1)).getHeapMemoryUsage();
@@ -91,8 +91,8 @@
     when(bean.getNonHeapMemoryUsage())
         .thenReturn(new MemoryUsage(1, 1, 1, 1), nonHeapUsage, new MemoryUsage(2, 2, 2, 2));
     result = profiler.prepareBeanAndGetLocalMinUsage(ProfilePhase.FINISH, bean, sleeper);
-    assertThat(result.getHeap()).isSameInstanceAs(heapUsage);
-    assertThat(result.getNonHeap()).isSameInstanceAs(nonHeapUsage);
+    assertThat(result.heap()).isSameInstanceAs(heapUsage);
+    assertThat(result.nonHeap()).isSameInstanceAs(nonHeapUsage);
     assertThat(sleeper.sleeps)
         .containsExactly(Duration.ofSeconds(10), Duration.ofSeconds(10))
         .inOrder();
@@ -118,8 +118,8 @@
     RecordingSleeper sleeper = new RecordingSleeper();
     MemoryProfiler.HeapAndNonHeap result =
         profiler.prepareBeanAndGetLocalMinUsage(ProfilePhase.ANALYZE, bean, sleeper);
-    assertThat(result.getHeap()).isSameInstanceAs(heapUsage);
-    assertThat(result.getNonHeap()).isSameInstanceAs(nonHeapUsage);
+    assertThat(result.heap()).isSameInstanceAs(heapUsage);
+    assertThat(result.nonHeap()).isSameInstanceAs(nonHeapUsage);
     assertThat(sleeper.sleeps).isEmpty();
 
     verify(bean, times(1)).gc();

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoCodecTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoCodecTest.java
index 99d1d67..1e64139 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoCodecTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoCodecTest.java

@@ -99,10 +99,10 @@
                   inInfo.getProvider(JavaCompilationArgsProvider.class);
               JavaCompilationArgsProvider outProvider =
                   outInfo.getProvider(JavaCompilationArgsProvider.class);
-              assertThat(inProvider.getRuntimeJars().toList()).hasSize(4);
-              assertThat(Dumper.dumpStructureWithEquivalenceReduction(inProvider.getRuntimeJars()))
+              assertThat(inProvider.runtimeJars().toList()).hasSize(4);
+              assertThat(Dumper.dumpStructureWithEquivalenceReduction(inProvider.runtimeJars()))
                   .isEqualTo(
-                      Dumper.dumpStructureWithEquivalenceReduction(outProvider.getRuntimeJars()));
+                      Dumper.dumpStructureWithEquivalenceReduction(outProvider.runtimeJars()));
             })
         .runTests();
   }

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java
index 6f3f05d..2aa0bf2 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaInfoStarlarkApiTest.java

@@ -73,13 +73,13 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
   }
 
@@ -104,14 +104,14 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib-ijar.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib-ijar.jar");
   }
 
@@ -142,10 +142,10 @@
     assertThat(prettyArtifactNames(javaRuleOutputJarsProvider.getAllClassOutputJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
 
-    assertThat(javaRuleOutputJarsProvider.getJavaOutputs()).hasSize(1);
-    JavaOutput javaOutput = javaRuleOutputJarsProvider.getJavaOutputs().get(0);
+    assertThat(javaRuleOutputJarsProvider.javaOutputs()).hasSize(1);
+    JavaOutput javaOutput = javaRuleOutputJarsProvider.javaOutputs().get(0);
 
-    assertThat(javaOutput.getCompileJar().prettyPrint())
+    assertThat(javaOutput.compileJar().prettyPrint())
         .isEqualTo("foo/my_starlark_rule_lib-ijar.jar");
   }
 
@@ -175,13 +175,13 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
   }
 
@@ -211,13 +211,13 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
   }
 
@@ -279,12 +279,12 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars())).isEmpty();
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars())).isEmpty();
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_direct-hjar.jar");
   }
 
@@ -307,10 +307,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
   }
 
@@ -333,10 +333,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
   }
 
@@ -371,10 +371,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
   }
 
@@ -410,10 +410,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_lib-src.jar");
   }
 
@@ -443,10 +443,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
   }
 
@@ -476,10 +476,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar", "foo/libmy_java_lib_direct-src.jar");
   }
 
@@ -515,10 +515,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly(
             "foo/my_starlark_rule_src.jar",
             "foo/libmy_java_lib_direct-src.jar",
@@ -558,10 +558,10 @@
     JavaSourceJarsProvider sourceJarsProvider =
         fetchJavaInfo().getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.sourceJars()))
         .containsExactly("foo/my_starlark_rule_src.jar");
 
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly(
             "foo/my_starlark_rule_src.jar",
             "foo/libmy_java_lib_direct-src.jar",
@@ -596,18 +596,18 @@
     JavaSourceJarsProvider javaSourceJarsProvider =
         javaInfo.getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(javaSourceJarsProvider.getSourceJars()).isEmpty();
+    assertThat(javaSourceJarsProvider.sourceJars()).isEmpty();
 
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_exports-hjar.jar");
   }
 
@@ -654,24 +654,24 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a-hjar.jar",
             "foo/libmy_java_lib_b-hjar.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a.jar",
             "foo/libmy_java_lib_b.jar",
             "foo/libmy_java_lib_c.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a-hjar.jar",
@@ -734,17 +734,17 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         javaInfo.getProvider(JavaCompilationArgsProvider.class);
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a-hjar.jar",
             "foo/libmy_java_lib_b-hjar.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar", "foo/libmy_java_lib_a.jar", "foo/libmy_java_lib_b.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a.jar",
@@ -752,7 +752,7 @@
             "foo/libmy_java_lib_c.jar",
             "foo/libmy_java_lib_d.jar");
 
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly(
             "foo/my_starlark_rule_lib.jar",
             "foo/libmy_java_lib_a-hjar.jar",
@@ -851,13 +851,13 @@
 
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         fetchJavaInfo().getProvider(JavaCompilationArgsProvider.class);
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectFullCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directFullCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib-stamped.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.runtimeJars()))
         .containsExactly("foo/my_starlark_rule_lib.jar");
-    assertThat(prettyArtifactNames(javaCompilationArgsProvider.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(javaCompilationArgsProvider.transitiveCompileTimeJars()))
         .containsExactly("foo/my_starlark_rule_lib-stamped.jar");
   }
 
@@ -894,8 +894,8 @@
         .containsExactly("foo/my_starlark_rule_src.jar");
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getJdeps)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::jdeps)
                     .collect(toImmutableList())))
         .containsExactly("foo/my_jdeps.pb");
   }
@@ -931,14 +931,14 @@
 
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getGeneratedClassJar)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::generatedClassJar)
                     .collect(toImmutableList())))
         .containsExactly("foo/generated_class.jar");
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getGeneratedSourceJar)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::generatedSourceJar)
                     .collect(toImmutableList())))
         .containsExactly("foo/generated_srcs.jar");
   }
@@ -1004,8 +1004,8 @@
 
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getCompileJdeps)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::compileJdeps)
                     .collect(toImmutableList())))
         .containsExactly("foo/compile.deps");
   }
@@ -1040,8 +1040,8 @@
 
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getNativeHeadersJar)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::nativeHeadersJar)
                     .collect(toImmutableList())))
         .containsExactly("foo/nativeheaders.jar");
   }
@@ -1076,8 +1076,8 @@
 
     assertThat(
             prettyArtifactNames(
-                ruleOutputs.getJavaOutputs().stream()
-                    .map(JavaOutput::getManifestProto)
+                ruleOutputs.javaOutputs().stream()
+                    .map(JavaOutput::manifestProto)
                     .collect(toImmutableList())))
         .containsExactly("foo/manifest.proto");
   }
@@ -1228,7 +1228,7 @@
 
     assertThat(pluginInfo).isNotNull();
     assertThat(pluginInfo.getJavaOutputs()).hasSize(1);
-    assertThat(pluginInfo.getJavaOutputs().get(0).getClassJar()).isEqualTo(classJar);
+    assertThat(pluginInfo.getJavaOutputs().get(0).classJar()).isEqualTo(classJar);
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
index 174ae0d..1fe6dbd 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaStarlarkApiTest.java

@@ -331,14 +331,14 @@
         .containsExactly("libdep.jar");
     assertThat(artifactFilesNames(sourceJars)).containsExactly("libdep-src.jar");
 
-    assertThat(outputs.getJavaOutputs()).hasSize(1);
-    JavaOutput javaOutput = outputs.getJavaOutputs().get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libdep.jar");
-    assertThat(javaOutput.getCompileJar().getFilename()).isEqualTo("libdep-hjar.jar");
+    assertThat(outputs.javaOutputs()).hasSize(1);
+    JavaOutput javaOutput = outputs.javaOutputs().get(0);
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libdep.jar");
+    assertThat(javaOutput.compileJar().getFilename()).isEqualTo("libdep-hjar.jar");
     assertThat(artifactFilesNames(javaOutput.getSourceJarsAsList()))
         .containsExactly("libdep-src.jar");
-    assertThat(javaOutput.getJdeps().getFilename()).isEqualTo("libdep.jdeps");
-    assertThat(javaOutput.getCompileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
+    assertThat(javaOutput.jdeps().getFilename()).isEqualTo("libdep.jdeps");
+    assertThat(javaOutput.compileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
   }
 
   @Test
@@ -393,12 +393,12 @@
 
     assertThat(javaOutputs.size()).isEqualTo(1);
     JavaOutput javaOutput = javaOutputs.get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libdep.jar");
-    assertThat(javaOutput.getCompileJar().getFilename()).isEqualTo("libdep-hjar.jar");
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libdep.jar");
+    assertThat(javaOutput.compileJar().getFilename()).isEqualTo("libdep-hjar.jar");
     assertThat(artifactFilesNames(javaOutput.getSourceJarsAsList()))
         .containsExactly("libdep-src.jar");
-    assertThat(javaOutput.getJdeps().getFilename()).isEqualTo("libdep.jdeps");
-    assertThat(javaOutput.getCompileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
+    assertThat(javaOutput.jdeps().getFilename()).isEqualTo("libdep.jdeps");
+    assertThat(javaOutput.compileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
   }
 
   @Test
@@ -522,17 +522,16 @@
 
     JavaRuleOutputJarsProvider outputs =
         JavaRuleOutputJarsProvider.fromStarlark(info.getValue("outputs"));
-    assertThat(outputs.getJavaOutputs()).hasSize(1);
+    assertThat(outputs.javaOutputs()).hasSize(1);
 
-    JavaOutput javaOutput = outputs.getJavaOutputs().get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libdep.jar");
-    assertThat(javaOutput.getCompileJar().getFilename()).isEqualTo("libdep-hjar.jar");
+    JavaOutput javaOutput = outputs.javaOutputs().get(0);
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libdep.jar");
+    assertThat(javaOutput.compileJar().getFilename()).isEqualTo("libdep-hjar.jar");
     assertThat(prettyArtifactNames(javaOutput.getSourceJarsAsList()))
         .containsExactly("java/test/libdep-src.jar");
-    assertThat(javaOutput.getJdeps().getFilename()).isEqualTo("libdep.jdeps");
-    assertThat(javaOutput.getNativeHeadersJar().getFilename())
-        .isEqualTo("libdep-native-header.jar");
-    assertThat(javaOutput.getCompileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
+    assertThat(javaOutput.jdeps().getFilename()).isEqualTo("libdep.jdeps");
+    assertThat(javaOutput.nativeHeadersJar().getFilename()).isEqualTo("libdep-native-header.jar");
+    assertThat(javaOutput.compileJdeps().getFilename()).isEqualTo("libdep-hjar.jdeps");
   }
 
   @Test
@@ -606,7 +605,7 @@
     JavaCompilationInfoProvider compilationInfo = info.getCompilationInfoProvider();
     JavaSourceJarsProvider sourceJarsProvider = info.getProvider(JavaSourceJarsProvider.class);
 
-    assertThat(prettyArtifactNames(compilationArgs.getRuntimeJars()))
+    assertThat(prettyArtifactNames(compilationArgs.runtimeJars()))
         .containsExactly(
             "java/test/libcustom.jar", "java/test/libdep.jar", "java/test/libruntime.jar")
         .inOrder();
@@ -619,7 +618,7 @@
         .containsExactly(
             "java/test/libcustom.jar", "java/test/libruntime.jar", "java/test/libdep.jar")
         .inOrder();
-    assertThat(prettyArtifactNames(sourceJarsProvider.getTransitiveSourceJars()))
+    assertThat(prettyArtifactNames(sourceJarsProvider.transitiveSourceJars()))
         .containsExactly(
             "java/test/libruntime-src.jar",
             "java/test/libdep-src.jar",
@@ -987,11 +986,11 @@
     ImmutableList<JavaOutput> javaOutputs = info.getJavaOutputs();
     assertThat(javaOutputs).hasSize(1);
     JavaOutput javaOutput = javaOutputs.get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libcustom.jar");
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libcustom.jar");
     assertThat(javaOutput.getSrcJar().getFilename()).isEqualTo("libcustom-src.jar");
-    assertThat(javaOutput.getCompileJar().getFilename()).isEqualTo("libcustom-hjar.jar");
-    assertThat(javaOutput.getJdeps().getFilename()).isEqualTo("libcustom.jdeps");
-    assertThat(javaOutput.getCompileJdeps().getFilename()).isEqualTo("libcustom-hjar.jdeps");
+    assertThat(javaOutput.compileJar().getFilename()).isEqualTo("libcustom-hjar.jar");
+    assertThat(javaOutput.jdeps().getFilename()).isEqualTo("libcustom.jdeps");
+    assertThat(javaOutput.compileJdeps().getFilename()).isEqualTo("libcustom-hjar.jdeps");
   }
 
   @Test
@@ -1041,7 +1040,7 @@
     ImmutableList<JavaOutput> javaOutputs = info.getJavaOutputs();
     assertThat(javaOutputs).hasSize(1);
     JavaOutput javaOutput = javaOutputs.get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libcustom.jar");
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libcustom.jar");
     assertThat(javaOutput.getSrcJar().getFilename()).isEqualTo("libcustom-src.jar");
   }
 
@@ -1097,11 +1096,11 @@
     ImmutableList<JavaOutput> javaOutputs = info.getJavaOutputs();
     assertThat(javaOutputs).hasSize(1);
     JavaOutput javaOutput = javaOutputs.get(0);
-    assertThat(javaOutput.getClassJar().getFilename()).isEqualTo("libcustom.jar");
+    assertThat(javaOutput.classJar().getFilename()).isEqualTo("libcustom.jar");
     assertThat(javaOutput.getSrcJar().getFilename()).isEqualTo("libcustom-mysrc.jar");
-    assertThat(javaOutput.getCompileJar().getFilename()).isEqualTo("libcustom-hjar.jar");
-    assertThat(javaOutput.getJdeps().getFilename()).isEqualTo("libcustom.jdeps");
-    assertThat(javaOutput.getCompileJdeps().getFilename()).isEqualTo("libcustom-hjar.jdeps");
+    assertThat(javaOutput.compileJar().getFilename()).isEqualTo("libcustom-hjar.jar");
+    assertThat(javaOutput.jdeps().getFilename()).isEqualTo("libcustom.jdeps");
+    assertThat(javaOutput.compileJdeps().getFilename()).isEqualTo("libcustom-hjar.jdeps");
   }
 
   @Test
@@ -1779,10 +1778,10 @@
     // Extract out information from native rule
     JavaCompilationArgsProvider jlJavaCompilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, javaLibraryTarget);
-    NestedSet<Artifact> jlCompileJars = jlJavaCompilationArgsProvider.getDirectCompileTimeJars();
-    NestedSet<Artifact> jlTransitiveRuntimeJars = jlJavaCompilationArgsProvider.getRuntimeJars();
+    NestedSet<Artifact> jlCompileJars = jlJavaCompilationArgsProvider.directCompileTimeJars();
+    NestedSet<Artifact> jlTransitiveRuntimeJars = jlJavaCompilationArgsProvider.runtimeJars();
     NestedSet<Artifact> jlTransitiveCompileTimeJars =
-        jlJavaCompilationArgsProvider.getTransitiveCompileTimeJars();
+        jlJavaCompilationArgsProvider.transitiveCompileTimeJars();
 
     // Using reference equality since should be precisely identical
     assertThat(myCompileJars).isSameInstanceAs(jlCompileJars);
@@ -1964,7 +1963,7 @@
     ConfiguredTarget jlExports = getConfiguredTarget("//foo:lib_exports");
     JavaCompilationArgsProvider jlExportsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jlExports);
-    assertThat(prettyArtifactNames(jlExportsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(jlExportsProvider.runtimeJars()))
         .containsAtLeast(
             "foo/libjl_bottom_for_deps.jar",
             "foo/libjl_bottom_for_runtime_deps.jar",
@@ -1974,7 +1973,7 @@
     ConfiguredTarget jlTop = getConfiguredTarget("//foo:lib_interm");
     JavaCompilationArgsProvider jlTopProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jlTop);
-    assertThat(prettyArtifactNames(jlTopProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(jlTopProvider.runtimeJars()))
         .contains("foo/libjl_bottom_for_exports.jar");
   }
 
@@ -2089,7 +2088,7 @@
     ConfiguredTarget importTarget = getConfiguredTarget("//foo:import");
     JavaCompilationArgsProvider compilationProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, importTarget);
-    assertThat(prettyArtifactNames(compilationProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(compilationProvider.runtimeJars()))
         .containsAtLeast("foo/libjl_bottom_for_deps.jar", "foo/libjl_bottom_for_runtime_deps.jar");
   }
 
@@ -3441,7 +3440,7 @@
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, myRuleTarget);
     List<String> directJars =
-        prettyArtifactNames(javaCompilationArgsProvider.getDirectCompileTimeJars());
+        prettyArtifactNames(javaCompilationArgsProvider.directCompileTimeJars());
     assertThat(directJars).containsExactly("foo/liba-hjar.jar");
   }
 
@@ -3493,7 +3492,7 @@
     ConfiguredTarget myRuleTarget = getConfiguredTarget("//foo:custom");
     JavaCompilationArgsProvider javaCompilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, myRuleTarget);
-    List<String> directJars = prettyArtifactNames(javaCompilationArgsProvider.getRuntimeJars());
+    List<String> directJars = prettyArtifactNames(javaCompilationArgsProvider.runtimeJars());
     assertThat(directJars).containsExactly("foo/liba.jar", "foo/libb.jar");
   }
 
@@ -3693,10 +3692,10 @@
   private static boolean javaCompilationArgsHaveTheSameParent(
       JavaCompilationArgsProvider args, JavaCompilationArgsProvider otherArgs) {
     if (!nestedSetsOfArtifactHaveTheSameParent(
-        args.getTransitiveCompileTimeJars(), otherArgs.getTransitiveCompileTimeJars())) {
+        args.transitiveCompileTimeJars(), otherArgs.transitiveCompileTimeJars())) {
       return false;
     }
-    if (!nestedSetsOfArtifactHaveTheSameParent(args.getRuntimeJars(), otherArgs.getRuntimeJars())) {
+    if (!nestedSetsOfArtifactHaveTheSameParent(args.runtimeJars(), otherArgs.runtimeJars())) {
       return false;
     }
     return true;
@@ -3779,9 +3778,9 @@
     assertThat(prettyArtifactNames(info.getTransitiveSourceJars().getSet(Artifact.class)))
         .containsExactly("java/test/amazing-src.jar", "java/test/libdep-src.jar");
     JavaCompilationArgsProvider provider = info.getProvider(JavaCompilationArgsProvider.class);
-    assertThat(prettyArtifactNames(provider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(provider.directCompileTimeJars()))
         .containsExactly("java/test/amazing-hjar.jar", "java/test/libdep-hjar.jar");
-    assertThat(prettyArtifactNames(provider.getCompileTimeJavaDependencyArtifacts()))
+    assertThat(prettyArtifactNames(provider.compileTimeJavaDependencyArtifacts()))
         .containsExactly("java/test/amazing-hjar.jdeps", "java/test/libdep-hjar.jdeps");
   }
 
@@ -3825,7 +3824,7 @@
     ImmutableList<JavaOutput> javaOutputs = info.getJavaOutputs();
     assertThat(javaOutputs).hasSize(1);
     JavaOutput output = javaOutputs.get(0);
-    assertThat(output.getManifestProto().getFilename()).isEqualTo("libb.jar_manifest_proto");
+    assertThat(output.manifestProto().getFilename()).isEqualTo("libb.jar_manifest_proto");
   }
 
   @Test
@@ -3938,8 +3937,8 @@
     ImmutableList<JavaOutput> javaOutputs = info.getJavaOutputs();
     assertThat(javaOutputs).hasSize(1);
     JavaOutput output = javaOutputs.get(0);
-    assertThat(output.getClassJar().getFilename()).isEqualTo("libc.jar");
-    assertThat(output.getCompileJar()).isNull();
+    assertThat(output.classJar().getFilename()).isEqualTo("libc.jar");
+    assertThat(output.compileJar()).isNull();
   }
 
   @Test

diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
index 00153ca..6d2ee0c 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/StarlarkJavaLiteProtoLibraryTest.java

@@ -250,11 +250,11 @@
     JavaCompilationArgsProvider compilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, target);
     assertThat(compilationArgsProvider).isNotNull();
-    assertThat(compilationArgsProvider.getDirectCompileTimeJars()).isNotNull();
+    assertThat(compilationArgsProvider.directCompileTimeJars()).isNotNull();
     JavaSourceJarsProvider sourceJarsProvider =
         JavaInfo.getProvider(JavaSourceJarsProvider.class, target);
     assertThat(sourceJarsProvider).isNotNull();
-    assertThat(sourceJarsProvider.getSourceJars()).isNotNull();
+    assertThat(sourceJarsProvider.sourceJars()).isNotNull();
   }
 
   @Test
@@ -293,7 +293,7 @@
 
     List<String> directJars =
         prettyArtifactNames(
-            JavaInfo.getProvider(JavaCompilationArgsProvider.class, litepb2).getRuntimeJars());
+            JavaInfo.getProvider(JavaCompilationArgsProvider.class, litepb2).runtimeJars());
     assertThat(directJars)
         .containsExactly("cross/libbravo-lite.jar", "protobuf/libjavalite_runtime.jar");
   }
@@ -496,7 +496,7 @@
             JavaCompilationArgsProvider.class, getConfiguredTarget("//x:foo_java_proto_lite"));
 
     Iterable<String> directJars =
-        prettyArtifactNames(compilationArgsProvider.getDirectCompileTimeJars());
+        prettyArtifactNames(compilationArgsProvider.directCompileTimeJars());
 
     assertThat(directJars).containsExactly("x/libbar_proto-lite-hjar.jar");
   }

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandLargeInputsTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandLargeInputsTest.java
index 1fd9dd1..726890f 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandLargeInputsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandLargeInputsTest.java

@@ -64,7 +64,7 @@
 
     CommandResult result =
         command.executeAsync(in, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().getRawExitCode()).isEqualTo(0);
+    assertThat(result.terminationStatus().getRawExitCode()).isEqualTo(0);
     TestUtil.assertArrayEquals(randomBytes, result.getStdout());
     assertThat(result.getStderr()).isEmpty();
    }
@@ -77,7 +77,7 @@
 
     CommandResult result =
         command.executeAsync(in, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().getRawExitCode()).isEqualTo(0);
+    assertThat(result.terminationStatus().getRawExitCode()).isEqualTo(0);
     TestUtil.assertArrayEquals(randomBytes, result.getStderr());
     assertThat(result.getStdout()).isEmpty();
    }
@@ -92,7 +92,7 @@
 
     CommandResult result =
         command.executeAsync(in, out, err, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().getRawExitCode()).isEqualTo(0);
+    assertThat(result.terminationStatus().getRawExitCode()).isEqualTo(0);
     assertThat(err.toByteArray()).isEmpty();
     TestUtil.assertArrayEquals(randomBytes, out.toByteArray());
     assertOutAndErrNotAvailable(result);
@@ -108,7 +108,7 @@
 
     CommandResult result =
         command.executeAsync(in, out, err, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().getRawExitCode()).isEqualTo(0);
+    assertThat(result.terminationStatus().getRawExitCode()).isEqualTo(0);
     assertThat(out.toByteArray()).isEmpty();
     TestUtil.assertArrayEquals(randomBytes, err.toByteArray());
     assertOutAndErrNotAvailable(result);
@@ -145,7 +145,7 @@
 
     CommandResult result =
         command.executeAsync(in, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().getRawExitCode()).isEqualTo(0);
+    assertThat(result.terminationStatus().getRawExitCode()).isEqualTo(0);
     assertThat(result.getStderr()).isEmpty();
     TestUtil.assertArrayEquals(allByteValues, result.getStdout());
   }

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java
index 685389d..e6f60ac 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandResultTest.java

@@ -73,9 +73,9 @@
             .setStderrStream(CommandResult.EMPTY_OUTPUT)
             .setTerminationStatus(new TerminationStatus(0, false))
             .build();
-    assertThat(commandResult.getWallExecutionTime()).isEmpty();
-    assertThat(commandResult.getUserExecutionTime()).isEmpty();
-    assertThat(commandResult.getSystemExecutionTime()).isEmpty();
+    assertThat(commandResult.wallExecutionTime()).isEmpty();
+    assertThat(commandResult.userExecutionTime()).isEmpty();
+    assertThat(commandResult.systemExecutionTime()).isEmpty();
   }
 
   @Test
@@ -89,8 +89,8 @@
             .setUserExecutionTime(Duration.ofMillis(1492))
             .setSystemExecutionTime(Duration.ofMillis(1787))
             .build();
-    assertThat(commandResult.getWallExecutionTime()).hasValue(Duration.ofMillis(1929));
-    assertThat(commandResult.getUserExecutionTime()).hasValue(Duration.ofMillis(1492));
-    assertThat(commandResult.getSystemExecutionTime()).hasValue(Duration.ofMillis(1787));
+    assertThat(commandResult.wallExecutionTime()).hasValue(Duration.ofMillis(1929));
+    assertThat(commandResult.userExecutionTime()).hasValue(Duration.ofMillis(1492));
+    assertThat(commandResult.systemExecutionTime()).hasValue(Duration.ofMillis(1787));
   }
 }

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
index 4952846..1f699d5 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java

@@ -84,7 +84,7 @@
   public void testSimpleCommand() throws Exception {
     Command command = new Command(new String[] {"ls"});
     CommandResult result = command.execute();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(result.getStderr()).isEmpty();
     assertThat(result.getStdout().length).isGreaterThan(0);
   }
@@ -138,7 +138,7 @@
   public void testRawCommand() throws Exception {
     Command command = new Command(new String[] { "perl", "-e", "print 'a'x100000" });
     CommandResult result = command.execute();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(result.getStderr()).isEmpty();
     assertThat(result.getStdout().length).isGreaterThan(0);
   }
@@ -154,7 +154,7 @@
   public void testHugeOutput() throws Exception {
     Command command = new Command(new String[] {"perl", "-e", "print 'a'x100000"});
     CommandResult result = command.execute();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(result.getStderr()).isEmpty();
     assertThat(result.getStdout()).hasLength(100000);
   }
@@ -168,7 +168,7 @@
     CommandResult result = command
         .executeAsync(emptyInput, out, err, Command.KILL_SUBPROCESS_ON_INTERRUPT)
         .get();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(out.toString("UTF-8")).isEmpty();
     assertThat(err.toString("UTF-8")).isEmpty();
   }
@@ -177,7 +177,7 @@
   public void testNoInputForCat() throws Exception {
     Command command = new Command(new String[]{"/bin/cat"});
     CommandResult result = command.execute();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(new String(result.getStdout(), "UTF-8")).isEmpty();
     assertThat(new String(result.getStderr(), "UTF-8")).isEmpty();
   }
@@ -255,7 +255,7 @@
     {
       String[] args = { "/bin/sh", "-c", "exit 0" };
       CommandResult result = new Command(args).execute();
-      TerminationStatus status = result.getTerminationStatus();
+      TerminationStatus status = result.terminationStatus();
       assertThat(status.success()).isTrue();
       assertThat(status.exited()).isTrue();
       assertThat(status.getExitCode()).isEqualTo(0);
@@ -272,7 +272,7 @@
               () -> new Command(args).execute());
       assertThat(e).hasMessageThat().isEqualTo("Process exited with status " + exit);
         checkCommandElements(e, "/bin/sh", "-c", "exit " + exit);
-        TerminationStatus status = e.getResult().getTerminationStatus();
+      TerminationStatus status = e.getResult().terminationStatus();
         assertThat(status.success()).isFalse();
         assertThat(status.exited()).isTrue();
         assertThat(status.getExitCode()).isEqualTo(exit);
@@ -290,7 +290,7 @@
               () -> new Command(args).execute());
       assertThat(e).hasMessageThat().isEqualTo("Process exited with status " + expected);
         checkCommandElements(e, "/bin/bash", "-c", "exit " + exit);
-        TerminationStatus status = e.getResult().getTerminationStatus();
+      TerminationStatus status = e.getResult().terminationStatus();
         assertThat(status.success()).isFalse();
         assertThat(status.exited()).isTrue();
         assertThat(status.getExitCode()).isEqualTo(expected);
@@ -315,7 +315,7 @@
               () -> new Command(args).execute());
       assertThat(e).hasMessageThat().isEqualTo("Process terminated by signal " + signal);
         checkCommandElements(e, killmyself, "" + signal);
-        TerminationStatus status = e.getResult().getTerminationStatus();
+      TerminationStatus status = e.getResult().terminationStatus();
         assertThat(status.success()).isFalse();
         assertThat(status.exited()).isFalse();
         assertThat(status.getTerminatingSignal()).isEqualTo(signal);
@@ -344,7 +344,7 @@
 
     CommandResult result =
         command.executeAsync(in, out, out, Command.KILL_SUBPROCESS_ON_INTERRUPT).get();
-    TerminationStatus status = result.getTerminationStatus();
+    TerminationStatus status = result.terminationStatus();
     assertThat(status.success()).isTrue();
   }
 
@@ -406,7 +406,7 @@
     AbnormalTerminationException e =
         assertThrows(AbnormalTerminationException.class, () -> command.execute(out, out));
     checkCommandElements(e, "cat", "/dev/thisisnotreal");
-      TerminationStatus status = e.getResult().getTerminationStatus();
+    TerminationStatus status = e.getResult().terminationStatus();
       // Subprocess either gets a SIGPIPE trying to write to our output stream,
       // or it exits with failure.  Both are observed, nondetermistically.
       assertThat(status.exited() ? status.getExitCode() == 1 : status.getTerminatingSignal() == 13)
@@ -425,12 +425,12 @@
 
   private static void checkATE(final AbnormalTerminationException ate) {
     final CommandResult result = ate.getResult();
-    assertThat(result.getTerminationStatus().success()).isFalse();
+    assertThat(result.terminationStatus().success()).isFalse();
   }
 
   private static void checkSuccess(final CommandResult result,
                                    final String expectedOutput) {
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(result.getStderr()).isEmpty();
     assertThat(new String(result.getStdout())).isEqualTo(expectedOutput);
   }

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java
index e55e690..e90eb0d 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingLinuxSandboxTest.java

@@ -62,8 +62,8 @@
     Command command = new Command(commandArguments.toArray(new String[0]));
     CommandResult commandResult = command.execute();
 
-    assertThat(commandResult.getTerminationStatus().success()).isTrue();
-    assertThat(commandResult.getStdoutStream().toString()).contains("colorless green ideas");
+    assertThat(commandResult.terminationStatus().success()).isTrue();
+    assertThat(commandResult.stdoutStream().toString()).contains("colorless green ideas");
   }
 
   @Test
@@ -82,8 +82,8 @@
     Command command = new Command(fullCommandLine.toArray(new String[0]));
     CommandResult commandResult = command.execute();
 
-    assertThat(commandResult.getTerminationStatus().success()).isTrue();
-    assertThat(commandResult.getStdoutStream().toString()).contains("sleep furiously");
+    assertThat(commandResult.terminationStatus().success()).isTrue();
+    assertThat(commandResult.stdoutStream().toString()).contains("sleep furiously");
   }
 
   private void checkLinuxSandboxStatistics(Duration userTimeToSpend, Duration systemTimeToSpend)

diff --git a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java
index 8962489..3ddc940 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandUsingProcessWrapperTest.java

@@ -63,8 +63,8 @@
     Command command = new Command(commandArguments.toArray(new String[0]));
     CommandResult commandResult = command.execute();
 
-    assertThat(commandResult.getTerminationStatus().success()).isTrue();
-    assertThat(commandResult.getStdoutStream().toString()).contains("worker bees can leave");
+    assertThat(commandResult.terminationStatus().success()).isTrue();
+    assertThat(commandResult.stdoutStream().toString()).contains("worker bees can leave");
   }
 
   @Test
@@ -76,8 +76,8 @@
     Command command = new Command(fullCommandLine.toArray(new String[0]));
     CommandResult commandResult = command.execute();
 
-    assertThat(commandResult.getTerminationStatus().success()).isTrue();
-    assertThat(commandResult.getStdoutStream().toString()).contains("even drones can fly away");
+    assertThat(commandResult.terminationStatus().success()).isTrue();
+    assertThat(commandResult.stdoutStream().toString()).contains("even drones can fly away");
   }
 
   private void checkProcessWrapperStatistics(Duration userTimeToSpend, Duration systemTimeToSpend)

diff --git a/src/test/java/com/google/devtools/build/lib/shell/ExecutionStatisticsTestUtil.java b/src/test/java/com/google/devtools/build/lib/shell/ExecutionStatisticsTestUtil.java
index 7ba632d..a47830d 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/ExecutionStatisticsTestUtil.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/ExecutionStatisticsTestUtil.java

@@ -51,7 +51,7 @@
 
     Command command = new Command(fullCommandLine.toArray(new String[0]));
     CommandResult commandResult = command.execute();
-    assertThat(commandResult.getTerminationStatus().success()).isTrue();
+    assertThat(commandResult.terminationStatus().success()).isTrue();
 
     Optional<ExecutionStatistics.ResourceUsage> resourceUsage =
         ExecutionStatistics.getResourceUsage(statisticsFilePath);

diff --git a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
index c28ba28..f09f299 100644
--- a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
+++ b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java

@@ -101,7 +101,7 @@
 
     CommandResult result =
         command.executeAsync(Command.NO_INPUT, Command.CONTINUE_SUBPROCESS_ON_INTERRUPT).get();
-    assertThat(result.getTerminationStatus().success()).isTrue();
+    assertThat(result.terminationStatus().success()).isTrue();
     assertThat(new String(result.getStdout(), UTF_8)).isEqualTo("start\n");
     assertThat(new String(result.getStderr(), UTF_8)).isEqualTo("end\n");
     assertThat(Files.exists(tmpDir.resolve("endfile"))).isTrue();

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
index fed4285..d3db24d 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/FilesetEntryFunctionTest.java

@@ -209,7 +209,7 @@
             // Strip the metadata from the actual results.
             (input) ->
                 FilesetOutputSymlink.createAlreadyRelativizedForTesting(
-                    input.getName(), input.getTargetPath(), input.isRelativeToExecRoot()));
+                    input.name(), input.targetPath(), input.relativeToExecRoot()));
     assertThat(actual).containsExactlyElementsIn(expectedSymlinks).inOrder();
   }
 

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
index efa4603..f595871 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RepositoryMappingFunctionTest.java

@@ -640,10 +640,10 @@
         RepositoryMappingValue.Key.create(ruleClassProvider.getToolsRepository(), false);
     EvaluationResult<RepositoryMappingValue> builtinsResult = eval(builtinsKey);
     assertThat(builtinsResult.hasError()).isFalse();
-    RepositoryMapping builtinsMapping = builtinsResult.get(builtinsKey).getRepositoryMapping();
+    RepositoryMapping builtinsMapping = builtinsResult.get(builtinsKey).repositoryMapping();
     EvaluationResult<RepositoryMappingValue> toolsResult = eval(toolsKey);
     assertThat(toolsResult.hasError()).isFalse();
-    RepositoryMapping toolsMapping = toolsResult.get(toolsKey).getRepositoryMapping();
+    RepositoryMapping toolsMapping = toolsResult.get(toolsKey).repositoryMapping();
 
     assertThat(builtinsMapping.entries()).containsAtLeastEntriesIn(toolsMapping.entries());
     assertThat(builtinsMapping.get("_builtins")).isEqualTo(RepositoryName.create("_builtins"));

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java
index 421c8ee..6ffde3b 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/TreeArtifactValueTest.java

@@ -39,7 +39,6 @@
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.testing.junit.testparameterinjector.TestParameter;
 import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import java.io.IOException;
@@ -68,21 +67,6 @@
       requireNonNull(type, "type");
     }
 
-    @InlineMe(replacement = "this.parentRelativePath()")
-    PathFragment getParentRelativePath() {
-      return parentRelativePath();
-    }
-
-    @InlineMe(replacement = "this.type()")
-    Dirent.Type getType() {
-      return type();
-    }
-
-    @InlineMe(replacement = "this.traversedSymlink()")
-    boolean getTraversedSymlink() {
-      return traversedSymlink();
-    }
-
     static VisitTreeArgs of(
         PathFragment parentRelativePath, Dirent.Type type, boolean traversedSymlink) {
       return new VisitTreeArgs(parentRelativePath, type, traversedSymlink);

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/LostImportantOutputHandlerModule.java b/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/LostImportantOutputHandlerModule.java
index 0c5a648..7ec1bce 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/LostImportantOutputHandlerModule.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/rewinding/LostImportantOutputHandlerModule.java

@@ -187,7 +187,7 @@
           throw new IllegalStateException(e);
         }
         return links.stream()
-            .filter(FilesetOutputSymlink::isRelativeToExecRoot)
+            .filter(FilesetOutputSymlink::relativeToExecRoot)
             .map(
                 link ->
                     new OutputAndOwner(

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java
index 50ac0361..58c8035 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContextTest.java

@@ -19,7 +19,6 @@
 import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableClassToInstanceMap;
-import com.google.errorprone.annotations.InlineMe;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.CodedInputStream;
 import com.google.protobuf.CodedOutputStream;
@@ -42,11 +41,6 @@
       requireNonNull(dataToSerialize, "dataToSerialize");
     }
 
-    @InlineMe(replacement = "this.dataToSerialize()")
-    String getDataToSerialize() {
-      return dataToSerialize();
-    }
-
     static Example withData(String data) {
       return new Example(data);
     }
@@ -63,7 +57,7 @@
     public void serialize(SerializationContext context, Example obj, CodedOutputStream codedOut)
         throws IOException {
       exampleCodecSerializeCalls++;
-      codedOut.writeStringNoTag(obj.getDataToSerialize());
+      codedOut.writeStringNoTag(obj.dataToSerialize());
     }
 
     @Override
@@ -125,7 +119,7 @@
 
     CodedInputStream codedIn = CodedInputStream.newInstance(bytes.toByteArray());
     assertThat(codedIn.readSInt32()).isEqualTo(registry.getCodecDescriptorForObject(obj).tag());
-    assertThat(codedIn.readString()).isEqualTo(obj.getDataToSerialize());
+    assertThat(codedIn.readString()).isEqualTo(obj.dataToSerialize());
     assertThat(codedIn.isAtEnd()).isTrue();
   }
 
@@ -142,7 +136,7 @@
 
     CodedInputStream codedIn = CodedInputStream.newInstance(bytes.toByteArray());
     assertThat(codedIn.readSInt32()).isEqualTo(registry.getCodecDescriptorForObject(obj).tag());
-    assertThat(codedIn.readString()).isEqualTo(obj.getDataToSerialize());
+    assertThat(codedIn.readString()).isEqualTo(obj.dataToSerialize());
     assertThat(codedIn.isAtEnd()).isFalse();
     assertThat(exampleCodecSerializeCalls).isEqualTo(1);
   }

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainsForTargetsTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainsForTargetsTest.java
index 6459f15..3fdf113 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainsForTargetsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/toolchains/ToolchainsForTargetsTest.java

@@ -57,7 +57,6 @@
 import com.google.devtools.build.skyframe.SkyKey;
 import com.google.devtools.build.skyframe.SkyValue;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
-import com.google.errorprone.annotations.InlineMe;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -112,11 +111,6 @@
       requireNonNull(toolchainCollection, "toolchainCollection");
     }
 
-    @InlineMe(replacement = "this.toolchainCollection()")
-    ToolchainCollection<UnloadedToolchainContext> getToolchainCollection() {
-      return toolchainCollection();
-    }
-
     static Value create(ToolchainCollection<UnloadedToolchainContext> toolchainCollection) {
       return new Value(toolchainCollection);
     }
@@ -234,7 +228,7 @@
         SkyframeExecutorTestUtils.evaluate(skyframeExecutor, key, /*keepGoing=*/ false, reporter);
     // Test call has finished, to reset the state.
     skyframeExecutor.getSkyframeBuildView().enableAnalysis(false);
-    return evalResult.get(key).getToolchainCollection();
+    return evalResult.get(key).toolchainCollection();
   }
 
   public ToolchainCollection<UnloadedToolchainContext> getToolchainCollection(String targetLabel)

diff --git a/src/test/java/com/google/devtools/build/lib/testutil/SpawnInputUtils.java b/src/test/java/com/google/devtools/build/lib/testutil/SpawnInputUtils.java
index 3759645..a634eec 100644
--- a/src/test/java/com/google/devtools/build/lib/testutil/SpawnInputUtils.java
+++ b/src/test/java/com/google/devtools/build/lib/testutil/SpawnInputUtils.java

@@ -57,8 +57,8 @@
         continue;
       }
       for (FilesetOutputSymlink filesetOutputSymlink : entry.getValue().symlinks()) {
-        if (filesetOutputSymlink.getTargetPath().toString().contains(inputName)) {
-          Path inputPath = execRoot.getRelative(filesetOutputSymlink.getTargetPath());
+        if (filesetOutputSymlink.targetPath().toString().contains(inputName)) {
+          Path inputPath = execRoot.getRelative(filesetOutputSymlink.targetPath());
           return ActionInputHelper.fromPath(inputPath.asFragment());
         }
       }
@@ -78,8 +78,8 @@
       throw new IllegalStateException(e);
     }
     for (FilesetOutputSymlink filesetOutputSymlink : filesetLinks) {
-      if (filesetOutputSymlink.getTargetPath().toString().contains(inputName)) {
-        Path inputPath = context.getExecRoot().getRelative(filesetOutputSymlink.getTargetPath());
+      if (filesetOutputSymlink.targetPath().toString().contains(inputName)) {
+        Path inputPath = context.getExecRoot().getRelative(filesetOutputSymlink.targetPath());
         return ActionInputHelper.fromPath(inputPath.asFragment());
       }
     }

diff --git a/src/test/java/com/google/devtools/build/lib/view/java/JavaCompilationArgsTest.java b/src/test/java/com/google/devtools/build/lib/view/java/JavaCompilationArgsTest.java
index 2b33f2e..0488573 100644
--- a/src/test/java/com/google/devtools/build/lib/view/java/JavaCompilationArgsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/view/java/JavaCompilationArgsTest.java

@@ -31,8 +31,8 @@
   @Test
   public void testSimple() throws Exception {
     JavaCompilationArgsProvider args = createArgs();
-    assertThat(getOnlyJarName(args.getTransitiveCompileTimeJars())).isEqualTo("compiletime.jar");
-    assertThat(getOnlyJarName(args.getRuntimeJars())).isEqualTo("runtime.jar");
+    assertThat(getOnlyJarName(args.transitiveCompileTimeJars())).isEqualTo("compiletime.jar");
+    assertThat(getOnlyJarName(args.runtimeJars())).isEqualTo("runtime.jar");
   }
 
   private JavaCompilationArgsProvider createArgs() throws Exception {

diff --git a/src/test/java/com/google/devtools/build/lib/view/java/JavaImportConfiguredTargetTest.java b/src/test/java/com/google/devtools/build/lib/view/java/JavaImportConfiguredTargetTest.java
index aeb4131..8043d1e 100644
--- a/src/test/java/com/google/devtools/build/lib/view/java/JavaImportConfiguredTargetTest.java
+++ b/src/test/java/com/google/devtools/build/lib/view/java/JavaImportConfiguredTargetTest.java

@@ -113,7 +113,7 @@
     ConfiguredTarget configuredTarget = getConfiguredTarget("//java:java_imp");
     Artifact compiledArtifact =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, configuredTarget)
-            .getDirectCompileTimeJars()
+            .directCompileTimeJars()
             .toList()
             .get(0);
     SpawnAction action = (SpawnAction) getGeneratingAction(compiledArtifact);
@@ -217,13 +217,13 @@
     // JavaCompilationArgs should hold classpaths of the transitive closure.
     JavaCompilationArgsProvider recursiveCompilationArgs =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, importJar);
-    assertThat(prettyArtifactNames(recursiveCompilationArgs.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(recursiveCompilationArgs.transitiveCompileTimeJars()))
         .containsExactly(
             "java/jarlib2/_ijar/import-jar/java/jarlib2/import-ijar.jar",
             "java/jarlib2/_ijar/exportjar/java/jarlib2/exportjar-ijar.jar",
             "java/jarlib2/_ijar/depjar/java/jarlib2/depjar-ijar.jar")
         .inOrder();
-    assertThat(prettyArtifactNames(recursiveCompilationArgs.getRuntimeJars()))
+    assertThat(prettyArtifactNames(recursiveCompilationArgs.runtimeJars()))
         .containsExactly(
             "java/jarlib2/import.jar", "java/jarlib2/exportjar.jar", "java/jarlib2/depjar.jar")
         .inOrder();
@@ -231,12 +231,12 @@
     // Recursive deps work the same as with java_library.
     JavaCompilationArgsProvider compilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, importJar);
-    assertThat(prettyArtifactNames(compilationArgsProvider.getDirectCompileTimeJars()))
+    assertThat(prettyArtifactNames(compilationArgsProvider.directCompileTimeJars()))
         .containsExactly(
             "java/jarlib2/_ijar/import-jar/java/jarlib2/import-ijar.jar",
             "java/jarlib2/_ijar/exportjar/java/jarlib2/exportjar-ijar.jar")
         .inOrder();
-    assertThat(prettyArtifactNames(compilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(compilationArgsProvider.runtimeJars()))
         .containsExactly(
             "java/jarlib2/import.jar", "java/jarlib2/exportjar.jar", "java/jarlib2/depjar.jar")
         .inOrder();
@@ -349,16 +349,16 @@
 
     JavaCompilationArgsProvider compilationArgs =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jarLib);
-    assertThat(prettyArtifactNames(compilationArgs.getTransitiveCompileTimeJars()))
+    assertThat(prettyArtifactNames(compilationArgs.transitiveCompileTimeJars()))
         .containsExactly(
             "java/genrules/_ijar/library-jar/java/genrules/generated-ijar.jar",
             "java/jarlib/_ijar/libraryjar/java/jarlib/library-ijar.jar")
         .inOrder();
-    assertThat(prettyArtifactNames(compilationArgs.getRuntimeJars()))
+    assertThat(prettyArtifactNames(compilationArgs.runtimeJars()))
         .containsExactly("java/genrules/generated.jar", "java/jarlib/library.jar")
         .inOrder();
 
-    Artifact jar = compilationArgs.getRuntimeJars().toList().get(0);
+    Artifact jar = compilationArgs.runtimeJars().toList().get(0);
     assertThat(getGeneratingAction(jar).prettyPrint())
         .isEqualTo("action 'Executing genrule //java/genrules:generated_jar'");
   }
@@ -598,7 +598,7 @@
     getConfiguredTarget("//java/my:a");
     Set<String> inputs =
         artifactsToStrings(
-            JavaInfo.getProvider(JavaSourceJarsProvider.class, aTarget).getTransitiveSourceJars());
+            JavaInfo.getProvider(JavaSourceJarsProvider.class, aTarget).transitiveSourceJars());
     assertThat(inputs)
         .isEqualTo(Sets.newHashSet("src java/my/dummy-src.jar", "bin java/my/libb-src.jar"));
   }
@@ -744,7 +744,7 @@
     ConfiguredTarget jarLib = getConfiguredTarget("//java/jarlib:libraryjar");
     JavaCompilationArgsProvider compilationArgsProvider =
         JavaInfo.getProvider(JavaCompilationArgsProvider.class, jarLib);
-    assertThat(prettyArtifactNames(compilationArgsProvider.getRuntimeJars()))
+    assertThat(prettyArtifactNames(compilationArgsProvider.runtimeJars()))
         .containsExactly("java/jarlib/library.jar");
   }
 
@@ -762,7 +762,7 @@
     List<String> jars =
         ActionsTestUtil.baseArtifactNames(
             JavaInfo.getProvider(JavaCompilationArgsProvider.class, lib)
-                .getTransitiveCompileTimeJars());
+                .transitiveCompileTimeJars());
     assertThat(jars).doesNotContain("b-ijar.jar");
     assertThat(jars).contains("b.jar");
   }

diff --git a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
index cbbb55e..4acba05 100644
--- a/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
+++ b/src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java

@@ -381,7 +381,7 @@
               ? Durations.toMillis(action.getTimeout())
               : TimeUnit.MINUTES.toMillis(15);
       boolean wasTimeout =
-          (cmdResult != null && cmdResult.getTerminationStatus().timedOut())
+          (cmdResult != null && cmdResult.terminationStatus().timedOut())
               || wasTimeout(timeoutMillis, wallTime.toMillis());
       final int exitCode;
       Status errStatus = null;
@@ -401,7 +401,7 @@
       } else if (cmdResult == null) {
         exitCode = LOCAL_EXEC_ERROR;
       } else {
-        exitCode = cmdResult.getTerminationStatus().getRawExitCode();
+        exitCode = cmdResult.terminationStatus().getRawExitCode();
       }
 
       ActionResult result = null;