diff --git a/typo3/sysext/core/Classes/Configuration/Loader/YamlFileLoader.php b/typo3/sysext/core/Classes/Configuration/Loader/YamlFileLoader.php
index fe6a1c51b335124bfd3effec3f940324bceec050..eb05f5fa13d9061c5d4b4e2e9430ea7104fa8a35 100644
--- a/typo3/sysext/core/Classes/Configuration/Loader/YamlFileLoader.php
+++ b/typo3/sysext/core/Classes/Configuration/Loader/YamlFileLoader.php
@@ -18,12 +18,12 @@ use Symfony\Component\Yaml\Yaml;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
- * A Yaml file loader that allows to load YAML files, based on the Symfony/Yaml component
+ * A YAML file loader that allows to load YAML files, based on the Symfony/Yaml component
  *
- * In addition to just load a yaml file, it adds some special functionality.
+ * In addition to just load a YAML file, it adds some special functionality.
  *
- * - A special "imports" key in the yaml file allows to include other yaml files recursively
- *   where the actual yaml file gets loaded after the import statements, which are interpreted at the very beginning
+ * - A special "imports" key in the YAML file allows to include other YAML files recursively
+ *   where the actual YAML file gets loaded after the import statements, which are interpreted at the very beginning
  *
  * - Merging configuration options of import files when having simple "lists" will add items to the list instead
  *   of overwriting them.
@@ -155,7 +155,7 @@ class YamlFileLoader
     }
 
     /**
-     * Same as array_replace_recursive except that when in simple arrays (= yaml lists), the entries are
+     * Same as array_replace_recursive except that when in simple arrays (= YAML lists), the entries are
      * appended (array_merge)
      *
      * @param array $val1
diff --git a/typo3/sysext/core/Classes/Configuration/Richtext.php b/typo3/sysext/core/Classes/Configuration/Richtext.php
index 77bd51346c33649447834c56f1618c11792a2b68..93ac17b66a5e79b813f86cb2496d2e49fd45369c 100644
--- a/typo3/sysext/core/Classes/Configuration/Richtext.php
+++ b/typo3/sysext/core/Classes/Configuration/Richtext.php
@@ -53,7 +53,7 @@ class Richtext
         // The main problem here is that all parameters that the processing needs is handed over to as TSconfig
         // "dotted array" syntax. We convert at least the processing information available under "processing"
         // together with pageTS, this way it can be overridden and understood in RteHtmlParser.
-        // However, all other parts of the core will depend on the non-dotted syntax (coming from Yaml directly)
+        // However, all other parts of the core will depend on the non-dotted syntax (coming from YAML directly)
 
         $pageTs = $this->getPageTsConfiguration($table, $field, $pid, $recordType);
 
@@ -113,7 +113,7 @@ class Richtext
 
     /**
      * Returns an array with Typoscript the old way (with dot)
-     * Since the functionality in Yaml is without the dots, but the new configuration is used without the dots
+     * Since the functionality in YAML is without the dots, but the new configuration is used without the dots
      * this functionality adds also an explicit = 1 to the arrays
      *
      * @param array $plainArray An array
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php b/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
index 80d73b4fa4d23ffeeb155f2cfd19b547126acd08..3a003d2984129bf8d586e6f059fe7daae3107cf2 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/Loader/YamlFileLoaderTest.php
@@ -18,7 +18,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Configuration\Loader;
 use TYPO3\CMS\Core\Configuration\Loader\YamlFileLoader;
 
 /**
- * Test case for the yaml file loader class
+ * Test case for the YAML file loader class
  */
 class YamlFileLoaderTest extends \TYPO3\TestingFramework\Core\Unit\UnitTestCase
 {
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index 2ad764c02966d2868b555a9d1c529f727cbfa0ee..5351eb421218512c3a553ab12aa32e52d9eae67d 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -188,7 +188,7 @@ class FormEditorController extends AbstractBackendController
     }
 
     /**
-     * Prepare the formElements.*.formEditor section from the yaml settings.
+     * Prepare the formElements.*.formEditor section from the YAML settings.
      * Sort all formElements into groups and add additional data.
      *
      * @param array $formElementsDefinition
@@ -248,7 +248,7 @@ class FormEditorController extends AbstractBackendController
     }
 
     /**
-     * Reduce the Yaml settings by the 'formEditor' keyword.
+     * Reduce the YAML settings by the 'formEditor' keyword.
      *
      * @return array
      */
