diff --git a/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php b/core/modules/outside_in/src/Render/MainContent/OffCanvasRenderer.php
similarity index 95%
rename from core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php
rename to core/modules/outside_in/src/Render/MainContent/OffCanvasRenderer.php
index 9119c9b8cf..3286ed9f4b 100644
--- a/core/modules/outside_in/src/Render/MainContent/OffCanvasRender.php
+++ b/core/modules/outside_in/src/Render/MainContent/OffCanvasRenderer.php
@@ -13,7 +13,7 @@
 /**
  * Default main content renderer for off-canvas dialog requests.
  */
-class OffCanvasRender extends DialogRenderer {
+class OffCanvasRenderer extends DialogRenderer {
 
   /**
    * The renderer.
@@ -23,7 +23,7 @@ class OffCanvasRender extends DialogRenderer {
   protected $renderer;
 
   /**
-   * Constructs a new OffCanvasRender.
+   * Constructs a new OffCanvasRenderer.
    *
    * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver
    *   The title resolver.
diff --git a/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php b/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
index db2e359554..a36dd47130 100644
--- a/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
+++ b/core/modules/system/tests/modules/dialog_renderer_test/src/Render/MainContent/WideModalRenderer.php
@@ -6,6 +6,7 @@
 use Drupal\Core\Ajax\OpenModalDialogCommand;
 use Drupal\Core\Controller\TitleResolverInterface;
 use Drupal\Core\Render\MainContent\DialogRenderer;
+use Drupal\Core\Render\MainContent\ModalRenderer;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -16,7 +17,7 @@
  * to demonstrate selecting a different render via 'data-dialog-renderer' link
  * attribute.
  */
-class WideModalRenderer extends DialogRenderer {
+class WideModalRenderer extends ModalRenderer {
 
   /**
    * The mode, either 'wide' or 'extra_wide'.
@@ -26,8 +27,8 @@ class WideModalRenderer extends DialogRenderer {
   protected $mode;
 
   /**
-   * WideModalRenderer constructor.
-   * 
+   * Constructs a new WideModalRenderer.
+   *
    * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver
    *   The title resolver.
    * @param string $mode