diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index fbd989c..49a2dd4 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -268,15 +268,15 @@ public function testContactConfigEntityTranslation() {
 
       // Update translatable fields.
       $edit = array(
-        'config_names[contact.form.feedback][label][translation]' => 'Website feedback - ' . $langcode,
-        'config_names[contact.form.feedback][reply][translation]' => 'Thank you for your mail - ' . $langcode,
+        'config_names[contact.contact_form.feedback][label][translation]' => 'Website feedback - ' . $langcode,
+        'config_names[contact.contact_form.feedback][reply][translation]' => 'Thank you for your mail - ' . $langcode,
       );
 
       // Save language specific version of form.
       $this->drupalPostForm($translation_page_url, $edit, t('Save translation'));
 
       // Expect translated values in language specific file.
-      $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.form.feedback');
+      $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.contact_form.feedback');
       $expected = array(
         'label' => 'Website feedback - ' . $langcode,
         'reply' => 'Thank you for your mail - ' . $langcode,
@@ -307,7 +307,7 @@ public function testContactConfigEntityTranslation() {
       $langcode_prefixes = array_merge(array(''), $this->langcodes);
       foreach ($langcode_prefixes as $langcode_prefix) {
         $this->drupalGet(ltrim("$langcode_prefix/$translation_base_url/$langcode/edit"));
-        $this->assertFieldByName('config_names[contact.form.feedback][label][translation]', 'Website feedback - ' . $langcode);
+        $this->assertFieldByName('config_names[contact.contact_form.feedback][label][translation]', 'Website feedback - ' . $langcode);
         $this->assertText($label);
       }
     }
@@ -339,7 +339,7 @@ public function testContactConfigEntityTranslation() {
       $this->assertNoLinkByHref("$translation_base_url/$langcode/delete");
 
       // Expect no language specific file present anymore.
-      $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.form.feedback');
+      $override = \Drupal::languageManager()->getLanguageConfigOverride($langcode, 'contact.contact_form.feedback');
       $this->assertTrue($override->isNew());
     }
 
diff --git a/core/modules/contact/config/install/contact.form.feedback.yml b/core/modules/contact/config/install/contact.contact_form.feedback.yml
similarity index 100%
rename from core/modules/contact/config/install/contact.form.feedback.yml
rename to core/modules/contact/config/install/contact.contact_form.feedback.yml
diff --git a/core/modules/contact/config/install/contact.form.personal.yml b/core/modules/contact/config/install/contact.contact_form.personal.yml
similarity index 100%
rename from core/modules/contact/config/install/contact.form.personal.yml
rename to core/modules/contact/config/install/contact.contact_form.personal.yml
diff --git a/core/modules/contact/config/schema/contact.schema.yml b/core/modules/contact/config/schema/contact.schema.yml
index 7ebb6f4..c2c83d5 100644
--- a/core/modules/contact/config/schema/contact.schema.yml
+++ b/core/modules/contact/config/schema/contact.schema.yml
@@ -1,6 +1,6 @@
 # Schema for the configuration files of the Contact module.
 
-contact.form.*:
+contact.contact_form.*:
   type: config_entity
   label: 'Contact form'
   mapping:
diff --git a/core/modules/contact/src/ContactForm.php b/core/modules/contact/src/ContactFormEditForm.php
similarity index 97%
rename from core/modules/contact/src/ContactForm.php
rename to core/modules/contact/src/ContactFormEditForm.php
index faaa40a..8e2e274 100644
--- a/core/modules/contact/src/ContactForm.php
+++ b/core/modules/contact/src/ContactFormEditForm.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\contact\ContactForm.
+ * Contains \Drupal\contact\ContactFormEditForm.
  */
 
 namespace Drupal\contact;
@@ -14,7 +14,7 @@
 /**
  * Base form for contact form edit forms.
  */
-class ContactForm extends EntityForm {
+class ContactFormEditForm extends EntityForm {
 
   /**
    * {@inheritdoc}
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index b897e97..5f99e49 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -22,8 +22,8 @@
  *     "access" = "Drupal\contact\ContactFormAccessController",
  *     "list_builder" = "Drupal\contact\ContactFormListBuilder",
  *     "form" = {
- *       "add" = "Drupal\contact\ContactForm",
- *       "edit" = "Drupal\contact\ContactForm",
+ *       "add" = "Drupal\contact\ContactFormEditForm",
+ *       "edit" = "Drupal\contact\ContactFormEditForm",
  *       "delete" = "Drupal\contact\Form\ContactFormDeleteForm"
  *     }
  *   },