diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
index 34c28e79813cdfcae72e4aa96a421aca164bc43b..db45fad2347ce8a38e9a5587ec114959ed6e9d89 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -51,7 +51,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderS
  *
  *    <f:cObject typoscriptObjectPath="lib.someLibObject" />
  *
- * Rendered :ts:`lib.someLibObject`.
+ * Rendered :typoscript:`lib.someLibObject`.
  *
  * Specify cObject data & current value
  * ------------------------------------
@@ -60,7 +60,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderS
  *
  *    <f:cObject typoscriptObjectPath="lib.customHeader" data="{article}" currentValueKey="title" />
  *
- * Rendered :ts:`lib.customHeader`. Data and current value will be available in TypoScript.
+ * Rendered :typoscript:`lib.customHeader`. Data and current value will be available in TypoScript.
  *
  * Inline notation
  * ---------------
@@ -69,12 +69,12 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderS
  *
  *    {article -> f:cObject(typoscriptObjectPath: 'lib.customHeader')}
  *
- * Rendered :ts:`lib.customHeader`. Data will be available in TypoScript.
+ * Rendered :typoscript:`lib.customHeader`. Data will be available in TypoScript.
  *
  * Accessing the data in TypoScript
  * --------------------------------
  *
- * ::
+ * .. code-block:: typoscript
  *
  *    lib.customHeader = COA
  *    lib.customHeader {
@@ -84,8 +84,8 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderS
  *        20.current = 1
  *    }
  *
- * When passing an object with ``{data}``, the properties of the object are accessible with :ts:`.field` in
- * TypoScript. If only a single value is passed or the ``currentValueKey`` is specified, :ts:`.current = 1`
+ * When passing an object with ``{data}``, the properties of the object are accessible with :typoscript:`.field` in
+ * TypoScript. If only a single value is passed or the ``currentValueKey`` is specified, :typoscript:`.current = 1`
  * can be used in the TypoScript.
  */
 final class CObjectViewHelper extends AbstractViewHelper
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
index 30c2d0162a20e6553244b7595825265060c67c63..02983e639df94f0e5655ed802fa83eefe7fbdaa7 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
@@ -32,7 +32,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithRenderStatic;
 /**
  * Renders a string by passing it to a TYPO3 `parseFunc`_.
  * You can either specify a path to the TypoScript setting or set the `parseFunc`_ options directly.
- * By default :ts:`lib.parseFunc_RTE` is used to parse the string.
+ * By default :typoscript:`lib.parseFunc_RTE` is used to parse the string.
  *
  * Examples
  * ========