diff --git a/core/modules/contact/contact.links.action.yml b/core/modules/contact/contact.links.action.yml
index 09eaac8..78e139a 100644
--- a/core/modules/contact/contact.links.action.yml
+++ b/core/modules/contact/contact.links.action.yml
@@ -1,6 +1,6 @@
 contact.form_add:
   route_name: contact.form_add
-  title: 'Add form'
+  title: 'Add contact form'
   weight: 1
   appears_on:
     - contact.form_list
diff --git a/core/modules/contact/contact.links.menu.yml b/core/modules/contact/contact.links.menu.yml
index 31e5dc7..304be08 100644
--- a/core/modules/contact/contact.links.menu.yml
+++ b/core/modules/contact/contact.links.menu.yml
@@ -1,7 +1,7 @@
 contact.form_list:
   title: 'Contact forms'
   parent: system.admin_structure
-  description: 'Create a system contact form and set up other forms to use.'
+  description: 'Create and manage contact forms.'
   route_name: contact.form_list
 contact.site_page:
   title: Contact
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index 1ba2dbc..567ccf0 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -18,7 +18,7 @@ contact.form_add:
   path: '/admin/structure/contact/add'
   defaults:
     _entity_form: 'contact_form.add'
-    _title: 'Add form'
+    _title: 'Add contact form'
   requirements:
     _permission: 'administer contact forms'
 
@@ -42,7 +42,7 @@ contact.site_page:
 contact.site_page_form:
   path: '/contact/{contact_form}'
   defaults:
-    _title: 'Contact form'
+    _title: 'Contact'
     _content: '\Drupal\contact\Controller\ContactController::contactSitePage'
   requirements:
     _entity_access: 'contact_form.view'
