diff --git a/core/lib/Drupal/Core/Entity/EntityNG.php b/core/lib/Drupal/Core/Entity/EntityNG.php
index ef8e7f8..472c5f1 100644
--- a/core/lib/Drupal/Core/Entity/EntityNG.php
+++ b/core/lib/Drupal/Core/Entity/EntityNG.php
@@ -29,17 +29,17 @@ class EntityNG extends Entity {
   /**
    * Status code indentifying a removed translation.
    */
-  protected static $TRANSLATION_REMOVED = 0;
+  const TRANSLATION_REMOVED = 0;
 
   /**
    * Status code indentifying an existing translation.
    */
-  protected static $TRANSLATION_EXISTING = 1;
+  const TRANSLATION_EXISTING = 1;
 
   /**
    * Status code indentifying a newly created translation.
    */
-  protected static $TRANSLATION_CREATED = 2;
+  const TRANSLATION_CREATED = 2;
 
   /**
    * Local cache holding the value of the bundle field.
@@ -153,7 +153,7 @@ public function __construct(array $values, $entity_type, $bundle = FALSE, $trans
 
     // Initialize translations. Ensure we have at least an entry for the entity
     // original language.
-    $data = array('status' => self::$TRANSLATION_EXISTING);
+    $data = array('status' => self::TRANSLATION_EXISTING);
     $this->translations[Language::LANGCODE_DEFAULT] = $data;
     if ($translations) {
       $default_langcode = $this->language()->id;
@@ -296,7 +296,7 @@ public function get($property_name) {
    * @return \Drupal\Core\Entity\Field\FieldInterface
    */
   protected function getTranslatedField($property_name, $langcode) {
-    if ($this->translations[$this->activeLangcode]['status'] == self::$TRANSLATION_REMOVED) {
+    if ($this->translations[$this->activeLangcode]['status'] == self::TRANSLATION_REMOVED) {
       $message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
       throw new \InvalidArgumentException(format_string($message, array('@langcode' => $this->activeLangcode)));
     }
@@ -601,7 +601,7 @@ public function addTranslation($langcode, array $values = array()) {
       }
     }
 
-    $this->translations[$langcode]['status'] = self::$TRANSLATION_CREATED;
+    $this->translations[$langcode]['status'] = self::TRANSLATION_CREATED;
     $translation = $this->getTranslation($langcode);
     $definitions = $translation->getPropertyDefinitions();
 
@@ -625,7 +625,7 @@ public function removeTranslation($langcode) {
           unset($this->fields[$langcode]);
         }
       }
-      $this->translations[$langcode]['status'] = self::$TRANSLATION_REMOVED;
+      $this->translations[$langcode]['status'] = self::TRANSLATION_REMOVED;
     }
     else {
       $message = 'The specified translation (@langcode) cannot be removed.';
@@ -638,7 +638,7 @@ public function removeTranslation($langcode) {
    */
   public function initTranslation($langcode) {
     if ($langcode != Language::LANGCODE_DEFAULT && $langcode != $this->getDefaultLanguage()->id) {
-      $this->translations[$langcode]['status'] = self::$TRANSLATION_EXISTING;
+      $this->translations[$langcode]['status'] = self::TRANSLATION_EXISTING;
     }
   }
 
@@ -782,7 +782,7 @@ public function __unset($name) {
    * Overrides Entity::createDuplicate().
    */
   public function createDuplicate() {
-    if ($this->translations[$this->activeLangcode]['status'] == self::$TRANSLATION_REMOVED) {
+    if ($this->translations[$this->activeLangcode]['status'] == self::TRANSLATION_REMOVED) {
       $message = 'The entity object refers to a removed translation (@langcode) and cannot be manipulated.';
       throw new \InvalidArgumentException(format_string($message, array('@langcode' => $this->activeLangcode)));
     }
diff --git a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
index cf58f6c..2386f1f 100644
--- a/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
+++ b/core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
@@ -426,7 +426,7 @@ public function entityFormEntityBuild($entity_type, EntityInterface $entity, arr
     }
 
     // Set contextual information that can be reused during the storage phase.
-    // @todo Remove this once translation metadata is converted to regular
+    // @todo Remove this once translation metadata are converted to regular
     //   fields.
     $attributes = \Drupal::request()->attributes;
     $attributes->set('source_langcode', $source_langcode);