diff --git a/core/lib/Drupal/Core/Condition/ConditionInterface.php b/core/lib/Drupal/Core/Condition/ConditionInterface.php
index 411d86f..c3e4e0e 100644
--- a/core/lib/Drupal/Core/Condition/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Condition/ConditionInterface.php
@@ -9,7 +9,7 @@
 
 use Drupal\Core\Executable\ExecutableInterface;
 use Drupal\Core\Executable\ExecutableManagerInterface;
-use Drupal\Core\Form\FormInterface;
+use Drupal\Core\Plugin\PluginFormInterface;
 
 /**
  * An interface for condition plugins.
@@ -29,7 +29,7 @@
  * @see \Drupal\Core\TypedData\TypedDataManager::create()
  * @see \Drupal\Core\Executable\ExecutableInterface
  */
-interface ConditionInterface extends ExecutableInterface, FormInterface {
+interface ConditionInterface extends ExecutableInterface, PluginFormInterface {
 
   /**
    * Determines whether condition result will be negated.
diff --git a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
index e583e41..a74d806 100644
--- a/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
+++ b/core/lib/Drupal/Core/Condition/ConditionPluginBase.php
@@ -17,22 +17,14 @@
   /**
    * {@inheritdoc}
    */
-  public function getFormId() {
-    $definition = $this->getPluginDefinition();
-    return implode('_', array($definition['module'], $definition['id'], 'condition'));
-  }
-
-  /**
-   * Implements \Drupal\condition\Plugin\ConditionInterface::isNegated().
-   */
   public function isNegated() {
     return !empty($this->configuration['negate']);
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::buildForm().
+   * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state) {
+  public function buildConfigurationForm(array $form, array &$form_state) {
     $form['negate'] = array(
       '#type' => 'checkbox',
       '#title' => $this->t('Negate the condition.'),
@@ -42,19 +34,20 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::validateForm().
+   * {@inheritdoc}
    */
-  public function validateForm(array &$form, array &$form_state) {}
+  public function validateConfigurationForm(array &$form, array &$form_state) {
+  }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::submitForm().
+   * {@inheritdoc}
    */
-  public function submitForm(array &$form, array &$form_state) {
+  public function submitConfigurationForm(array &$form, array &$form_state) {
     $this->configuration['negate'] = $form_state['values']['negate'];
   }
 
   /**
-   * Implements \Drupal\Core\Executable\ExecutablePluginBase::execute().
+   * {@inheritdoc}
    */
   public function execute() {
     return $this->executableManager->execute($this);
diff --git a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php b/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
index 9dda571..3f12a06 100644
--- a/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
+++ b/core/modules/language/lib/Drupal/language/Plugin/Condition/Language.php
@@ -28,8 +28,8 @@ class Language extends ConditionPluginBase {
   /**
    * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state) {
-    $form = parent::buildForm($form, $form_state);
+  public function buildConfigurationForm(array $form, array &$form_state) {
+    $form = parent::buildConfigurationForm($form, $form_state);
     if (\Drupal::languageManager()->isMultilingual()) {
       // Fetch languages.
       $languages = language_list(Lang::STATE_ALL);
@@ -57,9 +57,9 @@ public function buildForm(array $form, array &$form_state) {
   /**
    * {@inheritdoc}
    */
-  public function submitForm(array &$form, array &$form_state) {
+  public function submitConfigurationForm(array &$form, array &$form_state) {
     $this->configuration['langcodes'] = array_filter($form_state['values']['langcodes']);
-    parent::submitForm($form, $form_state);
+    parent::submitConfigurationForm($form, $form_state);
   }
 
   /**
diff --git a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php b/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
index 3739209..f2c8e24 100644
--- a/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Plugin/Condition/NodeType.php
@@ -28,10 +28,10 @@
 class NodeType extends ConditionPluginBase {
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::buildForm().
+   * {@inheritdoc}
    */
-  public function buildForm(array $form, array &$form_state) {
-    $form = parent::buildForm($form, $form_state);
+  public function buildConfigurationForm(array $form, array &$form_state) {
+    $form = parent::buildConfigurationForm($form, $form_state);
     $options = array();
     foreach (node_type_get_types() as $type) {
       $options[$type->type] = $type->name;
@@ -47,9 +47,9 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::validateForm().
+   * {@inheritdoc}
    */
-  public function validateForm(array &$form, array &$form_state) {
+  public function validateConfigurationForm(array &$form, array &$form_state) {
     foreach ($form_state['values']['bundles'] as $bundle) {
       if (!in_array($bundle, array_keys(node_type_get_types()))) {
         form_set_error('bundles', $form_state, t('You have chosen an invalid node bundle, please check your selection and try again.'));
@@ -58,15 +58,15 @@ public function validateForm(array &$form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::submitForm().
+   * {@inheritdoc}
    */
-  public function submitForm(array &$form, array &$form_state) {
+  public function submitConfigurationForm(array &$form, array &$form_state) {
     $this->configuration['bundles'] = $form_state['values']['bundles'];
-    parent::submitForm($form, $form_state);
+    parent::submitConfigurationForm($form, $form_state);
   }
 
   /**
-   * Implements \Drupal\Core\Executable\ExecutableInterface::summary().
+   * {@inheritdoc}
    */
   public function summary() {
     if (count($this->configuration['bundles']) > 1) {
@@ -80,7 +80,7 @@ public function summary() {
   }
 
   /**
-   * Implements \Drupal\condition\ConditionInterface::evaluate().
+   * {@inheritdoc}
    */
   public function evaluate() {
     $node = $this->getContextValue('node');