diff --git a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php
index 2d51c25..a185156 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/block/block/ViewsExposedFilterBlock.php
@@ -26,11 +26,10 @@ class ViewsExposedFilterBlock extends ViewsBlock {
    * Implements \Drupal\block\BlockBase::blockBuild().
    */
   public function blockBuild() {
-    $type = 'exp';
-    $output = $this->view->display_handler->viewSpecialBlocks($type);
+    $output = $this->view->display_handler->viewExposedFormBlocks();
     // Before returning the block output, convert it to a renderable array with
     // contextual links.
-    views_add_block_contextual_links($output, $this->view, $this->display_id, 'special_block_' . $type);
+    views_add_block_contextual_links($output, $this->view, $this->display_id, 'exposed_filter');
     $this->view->destroy();
     return $output;
   }
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index b31af4b..851ffb4 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2667,20 +2667,21 @@ public function getSpecialBlocks() {
   }
 
   /**
-   * Render any special blocks provided for this display.
+   * Render the exposed form as block.
+   *
+   * @return string|NULL
+   *  The rendered exposed form as string or NULL otherwise.
    */
-  public function viewSpecialBlocks($type) {
-    if ($type == 'exp') {
-      // avoid interfering with the admin forms.
-      if (arg(0) == 'admin' && arg(1) == 'structure' && arg(2) == 'views') {
-        return;
-      }
-      $this->view->initHandlers();
+  public function viewExposedFormBlocks() {
+    // avoid interfering with the admin forms.
+    if (arg(0) == 'admin' && arg(1) == 'structure' && arg(2) == 'views') {
+      return;
+    }
+    $this->view->initHandlers();
 
-      if ($this->usesExposed() && $this->getOption('exposed_block')) {
-        $exposed_form = $this->getPlugin('exposed_form');
-        return $exposed_form->render_exposed_form(TRUE);
-      }
+    if ($this->usesExposed() && $this->getOption('exposed_block')) {
+      $exposed_form = $this->getPlugin('exposed_form');
+      return $exposed_form->render_exposed_form(TRUE);
     }
   }
 
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index f4d8404..cd63284 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -534,7 +534,7 @@ function views_contextual_links_view_alter(&$element, $items) {
  *   content.
  * @param $block_type
  *   The type of the block. If it's block it's a regular views display,
- *   but 'special_block_-exp' exist as well.
+ *   but 'exposed_filter' exist as well.
  */
 function views_add_block_contextual_links(&$block, ViewExecutable $view, $display_id, $block_type = 'block') {
   // Do not add contextual links to an empty block.
@@ -635,7 +635,7 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable
     }
 
     // On exposed_forms blocks contextual links should always be visible.
-    $plugin['contextual_links_locations'][] = 'special_block_-exp';
+    $plugin['contextual_links_locations'][] = 'exposed_filter';
     $has_links = !empty($plugin['contextual links']) && !empty($plugin['contextual_links_locations']);
     if ($has_links && in_array($location, $plugin['contextual_links_locations'])) {
       foreach ($plugin['contextual links'] as $module => $link) {