diff --git a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
index fdc79a929c6fa46c01f0de7bca1147515866d252..6980070b6047f46b20afba2cb8044aff384ff627 100644
--- a/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
+++ b/typo3/sysext/form/Classes/Domain/Model/FormDefinition.php
@@ -142,7 +142,7 @@ use TYPO3\CMS\Form\Mvc\ProcessingRule;
  *
  * Often, it is not really useful to manually create the $prototypeConfiguration array.
  *
- * Most of it comes pre-configured inside the extensions's yaml settings,
+ * Most of it comes pre-configured inside the YAML settings of the extensions,
  * and the {@link \TYPO3\CMS\Form\Domain\Configuration\ConfigurationService} contains helper methods
  * which return the ready-to-use *$prototypeConfiguration*.
  *
diff --git a/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php b/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
index 754f63fea88c5f6a3bd8f77101a31f7fa8e12182..f3b138648c3ba4b067fae9f0a55b62a871c17a9a 100644
--- a/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Configuration/ConfigurationManager.php
@@ -66,12 +66,12 @@ class ConfigurationManager extends ExtbaseConfigurationManager implements Config
     }
 
     /**
-     * Load and parse yaml files which are configured within the TypoScript
+     * Load and parse YAML files which are configured within the TypoScript
      * path plugin.tx_extensionkey.settings.yamlConfigurations
      *
      * The following steps will be done:
      *
-     * * Convert each singe yaml file into an array
+     * * Convert each singe YAML file into an array
      * * merge this arrays together
      * * resolve all declared inheritances
      * * remove all keys if their values are NULL
diff --git a/typo3/sysext/form/Configuration/TypoScript/setup.txt b/typo3/sysext/form/Configuration/TypoScript/setup.txt
index 8ca61651e828e9f21b977037439e97453b5be862..eb81df0fcbccd15d6c0d9a85ba21c6b079b12db6 100644
--- a/typo3/sysext/form/Configuration/TypoScript/setup.txt
+++ b/typo3/sysext/form/Configuration/TypoScript/setup.txt
@@ -2,11 +2,11 @@ plugin.tx_form {
     view {
         # Note that this configuration only affects the EXT:Form plugin
         # template (form/Resources/Private/Frontend/Templates/Render.html)
-        # The fluid paths for the formelements reside within the yaml settings.
+        # The fluid paths for the formelements reside within the YAML settings.
         # @see TYPO3.CMS.Form.<prototypeName>.standard.formElementsDefinition.Form.renderingOptions
         #
         # That means: If you want to override the formelement templates
-        # then change them within the yaml settings, not here.
+        # then change them within the YAML settings, not here.
         templateRootPaths.0 = EXT:form/Resources/Private/Frontend/Templates/
         partialRootPaths.0 = EXT:form/Resources/Private/Frontend/Partials/
         layoutRootPaths.0 = EXT:form/Resources/Private/Frontend/Layouts/
diff --git a/typo3/sysext/form/Documentation/Config/formManager/Index.rst b/typo3/sysext/form/Documentation/Config/formManager/Index.rst
index ffa64832ef93822f00c403ce05094bd1de4bc216..0c618087a5398aac22ce306eac1ac90d7a7cac6c 100644
--- a/typo3/sysext/form/Documentation/Config/formManager/Index.rst
+++ b/typo3/sysext/form/Documentation/Config/formManager/Index.rst
@@ -316,7 +316,7 @@ selectablePrototypesConfiguration.*.newFormTemplates.*.templatePath
       - :ref:`Translate "Start template" options<concepts-formmanager-translation-starttemplate>`
 
 :aspect:`Description`
-      The filesystem path to the `Start template`` yaml file.
+      The filesystem path to the `Start template`` YAML file.
 
 
 .. _typo3.cms.form.formmanager.selectableprototypesconfiguration.*.newformtemplates.*.label: