core/lib/Drupal/Core/Controller/HtmlControllerBase.php    | 4 ++--
 core/lib/Drupal/Core/Controller/HtmlPageController.php    | 2 +-
 core/lib/Drupal/Core/Page/RenderHtmlRendererInterface.php | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/lib/Drupal/Core/Controller/HtmlControllerBase.php b/core/lib/Drupal/Core/Controller/HtmlControllerBase.php
index 277a3a4..b2a639b 100644
--- a/core/lib/Drupal/Core/Controller/HtmlControllerBase.php
+++ b/core/lib/Drupal/Core/Controller/HtmlControllerBase.php
@@ -27,7 +27,7 @@ class HtmlControllerBase {
   protected $titleResolver;
 
   /**
-   * The render array to HTML fragment converter.
+   * The render array to HTML fragment renderer.
    *
    * @var \Drupal\Core\Page\RenderHtmlRendererInterface
    */
@@ -39,7 +39,7 @@ class HtmlControllerBase {
    * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver
    *   The title resolver.
    * @param \Drupal\Core\Page\RenderHtmlRendererInterface $render_html_renderer
-   *   The render html renderer.
+   *   The render array to HTML fragment renderer.
    */
   public function __construct(TitleResolverInterface $title_resolver, RenderHtmlRendererInterface $render_html_renderer) {
     $this->titleResolver = $title_resolver;
diff --git a/core/lib/Drupal/Core/Controller/HtmlPageController.php b/core/lib/Drupal/Core/Controller/HtmlPageController.php
index 83d5658..efc11ac 100644
--- a/core/lib/Drupal/Core/Controller/HtmlPageController.php
+++ b/core/lib/Drupal/Core/Controller/HtmlPageController.php
@@ -30,7 +30,7 @@ class HtmlPageController extends HtmlControllerBase {
    * @param \Drupal\Core\Controller\TitleResolverInterface $title_resolver
    *   The title resolver.
    * @param \Drupal\Core\Page\RenderHtmlRendererInterface $render_html_renderer
-   *   The render html renderer.
+   *   The render array to HTML fragment renderer.
    */
   public function __construct(ControllerResolverInterface $controller_resolver, TitleResolverInterface $title_resolver, RenderHtmlRendererInterface $render_html_renderer) {
     parent::__construct($title_resolver, $render_html_renderer);
diff --git a/core/lib/Drupal/Core/Page/RenderHtmlRendererInterface.php b/core/lib/Drupal/Core/Page/RenderHtmlRendererInterface.php
index 95fabae..4807be9 100644
--- a/core/lib/Drupal/Core/Page/RenderHtmlRendererInterface.php
+++ b/core/lib/Drupal/Core/Page/RenderHtmlRendererInterface.php
@@ -23,6 +23,8 @@
    *
    * @return \Drupal\Core\Page\HtmlFragment
    *   The equivalent HtmlFragment object.
+   *
+   * @todo Change this documentation once https://www.drupal.org/node/2339475 lands.
    */
   public function render(array $render_array);