diff --git a/behat.yml.dist b/behat.yml.dist
index ce006ba39b93db485095719e9db5d1941a5ea833..d6b84db2ca7488e830e68fb79b93b4893b85c3d6 100644
--- a/behat.yml.dist
+++ b/behat.yml.dist
@@ -1,21 +1,21 @@
 default:
   autoload:
-    - "%paths.base%/tests/features/bootstrap"
+    - '%paths.base%/tests/features/bootstrap'
   suites:
     default:
       paths:
-        - "%paths.base%/tests/features"
+        - '%paths.base%/tests/features'
       contexts:
-        - "Drupal\DrupalExtension\Context\ConfigContext"
-        - "Drupal\DrupalExtension\Context\MinkContext"
-        - "Drupal\DrupalExtension\Context\MarkupContext"
-        - "Drupal\DrupalExtension\Context\MessageContext"
-        - "Drupal\DrupalExtension\Context\DrupalContext"
-        - "NuvoleWeb\Drupal\DrupalExtension\Context\DrupalContext"
-        - "NuvoleWeb\Drupal\DrupalExtension\Context\SelectFieldContext"
-        - "NuvoleWeb\Drupal\DrupalExtension\Context\VisibilityContext"
-        - "NuvoleWeb\Drupal\DrupalExtension\Context\ContentContext"
-        - "FeatureContext"
+        - 'Drupal\DrupalExtension\Context\ConfigContext'
+        - 'Drupal\DrupalExtension\Context\MinkContext'
+        - 'Drupal\DrupalExtension\Context\MarkupContext'
+        - 'Drupal\DrupalExtension\Context\MessageContext'
+        - 'Drupal\DrupalExtension\Context\DrupalContext'
+        - 'NuvoleWeb\Drupal\DrupalExtension\Context\DrupalContext'
+        - 'NuvoleWeb\Drupal\DrupalExtension\Context\SelectFieldContext'
+        - 'NuvoleWeb\Drupal\DrupalExtension\Context\VisibilityContext'
+        - 'NuvoleWeb\Drupal\DrupalExtension\Context\ContentContext'
+        - 'FeatureContext'
   extensions:
     Behat\MinkExtension:
       goutte: ~
@@ -23,22 +23,22 @@ default:
       javascript_session: selenium2
       base_url: http://127.0.0.1:8888
     NuvoleWeb\Drupal\DrupalExtension:
-      api_driver: "drupal"
+      api_driver: 'drupal'
       drupal:
         # Change this to the absolute path to Drupal install.
-        drupal_root: "build"
+        drupal_root: 'build'
       region_map:
-        left sidebar: "#sidebar-first"
-        content: "#content"
-        media_heading: ".media-heading"
-        media_text: ".media-text"
-        jumbotron: ".jumbotron"
-        quote: ".quote"
-        modal: ".modal-dialog"
+        left sidebar: '#sidebar-first'
+        content: '#content'
+        media_heading: '.media-heading'
+        media_text: '.media-text'
+        jumbotron: '.jumbotron'
+        quote: '.quote'
+        modal: '.modal-dialog'
       selectors:
         error_message_selector: '.alert.alert-danger'
       text:
-        node_submit_label: "Save and publish"
+        node_submit_label: 'Save and publish'
     Bex\Behat\ScreenshotExtension:
       active_image_drivers: img42
   formatters:
diff --git a/src/Plugin/Validation/Constraint/PatternConstraintTrait.php b/src/Plugin/Validation/Constraint/PatternConstraintTrait.php
deleted file mode 100644
index fcf8bb99883d8b6e8f794f4a19a20252f423a27f..0000000000000000000000000000000000000000
--- a/src/Plugin/Validation/Constraint/PatternConstraintTrait.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Drupal\ui_patterns\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\ExecutionContextInterface;
-
-/**
- * Class BasePatternConstraint.
- *
- * @package Drupal\ui_patterns\Plugin\Validation\Constraint
- */
-trait PatternConstraintTrait {
-
-  /**
-   * Execution context object.
-   *
-   * @var \Symfony\Component\Validator\ExecutionContextInterface
-   */
-  protected $context;
-
-  /**
-   * {@inheritdoc}
-   */
-  public function initialize(ExecutionContextInterface $context) {
-    $this->context = $context;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validatedBy() {
-    return self::class;
-  }
-
-}
diff --git a/src/Plugin/Validation/Constraint/ValidPatternMachineNameConstraint.php b/src/Plugin/Validation/Constraint/ValidPatternMachineNameConstraint.php
deleted file mode 100644
index 924bc095ec02046c95be2d831dbc68a967d7f913..0000000000000000000000000000000000000000
--- a/src/Plugin/Validation/Constraint/ValidPatternMachineNameConstraint.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace Drupal\ui_patterns\Plugin\Validation\Constraint;
-
-use Symfony\Component\Validator\ConstraintValidatorInterface;
-use Symfony\Component\Validator\Constraint;
-
-/**
- * ValidFieldNameConstraint constraint.
- *
- * @Constraint(
- *   id = "ValidPatternMachineName",
- *   label = @Translation("Valid pattern field name", context = "Validation")
- * )
- */
-class ValidPatternMachineNameConstraint extends Constraint implements ConstraintValidatorInterface {
-
-  use PatternConstraintTrait;
-
-  /**
-   * Error message.
-   *
-   * @var string
-   */
-  public $message = 'Field cannot be named "@field" since it is among pattern reserved words: @reserved.';
-
-  /**
-   * Reserved words.
-   *
-   * @var array
-   */
-  protected $reserved = ['id', 'type', 'theme', 'context', 'use', 'attributes'];
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validate($value, Constraint $constraint) {
-    if (in_array($value, $this->reserved)) {
-      $this->context->addViolation($this->message, [
-        '@field' => $value,
-        '@reserved' => implode(', ', $this->reserved),
-      ]);
-    }
-  }
-
-}
diff --git a/src/TypedData/PatternDataDefinition.php b/src/TypedData/PatternDataDefinition.php
index 5e5a5ab8c1044c1175fef0ce2b3c13e4583f70cc..80f66bf8ba1ecf6eb4216c1f07e71969d0a812d1 100644
--- a/src/TypedData/PatternDataDefinition.php
+++ b/src/TypedData/PatternDataDefinition.php
@@ -47,8 +47,7 @@ class PatternDataDefinition extends MapDataDefinition {
    */
   protected function getMachineNameDefinition() {
     return DataDefinition::create('string')
-      ->addConstraint('Regex', self::MACHINE_NAME)
-      ->addConstraint('ValidPatternMachineName');
+      ->addConstraint('Regex', self::MACHINE_NAME);
   }
 
   /**