diff --git a/core/modules/entity/entity.module b/core/modules/entity/entity.module
index 064b285..58ebd5d 100644
--- a/core/modules/entity/entity.module
+++ b/core/modules/entity/entity.module
@@ -14,7 +14,7 @@ use Drupal\entity\EntityInterface;
 /**
  * The type of language used to define the form language.
  */
-const ENTITY_LANGUAGE_TYPE_FORM = 'entity_language_form';
+const ENTITY_LANGUAGE_CONTENT_EDIT = 'language_content_edit';
 
 /**
  * Implements hook_help().
@@ -478,7 +478,7 @@ function entity_form_state_defaults(EntityInterface $entity, $operation = 'defau
   $form_state['build_info']['callback'] = array($controller, 'build');
   $form_state['build_info']['base_form_id'] = $entity->entityType() . '_form';
   $form_state['build_info']['args'] = array($entity);
-  $form_state['langcode'] = empty($langcode) ? language(ENTITY_LANGUAGE_TYPE_FORM)->langcode : $langcode;
+  $form_state['langcode'] = empty($langcode) ? language(ENTITY_LANGUAGE_CONTENT_EDIT)->langcode : $langcode;
   return $form_state;
 }
 
@@ -570,7 +570,7 @@ function entity_language_types_info() {
   require_once DRUPAL_ROOT . '/core/modules/language/language.negotiation.inc';
 
   return array(
-    ENTITY_LANGUAGE_TYPE_FORM => array(
+    ENTITY_LANGUAGE_CONTENT_EDIT => array(
       'name' => t('Form'),
       'description' => t('Order of language detection methods for form.'),
       'fixed' => array(LANGUAGE_NEGOTIATION_CONTENT),
@@ -582,5 +582,5 @@ function entity_language_types_info() {
  * Implements hook_language_negotiation_info_alter().
  */
 function entity_language_negotiation_info_alter(&$negotiation_info) {
-  $negotiation_info['language-content']['types'][] = ENTITY_LANGUAGE_TYPE_FORM;
+  $negotiation_info['language-content']['types'][] = ENTITY_LANGUAGE_CONTENT_EDIT;
 }