diff --git a/java/google/registry/tools/soy/RemoveIpAddress.soy b/java/google/registry/tools/soy/RemoveIpAddress.soy
index 572008fa7..252097371 100644
--- a/java/google/registry/tools/soy/RemoveIpAddress.soy
+++ b/java/google/registry/tools/soy/RemoveIpAddress.soy
@@ -19,7 +19,7 @@
  */
 {template .remove_ip_address stricthtml="false"}
 {@param name: string}
-{@param ipAddresses: list<map<string, string>>}
+{@param ipAddresses: list<legacy_object_map<string, string>>}
 {@param requestedByRegistrar: string}
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
diff --git a/java/google/registry/ui/soy/registrar/Domain.soy b/java/google/registry/ui/soy/registrar/Domain.soy
index 636bfcefa..57c27ce63 100644
--- a/java/google/registry/ui/soy/registrar/Domain.soy
+++ b/java/google/registry/ui/soy/registrar/Domain.soy
@@ -163,7 +163,7 @@
 
 /** Renders an input form row for a specific type of contact. */
 {template .showContact_ visibility="private"}
-  {@param contacts: list<map<string, ?>>} /** List of EPP domain:contacts. */
+  {@param contacts: list<legacy_object_map<string, ?>>} /** List of EPP domain:contacts. */
   {@param type: string} /** Type of contact (e.g. admin, tech) */
   {for $contact in $contacts}
     {if $type == $contact['@type']}