diff --git a/java/google/registry/tools/CreateContactCommand.java b/java/google/registry/tools/CreateContactCommand.java
index 2ba0d6176..e243495f4 100644
--- a/java/google/registry/tools/CreateContactCommand.java
+++ b/java/google/registry/tools/CreateContactCommand.java
@@ -22,13 +22,14 @@ 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.CreateContactSoyInfo;
+import google.registry.tools.soy.ContactCreateSoyInfo;
 import java.util.List;
 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 {
+
   // TODO(b/19016175): Expand to allow full suite of contact flows.
   @Parameter(
       names = {"-c", "--client"},
@@ -111,12 +112,10 @@ final class CreateContactCommand extends MutatingEppToolCommand implements Gtech
     if (isNullOrEmpty(password)) {
       password = passwordGenerator.createPassword(PASSWORD_LENGTH);
     }
-
     checkArgument(street == null || street.size() <= 3,
         "Addresses must contain at most 3 street lines.");
 
-    setSoyTemplate(CreateContactSoyInfo.getInstance(),
-        CreateContactSoyInfo.CREATECONTACT);
+    setSoyTemplate(ContactCreateSoyInfo.getInstance(), ContactCreateSoyInfo.CONTACTCREATE);
     addSoyRecord(clientIdentifier, new SoyMapData(
         "id", id,
         "name", name,
diff --git a/java/google/registry/tools/CreateDomainCommand.java b/java/google/registry/tools/CreateDomainCommand.java
index dde1ab496..74b2c39d8 100644
--- a/java/google/registry/tools/CreateDomainCommand.java
+++ b/java/google/registry/tools/CreateDomainCommand.java
@@ -21,14 +21,16 @@ 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.CreateDomainSoyInfo;
+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 {
-  @Parameter(names = {"-c", "--client"},
+
+  @Parameter(
+      names = {"-c", "--client"},
       description = "Client identifier of the registrar to execute the command as",
       required = true)
   String clientIdentifier;
@@ -52,7 +54,7 @@ final class CreateDomainCommand extends MutatingEppToolCommand implements GtechC
 
   @Parameter(
       names = {"-r", "--registrant"},
-      description = "Domain registrant.", 
+      description = "Domain registrant.",
       required = true)
   private String registrant;
 
@@ -83,10 +85,9 @@ final class CreateDomainCommand extends MutatingEppToolCommand implements GtechC
     if (isNullOrEmpty(password)) {
       password = passwordGenerator.createPassword(PASSWORD_LENGTH);
     }
-
     checkArgument(ns == null || ns.size() <= 13, "There can be at most 13 nameservers.");
 
-    setSoyTemplate(CreateDomainSoyInfo.getInstance(), CreateDomainSoyInfo.CREATEDOMAIN);
+    setSoyTemplate(DomainCreateSoyInfo.getInstance(), DomainCreateSoyInfo.DOMAINCREATE);
     addSoyRecord(clientIdentifier, new SoyMapData(
         "domain", domain,
         "period", period == null ? null : period.toString(),
diff --git a/java/google/registry/tools/soy/CreateContact.soy b/java/google/registry/tools/soy/ContactCreate.soy
similarity index 99%
rename from java/google/registry/tools/soy/CreateContact.soy
rename to java/google/registry/tools/soy/ContactCreate.soy
index e47ce867e..7b02bf6ef 100644
--- a/java/google/registry/tools/soy/CreateContact.soy
+++ b/java/google/registry/tools/soy/ContactCreate.soy
@@ -16,7 +16,7 @@
 /**
  * Create contact
  */
-{template .createcontact}
+{template .contactcreate}
   {@param? id: string}
   {@param? name: string}
   {@param? org: string}
diff --git a/java/google/registry/tools/soy/CreateDomain.soy b/java/google/registry/tools/soy/DomainCreate.soy
similarity index 98%
rename from java/google/registry/tools/soy/CreateDomain.soy
rename to java/google/registry/tools/soy/DomainCreate.soy
index 8cf1220bd..4a8b83c45 100644
--- a/java/google/registry/tools/soy/CreateDomain.soy
+++ b/java/google/registry/tools/soy/DomainCreate.soy
@@ -16,7 +16,7 @@
 /**
  * Create domain
  */
-{template .createdomain}
+{template .domaincreate}
   {@param domain: string}
   {@param? period: string}
   {@param? ns: list<string>}
@@ -53,4 +53,3 @@
     </command>
   </epp>
 {/template}
-