diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
index 77d0874..f81b9e5 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
@@ -41,7 +41,7 @@ public function form(array $form, array &$form_state, EntityInterface $term) {
       '#format' => $term->format,
       '#weight' => 0,
     );
-    $language_configuration = module_invoke('language', 'get_default_configuration', 'vocabulary', $vocabulary->machine_name);
+    $language_configuration = module_invoke('language', 'get_default_configuration', 'taxonomy_term', $vocabulary->machine_name);
     $form['langcode'] = array(
       '#type' => 'language_select',
       '#title' => t('Language'),
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
index 31bbf62..65f756f 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
@@ -95,7 +95,7 @@ function testVocabularyDefaultLanguageForTerms() {
     $this->assertResponse(200, 'The vocabulary has been created.');
 
     // Check that the language settings were saved.
-    $language_settings = language_get_default_configuration('vocabulary', $edit['machine_name']);
+    $language_settings = language_get_default_configuration('taxonomy_term', $edit['machine_name']);
     $this->assertEqual($language_settings['langcode'], 'bb');
     $this->assertEqual($language_settings['language_hidden'], FALSE);
 
@@ -111,7 +111,7 @@ function testVocabularyDefaultLanguageForTerms() {
     $this->drupalPost('admin/structure/taxonomy/' . $machine_name . '/edit', $edit, t('Save'));
 
     // And check again the settings and also the interface.
-    $language_settings = language_get_default_configuration('vocabulary', $machine_name);
+    $language_settings = language_get_default_configuration('taxonomy_term', $machine_name);
     $this->assertEqual($language_settings['langcode'], 'aa');
     $this->assertEqual($language_settings['language_hidden'], TRUE);
 
@@ -133,7 +133,7 @@ function testVocabularyDefaultLanguageForTerms() {
     $old_settings = config('language.settings')->get(language_get_default_configuration_settings_key('vocabulary', $machine_name));
     $this->assertNull($old_settings, 'The old vocabulary settings were deleted.');
     // Check that we have the new settings.
-    $new_settings = language_get_default_configuration('vocabulary', $new_machine_name);
+    $new_settings = language_get_default_configuration('taxonomy_term', $new_machine_name);
     $this->assertEqual($new_settings['langcode'], 'authors_default');
     $this->assertEqual($new_settings['language_hidden'], TRUE);
   }
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
index 59579a4..aa4d2df 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
@@ -135,7 +135,7 @@ public function languageConfigurationSubmit(array &$form, array &$form_state) {
     // Delete the old language settings for the vocabulary, if the machine name
     // is changed.
     if ($vocabulary && isset($vocabulary->machine_name) && $vocabulary->machine_name != $form_state['values']['machine_name']) {
-      language_clear_default_configuration('vocabulary', $vocabulary->machine_name);
+      language_clear_default_configuration('taxonomy_term', $vocabulary->machine_name);
     }
     // Since the machine name is not known yet, and it can be changed anytime,
     // we have to also update the bundle property for the default language
diff --git a/core/modules/taxonomy/taxonomy.admin.inc b/core/modules/taxonomy/taxonomy.admin.inc
index 273b35c..24c2039 100644
--- a/core/modules/taxonomy/taxonomy.admin.inc
+++ b/core/modules/taxonomy/taxonomy.admin.inc
@@ -534,7 +534,7 @@ function theme_taxonomy_overview_terms($variables) {
 function taxonomy_term_add($vocabulary) {
   $term = entity_create('taxonomy_term', array('vid' => $vocabulary->vid, 'vocabulary_machine_name' => $vocabulary->machine_name));
   if (module_exists('language')) {
-    $term->langcode = language_get_default_langcode('vocabulary', $vocabulary->machine_name);
+    $term->langcode = language_get_default_langcode('taxonomy_term', $vocabulary->machine_name);
   }
   return entity_get_form($term);
 }
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
index 51c9e64..1ef0429 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationUITest.php
@@ -55,7 +55,7 @@ function setUp() {
 
     // Enable translation for the entity_test entity type and ensure the change
     // is picked up.
-    translation_entity_set_settings('entity_test', 'entity_test', 'enabled', TRUE);
+    translation_entity_set_config('entity_test', 'entity_test', 'enabled', TRUE);
     drupal_static_reset();
     entity_info_cache_clear();
     menu_router_rebuild();
diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module
index 5a9c0ab..6f0fba5 100644
--- a/core/modules/translation_entity/translation_entity.module
+++ b/core/modules/translation_entity/translation_entity.module
@@ -209,7 +209,7 @@ function translation_entity_add_access(EntityInterface $entity, Language $source
  * @todo Generalize this logic so that it is available to any module needing
  *   per-bundle configuration.
  */
-function translation_entity_get_setting_key($entity_type, $bundle, $setting) {
+function translation_entity_get_config_key($entity_type, $bundle, $setting) {
   $entity_type = preg_replace('/[^0-9a-zA-Z_]/', "_", $entity_type);
   $bundle = preg_replace('/[^0-9a-zA-Z_]/', "_", $bundle);
   return $entity_type . '.' . $bundle . '.translation_entity.' . $setting;
@@ -228,8 +228,8 @@ function translation_entity_get_setting_key($entity_type, $bundle, $setting) {
  * @returns mixed
  *   The stored value for the given setting.
  */
-function translation_entity_get_setting($entity_type, $bundle, $setting) {
-  $key = translation_entity_get_setting_key($entity_type, $bundle, $setting);
+function translation_entity_get_config($entity_type, $bundle, $setting) {
+  $key = translation_entity_get_config_key($entity_type, $bundle, $setting);
   return config('translation_entity.settings')->get($key);
 }
 
@@ -245,8 +245,8 @@ function translation_entity_get_setting($entity_type, $bundle, $setting) {
  * @param $value
  *   The value to be stored for the given setting.
  */
-function translation_entity_set_setting($entity_type, $bundle, $setting, $value) {
-  $key = translation_entity_get_setting_key($entity_type, $bundle, $setting);
+function translation_entity_set_config($entity_type, $bundle, $setting, $value) {
+  $key = translation_entity_get_config_key($entity_type, $bundle, $setting);
   return config('translation_entity.settings')->set($key, $value)->save();
 }
 
@@ -271,7 +271,7 @@ function translation_entity_enabled($entity_type, $bundle = NULL, $skip_handler
   $bundles = !empty($bundle) ? array($bundle) : entity_get_bundles($entity_type);
 
   foreach ($bundles as $bundle) {
-    if (translation_entity_get_setting($entity_type, $bundle, 'enabled')) {
+    if (translation_entity_get_config($entity_type, $bundle, 'enabled')) {
       $enabled = TRUE;
       break;
     }
@@ -586,7 +586,7 @@ function translation_entity_language_configuration_element_submit($form, &$form_
   $enabled = $form_state['values'][$key]['translation_entity'];
 
   if (translation_entity_enabled($context['entity_type'], $context['bundle']) != $enabled) {
-    translation_entity_set_setting($context['entity_type'], $context['bundle'], 'enabled', $enabled);
+    translation_entity_set_config($context['entity_type'], $context['bundle'], 'enabled', $enabled);
     entity_info_cache_clear();
     menu_router_rebuild();
   }