diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 2e4f61991..19669605f 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -728,14 +728,14 @@ class DomainAdmin(ListHeaderAdmin):
             obj.deletedInEpp()
             obj.save()
         except RegistryError as err:
-            # To get past the linter..
-            l1 = f"Cannot delete Domain when in status {obj.status}"
-            l2 = "This subdomain is being used as a hostname on another domain"
+            # Using variables to get past the linter
+            message1 = f"Cannot delete Domain when in status {obj.status}"
+            message2 = "This subdomain is being used as a hostname on another domain"
             # Human-readable mappings of ErrorCodes. Can be expanded.
             error_messages = {
                 # noqa on these items as black wants to reformat to an invalid length
-                ErrorCode.OBJECT_STATUS_PROHIBITS_OPERATION: l1,
-                ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION: l2,
+                ErrorCode.OBJECT_STATUS_PROHIBITS_OPERATION: message1,
+                ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION: message2,
             }
 
             message = "Cannot connect to the registry"
@@ -756,7 +756,8 @@ class DomainAdmin(ListHeaderAdmin):
                 self.message_user(
                     request,
                     "Error deleting this Domain: "
-                    f"Can't switch from state '{obj.state}' to 'deleted'",
+                    f"Can't switch from state '{obj.state}' to 'deleted'"
+                    ", must be either 'dns_needed' or 'on_hold'",
                     messages.ERROR,
                 )
         except Exception:
diff --git a/src/registrar/templates/django/admin/domain_change_form.html b/src/registrar/templates/django/admin/domain_change_form.html
index 1b8b90930..cc6261af0 100644
--- a/src/registrar/templates/django/admin/domain_change_form.html
+++ b/src/registrar/templates/django/admin/domain_change_form.html
@@ -15,7 +15,7 @@
         {% endif %}
         <input id="manageDomainSubmitButton" type="submit" value="Manage Domain" name="_edit_domain">
         <input type="submit" value="get status" name="_get_status">
-        <input type="submit" value="EPP Delete Domain" name="_delete_domain">
+        <input type="submit" value="Delete Domain in Registry" name="_delete_domain">
     </div>
     {{ block.super }}
 {% endblock %}
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 7cd530123..c12a2d2a6 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -108,12 +108,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "EPP Delete Domain")
+        self.assertContains(response, "Delete Domain in Registry")
 
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Epp Delete Domain", "name": domain.name},
+            {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -148,12 +148,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "EPP Delete Domain")
+        self.assertContains(response, "Delete Domain in Registry")
 
         # Test the error
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Epp Delete Domain", "name": domain.name},
+            {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -192,12 +192,12 @@ class TestDomainAdmin(MockEppLib):
         )
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, domain.name)
-        self.assertContains(response, "EPP Delete Domain")
+        self.assertContains(response, "Delete Domain in Registry")
 
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Epp Delete Domain", "name": domain.name},
+            {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client
@@ -219,7 +219,7 @@ class TestDomainAdmin(MockEppLib):
         # Test the info dialog
         request = self.factory.post(
             "/admin/registrar/domain/{}/change/".format(domain.pk),
-            {"_delete_domain": "Epp Delete Domain", "name": domain.name},
+            {"_delete_domain": "Delete Domain in Registry", "name": domain.name},
             follow=True,
         )
         request.user = self.client