diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraint.php b/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraint.php
new file mode 100644
index 0000000..5327c70
--- /dev/null
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraint.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity\Plugin\Validation\Constraint\EntityChangedConstraint.
+ */
+
+namespace Drupal\entity\Plugin\Validation\Constraint;
+
+use Drupal\Component\Annotation\Plugin;
+use Drupal\Core\Annotation\Translation;
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * Validation constraint for the entity changed timestamp.
+ *
+ * @Plugin(
+ *   id = "EntityChanged",
+ *   label = @Translation("Entity changed", context = "Validation")
+ * )
+ */
+class EntityChangedConstraint extends Constraint {
+
+  public $message = 'The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.';
+}
diff --git a/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php b/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php
new file mode 100644
index 0000000..6d3469a
--- /dev/null
+++ b/core/modules/entity/lib/Drupal/entity/Plugin/Validation/Constraint/EntityChangedConstraintValidator.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\entity\Plugin\Validation\Constraint\EntityChangedConstraintValidator.
+ */
+
+namespace Drupal\entity\Plugin\Validation\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+
+/**
+ * Validates the EntityChanged constraint.
+ */
+class EntityChangedConstraintValidator extends ConstraintValidator {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function validate($value, Constraint $constraint) {
+    if (isset($value)) {
+      // We are on the field item level, so we need to go two levels up for the
+      // entity object.
+      $entity = $this->context->getMetadata()->getTypedData()->getParent()->getParent();
+      $saved_entity = entity_load_unchanged($entity->type, $entity->id());
+      if (!empty($saved_entity) && ($saved_entity instanceof EntityChangedInterface) && ($saved_entity->getChangedTime() > $value)) {
+        $this->context->addViolation($constraint->message);
+      }
+    }
+  }
+}
diff --git a/core/modules/node/lib/Drupal/node/Entity/Node.php b/core/modules/node/lib/Drupal/node/Entity/Node.php
index 99063bb..f69bf1a 100644
--- a/core/modules/node/lib/Drupal/node/Entity/Node.php
+++ b/core/modules/node/lib/Drupal/node/Entity/Node.php
@@ -376,7 +376,7 @@ public static function baseFieldDefinitions($entity_type) {
       'description' => t('The time that the node was last edited.'),
       'type' => 'integer_field',
       'property_constraints' => array(
-        'value' => array('NodeChanged' => array()),
+        'value' => array('EntityChanged' => array()),
       ),
     );
     $properties['comment'] = array(
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraint.php b/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraint.php
deleted file mode 100644
index 1ca461f..0000000
--- a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraint.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Plugin\Validation\Constraint\NodeChangedConstraint.
- */
-
-namespace Drupal\node\Plugin\Validation\Constraint;
-
-use Drupal\Component\Annotation\Plugin;
-use Drupal\Core\Annotation\Translation;
-use Symfony\Component\Validator\Constraint;
-
-/**
- * Validation constraint for the node changed timestamp.
- *
- * @Plugin(
- *   id = "NodeChanged",
- *   label = @Translation("Node changed", context = "Validation")
- * )
- */
-class NodeChangedConstraint extends Constraint {
-
-  public $message = 'The content has either been modified by another user, or you have already submitted modifications. As a result, your changes cannot be saved.';
-}
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php b/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php
deleted file mode 100644
index 0479e38..0000000
--- a/core/modules/node/lib/Drupal/node/Plugin/Validation/Constraint/NodeChangedConstraintValidator.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\node\Plugin\Validation\Constraint\NodeChangedConstraintValidator.
- */
-
-namespace Drupal\node\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\ConstraintValidator;
-
-/**
- * Validates the NodeChanged constraint.
- */
-class NodeChangedConstraintValidator extends ConstraintValidator {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($value, Constraint $constraint) {
-    if (isset($value)) {
-      // We are on the field item level, so we need to go two levels up for the
-      // node object.
-      $node = $this->context->getMetadata()->getTypedData()->getParent()->getParent();
-      $id = $node->id();
-      $language = $node->language();
-      if ($id && (node_last_changed($id, $language->id) > $value)) {
-        $this->context->addViolation($constraint->message);
-      }
-    }
-  }
-}
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
index da83581..4fb9b13 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
@@ -253,6 +253,9 @@ public static function baseFieldDefinitions($entity_type) {
       'label' => t('Changed'),
       'description' => t('The time that the term was last edited.'),
       'type' => 'integer_field',
+      'property_constraints' => array(
+        'value' => array('EntityChanged' => array()),
+      ),
     );
     return $properties;
   }