diff --git a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
index 7ed68fbd3a8b554f35692fff53348335418485b2..ae43ecf2095b625c7f6eec94ad46c25e6cf144cd 100644
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldType/EmailItem.php
@@ -32,7 +32,7 @@ class EmailItem extends FieldItemBase {
    */
   public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) {
     $properties['value'] = DataDefinition::create('email')
-      ->setLabel(t('E-mail'))
+      ->setLabel(t('Email'))
       ->setRequired(TRUE);
 
     return $properties;
diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php
index 9bb4cdbb91d4097da7a214e7f835ea375bd191b8..649cf989727647c86a5d976ed6768db19268fe04 100644
--- a/core/lib/Drupal/Core/Render/RendererInterface.php
+++ b/core/lib/Drupal/Core/Render/RendererInterface.php
@@ -42,7 +42,7 @@ public function renderRoot(&$elements);
    *
    * Calls ::render() in such a way that placeholders are replaced.
    *
-   * Useful for e.g. rendering the values of tokens or e-mails, which need a
+   * Useful for e.g. rendering the values of tokens or emails, which need a
    * render array being turned into a string, but don't need any of the
    * bubbleable metadata (the attached assets the cache tags).
    *
diff --git a/core/modules/contact/src/ContactFormInterface.php b/core/modules/contact/src/ContactFormInterface.php
index 0397bc4e9684fd7c32f151ebd5d125bfb3da07d3..8f588ee893dc12de634bb3d90be5a80ffbe1287e 100644
--- a/core/modules/contact/src/ContactFormInterface.php
+++ b/core/modules/contact/src/ContactFormInterface.php
@@ -15,10 +15,10 @@
 interface ContactFormInterface extends ConfigEntityInterface {
 
   /**
-   * Returns list of recipient e-mail addresses.
+   * Returns list of recipient email addresses.
    *
    * @return array
-   *   List of recipient e-mail addresses.
+   *   List of recipient email addresses.
    */
   public function getRecipients();
 
@@ -39,10 +39,10 @@ public function getReply();
   public function getWeight();
 
   /**
-   * Sets list of recipient e-mail addresses.
+   * Sets list of recipient email addresses.
    *
    * @param array $recipients
-   *   The desired list of e-mail addresses of this category.
+   *   The desired list of email addresses of this category.
    *
    * @return $this
    */
diff --git a/core/modules/contact/src/Controller/ContactController.php b/core/modules/contact/src/Controller/ContactController.php
index fb6830d49bf6dd84ba92a13f3f07c69cfea58068..1a9b724c1809ea8ae7f33d1e447559fb29c04460 100644
--- a/core/modules/contact/src/Controller/ContactController.php
+++ b/core/modules/contact/src/Controller/ContactController.php
@@ -103,10 +103,10 @@ public function contactSitePage(ContactFormInterface $contact_form = NULL) {
    *
    * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
    *   Exception is thrown when user tries to access a contact form for a
-   *   user who does not have an e-mail address configured.
+   *   user who does not have an email address configured.
    */
   public function contactPersonalPage(UserInterface $user) {
-    // Do not continue if the user does not have an e-mail address configured.
+    // Do not continue if the user does not have an email address configured.
     if (!$user->getEmail()) {
       throw new NotFoundHttpException();
     }
diff --git a/core/modules/simpletest/src/InstallerTestBase.php b/core/modules/simpletest/src/InstallerTestBase.php
index e6f7d7b47de33ee27fea52590073dc8e33331980..0b8ff77280c91143922cdcbbde6903a8f5bcf39d 100644
--- a/core/modules/simpletest/src/InstallerTestBase.php
+++ b/core/modules/simpletest/src/InstallerTestBase.php
@@ -156,7 +156,7 @@ protected function setUp() {
       $this->container = $this->kernel->getContainer();
 
       // Manually configure the test mail collector implementation to prevent
-      // tests from sending out e-mails and collect them in state instead.
+      // tests from sending out emails and collect them in state instead.
       $this->container->get('config.factory')
         ->getEditable('system.mail')
         ->set('interface.default', 'test_mail_collector')
diff --git a/core/modules/user/src/AccountForm.php b/core/modules/user/src/AccountForm.php
index f1c505d90d76036e7340b32f7e2e90e14408b20e..36dbd7789985f83ccf2e1c8343655c43d4c29d80 100644
--- a/core/modules/user/src/AccountForm.php
+++ b/core/modules/user/src/AccountForm.php
@@ -151,7 +151,7 @@ public function form(array $form, FormStateInterface $form_state) {
         // The user may only change their own password without their current
         // password if they logged in via a one-time login link.
         if (!$form_state->get('user_pass_reset')) {
-          $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via e-mail.">Reset your password</a>.', array(
+          $form['account']['current_pass']['#description'] = $this->t('Required if you want to change the %mail or %pass below. <a href=":request_new_url" title="Send password reset instructions via email.">Reset your password</a>.', array(
             '%mail' => $form['account']['mail']['#title'],
             '%pass' => $this->t('Password'),
             ':request_new_url' => $this->url('user.pass'),
diff --git a/core/modules/user/src/Form/UserPasswordForm.php b/core/modules/user/src/Form/UserPasswordForm.php
index 8a1a83982e8ff312d45a17f82a2b289304cca329..e1c4adab6007775e3e2aa1379f1bec5fc15621e3 100644
--- a/core/modules/user/src/Form/UserPasswordForm.php
+++ b/core/modules/user/src/Form/UserPasswordForm.php
@@ -99,7 +99,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     else {
       $form['mail'] = array(
         '#prefix' => '<p>',
-        '#markup' => $this->t('Password reset instructions will be sent to your registered e-mail address.'),
+        '#markup' => $this->t('Password reset instructions will be sent to your registered email address.'),
         '#suffix' => '</p>',
       );
       $form['name']['#default_value'] = $this->getRequest()->query->get('name');
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 437c881f54a881c64188fa42fcd4db1677920e40..3831dd7e640625b0e709f914cc1ef12b6ad735af 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -112,7 +112,7 @@ public function build() {
     }
     $items['request_password'] = \Drupal::l($this->t('Reset your password'), new Url('user.pass', array(), array(
       'attributes' => array(
-        'title' => $this->t('Send password reset instructions via e-mail.'),
+        'title' => $this->t('Send password reset instructions via email.'),
         'class' => array('request-password-link'),
       ),
     )));
diff --git a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
index c6c2cbba9447284f24279be4dda1d8b8757d9441..8381b1dbc925d64e747cc7ccee0121559ada92d3 100644
--- a/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
+++ b/core/modules/user/src/Tests/Migrate/d7/MigrateUserTest.php
@@ -49,7 +49,7 @@ protected function setUp() {
    * @param string $label
    *   The username.
    * @param string $mail
-   *   The user's e-mail address.
+   *   The user's email address.
    * @param int $access
    *   The last access time.
    * @param int $login
@@ -59,7 +59,7 @@ protected function setUp() {
    * @param string $langcode
    *   The user account's language code.
    * @param string $init
-   *   The user's initial e-mail address.
+   *   The user's initial email address.
    * @param string[] $roles
    *   Role IDs the user account is expected to have.
    * @param bool $has_picture
diff --git a/core/modules/user/src/Tests/UserValidationTest.php b/core/modules/user/src/Tests/UserValidationTest.php
index b419103b8eab0cd1ac92cd720a510e0832f5b93f..f39e11ee2cfff5217fc4928427becddd51d1854e 100644
--- a/core/modules/user/src/Tests/UserValidationTest.php
+++ b/core/modules/user/src/Tests/UserValidationTest.php
@@ -134,7 +134,7 @@ function testValidation() {
     $this->assertEqual($violations[0]->getMessage(), t('The email address %mail is already taken.', array('%mail' => 'existing@example.com')));
     $user->set('mail', NULL);
     $violations = $user->validate();
-    $this->assertEqual(count($violations), 1, 'E-mail addresses may not be removed');
+    $this->assertEqual(count($violations), 1, 'Email addresses may not be removed');
     $this->assertEqual($violations[0]->getPropertyPath(), 'mail');
     $this->assertEqual($violations[0]->getMessage(), t('@name field is required.', array('@name' => $user->getFieldDefinition('mail')->getLabel())));
     $user->set('mail', 'someone@example.com');
diff --git a/core/modules/user/user.permissions.yml b/core/modules/user/user.permissions.yml
index 6eb0697067be4f41785fe96bf91cfc7bcea0c1d4..810583cd2a49e5dad2fe73ad1aa621401e08b133 100644
--- a/core/modules/user/user.permissions.yml
+++ b/core/modules/user/user.permissions.yml
@@ -3,11 +3,11 @@ administer permissions:
   restrict access: true
 administer account settings:
   title: 'Administer account settings'
-  description: 'Configure site-wide settings and behavior for user accounts and registration. This includes account cancellation methods, the content of user e-mails and fields attached to users.'
+  description: 'Configure site-wide settings and behavior for user accounts and registration. This includes account cancellation methods, the content of user emails and fields attached to users.'
   restrict access: true
 administer users:
   title: 'Administer users'
-  description: 'Manage all user accounts. This includes editing all user information, changes of e-mail addresses and passwords, issuing e-mails to users and blocking and deleting user accounts.'
+  description: 'Manage all user accounts. This includes editing all user information, changes of email addresses and passwords, issuing emails to users and blocking and deleting user accounts.'
   restrict access: true
 access user profiles:
   title: 'View user information'