diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraint.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraint.php
similarity index 87%
rename from core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraint.php
rename to core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraint.php
index beaff89..401be63 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraint.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraint.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\NullConstraint.
+ * Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\IsNullConstraint.
  */
 
 namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
@@ -20,4 +20,4 @@
  *   type = false
  * )
  */
-class NullConstraint extends IsNull { }
+class IsNullConstraint extends IsNull { }
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
similarity index 91%
rename from core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraintValidator.php
rename to core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
index 13efea2..fa1ac35 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NullConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\NullConstraintValidator.
+ * Contains \Drupal\Core\Validation\Plugin\Validation\Constraint\IsNullConstraintValidator.
  */
 
 namespace Drupal\Core\Validation\Plugin\Validation\Constraint;
@@ -18,7 +18,7 @@
  *
  * Overrides the symfony validator to handle empty Typed Data structures.
  */
-class NullConstraintValidator extends IsNullValidator {
+class IsNullConstraintValidator extends IsNullValidator {
 
   use TypedDataAwareValidatorTrait;