diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index 65a73e6..982f0e0 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -117,7 +117,7 @@ function testSiteWideContact() {
     $this->assertRaw(t('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');
+    $langcode = \Drupal::config('contact.contact_form.' . $id)->get('langcode');
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->id;
     $this->assertEqual($langcode, $default_langcode);
 
@@ -126,7 +126,7 @@ function testSiteWideContact() {
 
     // Test update contact form.
     $this->updateContactForm($id, $label = $this->randomName(16), $recipients_str = implode(',', array($recipients[0], $recipients[1])), $reply = $this->randomName(30), FALSE);
-    $config = \Drupal::config('contact.form.' . $id)->get();
+    $config = \Drupal::config('contact.contact_form.' . $id)->get();
     $this->assertEqual($config['label'], $label);
     $this->assertEqual($config['recipients'], array($recipients[0], $recipients[1]));
     $this->assertEqual($config['reply'], $reply);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
index ef752b7..6b9a50d 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactCategoryTest.php
@@ -30,7 +30,7 @@ class MigrateContactCategoryTest extends MigrateDrupalTestBase {
    */
   public function setUp() {
     parent::setUp();
-    $migration = entity_load('migration', 'd6_contact_form');
+    $migration = entity_load('migration', 'd6_contact_category');
     $dumps = array(
       $this->getDumpDirectory() . '/Drupal6ContactCategory.php',
     );
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
index 3f9b521..83382ef 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
@@ -58,7 +58,7 @@ public function testContactSettings() {
     $config = \Drupal::config('contact.settings');
     $this->assertIdentical($config->get('user_default_enabled'), true);
     $this->assertIdentical($config->get('flood.limit'), 3);
-    $this->assertIdentical($config->get('default_category'), 'some_other_category');
+    $this->assertIdentical($config->get('default_form'), 'some_other_category');
     $this->assertConfigSchema(\Drupal::service('config.typed'), 'contact.settings', $config->get());
   }
 
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 127b863..85442e7 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 category',
+        'title' => 'Add form',
       ),
     );
     $normal_expected_response = array(
@@ -165,7 +165,7 @@ public function testDialog() {
     $this->drupalGet('admin/structure/contact/add');
     // Check we get a chunk of the code, we can't test the whole form as form
     // build id and token with be different.
-    $form = $this->xpath("//form[@id='contact-category-add-form']");
+    $form = $this->xpath("//form[@id='contact-form-add-form']");
     $this->assertTrue(!empty($form), 'Non-JS entity form page present.');
 
     // Emulate going to the JS version of the form and check the JSON response.
@@ -173,7 +173,7 @@ public function testDialog() {
     $this->drupalSetContent($ajax_result[1]['data']);
     // Remove the data, the form build id and token will never match.
     unset($ajax_result[1]['data']);
-    $form = $this->xpath("//form[@id='contact-category-add-form']");
+    $form = $this->xpath("//form[@id='contact-form-add-form']");
     $this->assertTrue(!empty($form), 'Modal dialog JSON contains entity form.');
     $this->assertEqual($entity_form_expected_response, $ajax_result[1]);
   }