diff --git a/core/modules/contact/src/ContactFormEditForm.php b/core/modules/contact/src/ContactFormEditForm.php
index 072626c..4e7a388 100644
--- a/core/modules/contact/src/ContactFormEditForm.php
+++ b/core/modules/contact/src/ContactFormEditForm.php
@@ -99,12 +99,12 @@ public function save(array $form, FormStateInterface $form_state) {
     $edit_link = \Drupal::linkGenerator()->generateFromUrl($this->t('Edit'), $this->entity->urlInfo());
 
     if ($status == SAVED_UPDATED) {
-      drupal_set_message($this->t('Form %label has been updated.', array('%label' => $contact_form->label())));
-      $this->logger('contact')->notice('Form %label has been updated.', array('%label' => $contact_form->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Contact form %label has been updated.', array('%label' => $contact_form->label())));
+      $this->logger('contact')->notice('Contact form %label has been updated.', array('%label' => $contact_form->label(), 'link' => $edit_link));
     }
     else {
-      drupal_set_message($this->t('Form %label has been added.', array('%label' => $contact_form->label())));
-      $this->logger('contact')->notice('Form %label has been added.', array('%label' => $contact_form->label(), 'link' => $edit_link));
+      drupal_set_message($this->t('Contact form %label has been added.', array('%label' => $contact_form->label())));
+      $this->logger('contact')->notice('Contact form %label has been added.', array('%label' => $contact_form->label(), 'link' => $edit_link));
     }
 
     // Update the default form.
diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php
index ab67e30..cffbf5a 100644
--- a/core/modules/contact/src/Controller/ContactController.php
+++ b/core/modules/contact/src/Controller/ContactController.php
@@ -86,7 +86,7 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
       // If there are no forms, do not display the form.
       if (empty($contact_form)) {
         if ($this->currentUser()->hasPermission('administer contact forms')) {
-          drupal_set_message($this->t('The contact form has not been configured. <a href="@add">Add one or more form</a> .', array(
+          drupal_set_message($this->t('The contact form has not been configured. <a href="@add">Add one or more forms</a> .', array(
             '@add' => $this->url('contact.form_add'))), 'error');
           return array();
         }
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index c3d5935..83681f3 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\contact\Entity\ContactForm.
+ * Contains \Drupal\contact\Entity\ContactForm.
  */
 
 namespace Drupal\contact\Entity;
diff --git a/core/modules/contact/src/Form/ContactFormDeleteForm.php b/core/modules/contact/src/Form/ContactFormDeleteForm.php
index 68eed30..26c21aa 100644
--- a/core/modules/contact/src/Form/ContactFormDeleteForm.php
+++ b/core/modules/contact/src/Form/ContactFormDeleteForm.php
@@ -42,8 +42,8 @@ public function getConfirmText() {
    */
   public function submit(array $form, FormStateInterface $form_state) {
     $this->entity->delete();
-    drupal_set_message($this->t('Form %label has been deleted.', array('%label' => $this->entity->label())));
-    $this->logger('contact')->notice('Form %label has been deleted.', array('%label' => $this->entity->label()));
+    drupal_set_message($this->t('Contact form %label has been deleted.', array('%label' => $this->entity->label())));
+    $this->logger('contact')->notice('Contact form %label has been deleted.', array('%label' => $this->entity->label()));
     $form_state->setRedirectUrl($this->getCancelUrl());
   }
 
diff --git a/core/modules/contact/src/MessageInterface.php b/core/modules/contact/src/MessageInterface.php
index 85318ec..224564e 100644
--- a/core/modules/contact/src/MessageInterface.php
+++ b/core/modules/contact/src/MessageInterface.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Entity\ContentEntityInterface;
 
 /**
- * Provides an interface defining a contant message entity
+ * Provides an interface defining a contact message entity.
  */
 interface MessageInterface extends ContentEntityInterface {
 
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index ea24af9..436b2bf 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -110,11 +110,11 @@ function testSiteWideContact() {
     $this->addContactForm($id = drupal_strtolower($this->randomMachineName($max_length_exceeded)), $label = $this->randomMachineName($max_length_exceeded), implode(',', array($recipients[0])), '', TRUE);
     $this->assertText(format_string('Machine-readable name cannot be longer than !max characters but is currently !exceeded characters long.', array('!max' => $max_length, '!exceeded' => $max_length_exceeded)));
     $this->addContactForm($id = drupal_strtolower($this->randomMachineName($max_length)), $label = $this->randomMachineName($max_length), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertRaw(t('Form %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been added.', array('%label' => $label)));
 
     // Create first valid form.
     $this->addContactForm($id = drupal_strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0])), '', TRUE);
-    $this->assertRaw(t('Form %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been added.', array('%label' => $label)));
 
     // Check that the form was created in site default language.
     $langcode = \Drupal::config('contact.form.' . $id)->get('langcode');
@@ -131,7 +131,7 @@ function testSiteWideContact() {
     $this->assertEqual($config['recipients'], array($recipients[0], $recipients[1]));
     $this->assertEqual($config['reply'], $reply);
     $this->assertNotEqual($id, \Drupal::config('contact.settings')->get('default_form'));
-    $this->assertRaw(t('Form %label has been updated.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been updated.', array('%label' => $label)));
     // Ensure the label is displayed on the contact page for this form.
     $this->drupalGet('contact/' . $id);
     $this->assertText($label);
@@ -149,14 +149,14 @@ function testSiteWideContact() {
 
     // Add more forms.
     $this->addContactForm(drupal_strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0], $recipients[1])), '', FALSE);
-    $this->assertRaw(t('Form %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been added.', array('%label' => $label)));
 
     $this->addContactForm($name = drupal_strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($recipients[0], $recipients[1], $recipients[2])), '', FALSE);
-    $this->assertRaw(t('Form %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been added.', array('%label' => $label)));
 
     // Try adding a form that already exists.
     $this->addContactForm($name, $label, '', '', FALSE);
-    $this->assertNoRaw(t('Form %label has been saved.', array('%label' => $label)));
+    $this->assertNoRaw(t('Contact form %label has been added.', array('%label' => $label)));
     $this->assertRaw(t('The machine-readable name is already in use. It must be unique.'));
 
     // Clear flood table in preparation for flood test and allow other checks to complete.
@@ -407,7 +407,7 @@ function deleteContactForms() {
       }
       else {
         $this->drupalPostForm("admin/structure/contact/manage/$id/delete", array(), t('Delete'));
-        $this->assertRaw(t('Form %label has been deleted.', array('%label' => $contact_form->label())));
+        $this->assertRaw(t('Contact form %label has been deleted.', array('%label' => $contact_form->label())));
         $this->assertFalse(entity_load('contact_form', $id), format_string('Form %contact_form not found', array('%contact_form' => $contact_form->label())));
       }
     }
diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/src/Tests/ContactStorageTest.php
index be61021..f444c0a 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/src/Tests/ContactStorageTest.php
@@ -50,7 +50,7 @@ public function testContactStorage() {
     // Create first valid contact form.
     $mail = 'simpletest@example.com';
     $this->addContactForm($id = drupal_strtolower($this->randomMachineName(16)), $label = $this->randomMachineName(16), implode(',', array($mail)), '', TRUE);
-    $this->assertRaw(t('Form %label has been added.', array('%label' => $label)));
+    $this->assertRaw(t('Contact form %label has been added.', array('%label' => $label)));
 
     // Ensure that anonymous can submit site-wide contact form.
     user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 85442e7..867ed11 100644
--- a/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -57,7 +57,7 @@ public function testDialog() {
       'settings' => NULL,
       'dialogOptions' => array(
         'modal' => TRUE,
-        'title' => 'Add form',
+        'title' => 'Add contact form',
       ),
     );
     $normal_expected_response = array(