diff --git a/app/resources/locales/en_US/enumeration.po b/app/resources/locales/en_US/enumeration.po
index 363e85a87..c6f01644c 100644
--- a/app/resources/locales/en_US/enumeration.po
+++ b/app/resources/locales/en_US/enumeration.po
@@ -529,11 +529,8 @@ msgstr "Postal Code"
 msgid "RequiredAddressFieldsEnum.street"
 msgstr "Street"
 
-msgid "RequiredAddressFieldsEnum.street,room,locality,state,postal_code"
-msgstr "Street, Room, Locality, City, State, Postal Code"
-
-msgid "RequiredAddressFieldsEnum.street,room,locality,state,postal_code,country"
-msgstr "Street, Room, Locality, City, State, Postal Code, Country"
+msgid "RequiredAddressFieldsEnum.street,locality,state,postal_code"
+msgstr "Street, City, State, Postal Code"
 
 msgid "GroupedAddressFieldsEnum.street,room"
 msgstr "Street, Room"
diff --git a/app/src/Lib/Enum/GroupedAddressFieldsEnum.php b/app/src/Lib/Enum/GroupedAddressFieldsEnum.php
index 7a2bd3ff1..c44c7c270 100644
--- a/app/src/Lib/Enum/GroupedAddressFieldsEnum.php
+++ b/app/src/Lib/Enum/GroupedAddressFieldsEnum.php
@@ -33,6 +33,6 @@ class GroupedAddressFieldsEnum extends StandardEnum {
   // The order needs to be from local to country. Since this is the
   // ordering that will be used for rendering
   const StreetRoom         = 'street,room';
-  const CityLocality       = 'city,locality';
+  const Locality           = 'locality';
   const StatePostalCountry = 'state,postal_code,country';
 }
\ No newline at end of file
diff --git a/app/src/Lib/Enum/RequiredAddressFieldsEnum.php b/app/src/Lib/Enum/RequiredAddressFieldsEnum.php
index a2e2a4bbd..4ad59395c 100644
--- a/app/src/Lib/Enum/RequiredAddressFieldsEnum.php
+++ b/app/src/Lib/Enum/RequiredAddressFieldsEnum.php
@@ -34,6 +34,6 @@ class RequiredAddressFieldsEnum extends StandardEnum {
   const Country                      = "country";
   const Postal                       = "postal_code";
   const Street                       = "street";
-  const StreetCityStatePostal        = "street,room,locality,state,postal_code";
-  const StreetCityStatePostalCountry = "street,room,locality,state,postal_code,country";
+  const StreetCityStatePostal        = "street,locality,state,postal_code";
+  const StreetCityStatePostalCountry = "street,locality,state,postal_code,country";
 }
\ No newline at end of file