Add initial straightforward field renames

src/registrar/models/contact.py

@@ -18,7 +18,7 @@ class Contact(TimeStampedModel):
     first_name = models.CharField(
         null=True,
         blank=True,
-        verbose_name="first name / given name",
+        verbose_name="First name",
         db_index=True,
     )
     middle_name = models.CharField(
@@ -28,13 +28,13 @@ class Contact(TimeStampedModel):
     last_name = models.CharField(
         null=True,
         blank=True,
-        verbose_name="last name / family name",
+        verbose_name="Last Name",
         db_index=True,
     )
     title = models.CharField(
         null=True,
         blank=True,
-        verbose_name="title or role in your organization",
+        verbose_name="Title / role",
     )
     email = models.EmailField(
         null=True,

src/registrar/models/domain.py

@@ -992,6 +992,7 @@ class Domain(TimeStampedModel, DomainHelper):
         blank=False,
         default=None,  # prevent saving without a value
         unique=True,
+        verbose_name="Domain",
         help_text="Fully qualified domain name",
     )
 
@@ -1000,6 +1001,7 @@ class Domain(TimeStampedModel, DomainHelper):
         choices=State.choices,
         default=State.UNKNOWN,
         protected=True,  # cannot change state directly, particularly in Django admin
+        verbose_name="Domain state",
         help_text="Very basic info about the lifecycle of this domain object",
     )
 
@@ -1017,12 +1019,14 @@ class Domain(TimeStampedModel, DomainHelper):
     deleted = DateField(
         null=True,
         editable=False,
+        verbose_name="Deleted on",
         help_text="Deleted at date",
     )
 
     first_ready = DateField(
         null=True,
         editable=False,
+        verbose_name="First ready on",
         help_text="The last time this domain moved into the READY state",
     )
 

src/registrar/models/domain_information.py

@@ -62,6 +62,7 @@ class DomainInformation(TimeStampedModel):
     is_election_board = models.BooleanField(
         null=True,
         blank=True,
+        verbose_name="Election office",
         help_text="Is your organization an election office?",
     )
 
@@ -121,13 +122,13 @@ class DomainInformation(TimeStampedModel):
         null=True,
         blank=True,
         help_text="Street address",
-        verbose_name="Street address",
+        verbose_name="Address line 1",
     )
     address_line2 = models.CharField(
         null=True,
         blank=True,
         help_text="Street address line 2 (optional)",
-        verbose_name="Street address line 2 (optional)",
+        verbose_name="Address line 2",
     )
     city = models.CharField(
         null=True,
@@ -139,21 +140,22 @@ class DomainInformation(TimeStampedModel):
         choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
+        verbose_name="State / territory",
         help_text="State, territory, or military post",
-        verbose_name="State, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
         null=True,
         blank=True,
         help_text="Zip code",
+        verbose_name="Zip code",
         db_index=True,
     )
     urbanization = models.CharField(
         null=True,
         blank=True,
         help_text="Urbanization (required for Puerto Rico only)",
-        verbose_name="Urbanization (required for Puerto Rico only)",
+        verbose_name="Urbanization",
     )
 
     about_your_organization = models.TextField(
@@ -177,6 +179,7 @@ class DomainInformation(TimeStampedModel):
         null=True,
         # Access this information via Domain as "domain.domain_info"
         related_name="domain_info",
+        verbose_name="Domain request",
         help_text="Domain to which this information belongs",
     )
 

src/registrar/models/domain_request.py

@@ -550,12 +550,14 @@ class DomainRequest(TimeStampedModel):
         choices=StateTerritoryChoices.choices,
         null=True,
         blank=True,
+        verbose_name="State / territory",
         help_text="State, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
         null=True,
         blank=True,
+        verbose_name="Zip code",
         help_text="Zip code",
         db_index=True,
     )

src/registrar/models/draft_domain.py

@@ -18,5 +18,6 @@ class DraftDomain(TimeStampedModel, DomainHelper):
         max_length=253,
         blank=False,
         default=None,  # prevent saving without a value
+        verbose_name="Requested domain",
         help_text="Fully qualified domain name",
     )

src/registrar/models/host.py

@@ -21,6 +21,7 @@ class Host(TimeStampedModel):
         blank=False,
         default=None,  # prevent saving without a value
         unique=False,
+        verbose_name="Host name",
         help_text="Fully qualified domain name",
     )
 

src/registrar/models/transition_domain.py

@@ -26,7 +26,7 @@ class TransitionDomain(TimeStampedModel):
     domain_name = models.CharField(
         null=True,
         blank=True,
-        verbose_name="Domain name",
+        verbose_name="Domain",
     )
     status = models.CharField(
         max_length=255,
@@ -83,8 +83,8 @@ class TransitionDomain(TimeStampedModel):
     first_name = models.CharField(
         null=True,
         blank=True,
-        help_text="First name",
-        verbose_name="first name / given name",
+        help_text="First name / given name",
+        verbose_name="First name",
         db_index=True,
     )
     middle_name = models.CharField(
@@ -100,6 +100,7 @@ class TransitionDomain(TimeStampedModel):
     title = models.CharField(
         null=True,
         blank=True,
+        verbose_name="Title / role",
         help_text="Title",
     )
     email = models.EmailField(
@@ -126,12 +127,14 @@ class TransitionDomain(TimeStampedModel):
         max_length=2,
         null=True,
         blank=True,
+        verbose_name="State / territory",
         help_text="State, territory, or military post",
     )
     zipcode = models.CharField(
         max_length=10,
         null=True,
         blank=True,
+        verbose_name="Zip code",
         help_text="Zip code",
         db_index=True,
     )

src/registrar/models/user.py

@@ -32,6 +32,7 @@ class User(AbstractUser):
         default=None,  # Set the default value to None
         null=True,  # Allow the field to be null
         blank=True,  # Allow the field to be blank
+        verbose_name="User status"
     )
 
     domains = models.ManyToManyField(

src/registrar/models/user_group.py

@@ -11,8 +11,8 @@ class UserGroup(Group):
     """
 
     class Meta:
-        verbose_name = "User group"
-        verbose_name_plural = "User groups"
+        verbose_name = "Group"
+        verbose_name_plural = "Groups"
 
     def create_cisa_analyst_group(apps, schema_editor):
         """This method gets run from a data migration."""