diff --git a/core/src/main/java/google/registry/tools/DeleteDomainCommand.java b/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
index 7989dc02d..da0420241 100644
--- a/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
+++ b/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
@@ -17,7 +17,7 @@ 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.soy.DeleteDomainSoyInfo;
+import google.registry.tools.soy.DomainDeleteSoyInfo;
 
 /** A command to delete a domain via EPP. */
 @Parameters(separators = " =", commandDescription = "Delete domain")
@@ -60,7 +60,7 @@ final class DeleteDomainCommand extends MutatingEppToolCommand {
       // Immediate deletion is accomplished using the superuser extension.
       superuser = true;
     }
-    setSoyTemplate(DeleteDomainSoyInfo.getInstance(), DeleteDomainSoyInfo.DELETEDOMAIN);
+    setSoyTemplate(DomainDeleteSoyInfo.getInstance(), DomainDeleteSoyInfo.DELETEDOMAIN);
     addSoyRecord(clientId, new SoyMapData(
         "domainName", domainName,
         "immediately", immediately,
diff --git a/core/src/main/java/google/registry/tools/DeleteHostCommand.java b/core/src/main/java/google/registry/tools/DeleteHostCommand.java
index 1070ea49c..4e521bc77 100644
--- a/core/src/main/java/google/registry/tools/DeleteHostCommand.java
+++ b/core/src/main/java/google/registry/tools/DeleteHostCommand.java
@@ -17,7 +17,7 @@ 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.soy.DeleteHostSoyInfo;
+import google.registry.tools.soy.HostDeleteSoyInfo;
 
 /** A command to delete a host via EPP. */
 @Parameters(separators = " =", commandDescription = "Delete host")
@@ -49,7 +49,7 @@ final class DeleteHostCommand extends MutatingEppToolCommand {
 
   @Override
   protected void initMutatingEppToolCommand() {
-    setSoyTemplate(DeleteHostSoyInfo.getInstance(), DeleteHostSoyInfo.DELETEHOST);
+    setSoyTemplate(HostDeleteSoyInfo.getInstance(), HostDeleteSoyInfo.DELETEHOST);
     addSoyRecord(clientId, new SoyMapData(
         "hostName", hostName,
         "reason", reason,
diff --git a/core/src/main/java/google/registry/tools/RenewDomainCommand.java b/core/src/main/java/google/registry/tools/RenewDomainCommand.java
index d5be98810..54533795e 100644
--- a/core/src/main/java/google/registry/tools/RenewDomainCommand.java
+++ b/core/src/main/java/google/registry/tools/RenewDomainCommand.java
@@ -25,7 +25,7 @@ import com.beust.jcommander.Parameters;
 import com.google.common.base.Joiner;
 import com.google.template.soy.data.SoyMapData;
 import google.registry.model.domain.DomainBase;
-import google.registry.tools.soy.RenewDomainSoyInfo;
+import google.registry.tools.soy.DomainRenewSoyInfo;
 import google.registry.util.Clock;
 import java.util.List;
 import java.util.Optional;
@@ -68,7 +68,7 @@ final class RenewDomainCommand extends MutatingEppToolCommand {
       Optional<DomainBase> domainOptional =
           loadByForeignKey(DomainBase.class, domainName, now);
       checkArgumentPresent(domainOptional, "Domain '%s' does not exist or is deleted", domainName);
-      setSoyTemplate(RenewDomainSoyInfo.getInstance(), RenewDomainSoyInfo.RENEWDOMAIN);
+      setSoyTemplate(DomainRenewSoyInfo.getInstance(), DomainRenewSoyInfo.RENEWDOMAIN);
       DomainBase domain = domainOptional.get();
       addSoyRecord(
           isNullOrEmpty(clientId) ? domain.getCurrentSponsorClientId() : clientId,
diff --git a/core/src/main/resources/google/registry/tools/soy/DeleteDomain.soy b/core/src/main/resources/google/registry/tools/soy/DomainDelete.soy
similarity index 100%
rename from core/src/main/resources/google/registry/tools/soy/DeleteDomain.soy
rename to core/src/main/resources/google/registry/tools/soy/DomainDelete.soy
diff --git a/core/src/main/resources/google/registry/tools/soy/RenewDomain.soy b/core/src/main/resources/google/registry/tools/soy/DomainRenew.soy
similarity index 100%
rename from core/src/main/resources/google/registry/tools/soy/RenewDomain.soy
rename to core/src/main/resources/google/registry/tools/soy/DomainRenew.soy
diff --git a/core/src/main/resources/google/registry/tools/soy/DeleteHost.soy b/core/src/main/resources/google/registry/tools/soy/HostDelete.soy
similarity index 100%
rename from core/src/main/resources/google/registry/tools/soy/DeleteHost.soy
rename to core/src/main/resources/google/registry/tools/soy/HostDelete.soy