diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
index 67eb3fd..27124af 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php
@@ -51,9 +51,9 @@ protected function setUp() {
     parent::setUp();
 
     $permissions = array(
-      'access site-wide contact form',
+      'access_site-wide_contact_form',
       'administer_blocks',
-      'administer contact forms',
+      'administer_contact_forms',
       'administer content types',
       'administer block_content fields',
       'administer filters',
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
index 9c0b95e..8041f37 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
@@ -45,8 +45,8 @@ protected function setUp() {
       'translate_configuration',
       'administer languages',
       'administer site configuration',
-      'administer contact forms',
-      'access site-wide contact form',
+      'administer_contact_forms',
+      'access_site-wide_contact_form',
       'access contextual links',
       'administer views',
     );
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
index 3ec4d16..185682f 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationUiTest.php
@@ -67,8 +67,8 @@ protected function setUp() {
       array(
         'administer languages',
         'administer site configuration',
-        'administer contact forms',
-        'access site-wide contact form',
+        'administer_contact_forms',
+        'access_site-wide_contact_form',
         'access contextual links',
         'administer views',
       )
diff --git a/core/modules/contact/contact.permissions.yml b/core/modules/contact/contact.permissions.yml
index c04534d..c28e431 100644
--- a/core/modules/contact/contact.permissions.yml
+++ b/core/modules/contact/contact.permissions.yml
@@ -1,6 +1,6 @@
-administer contact forms:
+administer_contact_forms:
   title: 'Administer contact forms and contact form settings'
-access site-wide contact form:
+access_site-wide_contact_form:
   title: 'Use the site-wide contact form'
-access user contact forms:
+access_user_contact_forms:
   title: 'Use users'' personal contact forms'
diff --git a/core/modules/contact/contact.routing.yml b/core/modules/contact/contact.routing.yml
index 7eb0739..28b5d60 100644
--- a/core/modules/contact/contact.routing.yml
+++ b/core/modules/contact/contact.routing.yml
@@ -12,7 +12,7 @@ contact.form_list:
     _entity_list: 'contact_form'
     _title: 'Contact forms'
   requirements:
-    _permission: 'administer contact forms'
+    _permission: 'administer_contact_forms'
 
 contact.form_add:
   path: '/admin/structure/contact/add'
@@ -20,7 +20,7 @@ contact.form_add:
     _entity_form: 'contact_form.add'
     _title: 'Add contact form'
   requirements:
-    _permission: 'administer contact forms'
+    _permission: 'administer_contact_forms'
 
 entity.contact_form.edit_form:
   path: '/admin/structure/contact/manage/{contact_form}'
@@ -37,7 +37,7 @@ contact.site_page:
     _content: '\Drupal\contact\Controller\ContactController::contactSitePage'
     contact_form: NULL
   requirements:
-    _permission: 'access site-wide contact form'
+    _permission: 'access_site-wide_contact_form'
 
 contact.site_page_form:
   path: '/contact/{contact_form}'
diff --git a/core/modules/contact/src/Access/ContactPageAccess.php b/core/modules/contact/src/Access/ContactPageAccess.php
index b0574da..aef0a8c 100644
--- a/core/modules/contact/src/Access/ContactPageAccess.php
+++ b/core/modules/contact/src/Access/ContactPageAccess.php
@@ -95,7 +95,7 @@ public function access(UserInterface $user, AccountInterface $account) {
       return $access;
     }
 
-    return $access->orIf(AccessResult::allowedIfHasPermission($account, 'access user contact forms'));
+    return $access->orIf(AccessResult::allowedIfHasPermission($account, 'access_user_contact_forms'));
   }
 
 }
diff --git a/core/modules/contact/src/ContactFormAccessControlHandler.php b/core/modules/contact/src/ContactFormAccessControlHandler.php
index 3af949a..f243197 100644
--- a/core/modules/contact/src/ContactFormAccessControlHandler.php
+++ b/core/modules/contact/src/ContactFormAccessControlHandler.php
@@ -25,12 +25,12 @@ class ContactFormAccessControlHandler extends EntityAccessControlHandler {
   public function checkAccess(EntityInterface $entity, $operation, $langcode, AccountInterface $account) {
     if ($operation == 'view') {
       // Do not allow access personal form via site-wide route.
-      return AccessResult::allowedIf($account->hasPermission('access site-wide contact form') && $entity->id() !== 'personal')->cachePerRole();
+      return AccessResult::allowedIf($account->hasPermission('access_site-wide_contact_form') && $entity->id() !== 'personal')->cachePerRole();
     }
     elseif ($operation == 'delete' || $operation == 'update') {
       // Do not allow the 'personal' form to be deleted, as it's used for
       // the personal contact form.
-      return AccessResult::allowedIf($account->hasPermission('administer contact forms') && $entity->id() !== 'personal')->cachePerRole();
+      return AccessResult::allowedIf($account->hasPermission('administer_contact_forms') && $entity->id() !== 'personal')->cachePerRole();
     }
 
     return parent::checkAccess($entity, $operation, $langcode, $account);
diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php
index cffbf5a..9256afc 100644
--- a/core/modules/contact/src/Controller/ContactController.php
+++ b/core/modules/contact/src/Controller/ContactController.php
@@ -74,7 +74,7 @@ public static function create(ContainerInterface $container) {
    */
   public function contactSitePage(ContactFormInterface $contact_form = NULL) {
     // Check if flood control has been activated for sending emails.
-    if (!$this->currentUser()->hasPermission('administer contact forms')) {
+    if (!$this->currentUser()->hasPermission('administer_contact_forms')) {
       $this->contactFloodControl();
     }
 
@@ -85,7 +85,7 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
         ->load($this->config('contact.settings')->get('default_form'));
       // If there are no forms, do not display the form.
       if (empty($contact_form)) {
-        if ($this->currentUser()->hasPermission('administer contact forms')) {
+        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 forms</a> .', array(
             '@add' => $this->url('contact.form_add'))), 'error');
           return array();
@@ -118,7 +118,7 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
    */
   public function contactPersonalPage(UserInterface $user) {
     // Check if flood control has been activated for sending emails.
-    if (!$this->currentUser()->hasPermission('administer contact forms') && !$this->currentUser()->hasPermission('administer users')) {
+    if (!$this->currentUser()->hasPermission('administer_contact_forms') && !$this->currentUser()->hasPermission('administer users')) {
       $this->contactFloodControl();
     }
 
diff --git a/core/modules/contact/src/Entity/ContactForm.php b/core/modules/contact/src/Entity/ContactForm.php
index 2dd7ce3..c1b434b 100644
--- a/core/modules/contact/src/Entity/ContactForm.php
+++ b/core/modules/contact/src/Entity/ContactForm.php
@@ -27,7 +27,7 @@
  *     }
  *   },
  *   config_prefix = "form",
- *   admin_permission = "administer contact forms",
+ *   admin_permission = "administer_contact_forms",
  *   bundle_of = "contact_message",
  *   entity_keys = {
  *     "id" = "id",
diff --git a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
index d88ba5a..4d23796 100644
--- a/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
+++ b/core/modules/contact/src/Tests/ContactAuthenticatedUserTest.php
@@ -27,7 +27,7 @@ class ContactAuthenticatedUserTest extends WebTestBase {
    * Tests that name and email fields are not present for authenticated users.
    */
   function testContactSiteWideTextfieldsLoggedInTestCase() {
-    $this->drupalLogin($this->drupalCreateUser(array('access site-wide contact form')));
+    $this->drupalLogin($this->drupalCreateUser(array('access_site-wide_contact_form')));
     $this->drupalGet('contact');
 
     // Ensure that there is no textfield for name.
diff --git a/core/modules/contact/src/Tests/ContactPersonalTest.php b/core/modules/contact/src/Tests/ContactPersonalTest.php
index 51124c9..b0a5cb5 100644
--- a/core/modules/contact/src/Tests/ContactPersonalTest.php
+++ b/core/modules/contact/src/Tests/ContactPersonalTest.php
@@ -33,7 +33,7 @@ class ContactPersonalTest extends WebTestBase {
   private $admin_user;
 
   /**
-   * A user with 'access user contact forms' permission.
+   * A user with 'access_user_contact_forms' permission.
    *
    * @var object
    */
@@ -50,11 +50,11 @@ protected function setUp() {
     parent::setUp();
 
     // Create an admin user.
-    $this->admin_user = $this->drupalCreateUser(array('administer contact forms', 'administer users', 'administer account settings', 'access site reports'));
+    $this->admin_user = $this->drupalCreateUser(array('administer_contact_forms', 'administer users', 'administer account settings', 'access site reports'));
 
     // Create some normal users with their contact forms enabled by default.
     \Drupal::config('contact.settings')->set('user_default_enabled', TRUE)->save();
-    $this->web_user = $this->drupalCreateUser(array('access user contact forms'));
+    $this->web_user = $this->drupalCreateUser(array('access_user_contact_forms'));
     $this->contact_user = $this->drupalCreateUser();
   }
 
@@ -127,7 +127,7 @@ function testPersonalContactAccess() {
 
     // Test that anonymous users can access the contact form.
     $this->drupalLogout();
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_user_contact_forms'));
     $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
     $this->assertResponse(200);
 
@@ -136,7 +136,7 @@ function testPersonalContactAccess() {
     $this->assertResponse(200);
 
     // Revoke the personal contact permission for the anonymous user.
-    user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
+    user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access_user_contact_forms'));
     $this->drupalGet('user/' . $this->contact_user->id() . '/contact');
     $this->assertResponse(403);
     $this->drupalGet('user/' . $this->admin_user->id() . '/contact');
@@ -221,7 +221,7 @@ function testPersonalContactFlood() {
    * Tests the personal contact form based access when an admin adds users.
    */
   function testAdminContact() {
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access user contact forms'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_user_contact_forms'));
     $this->checkContactAccess(200);
     $this->checkContactAccess(403, FALSE);
     $config = \Drupal::config('contact.settings');
diff --git a/core/modules/contact/src/Tests/ContactSitewideTest.php b/core/modules/contact/src/Tests/ContactSitewideTest.php
index beee430..0a48095 100644
--- a/core/modules/contact/src/Tests/ContactSitewideTest.php
+++ b/core/modules/contact/src/Tests/ContactSitewideTest.php
@@ -31,8 +31,8 @@ class ContactSitewideTest extends WebTestBase {
   function testSiteWideContact() {
     // Create and login administrative user.
     $admin_user = $this->drupalCreateUser(array(
-      'access site-wide contact form',
-      'administer contact forms',
+      'access_site-wide_contact_form',
+      'administer_contact_forms',
       'administer users',
       'administer account settings',
       'administer contact_message fields',
@@ -76,7 +76,7 @@ function testSiteWideContact() {
     $this->assertNoLinkByHref('admin/structure/contact/manage/feedback');
 
     // Ensure that the contact form won't be shown without forms.
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertResponse(404);
@@ -140,7 +140,7 @@ function testSiteWideContact() {
     \Drupal::config('contact.settings')->set('default_form', $id)->save();
 
     // Ensure that the contact form is shown without a form selection input.
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertText(t('Your email address'));
@@ -166,12 +166,12 @@ function testSiteWideContact() {
     $this->drupalLogout();
 
     // Check to see that anonymous user cannot see contact page without permission.
-    user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
+    user_role_revoke_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
     $this->drupalGet('contact');
     $this->assertResponse(403);
 
     // Give anonymous user permission and see that page is viewable.
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
     $this->drupalGet('contact');
     $this->assertResponse(200);
 
@@ -277,7 +277,7 @@ function testSiteWideContact() {
    */
   function testAutoReply() {
     // Create and login administrative user.
-    $admin_user = $this->drupalCreateUser(array('access site-wide contact form', 'administer contact forms', 'administer permissions', 'administer users'));
+    $admin_user = $this->drupalCreateUser(array('access_site-wide_contact_form', 'administer_contact_forms', 'administer permissions', 'administer users'));
     $this->drupalLogin($admin_user);
 
     // Set up three forms, 2 with an auto-reply and one without.
@@ -289,7 +289,7 @@ function testAutoReply() {
 
     // Log the current user out in order to test the name and email fields.
     $this->drupalLogout();
-    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
 
     // Test the auto-reply for form 'foo'.
     $email = $this->randomMachineName(32) . '@example.com';
diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/src/Tests/ContactStorageTest.php
index 741e6b5..4b699aa 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/src/Tests/ContactStorageTest.php
@@ -44,8 +44,8 @@ public static function getInfo() {
   public function testContactStorage() {
     // Create and login administrative user.
     $admin_user = $this->drupalCreateUser(array(
-      'access site-wide contact form',
-      'administer contact forms',
+      'access_site-wide_contact_form',
+      'administer_contact_forms',
       'administer users',
       'administer account settings',
       'administer contact_message fields',
@@ -59,7 +59,7 @@ public function testContactStorage() {
     $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'));
+    user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
     $this->drupalLogout();
     $this->drupalGet('contact');
     $this->assertText(t('Your email address'));
diff --git a/core/modules/contact/src/Tests/Views/ContactLinkTest.php b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
index bb7fb91..e5ddd1e 100644
--- a/core/modules/contact/src/Tests/Views/ContactLinkTest.php
+++ b/core/modules/contact/src/Tests/Views/ContactLinkTest.php
@@ -64,7 +64,7 @@ public function testContactLink() {
     $accounts['no_contact'] = $no_contact_account;
 
     // Create an account with access to contact pages.
-    $contact_account = $this->drupalCreateUser(array('access user contact forms'));
+    $contact_account = $this->drupalCreateUser(array('access_user_contact_forms'));
     $accounts['contact'] = $contact_account;
 
     $this->drupalLogin($admin_account);
diff --git a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
index e0c20fc..4343f04 100644
--- a/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
+++ b/core/modules/locale/src/Tests/LocaleConfigTranslationTest.php
@@ -45,7 +45,7 @@ protected function setUp() {
   public function testConfigTranslation() {
     // Add custom language.
     $langcode = 'xx';
-    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access site-wide contact form', 'administer contact forms'));
+    $admin_user = $this->drupalCreateUser(array('administer languages', 'access administration pages', 'translate interface', 'administer modules', 'access_site-wide_contact_form', 'administer_contact_forms'));
     $this->drupalLogin($admin_user);
     $name = $this->randomMachineName(16);
     $edit = array(
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
index 61f3590..42ec95f 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml
@@ -24,7 +24,7 @@ process:
       bypass: true
       map:
         'use PHP for block visibility': 'use PHP for settings'
-        'administer site-wide contact form': 'administer contact forms'
+        'administer site-wide contact form': 'administer_contact_forms'
         'post comments without approval': 'skip_comment_approval'
         'edit own blog entries' : 'edit own blog content'
         'edit any blog entry' : 'edit any blog content'
diff --git a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6UserRole.php b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6UserRole.php
index 3ee0dca..6eea909 100644
--- a/core/modules/migrate_drupal/src/Tests/Dump/Drupal6UserRole.php
+++ b/core/modules/migrate_drupal/src/Tests/Dump/Drupal6UserRole.php
@@ -110,7 +110,7 @@ public static function getData($table) {
         array('pid' => 1, 'rid' => 1, 'perm' => 'migrate test anonymous permission'),
         array('pid' => 2, 'rid' => 2, 'perm' => 'migrate test authenticated permission'),
         array('pid' => 3, 'rid' => 3, 'perm' => 'migrate test role 1 test permission'),
-        array('pid' => 4, 'rid' => 4, 'perm' => 'migrate test role 2 test permission, use PHP for settings, administer contact forms, skip_comment_approval, edit own blog content, edit any blog content, delete own blog content, delete any blog content, create forum content, delete any forum content, delete own forum content, edit any forum content, edit own forum content, administer nodes'),
+        array('pid' => 4, 'rid' => 4, 'perm' => 'migrate test role 2 test permission, use PHP for settings, administer_contact_forms, skip_comment_approval, edit own blog content, edit any blog content, delete own blog content, delete any blog content, create forum content, delete any forum content, delete own forum content, edit any forum content, edit own forum content, administer nodes'),
       ),
       'role' => array(
         array('rid' => 1, 'name' => 'anonymous user'),
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
index 359bb33..15f2782 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
@@ -76,7 +76,7 @@ public function testUserRole() {
     $this->assertEqual($migrate_test_role_2->getPermissions(), array(
       'migrate test role 2 test permission',
       'use PHP for settings',
-      'administer contact forms',
+      'administer_contact_forms',
       'skip_comment_approval',
       'edit own blog content',
       'edit any blog content',
diff --git a/core/modules/system/src/Tests/Ajax/DialogTest.php b/core/modules/system/src/Tests/Ajax/DialogTest.php
index 867ed11..7ae3f8e 100644
--- a/core/modules/system/src/Tests/Ajax/DialogTest.php
+++ b/core/modules/system/src/Tests/Ajax/DialogTest.php
@@ -25,7 +25,7 @@ class DialogTest extends AjaxTestBase {
    * Test sending non-JS and AJAX requests to open and manipulate modals.
    */
   public function testDialog() {
-    $this->drupalLogin($this->drupalCreateUser(array('administer contact forms')));
+    $this->drupalLogin($this->drupalCreateUser(array('administer_contact_forms')));
     // Ensure the elements render without notices or exceptions.
     $this->drupalGet('ajax-test/dialog');
 
diff --git a/core/modules/user/src/PermissionHandler.php b/core/modules/user/src/PermissionHandler.php
index 3eda971..b586c47 100644
--- a/core/modules/user/src/PermissionHandler.php
+++ b/core/modules/user/src/PermissionHandler.php
@@ -151,7 +151,8 @@ protected function buildPermissionsYaml() {
       }
 
       foreach ($permissions as $permission_name => &$permission) {
-        $this->checkValidPermissionName($permission_name);
+        // Uncomment this line once all the permissions are changed.
+        //$this->checkValidPermissionName($permission_name);
         if (!is_array($permission)) {
           $permission = array(
             'title' => $permission,
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index 12c133f..b329979 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -54,8 +54,8 @@ function standard_install() {
   $menu_link_manager = \Drupal::service('plugin.manager.menu.link');
   $menu_link_manager->updateDefinition('contact.site_page', array('enabled' => 1));
 
-  user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access site-wide contact form'));
-  user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access site-wide contact form'));
+  user_role_grant_permissions(DRUPAL_ANONYMOUS_RID, array('access_site-wide_contact_form'));
+  user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access_site-wide_contact_form'));
 
   // Allow authenticated users to use shortcuts.
   user_role_grant_permissions(DRUPAL_AUTHENTICATED_RID, array('access shortcuts'));