diff --git a/java/google/registry/tools/AuctionStatusCommand.java b/java/google/registry/tools/AuctionStatusCommand.java
index 73db44d52..e8e52ca15 100644
--- a/java/google/registry/tools/AuctionStatusCommand.java
+++ b/java/google/registry/tools/AuctionStatusCommand.java
@@ -35,7 +35,6 @@ import com.google.common.net.InternetDomainName;
 import com.googlecode.objectify.Work;
 import google.registry.model.contact.ContactResource;
 import google.registry.model.domain.DomainApplication;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import java.nio.file.Files;
@@ -45,7 +44,7 @@ import java.util.List;
 
 /** Command to check the status of domain applications. */
 @Parameters(separators = " =", commandDescription = "Check auction status")
-final class AuctionStatusCommand implements RemoteApiCommand, GtechCommand {
+final class AuctionStatusCommand implements RemoteApiCommand {
 
   @Parameter(
       description = "Domains(s) to check",
diff --git a/java/google/registry/tools/CanonicalizeLabelsCommand.java b/java/google/registry/tools/CanonicalizeLabelsCommand.java
index 583b81878..1a93d468a 100644
--- a/java/google/registry/tools/CanonicalizeLabelsCommand.java
+++ b/java/google/registry/tools/CanonicalizeLabelsCommand.java
@@ -22,7 +22,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.base.Joiner;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.util.DomainNameUtils;
 import google.registry.util.Idn;
 import google.registry.util.NonFinalForTesting;
@@ -36,7 +35,7 @@ import java.util.TreeSet;
 
 /** Command to clean up a set of labels and turn them into punycode. */
 @Parameters(commandDescription = "Canonicalize domain labels")
-final class CanonicalizeLabelsCommand implements Command, GtechCommand {
+final class CanonicalizeLabelsCommand implements Command {
 
   @Parameter(
       description = "Filename of file containing domain labels, one per line",
diff --git a/java/google/registry/tools/Command.java b/java/google/registry/tools/Command.java
index c6d71b761..f48617625 100644
--- a/java/google/registry/tools/Command.java
+++ b/java/google/registry/tools/Command.java
@@ -27,9 +27,4 @@ public interface Command {
    * install it as needed.
    */
   public interface RemoteApiCommand extends Command {}
-
-  /**
-   * Marker interface for commands that are gTech safe.
-   */
-  public interface GtechCommand extends Command {}
 }
diff --git a/java/google/registry/tools/ConvertIdnCommand.java b/java/google/registry/tools/ConvertIdnCommand.java
index c85411e57..357adf340 100644
--- a/java/google/registry/tools/ConvertIdnCommand.java
+++ b/java/google/registry/tools/ConvertIdnCommand.java
@@ -20,14 +20,13 @@ import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.base.Ascii;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.util.Idn;
 import java.io.IOException;
 import java.util.List;
 
 /** Command to convert IDN labels to/from punycode. */
 @Parameters(commandDescription = "Convert IDNs to/from punycode")
-final class ConvertIdnCommand implements Command, GtechCommand {
+final class ConvertIdnCommand implements Command {
 
   @Parameter(
       description = "Labels to convert",
diff --git a/java/google/registry/tools/CreateAnchorTenantCommand.java b/java/google/registry/tools/CreateAnchorTenantCommand.java
index f4c376e34..9cc6a9660 100644
--- a/java/google/registry/tools/CreateAnchorTenantCommand.java
+++ b/java/google/registry/tools/CreateAnchorTenantCommand.java
@@ -24,7 +24,6 @@ import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.net.InternetDomainName;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.CreateAnchorTenantSoyInfo;
 import javax.inject.Inject;
 import org.joda.money.Money;
@@ -32,7 +31,7 @@ import org.joda.time.DateTime;
 
 /** A command to create a new anchor tenant domain. */
 @Parameters(separators = " =", commandDescription = "Provision a domain for an anchor tenant.")
-final class CreateAnchorTenantCommand extends MutatingEppToolCommand implements GtechCommand {
+final class CreateAnchorTenantCommand extends MutatingEppToolCommand {
 
   private static final int PASSWORD_LENGTH = 16;
   private static final int DEFAULT_ANCHOR_TENANT_PERIOD_YEARS = 2;
diff --git a/java/google/registry/tools/CreateContactCommand.java b/java/google/registry/tools/CreateContactCommand.java
index 6dc756f26..b765ff001 100644
--- a/java/google/registry/tools/CreateContactCommand.java
+++ b/java/google/registry/tools/CreateContactCommand.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Strings.isNullOrEmpty;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.params.PhoneNumberParameter;
 import google.registry.tools.soy.ContactCreateSoyInfo;
 import java.util.List;
@@ -28,7 +27,7 @@ import javax.inject.Inject;
 
 /** A command to create a new contact via EPP. */
 @Parameters(separators = " =", commandDescription = "Create a new contact via EPP.")
-final class CreateContactCommand extends MutatingEppToolCommand implements GtechCommand {
+final class CreateContactCommand extends MutatingEppToolCommand {
 
   // TODO(b/19016175): Expand to allow full suite of contact flows.
   @Parameter(
diff --git a/java/google/registry/tools/CreateCreditBalanceCommand.java b/java/google/registry/tools/CreateCreditBalanceCommand.java
index bd0646cd0..e82d4a9a8 100644
--- a/java/google/registry/tools/CreateCreditBalanceCommand.java
+++ b/java/google/registry/tools/CreateCreditBalanceCommand.java
@@ -22,14 +22,13 @@ import com.beust.jcommander.Parameters;
 import google.registry.model.billing.RegistrarCredit;
 import google.registry.model.billing.RegistrarCreditBalance;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.util.SystemClock;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 
 /** Command for creating a new balance for a registrar credit. */
 @Parameters(separators = " =", commandDescription = "Create a new registrar credit balance")
-final class CreateCreditBalanceCommand extends MutatingCommand implements GtechCommand {
+final class CreateCreditBalanceCommand extends MutatingCommand {
 
   @Parameter(
       names = "--registrar",
diff --git a/java/google/registry/tools/CreateCreditCommand.java b/java/google/registry/tools/CreateCreditCommand.java
index 20320ef7e..03281e587 100644
--- a/java/google/registry/tools/CreateCreditCommand.java
+++ b/java/google/registry/tools/CreateCreditCommand.java
@@ -23,14 +23,13 @@ import google.registry.model.billing.RegistrarCredit;
 import google.registry.model.billing.RegistrarCredit.CreditType;
 import google.registry.model.billing.RegistrarCreditBalance;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import javax.annotation.Nullable;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 
 /** Command for creating a registrar credit object with an initial balance. */
 @Parameters(separators = " =", commandDescription = "Create a new registrar credit")
-final class CreateCreditCommand extends MutatingCommand implements GtechCommand {
+final class CreateCreditCommand extends MutatingCommand {
 
   @Parameter(
       names = "--registrar",
diff --git a/java/google/registry/tools/CreateDomainCommand.java b/java/google/registry/tools/CreateDomainCommand.java
index 80e477b4c..e72610d59 100644
--- a/java/google/registry/tools/CreateDomainCommand.java
+++ b/java/google/registry/tools/CreateDomainCommand.java
@@ -20,14 +20,13 @@ import static com.google.common.base.Strings.isNullOrEmpty;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DomainCreateSoyInfo;
 import java.util.List;
 import javax.inject.Inject;
 
 /** A command to create a new domain via EPP. */
 @Parameters(separators = " =", commandDescription = "Create a new domain via EPP.")
-final class CreateDomainCommand extends MutatingEppToolCommand implements GtechCommand {
+final class CreateDomainCommand extends MutatingEppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/CreateHostCommand.java b/java/google/registry/tools/CreateHostCommand.java
index 6bdd4048e..29246a32e 100644
--- a/java/google/registry/tools/CreateHostCommand.java
+++ b/java/google/registry/tools/CreateHostCommand.java
@@ -21,7 +21,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InetAddresses;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.HostCreateSoyInfo;
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -30,7 +29,7 @@ import java.util.List;
 
 /** A command to create a new host via EPP. */
 @Parameters(separators = " =", commandDescription = "Create a new host via EPP.")
-final class CreateHostCommand extends MutatingEppToolCommand implements GtechCommand {
+final class CreateHostCommand extends MutatingEppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/CreateLrpTokensCommand.java b/java/google/registry/tools/CreateLrpTokensCommand.java
index de7b944d1..292d3f9f7 100644
--- a/java/google/registry/tools/CreateLrpTokensCommand.java
+++ b/java/google/registry/tools/CreateLrpTokensCommand.java
@@ -32,7 +32,6 @@ import com.google.common.io.LineReader;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Work;
 import google.registry.model.domain.LrpToken;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import java.io.StringReader;
@@ -50,7 +49,7 @@ import javax.inject.Inject;
         + " file of assignees for bulk token creation (using -i). Assignee/token pairs are printed"
         + " to stdout, and should be piped to a file for distribution to assignees or for cleanup"
         + " in the event of a command interruption.")
-public final class CreateLrpTokensCommand implements RemoteApiCommand, GtechCommand {
+public final class CreateLrpTokensCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-a", "--assignee"},
diff --git a/java/google/registry/tools/CreateRegistrarCommand.java b/java/google/registry/tools/CreateRegistrarCommand.java
index 99d6fab3e..2bfe9472b 100644
--- a/java/google/registry/tools/CreateRegistrarCommand.java
+++ b/java/google/registry/tools/CreateRegistrarCommand.java
@@ -34,14 +34,13 @@ import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import java.util.List;
 import javax.annotation.Nullable;
 
 /** Command to create a Registrar. */
 @Parameters(separators = " =", commandDescription = "Create new registrar account(s)")
 final class CreateRegistrarCommand extends CreateOrUpdateRegistrarCommand
-    implements GtechCommand, ServerSideCommand {
+    implements ServerSideCommand {
 
   private static final ImmutableSet<RegistryToolEnvironment> ENVIRONMENTS_ALLOWING_GROUP_CREATION =
       ImmutableSet.of(PRODUCTION, SANDBOX, UNITTEST);
diff --git a/java/google/registry/tools/CreateRegistrarGroupsCommand.java b/java/google/registry/tools/CreateRegistrarGroupsCommand.java
index 67749f562..f52312bba 100644
--- a/java/google/registry/tools/CreateRegistrarGroupsCommand.java
+++ b/java/google/registry/tools/CreateRegistrarGroupsCommand.java
@@ -24,7 +24,6 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.server.CreateGroupsAction;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -35,7 +34,7 @@ import java.util.List;
  */
 @Parameters(separators = " =", commandDescription = "Create groups for a registrar.")
 public class CreateRegistrarGroupsCommand extends ConfirmingCommand
-    implements ServerSideCommand, GtechCommand {
+    implements ServerSideCommand {
 
   @Parameter(
       description = "Client identifier(s) of the registrar(s) to create groups for",
diff --git a/java/google/registry/tools/DeleteDomainCommand.java b/java/google/registry/tools/DeleteDomainCommand.java
index ea8fe5fc7..bb1253170 100644
--- a/java/google/registry/tools/DeleteDomainCommand.java
+++ b/java/google/registry/tools/DeleteDomainCommand.java
@@ -17,12 +17,11 @@ package google.registry.tools;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DeleteDomainSoyInfo;
 
 /** A command to delete a domain via EPP. */
 @Parameters(separators = " =", commandDescription = "Delete domain")
-final class DeleteDomainCommand extends MutatingEppToolCommand implements GtechCommand {
+final class DeleteDomainCommand extends MutatingEppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/DomainApplicationInfoCommand.java b/java/google/registry/tools/DomainApplicationInfoCommand.java
index c20ba8110..9ce86e978 100644
--- a/java/google/registry/tools/DomainApplicationInfoCommand.java
+++ b/java/google/registry/tools/DomainApplicationInfoCommand.java
@@ -21,12 +21,11 @@ import com.beust.jcommander.Parameters;
 import com.google.common.base.Ascii;
 import com.google.template.soy.data.SoyMapData;
 import google.registry.model.domain.launch.LaunchPhase;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DomainApplicationInfoSoyInfo;
 
 /** A command to execute a domain application info EPP command. */
 @Parameters(separators = " =", commandDescription = "Get domain application EPP info")
-final class DomainApplicationInfoCommand extends EppToolCommand implements GtechCommand {
+final class DomainApplicationInfoCommand extends EppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/DomainCheckClaimsCommand.java b/java/google/registry/tools/DomainCheckClaimsCommand.java
index 54bc92842..d852aeae2 100644
--- a/java/google/registry/tools/DomainCheckClaimsCommand.java
+++ b/java/google/registry/tools/DomainCheckClaimsCommand.java
@@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.collect.Multimap;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DomainCheckClaimsSoyInfo;
 import java.util.Collection;
 import java.util.List;
 
 /** A command to execute a domain check claims epp command. */
 @Parameters(separators = " =", commandDescription = "Check claims on domain(s)")
-final class DomainCheckClaimsCommand extends EppToolCommand implements GtechCommand {
+final class DomainCheckClaimsCommand extends EppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/DomainCheckCommand.java b/java/google/registry/tools/DomainCheckCommand.java
index 729c76124..0887d90ae 100644
--- a/java/google/registry/tools/DomainCheckCommand.java
+++ b/java/google/registry/tools/DomainCheckCommand.java
@@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.collect.Multimap;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DomainCheckSoyInfo;
 import java.util.Collection;
 import java.util.List;
 
 /** A command to execute a domain check epp command. */
 @Parameters(separators = " =", commandDescription = "Check domain availability")
-final class DomainCheckCommand extends EppToolCommand implements GtechCommand {
+final class DomainCheckCommand extends EppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/DomainCheckFeeCommand.java b/java/google/registry/tools/DomainCheckFeeCommand.java
index 1cdd03589..29e65364e 100644
--- a/java/google/registry/tools/DomainCheckFeeCommand.java
+++ b/java/google/registry/tools/DomainCheckFeeCommand.java
@@ -18,14 +18,13 @@ import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.collect.Multimap;
 import com.google.template.soy.data.SoyMapData;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.DomainCheckFeeSoyInfo;
 import java.util.Collection;
 import java.util.List;
 
 /** A command to execute a domain check fees epp command. */
 @Parameters(separators = " =", commandDescription = "Check domain fees (for a 1-year create)")
-final class DomainCheckFeeCommand extends EppToolCommand implements GtechCommand {
+final class DomainCheckFeeCommand extends EppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/GenerateApplicationsReportCommand.java b/java/google/registry/tools/GenerateApplicationsReportCommand.java
index 7ff1b6073..8daa017b4 100644
--- a/java/google/registry/tools/GenerateApplicationsReportCommand.java
+++ b/java/google/registry/tools/GenerateApplicationsReportCommand.java
@@ -37,7 +37,6 @@ import google.registry.model.smd.SignedMark;
 import google.registry.model.smd.SignedMarkRevocationList;
 import google.registry.model.tmch.ClaimsListShard;
 import google.registry.tmch.TmchXmlSignature;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import google.registry.util.Clock;
@@ -53,7 +52,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, GtechCommand {
+final class GenerateApplicationsReportCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GenerateAuctionDataCommand.java b/java/google/registry/tools/GenerateAuctionDataCommand.java
index b00260e66..98f3574a7 100644
--- a/java/google/registry/tools/GenerateAuctionDataCommand.java
+++ b/java/google/registry/tools/GenerateAuctionDataCommand.java
@@ -44,7 +44,6 @@ import google.registry.model.domain.launch.ApplicationStatus;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarAddress;
 import google.registry.model.registrar.RegistrarContact;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import java.nio.file.Files;
@@ -64,7 +63,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, GtechCommand {
+final class GenerateAuctionDataCommand implements RemoteApiCommand {
 
   @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 71ddbe5ef..1a2c9b64d 100644
--- a/java/google/registry/tools/GenerateDnsReportCommand.java
+++ b/java/google/registry/tools/GenerateDnsReportCommand.java
@@ -30,7 +30,6 @@ import com.google.common.collect.Ordering;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.host.HostResource;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import google.registry.util.Clock;
@@ -45,7 +44,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, GtechCommand {
+final class GenerateDnsReportCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GetApplicationCommand.java b/java/google/registry/tools/GetApplicationCommand.java
index a95cce9ae..94df32fa1 100644
--- a/java/google/registry/tools/GetApplicationCommand.java
+++ b/java/google/registry/tools/GetApplicationCommand.java
@@ -18,12 +18,11 @@ import static google.registry.model.EppResourceUtils.loadDomainApplication;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
-import google.registry.tools.Command.GtechCommand;
 import java.util.List;
 
 /** Command to show a domain application. */
 @Parameters(separators = " =", commandDescription = "Show domain application resource(s)")
-final class GetApplicationCommand extends GetEppResourceCommand implements GtechCommand {
+final class GetApplicationCommand extends GetEppResourceCommand {
 
   @Parameter(
       description = "Domain application id(s)",
diff --git a/java/google/registry/tools/GetApplicationIdsCommand.java b/java/google/registry/tools/GetApplicationIdsCommand.java
index 207026fa1..7f71330f7 100644
--- a/java/google/registry/tools/GetApplicationIdsCommand.java
+++ b/java/google/registry/tools/GetApplicationIdsCommand.java
@@ -24,7 +24,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InternetDomainName;
 import google.registry.model.domain.DomainApplication;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import java.util.List;
 import org.joda.time.DateTime;
@@ -32,7 +31,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, GtechCommand {
+final class GetApplicationIdsCommand implements RemoteApiCommand {
 
   @Parameter(
       description = "Fully qualified domain name(s)",
diff --git a/java/google/registry/tools/GetAppliedLabelsCommand.java b/java/google/registry/tools/GetAppliedLabelsCommand.java
index 7af8a2228..83e403e55 100644
--- a/java/google/registry/tools/GetAppliedLabelsCommand.java
+++ b/java/google/registry/tools/GetAppliedLabelsCommand.java
@@ -26,7 +26,6 @@ import com.beust.jcommander.internal.Sets;
 import com.googlecode.objectify.Work;
 import google.registry.model.domain.DomainApplication;
 import google.registry.model.domain.launch.ApplicationStatus;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import google.registry.util.Idn;
@@ -40,7 +39,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, GtechCommand {
+final class GetAppliedLabelsCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-t", "--tld"},
diff --git a/java/google/registry/tools/GetContactCommand.java b/java/google/registry/tools/GetContactCommand.java
index 9dc71b192..2227ea9c0 100644
--- a/java/google/registry/tools/GetContactCommand.java
+++ b/java/google/registry/tools/GetContactCommand.java
@@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.contact.ContactResource;
-import google.registry.tools.Command.GtechCommand;
 import java.util.List;
 
 /** Command to show one or more contacts. */
 @Parameters(separators = " =", commandDescription = "Show contact resource(s)")
-final class GetContactCommand extends GetEppResourceCommand implements GtechCommand {
+final class GetContactCommand extends GetEppResourceCommand {
 
   @Parameter(
       description = "Contact id(s)",
diff --git a/java/google/registry/tools/GetDomainCommand.java b/java/google/registry/tools/GetDomainCommand.java
index 93d45e721..28e1f35ff 100644
--- a/java/google/registry/tools/GetDomainCommand.java
+++ b/java/google/registry/tools/GetDomainCommand.java
@@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.domain.DomainResource;
-import google.registry.tools.Command.GtechCommand;
 import java.util.List;
 
 /** Command to show a domain resource. */
 @Parameters(separators = " =", commandDescription = "Show domain resource(s)")
-final class GetDomainCommand extends GetEppResourceCommand implements GtechCommand {
+final class GetDomainCommand extends GetEppResourceCommand {
 
   @Parameter(
       description = "Fully qualified domain name(s)",
diff --git a/java/google/registry/tools/GetHistoryEntriesCommand.java b/java/google/registry/tools/GetHistoryEntriesCommand.java
index 4d4c0f960..a7228ec06 100644
--- a/java/google/registry/tools/GetHistoryEntriesCommand.java
+++ b/java/google/registry/tools/GetHistoryEntriesCommand.java
@@ -21,7 +21,6 @@ import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.xml.XmlTransformer;
 import org.joda.time.DateTime;
@@ -29,7 +28,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, GtechCommand {
+final class GetHistoryEntriesCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-a", "--after"},
diff --git a/java/google/registry/tools/GetHostCommand.java b/java/google/registry/tools/GetHostCommand.java
index b3333054e..83b8d1422 100644
--- a/java/google/registry/tools/GetHostCommand.java
+++ b/java/google/registry/tools/GetHostCommand.java
@@ -19,12 +19,11 @@ import static google.registry.model.EppResourceUtils.loadByForeignKey;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.host.HostResource;
-import google.registry.tools.Command.GtechCommand;
 import java.util.List;
 
 /** Command to show one or more host resources. */
 @Parameters(separators = " =", commandDescription = "Show host resource(s)")
-final class GetHostCommand extends GetEppResourceCommand implements GtechCommand {
+final class GetHostCommand extends GetEppResourceCommand {
 
   @Parameter(
       description = "Fully qualified host name(s)",
diff --git a/java/google/registry/tools/GetLrpTokenCommand.java b/java/google/registry/tools/GetLrpTokenCommand.java
index 4e8037f28..d4acfbbb2 100644
--- a/java/google/registry/tools/GetLrpTokenCommand.java
+++ b/java/google/registry/tools/GetLrpTokenCommand.java
@@ -22,7 +22,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableSet;
 import com.googlecode.objectify.Key;
 import google.registry.model.domain.LrpToken;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 
 /** Command to show token information for LRP participants. */
@@ -30,7 +29,7 @@ import google.registry.tools.Command.RemoteApiCommand;
     separators = " =",
     commandDescription = "Show token information for LRP participants by matching on a "
         + "known token or a unique ID (assignee).")
-public final class GetLrpTokenCommand implements RemoteApiCommand, GtechCommand {
+public final class GetLrpTokenCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-t", "--token"},
diff --git a/java/google/registry/tools/GetRegistrarCommand.java b/java/google/registry/tools/GetRegistrarCommand.java
index 22b2ec067..1c1cab90f 100644
--- a/java/google/registry/tools/GetRegistrarCommand.java
+++ b/java/google/registry/tools/GetRegistrarCommand.java
@@ -19,13 +19,12 @@ import static com.google.common.base.Preconditions.checkState;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import java.util.List;
 
 /** Command to show a registrar record. */
 @Parameters(separators = " =", commandDescription = "Show registrar record(s)")
-final class GetRegistrarCommand implements RemoteApiCommand, GtechCommand {
+final class GetRegistrarCommand implements RemoteApiCommand {
 
   @Parameter(
       description = "Client identifier of the registrar account(s)",
diff --git a/java/google/registry/tools/GetSchemaCommand.java b/java/google/registry/tools/GetSchemaCommand.java
index 1761aa53e..b71a59b62 100644
--- a/java/google/registry/tools/GetSchemaCommand.java
+++ b/java/google/registry/tools/GetSchemaCommand.java
@@ -16,11 +16,10 @@ package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 import google.registry.model.SchemaVersion;
-import google.registry.tools.Command.GtechCommand;
 
 /** Generates the schema file used for model versioning. */
 @Parameters(commandDescription = "Generate a model schema file")
-final class GetSchemaCommand implements GtechCommand {
+final class GetSchemaCommand implements Command {
   @Override
   public void run() throws Exception {
     System.out.println(SchemaVersion.getSchema());
diff --git a/java/google/registry/tools/GetSchemaTreeCommand.java b/java/google/registry/tools/GetSchemaTreeCommand.java
index a8df26f5a..285414c8c 100644
--- a/java/google/registry/tools/GetSchemaTreeCommand.java
+++ b/java/google/registry/tools/GetSchemaTreeCommand.java
@@ -31,7 +31,6 @@ import com.googlecode.objectify.annotation.Parent;
 import google.registry.model.BackupGroupRoot;
 import google.registry.model.annotations.NotBackedUp;
 import google.registry.model.annotations.VirtualEntity;
-import google.registry.tools.Command.GtechCommand;
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
@@ -42,7 +41,7 @@ import java.util.Set;
 
 /** Visualizes the schema parentage tree. */
 @Parameters(commandDescription = "Generate a model schema file")
-final class GetSchemaTreeCommand implements GtechCommand {
+final class GetSchemaTreeCommand implements Command {
 
   /** Mapping from parent classes in the Datastore sense to child classes. */
   private final Multimap<Class<?>, Class<?>> hierarchy =
diff --git a/java/google/registry/tools/GetTldCommand.java b/java/google/registry/tools/GetTldCommand.java
index 55f3e4f17..c9e73415d 100644
--- a/java/google/registry/tools/GetTldCommand.java
+++ b/java/google/registry/tools/GetTldCommand.java
@@ -19,13 +19,12 @@ import static google.registry.model.registry.Registries.assertTldExists;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import google.registry.model.registry.Registry;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import java.util.List;
 
 /** Command to show a TLD record. */
 @Parameters(separators = " =", commandDescription = "Show TLD record(s)")
-final class GetTldCommand implements RemoteApiCommand, GtechCommand {
+final class GetTldCommand implements RemoteApiCommand {
 
   @Parameter(
       description = "TLD(s) to show",
diff --git a/java/google/registry/tools/HashCertificateCommand.java b/java/google/registry/tools/HashCertificateCommand.java
index 6097ded4f..6f468e3af 100644
--- a/java/google/registry/tools/HashCertificateCommand.java
+++ b/java/google/registry/tools/HashCertificateCommand.java
@@ -21,7 +21,6 @@ import static google.registry.util.X509Utils.loadCertificate;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.base.Joiner;
-import google.registry.tools.Command.GtechCommand;
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.security.cert.CertificateParsingException;
@@ -30,7 +29,7 @@ import java.util.List;
 
 /** Command to hash a client certificate. */
 @Parameters(commandDescription = "Hash a client certificate")
-final class HashCertificateCommand implements GtechCommand {
+final class HashCertificateCommand implements Command {
 
   @Parameter(description = "Certificate filename")
   List<String> mainParameters = new ArrayList<>();
diff --git a/java/google/registry/tools/ListCreditsCommand.java b/java/google/registry/tools/ListCreditsCommand.java
index 1939c1c36..eb8b9aa26 100644
--- a/java/google/registry/tools/ListCreditsCommand.java
+++ b/java/google/registry/tools/ListCreditsCommand.java
@@ -25,13 +25,12 @@ import com.googlecode.objectify.Work;
 import google.registry.model.billing.RegistrarCredit;
 import google.registry.model.billing.RegistrarCreditBalance.BalanceMap;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import org.joda.money.Money;
 
 /** Command to list registrar credits and balances. */
 @Parameters(commandDescription = "List registrar credits and balances")
-final class ListCreditsCommand implements RemoteApiCommand, GtechCommand {
+final class ListCreditsCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-a", "--all"},
diff --git a/java/google/registry/tools/ListRegistrarsCommand.java b/java/google/registry/tools/ListRegistrarsCommand.java
index c4c8f5a0b..768f554d0 100644
--- a/java/google/registry/tools/ListRegistrarsCommand.java
+++ b/java/google/registry/tools/ListRegistrarsCommand.java
@@ -15,12 +15,11 @@
 package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.server.ListRegistrarsAction;
 
 /** Command to list all registrars. */
 @Parameters(separators = " =", commandDescription = "List all registrars.")
-final class ListRegistrarsCommand extends ListObjectsCommand implements GtechCommand {
+final class ListRegistrarsCommand extends ListObjectsCommand {
 
   @Override
   String getCommandPath() {
diff --git a/java/google/registry/tools/ListTldsCommand.java b/java/google/registry/tools/ListTldsCommand.java
index 186bea6ca..9df799b78 100644
--- a/java/google/registry/tools/ListTldsCommand.java
+++ b/java/google/registry/tools/ListTldsCommand.java
@@ -15,12 +15,11 @@
 package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.server.ListTldsAction;
 
 /** Command to list all top-level domains. */
 @Parameters(separators = " =", commandDescription = "List all top-level domains.")
-final class ListTldsCommand extends ListObjectsCommand implements GtechCommand {
+final class ListTldsCommand extends ListObjectsCommand {
 
   @Override
   String getCommandPath() {
diff --git a/java/google/registry/tools/PublishDetailReportCommand.java b/java/google/registry/tools/PublishDetailReportCommand.java
index 8abf79dd4..5094c4bfd 100644
--- a/java/google/registry/tools/PublishDetailReportCommand.java
+++ b/java/google/registry/tools/PublishDetailReportCommand.java
@@ -21,7 +21,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableMap;
 import google.registry.export.PublishDetailReportAction;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import java.util.Map;
 
 /**
@@ -29,7 +28,7 @@ import java.util.Map;
  */
 @Parameters(separators = " =", commandDescription = "Publish detail report for a registrar")
 public class PublishDetailReportCommand extends ConfirmingCommand
-    implements ServerSideCommand, GtechCommand {
+    implements ServerSideCommand {
 
   @Parameter(
       names = "--registrar_id",
diff --git a/java/google/registry/tools/RegistrarActivityReportCommand.java b/java/google/registry/tools/RegistrarActivityReportCommand.java
index e7abbccc2..ff2ed3696 100644
--- a/java/google/registry/tools/RegistrarActivityReportCommand.java
+++ b/java/google/registry/tools/RegistrarActivityReportCommand.java
@@ -26,7 +26,6 @@ import com.google.api.services.bigquery.model.JobConfigurationExtract;
 import com.google.api.services.bigquery.model.JobConfigurationQuery;
 import com.google.common.collect.ImmutableList;
 import google.registry.bigquery.BigqueryConnection;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.util.SqlTemplate;
 import java.nio.file.Path;
 import org.joda.time.DateTime;
@@ -35,7 +34,7 @@ import org.joda.time.format.DateTimeFormatter;
 
 /** Command for creating a registrar activity report and saving it to cloud storage. */
 @Parameters(separators = " =", commandDescription = "Generates a registrar activity report.")
-final class RegistrarActivityReportCommand implements GtechCommand {
+final class RegistrarActivityReportCommand implements Command {
 
   @ParametersDelegate
   private final BigqueryParameters bigqueryParameters = new BigqueryParameters();
diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java
index 12900dba9..9aff7ea64 100644
--- a/java/google/registry/tools/RegistrarContactCommand.java
+++ b/java/google/registry/tools/RegistrarContactCommand.java
@@ -34,7 +34,6 @@ import google.registry.model.common.GaeUserIdConverter;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.model.registrar.RegistrarContact.Builder;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.params.OptionalPhoneNumberParameter;
 import google.registry.tools.params.PathParameter;
 import java.io.IOException;
@@ -53,7 +52,7 @@ import javax.annotation.Nullable;
 @Parameters(
     separators = " =",
     commandDescription = "Create/read/update/delete the various contact lists for a Registrar.")
-final class RegistrarContactCommand extends MutatingCommand implements GtechCommand {
+final class RegistrarContactCommand extends MutatingCommand {
 
   private enum Mode { LIST, CREATE, UPDATE, DELETE }
 
diff --git a/java/google/registry/tools/SetupOteCommand.java b/java/google/registry/tools/SetupOteCommand.java
index 5b8adef5b..a16ed25ee 100644
--- a/java/google/registry/tools/SetupOteCommand.java
+++ b/java/google/registry/tools/SetupOteCommand.java
@@ -26,7 +26,6 @@ import com.google.re2j.Pattern;
 import google.registry.config.RegistryEnvironment;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registry.Registry.TldState;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import java.nio.file.Path;
@@ -39,7 +38,7 @@ import org.joda.time.Duration;
 @Parameters(
     separators = " =",
     commandDescription = "Set up OT&E TLDs and registrars")
-final class SetupOteCommand extends ConfirmingCommand implements RemoteApiCommand, GtechCommand {
+final class SetupOteCommand extends ConfirmingCommand implements RemoteApiCommand {
 
   // 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/UniformRapidSuspensionCommand.java b/java/google/registry/tools/UniformRapidSuspensionCommand.java
index 93d6ffd36..5c657507e 100644
--- a/java/google/registry/tools/UniformRapidSuspensionCommand.java
+++ b/java/google/registry/tools/UniformRapidSuspensionCommand.java
@@ -33,7 +33,6 @@ import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.host.HostResource;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.UniformRapidSuspensionSoyInfo;
 import java.util.ArrayList;
 import java.util.List;
@@ -48,7 +47,7 @@ import org.json.simple.parser.ParseException;
 /** A command to suspend a domain for the Uniform Rapid Suspension process. */
 @Parameters(separators = " =",
     commandDescription = "Suspend a domain for Uniform Rapid Suspension.")
-final class UniformRapidSuspensionCommand extends MutatingEppToolCommand implements GtechCommand {
+final class UniformRapidSuspensionCommand extends MutatingEppToolCommand {
 
   private static final ImmutableSet<String> URS_LOCKS = ImmutableSet.of(
       StatusValue.SERVER_DELETE_PROHIBITED.getXmlName(),
diff --git a/java/google/registry/tools/UpdateRegistrarCommand.java b/java/google/registry/tools/UpdateRegistrarCommand.java
index 598c883e2..a0dcaba18 100644
--- a/java/google/registry/tools/UpdateRegistrarCommand.java
+++ b/java/google/registry/tools/UpdateRegistrarCommand.java
@@ -18,12 +18,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.beust.jcommander.Parameters;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 
 /** Command to update a Registrar. */
 @Parameters(separators = " =", commandDescription = "Update registrar account(s)")
-final class UpdateRegistrarCommand extends CreateOrUpdateRegistrarCommand
-    implements GtechCommand {
+final class UpdateRegistrarCommand extends CreateOrUpdateRegistrarCommand {
 
   @Override
   Registrar getOldRegistrar(String clientId) {
diff --git a/java/google/registry/tools/UpdateServerLocksCommand.java b/java/google/registry/tools/UpdateServerLocksCommand.java
index ec9df42eb..b5cc92e72 100644
--- a/java/google/registry/tools/UpdateServerLocksCommand.java
+++ b/java/google/registry/tools/UpdateServerLocksCommand.java
@@ -25,7 +25,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.collect.ImmutableSet;
 import com.google.template.soy.data.SoyMapData;
 import google.registry.model.eppcommon.StatusValue;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.soy.UpdateServerLocksSoyInfo;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +33,7 @@ import java.util.Set;
 /** A command to execute a domain check claims epp command. */
 @Parameters(separators = " =",
     commandDescription = "Toggle server locks on a domain.")
-final class UpdateServerLocksCommand extends MutatingEppToolCommand implements GtechCommand {
+final class UpdateServerLocksCommand extends MutatingEppToolCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/java/google/registry/tools/ValidateLoginCredentialsCommand.java
index 98200f99b..0a985d538 100644
--- a/java/google/registry/tools/ValidateLoginCredentialsCommand.java
+++ b/java/google/registry/tools/ValidateLoginCredentialsCommand.java
@@ -26,7 +26,6 @@ import com.beust.jcommander.Parameters;
 import com.google.common.base.Optional;
 import google.registry.flows.TlsCredentials;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.tools.params.PathParameter;
 import java.nio.file.Files;
@@ -35,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, GtechCommand {
+final class ValidateLoginCredentialsCommand implements RemoteApiCommand {
 
   @Parameter(
       names = {"-c", "--client"},
diff --git a/java/google/registry/tools/VerifyOteCommand.java b/java/google/registry/tools/VerifyOteCommand.java
index a327e7cb7..f37c4a621 100644
--- a/java/google/registry/tools/VerifyOteCommand.java
+++ b/java/google/registry/tools/VerifyOteCommand.java
@@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import google.registry.config.RegistryEnvironment;
 import google.registry.model.registrar.Registrar;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.server.VerifyOteAction;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -40,7 +39,7 @@ import java.util.Map.Entry;
 @Parameters(
     separators = " =",
     commandDescription = "Verify passage of OT&E for specified (or all) registrars")
-final class VerifyOteCommand implements ServerSideCommand, GtechCommand {
+final class VerifyOteCommand implements ServerSideCommand {
 
   @Parameter(
       description = "List of registrar names to check; must be the same names as the ones used "
diff --git a/java/google/registry/tools/WhoisQueryCommand.java b/java/google/registry/tools/WhoisQueryCommand.java
index 4ce0e8fc9..cfd4864a1 100644
--- a/java/google/registry/tools/WhoisQueryCommand.java
+++ b/java/google/registry/tools/WhoisQueryCommand.java
@@ -17,7 +17,6 @@ package google.registry.tools;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.google.common.base.Joiner;
-import google.registry.tools.Command.GtechCommand;
 import google.registry.tools.Command.RemoteApiCommand;
 import google.registry.whois.Whois;
 import java.util.List;
@@ -25,7 +24,7 @@ import javax.inject.Inject;
 
 /** Command to execute a WHOIS query. */
 @Parameters(separators = " =", commandDescription = "Manually perform a WHOIS query")
-final class WhoisQueryCommand implements RemoteApiCommand, GtechCommand {
+final class WhoisQueryCommand implements RemoteApiCommand {
 
   @Parameter(
       description = "WHOIS query string",
diff --git a/java/google/registry/tools/soy/ContactCreate.soy b/java/google/registry/tools/soy/ContactCreate.soy
index 7b02bf6ef..9cfc36f0a 100644
--- a/java/google/registry/tools/soy/ContactCreate.soy
+++ b/java/google/registry/tools/soy/ContactCreate.soy
@@ -80,7 +80,7 @@
           </contact:authInfo>
         </contact:create>
       </create>
-      <clTRID>GTechTool</clTRID>
+      <clTRID>RegistryTool</clTRID>
     </command>
   </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/CreateAnchorTenant.soy b/java/google/registry/tools/soy/CreateAnchorTenant.soy
index 7e139b152..0bc533ffd 100644
--- a/java/google/registry/tools/soy/CreateAnchorTenant.soy
+++ b/java/google/registry/tools/soy/CreateAnchorTenant.soy
@@ -56,7 +56,7 @@
       </fee:create>
       {/if}
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DeleteDomain.soy b/java/google/registry/tools/soy/DeleteDomain.soy
index f91cba562..827231fd5 100644
--- a/java/google/registry/tools/soy/DeleteDomain.soy
+++ b/java/google/registry/tools/soy/DeleteDomain.soy
@@ -36,7 +36,7 @@
         <metadata:requestedByRegistrar>{$requestedByRegistrar}</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DomainApplicationInfo.soy b/java/google/registry/tools/soy/DomainApplicationInfo.soy
index 55d6243d6..eed7e2170 100644
--- a/java/google/registry/tools/soy/DomainApplicationInfo.soy
+++ b/java/google/registry/tools/soy/DomainApplicationInfo.soy
@@ -37,7 +37,7 @@
       <launch:applicationID>{$id}</launch:applicationID>
     </launch:info>
    </extension>
-   <clTRID>GTechTool</clTRID>
+   <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DomainCheck.soy b/java/google/registry/tools/soy/DomainCheck.soy
index 9d2c22e44..c4dcf8540 100644
--- a/java/google/registry/tools/soy/DomainCheck.soy
+++ b/java/google/registry/tools/soy/DomainCheck.soy
@@ -29,7 +29,7 @@
       {/foreach}
       </domain:check>
     </check>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DomainCheckClaims.soy b/java/google/registry/tools/soy/DomainCheckClaims.soy
index ba4abe465..362c2bea8 100644
--- a/java/google/registry/tools/soy/DomainCheckClaims.soy
+++ b/java/google/registry/tools/soy/DomainCheckClaims.soy
@@ -36,7 +36,7 @@
         <launch:phase>claims</launch:phase>
       </launch:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DomainCheckFee.soy b/java/google/registry/tools/soy/DomainCheckFee.soy
index db3b16bdc..768085cc1 100644
--- a/java/google/registry/tools/soy/DomainCheckFee.soy
+++ b/java/google/registry/tools/soy/DomainCheckFee.soy
@@ -40,7 +40,7 @@
       {/foreach}
       </fee:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/DomainCreate.soy b/java/google/registry/tools/soy/DomainCreate.soy
index 4a8b83c45..95930ca15 100644
--- a/java/google/registry/tools/soy/DomainCreate.soy
+++ b/java/google/registry/tools/soy/DomainCreate.soy
@@ -49,7 +49,7 @@
           </domain:authInfo>
         </domain:create>
       </create>
-      <clTRID>GTechTool</clTRID>
+      <clTRID>RegistryTool</clTRID>
     </command>
   </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/HostCreate.soy b/java/google/registry/tools/soy/HostCreate.soy
index c2220a489..34fbf0886 100644
--- a/java/google/registry/tools/soy/HostCreate.soy
+++ b/java/google/registry/tools/soy/HostCreate.soy
@@ -39,7 +39,7 @@
           {/if}
         </host:create>
       </create>
-      <clTRID>GTechTool</clTRID>
+      <clTRID>RegistryTool</clTRID>
     </command>
   </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/UniformRapidSuspension.soy b/java/google/registry/tools/soy/UniformRapidSuspension.soy
index 1ca2ab5e6..36d42954f 100644
--- a/java/google/registry/tools/soy/UniformRapidSuspension.soy
+++ b/java/google/registry/tools/soy/UniformRapidSuspension.soy
@@ -80,7 +80,7 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/java/google/registry/tools/soy/UpdateServerLocks.soy b/java/google/registry/tools/soy/UpdateServerLocks.soy
index 9e3128b80..92dc9e8e7 100644
--- a/java/google/registry/tools/soy/UpdateServerLocks.soy
+++ b/java/google/registry/tools/soy/UpdateServerLocks.soy
@@ -50,7 +50,7 @@
         <metadata:requestedByRegistrar>{$requestedByRegistrar}</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
 {/template}
diff --git a/javatests/google/registry/tools/testdata/contact_create_complete.xml b/javatests/google/registry/tools/testdata/contact_create_complete.xml
index 06e6d43a5..9540168ca 100644
--- a/javatests/google/registry/tools/testdata/contact_create_complete.xml
+++ b/javatests/google/registry/tools/testdata/contact_create_complete.xml
@@ -26,6 +26,6 @@
         </contact:authInfo>
       </contact:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/contact_create_minimal.xml b/javatests/google/registry/tools/testdata/contact_create_minimal.xml
index 53f48c2e3..927b4e3fa 100644
--- a/javatests/google/registry/tools/testdata/contact_create_minimal.xml
+++ b/javatests/google/registry/tools/testdata/contact_create_minimal.xml
@@ -13,6 +13,6 @@
         </contact:authInfo>
       </contact:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check.xml b/javatests/google/registry/tools/testdata/domain_check.xml
index 8ef3c8196..f199b3b39 100644
--- a/javatests/google/registry/tools/testdata/domain_check.xml
+++ b/javatests/google/registry/tools/testdata/domain_check.xml
@@ -6,6 +6,6 @@
         <domain:name>example.tld</domain:name>
       </domain:check>
     </check>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_claims.xml b/javatests/google/registry/tools/testdata/domain_check_claims.xml
index 15ffc75ad..1ad3df100 100644
--- a/javatests/google/registry/tools/testdata/domain_check_claims.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_claims.xml
@@ -12,6 +12,6 @@
         <launch:phase>claims</launch:phase>
       </launch:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml
index f63adc809..cf34fa60e 100644
--- a/javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml
@@ -14,6 +14,6 @@
         <launch:phase>claims</launch:phase>
       </launch:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml
index 714761f6a..723af8405 100644
--- a/javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml
@@ -12,6 +12,6 @@
         <launch:phase>claims</launch:phase>
       </launch:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_fee.xml b/javatests/google/registry/tools/testdata/domain_check_fee.xml
index b0860a561..669eb75c7 100644
--- a/javatests/google/registry/tools/testdata/domain_check_fee.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_fee.xml
@@ -15,6 +15,6 @@
         </fee:domain>
       </fee:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml
index 7b73d2bf7..ee1487357 100644
--- a/javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml
@@ -27,6 +27,6 @@
         </fee:domain>
       </fee:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml
index aa9e98a86..4dfa84aaa 100644
--- a/javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml
@@ -15,6 +15,6 @@
         </fee:domain>
       </fee:check>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_multiple.xml
index fe5707633..667e2de8d 100644
--- a/javatests/google/registry/tools/testdata/domain_check_multiple.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_multiple.xml
@@ -8,6 +8,6 @@
         <domain:name>example3.tld</domain:name>
       </domain:check>
     </check>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_check_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_second_tld.xml
index 73c644ebe..974b4d261 100644
--- a/javatests/google/registry/tools/testdata/domain_check_second_tld.xml
+++ b/javatests/google/registry/tools/testdata/domain_check_second_tld.xml
@@ -6,6 +6,6 @@
         <domain:name>example.tld2</domain:name>
       </domain:check>
     </check>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml
index 14155f03b..4435e4601 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml
@@ -20,6 +20,6 @@
         <metadata:anchorTenant>true</metadata:anchorTenant>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
index e936517c2..a8baf0c38 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
@@ -24,6 +24,6 @@
         <fee:fee>40000</fee:fee>
       </fee:create>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
index 1bee92152..08030ce7f 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
@@ -24,6 +24,6 @@
         <fee:fee>26.00</fee:fee>
       </fee:create>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
index ea88916e3..3479f42a4 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
@@ -20,6 +20,6 @@
         <metadata:anchorTenant>true</metadata:anchorTenant>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
index fbdba0a36..8e460d390 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
@@ -19,6 +19,6 @@
         <metadata:anchorTenant>true</metadata:anchorTenant>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml
index cfa720584..1a1472f7a 100644
--- a/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml
@@ -20,6 +20,6 @@
         <metadata:anchorTenant>true</metadata:anchorTenant>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_complete.xml b/javatests/google/registry/tools/testdata/domain_create_complete.xml
index 322a98bf3..c792955fc 100644
--- a/javatests/google/registry/tools/testdata/domain_create_complete.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_complete.xml
@@ -20,6 +20,6 @@
         </domain:authInfo>
       </domain:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_create_minimal.xml b/javatests/google/registry/tools/testdata/domain_create_minimal.xml
index 2d3dbcc80..d01b94656 100644
--- a/javatests/google/registry/tools/testdata/domain_create_minimal.xml
+++ b/javatests/google/registry/tools/testdata/domain_create_minimal.xml
@@ -13,6 +13,6 @@
         </domain:authInfo>
       </domain:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_delete.xml b/javatests/google/registry/tools/testdata/domain_delete.xml
index e35ac1ec3..b16cfec36 100644
--- a/javatests/google/registry/tools/testdata/domain_delete.xml
+++ b/javatests/google/registry/tools/testdata/domain_delete.xml
@@ -12,6 +12,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml b/javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml
index 8c37bcf99..188f01de8 100644
--- a/javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml
+++ b/javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml
@@ -12,6 +12,6 @@
         <metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml
index 8ea514e63..4d654865f 100644
--- a/javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml
+++ b/javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml
@@ -12,6 +12,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_info_landrush.xml b/javatests/google/registry/tools/testdata/domain_info_landrush.xml
index 42fe943d3..f5828bc44 100644
--- a/javatests/google/registry/tools/testdata/domain_info_landrush.xml
+++ b/javatests/google/registry/tools/testdata/domain_info_landrush.xml
@@ -14,6 +14,6 @@
       <launch:applicationID>123</launch:applicationID>
     </launch:info>
    </extension>
-   <clTRID>GTechTool</clTRID>
+   <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/domain_info_sunrush.xml b/javatests/google/registry/tools/testdata/domain_info_sunrush.xml
index 9dc1fe516..3ac43cdf7 100644
--- a/javatests/google/registry/tools/testdata/domain_info_sunrush.xml
+++ b/javatests/google/registry/tools/testdata/domain_info_sunrush.xml
@@ -14,6 +14,6 @@
       <launch:applicationID>123</launch:applicationID>
     </launch:info>
    </extension>
-   <clTRID>GTechTool</clTRID>
+   <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/host_create_complete.xml b/javatests/google/registry/tools/testdata/host_create_complete.xml
index dcc596cfe..b9bc7afed 100644
--- a/javatests/google/registry/tools/testdata/host_create_complete.xml
+++ b/javatests/google/registry/tools/testdata/host_create_complete.xml
@@ -8,6 +8,6 @@
         <host:addr ip="v6">2001:0db8:85a3:0000:0000:8a2e:0370:7334</host:addr>
       </host:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/host_create_minimal.xml b/javatests/google/registry/tools/testdata/host_create_minimal.xml
index 97133dc88..2eec147cd 100644
--- a/javatests/google/registry/tools/testdata/host_create_minimal.xml
+++ b/javatests/google/registry/tools/testdata/host_create_minimal.xml
@@ -5,6 +5,6 @@
         <host:name>notours.external</host:name>
       </host:create>
     </create>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/uniform_rapid_suspension.xml b/javatests/google/registry/tools/testdata/uniform_rapid_suspension.xml
index d15d6b02a..ecaf9a6d0 100644
--- a/javatests/google/registry/tools/testdata/uniform_rapid_suspension.xml
+++ b/javatests/google/registry/tools/testdata/uniform_rapid_suspension.xml
@@ -40,6 +40,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_existing_host.xml b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_existing_host.xml
index fe44c4e77..45ba154bf 100644
--- a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_existing_host.xml
+++ b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_existing_host.xml
@@ -30,6 +30,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo.xml b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo.xml
index 98122cf4b..ca9304f06 100644
--- a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo.xml
+++ b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo.xml
@@ -32,6 +32,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo_preserve.xml b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo_preserve.xml
index e7a7200ca..6c024c9d3 100644
--- a/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo_preserve.xml
+++ b/javatests/google/registry/tools/testdata/uniform_rapid_suspension_undo_preserve.xml
@@ -31,6 +31,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml b/javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml
index 3d20a2b06..da247f34b 100644
--- a/javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml
+++ b/javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml
@@ -20,6 +20,6 @@
         <metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml b/javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml
index f6c3a0692..4f16abdf5 100644
--- a/javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml
+++ b/javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml
@@ -16,6 +16,6 @@
         <metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
index 9bdf6719f..7517dfd5d 100644
--- a/javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
+++ b/javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
@@ -16,6 +16,6 @@
         <metadata:requestedByRegistrar>false</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml b/javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml
index 4f45218f3..438460b1e 100644
--- a/javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml
+++ b/javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml
@@ -20,6 +20,6 @@
         <metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>
diff --git a/javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml b/javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml
index b7315798b..08a80cf10 100644
--- a/javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml
+++ b/javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml
@@ -16,6 +16,6 @@
         <metadata:requestedByRegistrar>true</metadata:requestedByRegistrar>
       </metadata:metadata>
     </extension>
-    <clTRID>GTechTool</clTRID>
+    <clTRID>RegistryTool</clTRID>
   </command>
 </epp>