diff --git a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
index 603c946..e389c92 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\TypedData\Validation;
 
-use Drupal\Core\TypedData\Validation\Translation\TranslatorInterface;
+use Drupal\Core\Validation\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -68,7 +68,7 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
   /**
    * The translator.
    *
-   * @var \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface
+   * @var \Drupal\Core\Validation\Translation\TranslatorInterface
    */
   protected $translator;
 
@@ -117,7 +117,7 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
    *   The property string.
    * @param mixed $invalidValue
    *   The invalid value.
-   * @param \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface $translator
+   * @param \Drupal\Core\Validation\Translation\TranslatorInterface $translator
    *   The translator.
    * @param null $translationDomain
    *   (optional) The translation domain.
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
index 0bc64d1..c67c9f9 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\TypedData\Validation;
 
-use Drupal\Core\TypedData\Validation\Translation\TranslatorInterface;
+use Drupal\Core\Validation\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -38,7 +38,7 @@ class ExecutionContext implements ExecutionContextInterface {
   protected $root;
 
   /**
-   * @var \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface
+   * @var \Drupal\Core\Validation\Translation\TranslatorInterface
    */
   protected $translator;
 
@@ -117,7 +117,7 @@ class ExecutionContext implements ExecutionContextInterface {
    *   The validator.
    * @param mixed $root
    *   The root.
-   * @param \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface $translator
+   * @param \Drupal\Core\Validation\Translation\TranslatorInterface $translator
    *   The translator.
    * @param string $translationDomain
    *   (optional) The translation domain.
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContextFactory.php b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContextFactory.php
index 71a0b7c..aa15c72 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContextFactory.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContextFactory.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\TypedData\Validation;
 
-use Drupal\Core\TypedData\Validation\Translation\TranslatorInterface;
+use Drupal\Core\Validation\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Context\ExecutionContextFactoryInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
@@ -21,7 +21,7 @@
 class ExecutionContextFactory implements ExecutionContextFactoryInterface {
 
   /**
-   * @var \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface
+   * @var \Drupal\Core\Validation\Translation\TranslatorInterface
    */
   protected $translator;
 
@@ -33,7 +33,7 @@ class ExecutionContextFactory implements ExecutionContextFactoryInterface {
   /**
    * Constructs a new ExecutionContextFactory instance.
    *
-   * @param \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface $translator
+   * @param \Drupal\Core\Validation\Translation\TranslatorInterface $translator
    *   The translator instance.
    * @param string $translationDomain
    *   (optional) The translation domain.
diff --git a/core/lib/Drupal/Core/Validation/DrupalTranslator.php b/core/lib/Drupal/Core/Validation/DrupalTranslator.php
index b14c7d2..b89c553 100644
--- a/core/lib/Drupal/Core/Validation/DrupalTranslator.php
+++ b/core/lib/Drupal/Core/Validation/DrupalTranslator.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Validation;
 
-use Symfony\Component\Translation\TranslatorInterface;
+use Drupal\Core\Validation\Translation\TranslatorInterface;
 
 /**
  * Translates strings using Drupal's translation system.
diff --git a/core/lib/Drupal/Core/TypedData/Validation/Translation/TranslationInterface.php b/core/lib/Drupal/Core/Validation/TranslationInterface.php
similarity index 80%
rename from core/lib/Drupal/Core/TypedData/Validation/Translation/TranslationInterface.php
rename to core/lib/Drupal/Core/Validation/TranslationInterface.php
index d99992f..ef6b893 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/Translation/TranslationInterface.php
+++ b/core/lib/Drupal/Core/Validation/TranslationInterface.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\Core\TypedData\Validation\Translation\TranslatorInterface.
+ * Contains \Drupal\Core\Validation\TranslatorInterface.
  */
 
-namespace Drupal\Core\TypedData\Validation\Translation;
+namespace Drupal\Core\Validation;
 
 use Symfony\Component\Translation\TranslatorInterface as SymfonyTranslatorInterface;