diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
index c712a2d..1c8d13e 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/AddItem.php
@@ -23,14 +23,14 @@ public function __construct($type = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'add-item';
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
index f134de9..f80fee4 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
@@ -16,7 +16,7 @@
 class Analyze extends ViewsFormBase {
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'analyze';
@@ -54,7 +54,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $form_state['redirect'] = 'admin/structure/views/view/' . $form_state['view']->id() . '/edit';
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
index db707f9..67ed22b 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItem.php
@@ -24,14 +24,14 @@ public function __construct($type = NULL, $id = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'config-item';
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
@@ -184,7 +184,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::validateForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::validateForm().
    */
   public function validateForm(array &$form, array &$form_state) {
     $form_state['handler']->validateOptionsForm($form['options'], $form_state);
@@ -195,7 +195,7 @@ public function validateForm(array &$form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     // Run it through the handler's submit function.
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
index 628a1f9..c0d673e 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemExtra.php
@@ -24,14 +24,14 @@ public function __construct($type = NULL, $id = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'config-item-extra';
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
@@ -92,14 +92,14 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::validateForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::validateForm().
    */
   public function validateForm(array &$form, array &$form_state) {
     $form_state['handler']->validateExtraOptionsForm($form['options'], $form_state);
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     // Run it through the handler's submit function.
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
index ece1ce4..96229d4 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ConfigItemGroup.php
@@ -24,14 +24,14 @@ public function __construct($type = NULL, $id = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'config-item-group';
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL, $id = NULL) {
     $this->setType($type);
@@ -92,7 +92,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $item = &$form_state['handler']->options;
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
index 2f0db64..5642e86 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Display.php
@@ -22,14 +22,14 @@ public function __construct($type = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'display';
   }
 
   /**
-   * Overrides ViewsFormBase::getFormState().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getFormState().
    *
    * @todo Remove this and switch all usage of $form_state['section'] to
    *   $form_state['type'].
@@ -41,7 +41,7 @@ public function getFormState(ViewStorageInterface $view, $display_id, $js) {
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
@@ -97,7 +97,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::validateForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::validateForm().
    */
   public function validateForm(array &$form, array &$form_state) {
     $form_state['view']->get('executable')->displayHandlers->get($form_state['display_id'])->validateOptionsForm($form['options'], $form_state);
@@ -108,7 +108,7 @@ public function validateForm(array &$form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $form_state['view']->get('executable')->displayHandlers->get($form_state['display_id'])->submitOptionsForm($form['options'], $form_state);
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
index 6f70bf4..ad9a056 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/EditDetails.php
@@ -15,7 +15,7 @@
 class EditDetails extends ViewsFormBase {
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'edit-details';
@@ -66,7 +66,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $view = $form_state['view'];
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
index 50bbb9e..de01217 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/Rearrange.php
@@ -23,14 +23,14 @@ public function __construct($type = NULL) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'rearrange';
   }
 
   /**
-   * Overrides ViewsFormBase::getForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js, $type = NULL) {
     $this->setType($type);
@@ -133,7 +133,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $types = ViewExecutable::viewsHandlerTypes();
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
index 73b38d1..446d887 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/RearrangeFilter.php
@@ -16,7 +16,7 @@
 class RearrangeFilter extends ViewsFormBase {
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'rearrange-filter';
@@ -208,7 +208,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $types = ViewExecutable::viewsHandlerTypes();
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
index 292a7ca..a14210c 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
@@ -15,7 +15,7 @@
 class ReorderDisplays extends ViewsFormBase {
 
   /**
-   * Implements ViewsFormInterface::getFormKey().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormKey().
    */
   public function getFormKey() {
     return 'reorder-displays';
@@ -93,7 +93,7 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides ViewsFormBase::submitForm().
+   * Overrides \Drupal\views_ui\Form\Ajax\ViewsFormBase::submitForm().
    */
   public function submitForm(array &$form, array &$form_state) {
     $view = $form_state['view'];
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
index 3077deb..b5ce81c 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/Form/Ajax/ViewsFormBase.php
@@ -57,7 +57,7 @@ protected function setType($type) {
   }
 
   /**
-   * Implements ViewsFormInterface::getFormState().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getFormState().
    */
   public function getFormState(ViewStorageInterface $view, $display_id, $js) {
     // $js may already have been converted to a Boolean.
@@ -79,7 +79,7 @@ public function getFormState(ViewStorageInterface $view, $display_id, $js) {
   }
 
   /**
-   * Implements ViewsFormInterface::getForm().
+   * Implements \Drupal\views_ui\Form\Ajax\ViewsFormInterface::getForm().
    */
   public function getForm(ViewStorageInterface $view, $display_id, $js) {
     $form_state = $this->getFormState($view, $display_id, $js);