diff --git a/core/INSTALL.txt b/core/INSTALL.txt
index 72a3dd1..f409a99 100644
--- a/core/INSTALL.txt
+++ b/core/INSTALL.txt
@@ -105,7 +105,7 @@ INSTALLATION
 
    You will be guided through several screens to set up the database, add the
    site maintenance account (the first user, also known as user/1), and provide
-   basic web site settings.
+   basic website settings.
 
    During installation, several files and directories need to be created, which
    the install script will try to do automatically. However, on some hosting
diff --git a/core/modules/config/config.module b/core/modules/config/config.module
index 900e124..e11616d 100644
--- a/core/modules/config/config.module
+++ b/core/modules/config/config.module
@@ -13,7 +13,7 @@ function config_help($path, $arg) {
     case 'admin/help#config':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Configuration manager module provides a user interface for importing and exporting configuration changes; i.e., for staging configuration data between multiple instances of this web site. For more information, see the online handbook entry for <a href="!url">Configuration manager module</a>', array(
+      $output .= '<p>' . t('The Configuration manager module provides a user interface for importing and exporting configuration changes; i.e., for staging configuration data between multiple instances of this website. For more information, see the online handbook entry for <a href="!url">Configuration manager module</a>', array(
         '!url' => 'http://drupal.org/documentation/administer/config',
       )) . '</p>';
       return $output;
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 40eda67..f0f3a70 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -24,7 +24,7 @@ function filter_help($path, $arg) {
     case 'admin/help#filter':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats define the HTML tags, codes, and other input allowed in text entered in the site and they defend your web site against potentially damaging input from malicious users. A visual text editor can be associated with the text formats by using the <a href="!editor_help">Text Editor module</a>. For more information, see <a href="!filter_do">the online documentation for the Filter module</a>.', array('!filter_do' => 'https://drupal.org/documentation/modules/filter/','!editor_help' => \Drupal::url('help.page', array('name' => 'editor')))) . '</p>';
+      $output .= '<p>' . t('The Filter module allows administrators to configure text formats. Text formats define the HTML tags, codes, and other input allowed in text entered in the site and they defend your website against potentially damaging input from malicious users. A visual text editor can be associated with the text formats by using the <a href="!editor_help">Text Editor module</a>. For more information, see <a href="!filter_do">the online documentation for the Filter module</a>.', array('!filter_do' => 'https://drupal.org/documentation/modules/filter/','!editor_help' => \Drupal::url('help.page', array('name' => 'editor')))) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Managing text formats') . '</dt>';
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 4447052..20443ce 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -1234,7 +1234,7 @@ function hook_watchdog(array $log_entry) {
 
   $to = 'someone@example.com';
   $params = array();
-  $params['subject'] = t('[@site_name] @severity_desc: Alert from your web site', array(
+  $params['subject'] = t('[@site_name] @severity_desc: Alert from your website', array(
     '@site_name' => \Drupal::config('system.site')->get('name'),
     '@severity_desc' => $severity_list[$log_entry['severity']],
   ));