diff --git a/core/modules/language/language.module b/core/modules/language/language.module
index 2dd5e57..1f6678d 100644
--- a/core/modules/language/language.module
+++ b/core/modules/language/language.module
@@ -438,7 +438,7 @@ function language_get_default_langcode($entity_type, $bundle) {
   }
 
   $default_value = NULL;
-  $language_interface = language(Language::TYPE_INTERFACE);
+  $language_interface = Drupal::languageManager()->getLanguage();
   switch ($configuration['langcode']) {
     case 'site_default':
       $default_value = language_default()->id;
diff --git a/core/modules/language/language.negotiation.inc b/core/modules/language/language.negotiation.inc
index dc69597..a6438cf 100644
--- a/core/modules/language/language.negotiation.inc
+++ b/core/modules/language/language.negotiation.inc
@@ -56,7 +56,7 @@
  *   The current interface language code.
  */
 function language_from_interface() {
-  return language(Language::TYPE_INTERFACE)->id;
+  return Drupal::languageManager()->getLanguage()->id;
 }
 
 /**
@@ -376,7 +376,7 @@ function language_url_fallback($language = NULL, $request = NULL, $language_type
     return $default->id;
   }
   else {
-    $langcode = language($language_type)->id;
+    $langcode = Drupal::languageManager()->getLanguage()->id;
     return $langcode;
   }
 }
@@ -407,7 +407,7 @@ function language_switcher_url($type, $path) {
  */
 function language_switcher_session($type, $path) {
   $param = Drupal::config('language.negotiation')->get('session.parameter');
-  $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : language($type)->id;
+  $language_query = isset($_SESSION[$param]) ? $_SESSION[$param] : Drupal::languageManager()->getLanguage()->id;
 
   $languages = language_list();
   $links = array();
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
index d5a3c02..8177f3a 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageConfigurationElementTest.php
@@ -83,7 +83,7 @@ public function testDefaultLangcode() {
     // Current interface.
     language_save_default_configuration('custom_type', 'custom_bundle', array('langcode' => 'current_interface', 'language_show' => TRUE));
     $langcode = language_get_default_langcode('custom_type', 'custom_bundle');
-    $language_interface = language(Language::TYPE_INTERFACE);
+    $language_interface = \Drupal::languageManager()->getLanguage();
     $this->assertEqual($langcode, $language_interface->id);
 
     // Site's default.
diff --git a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
index 97488ed..c52e3f3 100644
--- a/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
+++ b/core/modules/language/lib/Drupal/language/Tests/LanguageDependencyInjectionTest.php
@@ -49,7 +49,7 @@ function testDependencyInjectedNewLanguage() {
     drupal_language_initialize();
 
     $expected = language_default();
-    $result = language(Language::TYPE_INTERFACE);
+    $result = \Drupal::languageManager()->getLanguage();
     foreach ($expected as $property => $value) {
       $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the new Language object %prop property.', array('%prop' => $property)));
     }
@@ -79,7 +79,7 @@ function testDependencyInjectedNewDefaultLanguage() {
     // The language system creates a Language object which contains the
     // same properties as the new default language object.
     $expected = new Language($new_language_default);
-    $result = language(Language::TYPE_INTERFACE);
+    $result = \Drupal::languageManager()->getLanguage();
     foreach ($expected as $property => $value) {
       $this->assertEqual($expected->$property, $result->$property, format_string('The dependency injected language object %prop property equals the default language object %prop property.', array('%prop' => $property)));
     }
diff --git a/core/modules/language/tests/language_test/language_test.module b/core/modules/language/tests/language_test/language_test.module
index c3386cf..876e653 100644
--- a/core/modules/language/tests/language_test/language_test.module
+++ b/core/modules/language/tests/language_test/language_test.module
@@ -15,8 +15,8 @@
  */
 function language_test_page_build() {
   language_test_store_language_negotiation();
-  if (isset(language(Language::TYPE_INTERFACE)->id) && isset(language(Language::TYPE_INTERFACE)->method_id)) {
-    drupal_set_message(t('Language negotiation method: @name', array('@name' => language(Language::TYPE_INTERFACE)->method_id)));
+  if (isset(Drupal::languageManager()->getLanguage()->id) && isset(Drupal::languageManager()->getLanguage()->method_id)) {
+    drupal_set_message(t('Language negotiation method: @name', array('@name' => Drupal::languageManager()->getLanguage()->method_id)));
   }
 }
 
@@ -96,9 +96,8 @@ function language_test_language_negotiation_info_alter(array &$negotiation_info)
  */
 function language_test_store_language_negotiation() {
   $last = array();
-  print_r(language_types_get_all());
   foreach (language_types_get_all() as $type) {
-    $last[$type] = language($type)->id;
+    $last[$type] = Drupal::languageManager()->getLanguage($type)->id;
   }
   Drupal::state()->set('language_test.language_negotiation_last', $last);
 }