diff --git a/java/google/registry/tools/CheckSnapshotCommand.java b/java/google/registry/tools/CheckSnapshotCommand.java
index 1234f9eea..81b11065a 100644
--- a/java/google/registry/tools/CheckSnapshotCommand.java
+++ b/java/google/registry/tools/CheckSnapshotCommand.java
@@ -26,7 +26,7 @@ import javax.inject.Inject;
  * Command to check the status of a Datastore backup, or "snapshot".
  */
 @Parameters(separators = " =", commandDescription = "Check the status of a Datastore snapshot")
-public class CheckSnapshotCommand implements RemoteApiCommand {
+public class CheckSnapshotCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-s", "--snapshot"},
diff --git a/java/google/registry/tools/RemoteApiCommand.java b/java/google/registry/tools/CommandWithRemoteApi.java
similarity index 94%
rename from java/google/registry/tools/RemoteApiCommand.java
rename to java/google/registry/tools/CommandWithRemoteApi.java
index 6e7982086..caa2fd295 100644
--- a/java/google/registry/tools/RemoteApiCommand.java
+++ b/java/google/registry/tools/CommandWithRemoteApi.java
@@ -20,4 +20,4 @@
  */
 package google.registry.tools;
 
-interface RemoteApiCommand extends Command {}
+interface CommandWithRemoteApi extends Command {}
diff --git a/java/google/registry/tools/CountDomainsCommand.java b/java/google/registry/tools/CountDomainsCommand.java
index 7c3532f0c..75ead28bc 100644
--- a/java/google/registry/tools/CountDomainsCommand.java
+++ b/java/google/registry/tools/CountDomainsCommand.java
@@ -28,7 +28,7 @@ import org.joda.time.DateTime;
 
 /** Command to show the count of active domains on a given TLD. */
 @Parameters(separators = " =", commandDescription = "Show count of domains on TLD")
-final class CountDomainsCommand implements RemoteApiCommand {
+final class CountDomainsCommand implements CommandWithRemoteApi {
 
   @Parameter(description = "TLD(s) to count domains on", required = true)
   private List<String> mainParameters;
diff --git a/java/google/registry/tools/CreateDomainCommand.java b/java/google/registry/tools/CreateDomainCommand.java
index 17dcbf400..a183cf195 100644
--- a/java/google/registry/tools/CreateDomainCommand.java
+++ b/java/google/registry/tools/CreateDomainCommand.java
@@ -32,7 +32,8 @@ import org.joda.time.DateTime;
 
 /** A command to create a new domain via EPP. */
 @Parameters(separators = " =", commandDescription = "Create a new domain via EPP.")
-final class CreateDomainCommand extends CreateOrUpdateDomainCommand implements RemoteApiCommand {
+final class CreateDomainCommand extends CreateOrUpdateDomainCommand
+    implements CommandWithRemoteApi {
 
   @Parameter(
       names = "--period",
diff --git a/java/google/registry/tools/DeletePremiumListCommand.java b/java/google/registry/tools/DeletePremiumListCommand.java
index 99e38da15..88b25a837 100644
--- a/java/google/registry/tools/DeletePremiumListCommand.java
+++ b/java/google/registry/tools/DeletePremiumListCommand.java
@@ -30,7 +30,7 @@ import javax.annotation.Nullable;
  * list is currently in use on a tld.
  */
 @Parameters(separators = " =", commandDescription = "Delete a PremiumList from Datastore.")
-final class DeletePremiumListCommand extends ConfirmingCommand implements RemoteApiCommand {
+final class DeletePremiumListCommand extends ConfirmingCommand implements CommandWithRemoteApi {
 
   @Nullable
   PremiumList premiumList;
diff --git a/java/google/registry/tools/DeleteTldCommand.java b/java/google/registry/tools/DeleteTldCommand.java
index 072ff60e1..be11882e5 100644
--- a/java/google/registry/tools/DeleteTldCommand.java
+++ b/java/google/registry/tools/DeleteTldCommand.java
@@ -30,7 +30,7 @@ import google.registry.model.registry.Registry.TldType;
  * <p>This command will fail if any domains are currently registered on the TLD.
  */
 @Parameters(separators = " =", commandDescription = "Delete a TLD from Datastore.")
-final class DeleteTldCommand extends ConfirmingCommand implements RemoteApiCommand {
+final class DeleteTldCommand extends ConfirmingCommand implements CommandWithRemoteApi {
 
   private Registry registry;
 
diff --git a/java/google/registry/tools/EncryptEscrowDepositCommand.java b/java/google/registry/tools/EncryptEscrowDepositCommand.java
index 84c5bcf40..65135a181 100644
--- a/java/google/registry/tools/EncryptEscrowDepositCommand.java
+++ b/java/google/registry/tools/EncryptEscrowDepositCommand.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 
 /** Command to encrypt an escrow deposit. */
 @Parameters(separators = " =", commandDescription = "Encrypt an escrow deposit")
-class EncryptEscrowDepositCommand implements RemoteApiCommand {
+class EncryptEscrowDepositCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GenerateAllocationTokensCommand.java b/java/google/registry/tools/GenerateAllocationTokensCommand.java
index 5e013e514..2daf39be6 100644
--- a/java/google/registry/tools/GenerateAllocationTokensCommand.java
+++ b/java/google/registry/tools/GenerateAllocationTokensCommand.java
@@ -49,7 +49,7 @@ import javax.inject.Named;
   commandDescription =
       "Generates and persists the given number of AllocationTokens, printing each token to stdout."
 )
-public class GenerateAllocationTokensCommand implements RemoteApiCommand {
+public class GenerateAllocationTokensCommand implements CommandWithRemoteApi {
 
   @Parameter(
     names = {"-p", "--prefix"},
diff --git a/java/google/registry/tools/GenerateApplicationsReportCommand.java b/java/google/registry/tools/GenerateApplicationsReportCommand.java
index 03b4a53b9..5dc4b300c 100644
--- a/java/google/registry/tools/GenerateApplicationsReportCommand.java
+++ b/java/google/registry/tools/GenerateApplicationsReportCommand.java
@@ -51,7 +51,7 @@ import org.joda.time.DateTime;
 
 /** Command to generate a report of all domain applications. */
 @Parameters(separators = " =", commandDescription = "Generate report of all domain applications.")
-final class GenerateApplicationsReportCommand implements RemoteApiCommand {
+final class GenerateApplicationsReportCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GenerateAuctionDataCommand.java b/java/google/registry/tools/GenerateAuctionDataCommand.java
index dddcc8cf1..c2ab2026b 100644
--- a/java/google/registry/tools/GenerateAuctionDataCommand.java
+++ b/java/google/registry/tools/GenerateAuctionDataCommand.java
@@ -66,7 +66,7 @@ import org.joda.time.format.DateTimeFormatter;
 
 /** Command to generate the auction data for a TLD. */
 @Parameters(separators = " =", commandDescription = "Generate auction data")
-final class GenerateAuctionDataCommand implements RemoteApiCommand {
+final class GenerateAuctionDataCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "TLD(s) to generate auction data for",
diff --git a/java/google/registry/tools/GenerateDnsReportCommand.java b/java/google/registry/tools/GenerateDnsReportCommand.java
index 9bb96303d..b0a3ad58e 100644
--- a/java/google/registry/tools/GenerateDnsReportCommand.java
+++ b/java/google/registry/tools/GenerateDnsReportCommand.java
@@ -40,7 +40,7 @@ import org.json.simple.JSONValue;
 
 /** Command to generate a report of all DNS data. */
 @Parameters(separators = " =", commandDescription = "Generate report of all DNS data in a TLD.")
-final class GenerateDnsReportCommand implements RemoteApiCommand {
+final class GenerateDnsReportCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GenerateEscrowDepositCommand.java b/java/google/registry/tools/GenerateEscrowDepositCommand.java
index ceaa34ea6..7d8ed0494 100644
--- a/java/google/registry/tools/GenerateEscrowDepositCommand.java
+++ b/java/google/registry/tools/GenerateEscrowDepositCommand.java
@@ -43,7 +43,7 @@ import org.joda.time.DateTime;
  * be stored in the specified manual subdirectory of the GCS RDE bucket.
  */
 @Parameters(separators = " =", commandDescription = "Generate an XML escrow deposit.")
-final class GenerateEscrowDepositCommand implements RemoteApiCommand {
+final class GenerateEscrowDepositCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GenerateLordnCommand.java b/java/google/registry/tools/GenerateLordnCommand.java
index 360bba353..153530aee 100644
--- a/java/google/registry/tools/GenerateLordnCommand.java
+++ b/java/google/registry/tools/GenerateLordnCommand.java
@@ -31,7 +31,7 @@ import org.joda.time.DateTime;
 
 /** Command to generate a LORDN CSV file for an entire TLD. */
 @Parameters(separators = " =", commandDescription = "Generate LORDN CSV file")
-final class GenerateLordnCommand implements RemoteApiCommand {
+final class GenerateLordnCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GetApplicationIdsCommand.java b/java/google/registry/tools/GetApplicationIdsCommand.java
index 5f4fafc0f..e1520af4b 100644
--- a/java/google/registry/tools/GetApplicationIdsCommand.java
+++ b/java/google/registry/tools/GetApplicationIdsCommand.java
@@ -30,7 +30,7 @@ import org.joda.time.DateTime;
 /** Command to generate a list of all applications for a given domain name(s). */
 @Parameters(separators = " =",
     commandDescription = "Generate list of application IDs and sponsors for given domain name(s)")
-final class GetApplicationIdsCommand implements RemoteApiCommand {
+final class GetApplicationIdsCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "Fully qualified domain name(s)",
diff --git a/java/google/registry/tools/GetAppliedLabelsCommand.java b/java/google/registry/tools/GetAppliedLabelsCommand.java
index a42453abd..58ac66086 100644
--- a/java/google/registry/tools/GetAppliedLabelsCommand.java
+++ b/java/google/registry/tools/GetAppliedLabelsCommand.java
@@ -38,7 +38,7 @@ import org.joda.time.DateTime;
 
 /** Command to generate a list of all slds in a tld that have open applications. */
 @Parameters(separators = " =", commandDescription = "Generate applied-for domains list")
-final class GetAppliedLabelsCommand implements RemoteApiCommand {
+final class GetAppliedLabelsCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GetClaimsListCommand.java b/java/google/registry/tools/GetClaimsListCommand.java
index 61c5d649f..21f071b65 100644
--- a/java/google/registry/tools/GetClaimsListCommand.java
+++ b/java/google/registry/tools/GetClaimsListCommand.java
@@ -33,7 +33,7 @@ import java.nio.file.Paths;
  * are currently storing in Datastore.
  */
 @Parameters(separators = " =", commandDescription = "Download the current claims list")
-final class GetClaimsListCommand implements RemoteApiCommand {
+final class GetClaimsListCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-o", "--output"},
diff --git a/java/google/registry/tools/GetEppResourceCommand.java b/java/google/registry/tools/GetEppResourceCommand.java
index 6df3f6f08..202b5f307 100644
--- a/java/google/registry/tools/GetEppResourceCommand.java
+++ b/java/google/registry/tools/GetEppResourceCommand.java
@@ -26,7 +26,7 @@ import org.joda.time.DateTime;
 
 /** Abstract command to print one or more resources to stdout. */
 @Parameters(separators = " =")
-abstract class GetEppResourceCommand implements RemoteApiCommand {
+abstract class GetEppResourceCommand implements CommandWithRemoteApi {
 
   private final DateTime now = DateTime.now(UTC);
 
diff --git a/java/google/registry/tools/GetHistoryEntriesCommand.java b/java/google/registry/tools/GetHistoryEntriesCommand.java
index d4277058c..9c0fac1f3 100644
--- a/java/google/registry/tools/GetHistoryEntriesCommand.java
+++ b/java/google/registry/tools/GetHistoryEntriesCommand.java
@@ -33,7 +33,7 @@ import org.joda.time.DateTime;
 /** Command to show history entries. */
 @Parameters(separators = " =",
   commandDescription = "Show history entries that occurred in a given time range")
-final class GetHistoryEntriesCommand implements RemoteApiCommand {
+final class GetHistoryEntriesCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-a", "--after"},
diff --git a/java/google/registry/tools/GetKeyringSecretCommand.java b/java/google/registry/tools/GetKeyringSecretCommand.java
index adb3d954e..1f11d0da9 100644
--- a/java/google/registry/tools/GetKeyringSecretCommand.java
+++ b/java/google/registry/tools/GetKeyringSecretCommand.java
@@ -33,7 +33,7 @@ import org.bouncycastle.openpgp.PGPKeyPair;
   separators = " =",
   commandDescription = "Retrieves the value of a secret from the keyring."
 )
-final class GetKeyringSecretCommand implements RemoteApiCommand {
+final class GetKeyringSecretCommand implements CommandWithRemoteApi {
 
   @Inject Keyring keyring;
 
diff --git a/java/google/registry/tools/GetRegistrarCommand.java b/java/google/registry/tools/GetRegistrarCommand.java
index 56eba1053..47f08a0e8 100644
--- a/java/google/registry/tools/GetRegistrarCommand.java
+++ b/java/google/registry/tools/GetRegistrarCommand.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /** Command to show a registrar record. */
 @Parameters(separators = " =", commandDescription = "Show registrar record(s)")
-final class GetRegistrarCommand implements RemoteApiCommand {
+final class GetRegistrarCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "Client identifier of the registrar account(s)",
diff --git a/java/google/registry/tools/GetResourceByKeyCommand.java b/java/google/registry/tools/GetResourceByKeyCommand.java
index d3903ff32..1edb00608 100644
--- a/java/google/registry/tools/GetResourceByKeyCommand.java
+++ b/java/google/registry/tools/GetResourceByKeyCommand.java
@@ -27,7 +27,7 @@ import java.util.List;
  * Command to get info on a Datastore resource by websafe key.
  */
 @Parameters(separators = " =", commandDescription = "Fetch a Datastore resource by websafe key")
-final class GetResourceByKeyCommand implements RemoteApiCommand {
+final class GetResourceByKeyCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "Websafe key string(s)",
diff --git a/java/google/registry/tools/GetTldCommand.java b/java/google/registry/tools/GetTldCommand.java
index d9db16161..2aa532d9a 100644
--- a/java/google/registry/tools/GetTldCommand.java
+++ b/java/google/registry/tools/GetTldCommand.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 /** Command to show a TLD record. */
 @Parameters(separators = " =", commandDescription = "Show TLD record(s)")
-final class GetTldCommand implements RemoteApiCommand {
+final class GetTldCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "TLD(s) to show",
diff --git a/java/google/registry/tools/GhostrydeCommand.java b/java/google/registry/tools/GhostrydeCommand.java
index 9d9d2511e..efeee8fd3 100644
--- a/java/google/registry/tools/GhostrydeCommand.java
+++ b/java/google/registry/tools/GhostrydeCommand.java
@@ -37,7 +37,7 @@ import org.bouncycastle.openpgp.PGPPublicKey;
 
 /** Command to encrypt/decrypt {@code .ghostryde} files. */
 @Parameters(separators = " =", commandDescription = "Encrypt/decrypt a ghostryde file.")
-final class GhostrydeCommand implements RemoteApiCommand {
+final class GhostrydeCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-e", "--encrypt"},
diff --git a/java/google/registry/tools/ListCursorsCommand.java b/java/google/registry/tools/ListCursorsCommand.java
index 57067a10c..eacd5e1b5 100644
--- a/java/google/registry/tools/ListCursorsCommand.java
+++ b/java/google/registry/tools/ListCursorsCommand.java
@@ -31,7 +31,7 @@ import java.util.Optional;
 
 /** Lists {@link Cursor} timestamps used by locking rolling cursor tasks, like in RDE. */
 @Parameters(separators = " =", commandDescription = "Lists cursor timestamps used by LRC tasks")
-final class ListCursorsCommand implements RemoteApiCommand {
+final class ListCursorsCommand implements CommandWithRemoteApi {
 
   @Parameter(names = "--type", description = "Which cursor to list.", required = true)
   private CursorType cursorType;
diff --git a/java/google/registry/tools/ListObjectsCommand.java b/java/google/registry/tools/ListObjectsCommand.java
index c5d66b077..82069bf05 100644
--- a/java/google/registry/tools/ListObjectsCommand.java
+++ b/java/google/registry/tools/ListObjectsCommand.java
@@ -33,7 +33,7 @@ import org.json.simple.JSONValue;
  *
  * <p>The formatting is done on the server side; this class just dumps the results to the screen.
  */
-abstract class ListObjectsCommand implements RemoteApiCommand, ServerSideCommand {
+abstract class ListObjectsCommand implements ServerSideCommand {
 
   @Nullable
   @Parameter(
diff --git a/java/google/registry/tools/MutatingCommand.java b/java/google/registry/tools/MutatingCommand.java
index b37cc4b17..c0ac3d525 100644
--- a/java/google/registry/tools/MutatingCommand.java
+++ b/java/google/registry/tools/MutatingCommand.java
@@ -41,7 +41,7 @@ import java.util.Set;
 import javax.annotation.Nullable;
 
 /** A {@link ConfirmingCommand} that changes objects in Datastore. */
-public abstract class MutatingCommand extends ConfirmingCommand implements RemoteApiCommand {
+public abstract class MutatingCommand extends ConfirmingCommand implements CommandWithRemoteApi {
 
   /**
    * A mutation of a specific entity, represented by an old and a new version of the entity.
diff --git a/java/google/registry/tools/PendingEscrowCommand.java b/java/google/registry/tools/PendingEscrowCommand.java
index 39e3480f0..8b837ec27 100644
--- a/java/google/registry/tools/PendingEscrowCommand.java
+++ b/java/google/registry/tools/PendingEscrowCommand.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 
 /** Command to show what escrow deposits are pending generation on the server. */
 @Parameters(separators = " =", commandDescription = "List pending RDE/BRDA deposits.")
-final class PendingEscrowCommand implements RemoteApiCommand {
+final class PendingEscrowCommand implements CommandWithRemoteApi {
 
   private static final Ordering<PendingDeposit> SORTER =
       new Ordering<PendingDeposit>() {
diff --git a/java/google/registry/tools/RegistryCli.java b/java/google/registry/tools/RegistryCli.java
index 82755b40c..f0c3b5798 100644
--- a/java/google/registry/tools/RegistryCli.java
+++ b/java/google/registry/tools/RegistryCli.java
@@ -185,8 +185,8 @@ final class RegistryCli implements AutoCloseable, CommandRunner {
       ((CommandWithConnection) command).setConnection(getConnection());
     }
 
-    // RemoteApiCommands need to have the remote api installed to work.
-    if (command instanceof RemoteApiCommand) {
+    // CommandWithRemoteApis need to have the remote api installed to work.
+    if (command instanceof CommandWithRemoteApi) {
       if (installer == null) {
         installer = new RemoteApiInstaller();
         RemoteApiOptions options = new RemoteApiOptions();
diff --git a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
index 1ba31b19c..790bf47c1 100644
--- a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
+++ b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
@@ -31,7 +31,7 @@ import google.registry.model.registry.Registry;
  * {@link RegistrarContact}.
  */
 @Parameters(commandDescription = "Re-save all environment entities.")
-final class ResaveEnvironmentEntitiesCommand implements RemoteApiCommand {
+final class ResaveEnvironmentEntitiesCommand implements CommandWithRemoteApi {
 
   private static final int BATCH_SIZE = 10;
 
diff --git a/java/google/registry/tools/SendEscrowReportToIcannCommand.java b/java/google/registry/tools/SendEscrowReportToIcannCommand.java
index 0aaeb01c2..7a0dd5ecc 100644
--- a/java/google/registry/tools/SendEscrowReportToIcannCommand.java
+++ b/java/google/registry/tools/SendEscrowReportToIcannCommand.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 
 /** Command to send ICANN notification that an escrow deposit was uploaded. */
 @Parameters(separators = " =", commandDescription = "Send an ICANN report of an uploaded deposit.")
-final class SendEscrowReportToIcannCommand implements RemoteApiCommand {
+final class SendEscrowReportToIcannCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "One or more foo-report.xml files.",
diff --git a/java/google/registry/tools/ServerSideCommand.java b/java/google/registry/tools/ServerSideCommand.java
index 95142df25..d2ebfbcac 100644
--- a/java/google/registry/tools/ServerSideCommand.java
+++ b/java/google/registry/tools/ServerSideCommand.java
@@ -15,5 +15,5 @@
 package google.registry.tools;
 
 /** A command that executes on the server. */
-interface ServerSideCommand extends CommandWithConnection, RemoteApiCommand {
+interface ServerSideCommand extends CommandWithConnection, CommandWithRemoteApi {
 }
diff --git a/java/google/registry/tools/SetupOteCommand.java b/java/google/registry/tools/SetupOteCommand.java
index 304928929..bc6b34d9e 100644
--- a/java/google/registry/tools/SetupOteCommand.java
+++ b/java/google/registry/tools/SetupOteCommand.java
@@ -42,7 +42,7 @@ import org.joda.time.Duration;
 
 /** Composite command to set up OT&E TLDs and accounts. */
 @Parameters(separators = " =", commandDescription = "Set up OT&E TLDs and registrars")
-final class SetupOteCommand extends ConfirmingCommand implements RemoteApiCommand {
+final class SetupOteCommand extends ConfirmingCommand implements CommandWithRemoteApi {
 
   // Regex: 3-14 alphanumeric characters or hyphens, the first of which must be a letter.
   private static final Pattern REGISTRAR_PATTERN = Pattern.compile("^[a-z][-a-z0-9]{2,13}$");
diff --git a/java/google/registry/tools/UpdateClaimsNoticeCommand.java b/java/google/registry/tools/UpdateClaimsNoticeCommand.java
index 8c0ae0c92..d00e00a80 100644
--- a/java/google/registry/tools/UpdateClaimsNoticeCommand.java
+++ b/java/google/registry/tools/UpdateClaimsNoticeCommand.java
@@ -29,7 +29,7 @@ import org.joda.time.DateTime;
 
 /** Command to update the claims notice on a domain application. */
 @Parameters(separators = " =", commandDescription = "Update the claims notice on an application.")
-final class UpdateClaimsNoticeCommand implements RemoteApiCommand {
+final class UpdateClaimsNoticeCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = "--id",
diff --git a/java/google/registry/tools/UpdateKmsKeyringCommand.java b/java/google/registry/tools/UpdateKmsKeyringCommand.java
index c3bba76cc..b7933bb19 100644
--- a/java/google/registry/tools/UpdateKmsKeyringCommand.java
+++ b/java/google/registry/tools/UpdateKmsKeyringCommand.java
@@ -32,7 +32,7 @@ import javax.inject.Inject;
   separators = " =",
   commandDescription = "Update values of secrets in KmsKeyring."
 )
-final class UpdateKmsKeyringCommand implements RemoteApiCommand {
+final class UpdateKmsKeyringCommand implements CommandWithRemoteApi {
 
   @Inject KmsUpdater kmsUpdater;
 
diff --git a/java/google/registry/tools/UpdateSmdCommand.java b/java/google/registry/tools/UpdateSmdCommand.java
index 9c139670f..6c516ae5f 100644
--- a/java/google/registry/tools/UpdateSmdCommand.java
+++ b/java/google/registry/tools/UpdateSmdCommand.java
@@ -38,7 +38,7 @@ import org.joda.time.DateTime;
 
 /** Command to update the SMD on a domain application. */
 @Parameters(separators = " =", commandDescription = "Update the SMD on an application.")
-final class UpdateSmdCommand implements RemoteApiCommand {
+final class UpdateSmdCommand implements CommandWithRemoteApi {
 
   @Inject DomainFlowTmchUtils tmchUtils;
   @Inject UpdateSmdCommand() {}
diff --git a/java/google/registry/tools/UploadClaimsListCommand.java b/java/google/registry/tools/UploadClaimsListCommand.java
index 248ae838d..14a797748 100644
--- a/java/google/registry/tools/UploadClaimsListCommand.java
+++ b/java/google/registry/tools/UploadClaimsListCommand.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 /** A command to upload a {@link ClaimsListShard}. */
 @Parameters(separators = " =", commandDescription = "Manually upload a new claims list file")
-final class UploadClaimsListCommand extends ConfirmingCommand implements RemoteApiCommand {
+final class UploadClaimsListCommand extends ConfirmingCommand implements CommandWithRemoteApi {
 
   @Parameter(description = "Claims list filename")
   private List<String> mainParameters = new ArrayList<>();
diff --git a/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/java/google/registry/tools/ValidateLoginCredentialsCommand.java
index 20117e3fe..af882b78c 100644
--- a/java/google/registry/tools/ValidateLoginCredentialsCommand.java
+++ b/java/google/registry/tools/ValidateLoginCredentialsCommand.java
@@ -34,7 +34,7 @@ import javax.annotation.Nullable;
 
 /** A command to test registrar login credentials. */
 @Parameters(separators = " =", commandDescription = "Test registrar login credentials")
-final class ValidateLoginCredentialsCommand implements RemoteApiCommand {
+final class ValidateLoginCredentialsCommand implements CommandWithRemoteApi {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/WhoisQueryCommand.java b/java/google/registry/tools/WhoisQueryCommand.java
index b3744f5db..df2367a1c 100644
--- a/java/google/registry/tools/WhoisQueryCommand.java
+++ b/java/google/registry/tools/WhoisQueryCommand.java
@@ -23,7 +23,7 @@ import javax.inject.Inject;
 
 /** Command to execute a WHOIS query. */
 @Parameters(separators = " =", commandDescription = "Manually perform a WHOIS query")
-final class WhoisQueryCommand implements RemoteApiCommand {
+final class WhoisQueryCommand implements CommandWithRemoteApi {
 
   @Parameter(
       description = "WHOIS query string",