diff --git a/core/includes/update.inc b/core/includes/update.inc
index 5c67611..b5c6aa1 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -100,6 +100,9 @@ function update_prepare_d8_bootstrap() {
         'description' => $has_required_schema ? '' : 'Please update your Drupal 7 installation to the most recent version before attempting to upgrade to Drupal 8',
       ),
     );
+    if ($has_required_schema) {
+      db_rename_table('languages', 'language');
+    }
   }
 }
 
diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index f69b367..231ae4e 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -132,8 +132,9 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
     // Delete the language for real. This a confirm form, we do not need any
     // fields changed.
     $this->drupalPost('admin/config/regional/language/delete/' . $langcode, array(), t('Delete'));
-    // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)), t('The test language has been removed.'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = array('%language' => $name, '%langcode' => $langcode);
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args)), t('The test language has been removed.'));
     $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
     // Verify that language is no longer found.
     $this->drupalGet('admin/config/regional/language/delete/' . $langcode);
@@ -154,8 +155,9 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
     $enabled = language_list('enabled');
     // Delete the disabled language.
     $this->drupalPost('admin/config/regional/language/delete/fr', array(), t('Delete'));
-    // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => 'French')), t('Disabled language has been removed.'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = array('%language' => 'French', '%langcode' => 'fr');
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args)), t('Disabled language has been removed.'));
     $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
     // Verify that language is no longer found.
     $this->drupalGet('admin/config/regional/language/delete/fr');
@@ -191,8 +193,9 @@ class LocaleConfigurationTest extends DrupalWebTestCase {
     $this->assertEqual($this->getUrl(), url('admin/config/regional/language', array('absolute' => TRUE)), t('Correct page redirection.'));
 
     $this->drupalPost('admin/config/regional/language/delete/en', array(), t('Delete'));
-    // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => 'English')), t('The English language has been removed.'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = array('%language' => 'English', '%langcode' => 'en');
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args)), t('The English language has been removed.'));
   }
 
 }
@@ -411,8 +414,9 @@ class LocaleTranslationFunctionalTest extends DrupalWebTestCase {
     $path = 'admin/config/regional/language/delete/' . $langcode;
     // This a confirm form, we do not need any fields changed.
     $this->drupalPost($path, array(), t('Delete'));
-    // We need raw here because %locale will add HTML.
-    $this->assertRaw(t('The language %locale has been removed.', array('%locale' => $name)), t('The test language has been removed.'));
+    // We need raw here because %language and %langcode will add HTML.
+    $t_args = array('%language' => $name, '%langcode' => $langcode);
+    $this->assertRaw(t('The %language (%langcode) language has been removed.', $t_args)), t('The test language has been removed.'));
     // Reload to remove $name.
     $this->drupalGet($path);
     // Verify that language is no longer found.
diff --git a/core/modules/translation/translation.test b/core/modules/translation/translation.test
index 3436f3b..776825a 100644
--- a/core/modules/translation/translation.test
+++ b/core/modules/translation/translation.test
@@ -291,7 +291,7 @@ class TranslationTestCase extends DrupalWebTestCase {
       $this->assertTrue(array_key_exists($language_code, $languages), t('Language was installed successfully.'));
 
       if (array_key_exists($language_code, $languages)) {
-        $this->assertRaw(t('The language %language has been created and can now be used. More information is available on the <a href="@locale-help">help screen</a>.', array('%language' => $languages[$language_code]->name, '@locale-help' => url('admin/help/locale'))), t('Language has been created.'));
+        $this->assertRaw(t('The language %language has been created and can now be used.', array('%language' => $languages[$language_code]->name)), t('Language has been created.'));
       }
     }
     elseif ($this->xpath('//input[@type="checkbox" and @name=:name and @checked="checked"]', array(':name' => 'languages[' . $language_code . '][enabled]'))) {