diff --git a/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php b/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
index 0f2fa56ee9ec0b2c9415b5e81ede63f4a6066519..504f780be8036d12146c50d7e258af86611fcf5b 100644
--- a/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
+++ b/typo3/sysext/extbase/Classes/Hook/DataHandler/CheckFlexFormValue.php
@@ -25,11 +25,11 @@ class CheckFlexFormValue
     /**
      * Check flexform value before merge
      *
-     * @param DataHandler $dataHander
+     * @param DataHandler $dataHandler
      * @param array $currentValue
      * @param array $newValue
      */
-    public function checkFlexFormValue_beforeMerge(DataHandler $dataHander, array &$currentValue, array &$newValue)
+    public function checkFlexFormValue_beforeMerge(DataHandler $dataHandler, array &$currentValue, array &$newValue)
     {
         $currentValue = $this->removeSwitchableControllerActionsRecursive($currentValue);
     }
diff --git a/typo3/sysext/extbase/Classes/Mvc/Response.php b/typo3/sysext/extbase/Classes/Mvc/Response.php
index c2ac4c36590e19c8c6c56d556f9b8797e48f504e..e8cf0dac29e598f9e15dbeac29853d64a14cc0ac 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Response.php
@@ -321,7 +321,7 @@ class Response implements \TYPO3\CMS\Extbase\Mvc\ResponseInterface
     public function addAdditionalHeaderData($additionalHeaderData)
     {
         if (!is_string($additionalHeaderData)) {
-            throw new \InvalidArgumentException('The additiona header data must be of type String, ' . gettype($additionalHeaderData) . ' given.', 1237370877);
+            throw new \InvalidArgumentException('The additional header data must be of type String, ' . gettype($additionalHeaderData) . ' given.', 1237370877);
         }
         if ($this->request->isCached()) {
             /** @var PageRenderer $pageRenderer */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 16cf6adcc990eed72381c663ce0815447f90ed38..cb7eadda229e0388aab381ab37da5f96a22ccd2c 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -189,7 +189,7 @@ class Query implements QueryInterface
     public function getQuerySettings()
     {
         if (!$this->querySettings instanceof QuerySettingsInterface) {
-            throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception('Tried to get the query settings without seting them before.', 1248689115);
+            throw new \TYPO3\CMS\Extbase\Persistence\Generic\Exception('Tried to get the query settings without setting them before.', 1248689115);
         }
         return $this->querySettings;
     }
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
index 1844664226e13038094be8db55a7b55611e4152e..571f948f650fd48c564ea0901f4dff274cbcbc84 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
@@ -59,7 +59,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 
     /**
      * An array holding the internal position the object was added.
-     * The object entry is unsetted when the object gets removed from the objectstorage
+     * The object entry is unset when the object gets removed from the objectstorage
      *
      * @var array
      */
@@ -75,7 +75,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 
     /**
      * An internal var holding the count of added objects to be stored as position.
-     * It would be resetted, when all objects will be removed from the objectstorage
+     * It would be reset, when all objects will be removed from the objectstorage
      *
      * @var int
      */
diff --git a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
index 189767c79cf26b6182ee03173eb736924135823d..b658db729f028d54ebf5d540d2e176646ee56b5f 100644
--- a/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/ExtensionUtility.php
@@ -133,7 +133,7 @@ tt_content.' . $pluginSignature . ' {
 }');
                 break;
             default:
-                throw new \InvalidArgumentException('The pluginType "' . $pluginType . '" is not suported', 1289858856);
+                throw new \InvalidArgumentException('The pluginType "' . $pluginType . '" is not supported', 1289858856);
         }
         $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['extbase']['extensions'][$extensionName]['plugins'][$pluginName]['pluginType'] = $pluginType;
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScript($extensionName, 'setup', '
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Controller/TestController.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Controller/TestController.php
index 84e56710b0b8ac86a4e6cd20aa0f3d90f4730bf8..52889fe1a9af6861c5d25d8ac5cf0f6afb4eddf4 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Controller/TestController.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Controller/TestController.php
@@ -28,10 +28,10 @@ class TestController extends ActionController
 {
     public function initializeFooAction()
     {
-        /** @var MvcPropertyMappingConfiguration $propertMappingConfiguration */
-        $propertMappingConfiguration = $this->arguments['fooParam']->getPropertyMappingConfiguration();
-        $propertMappingConfiguration->allowAllProperties();
-        $propertMappingConfiguration->setTypeConverterOption(
+        /** @var MvcPropertyMappingConfiguration $propertyMappingConfiguration */
+        $propertyMappingConfiguration = $this->arguments['fooParam']->getPropertyMappingConfiguration();
+        $propertyMappingConfiguration->allowAllProperties();
+        $propertyMappingConfiguration->setTypeConverterOption(
             PersistentObjectConverter::class,
             PersistentObjectConverter::CONFIGURATION_CREATION_ALLOWED,
             true
diff --git a/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php b/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
index 3ed302ce293ef909486a44999f43f4ee1dc650b2..031d061f7dc1d95f1338f3b2b8200d6eb693d16d 100644
--- a/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Pagination/QueryResultPaginatorTest.php
@@ -142,7 +142,7 @@ class QueryResultPaginatorTest extends FunctionalTestCase
     /**
      * @test
      */
-    public function paginatorProperlyCalulatesOnlyOnePage()
+    public function paginatorProperlyCalculatesOnlyOnePage()
     {
         $paginator = new QueryResultPaginator(
             $this->postRepository->findAll(),
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml
index 222a5904d006da92b8528c5ac593ee9e01581b58..1ca9395ec7b04d61b1bffdbd2fbc326b12f60b65 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/Fixtures/post-tag-mm.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<dataset><!-- foregin == tag-->
+<dataset><!-- foreign == tag-->
 	<tx_blogexample_post_tag_mm>
 		<uid_local>1</uid_local>
 		<uid_foreign>1</uid_foreign>
@@ -135,4 +135,4 @@
 		<sorting>1</sorting>
 		<sorting_foreign>10</sorting_foreign>
 	</tx_blogexample_post_tag_mm>
-</dataset>
\ No newline at end of file
+</dataset>
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
index fa4e8933902b74efd23b4899dbe1c0a2465b3d18..0129bf60b997796dba7ac1eb47ecde0071f3b531 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/PersistentObjectConverterTest.php
@@ -172,7 +172,7 @@ class PersistentObjectConverterTest extends FunctionalTestCase
     /**
      * @test
      */
-    public function convertFromthrowsInvalidTargetExceptionIfSourceContainsANonSettableProperty()
+    public function convertFromThrowsInvalidTargetExceptionIfSourceContainsANonSettableProperty()
     {
         static::expectException(Exception::class);
         static::expectExceptionCode(1297759968);
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
index 7a42f2f6d37a9d2303d071fc48fc54975284f74d..06ef2505d4ea3d9dc889d340261659ecab0950f9 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
@@ -285,15 +285,15 @@ class AbstractConfigurationManagerTest extends UnitTestCase
     ): void {
         $this->abstractConfigurationManager->expects(self::once())->method('getTypoScriptSetup')->willReturn($this->testTypoScriptSetup);
         $this->abstractConfigurationManager->expects(self::once())->method('getPluginConfiguration')->with()->willReturn($this->testPluginConfiguration);
-        $contextSpecifixFrameworkConfiguration = [
+        $contextSpecificFrameworkConfiguration = [
             'context' => [
-                'specific' => 'framwork',
+                'specific' => 'framework',
                 'conf' => 'iguration'
             ]
         ];
-        $this->abstractConfigurationManager->expects(self::once())->method('getContextSpecificFrameworkConfiguration')->willReturn($contextSpecifixFrameworkConfiguration);
+        $this->abstractConfigurationManager->expects(self::once())->method('getContextSpecificFrameworkConfiguration')->willReturn($contextSpecificFrameworkConfiguration);
         $actualResult = $this->abstractConfigurationManager->getConfiguration();
-        self::assertEquals($contextSpecifixFrameworkConfiguration, $actualResult);
+        self::assertEquals($contextSpecificFrameworkConfiguration, $actualResult);
     }
 
     /**
@@ -308,18 +308,18 @@ class AbstractConfigurationManagerTest extends UnitTestCase
             'CurrentExtensionName',
             'CurrentPluginName'
         )->willReturn($this->testPluginConfiguration);
-        $contextSpecifixFrameworkConfiguration = [
+        $contextSpecificFrameworkConfiguration = [
             'context' => [
-                'specific' => 'framwork',
+                'specific' => 'framework',
                 'conf' => 'iguration'
             ]
         ];
-        $this->abstractConfigurationManager->expects(self::once())->method('getContextSpecificFrameworkConfiguration')->willReturn($contextSpecifixFrameworkConfiguration);
+        $this->abstractConfigurationManager->expects(self::once())->method('getContextSpecificFrameworkConfiguration')->willReturn($contextSpecificFrameworkConfiguration);
         $actualResult = $this->abstractConfigurationManager->getConfiguration(
             'CurrentExtensionName',
             'CurrentPluginName'
         );
-        self::assertEquals($contextSpecifixFrameworkConfiguration, $actualResult);
+        self::assertEquals($contextSpecificFrameworkConfiguration, $actualResult);
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
index f474c425b25296acdcb24f3c0032081460caadde..461f4b77fb6d7eb6f2c9ff3cedb988857bbea17f 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
@@ -170,7 +170,7 @@ class BackendConfigurationManagerTest extends UnitTestCase
         $testPluginSettings = [
             'settings.' => [
                 'some.' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
@@ -178,7 +178,7 @@ class BackendConfigurationManagerTest extends UnitTestCase
         $testPluginSettingsConverted = [
             'settings' => [
                 'some' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
@@ -196,7 +196,7 @@ class BackendConfigurationManagerTest extends UnitTestCase
             'settings' => [
                 'foo' => 'bar',
                 'some' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index 654a479fc609ead967e8c87fee2e7dfe5ef31fec..5d6fb55224fde8e6fa88ecdc76b75327e60a1eec 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
@@ -180,7 +180,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
         $testPluginSettings = [
             'settings.' => [
                 'some.' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
@@ -188,7 +188,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
         $testPluginSettingsConverted = [
             'settings' => [
                 'some' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
@@ -206,7 +206,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
             'settings' => [
                 'foo' => 'bar',
                 'some' => [
-                    'nested' => 'valueOverridde',
+                    'nested' => 'valueOverride',
                     'new' => 'value'
                 ]
             ]
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
index 6413a75aa0118eff775e5662317136d46c60d15e..180e5199d86b0098a6e8152ac41150369e4fd7bd 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
@@ -46,9 +46,9 @@ class ArgumentTest extends UnitTestCase
         $this->simpleValueArgument->injectPropertyMapper($this->mockPropertyMapper);
         $this->objectArgument->injectPropertyMapper($this->mockPropertyMapper);
         $this->mockConfiguration = new \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration();
-        $propertyMappingConfiguranion = new \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration();
-        $this->simpleValueArgument->injectPropertyMappingConfiguration($propertyMappingConfiguranion);
-        $this->objectArgument->injectPropertyMappingConfiguration($propertyMappingConfiguranion);
+        $propertyMappingConfiguration = new \TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration();
+        $this->simpleValueArgument->injectPropertyMappingConfiguration($propertyMappingConfiguration);
+        $this->objectArgument->injectPropertyMappingConfiguration($propertyMappingConfiguration);
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
index bad2986ed18e088dc82250cb0c66edb44ab014b1..48c04040f2cfcdc6370b45fd0038890e183cabd4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/MvcPropertyMappingConfigurationServiceTest.php
@@ -30,7 +30,7 @@ class MvcPropertyMappingConfigurationServiceTest extends UnitTestCase
      *
      * @return array
      */
-    public function dataProviderForgenerateTrustedPropertiesToken()
+    public function dataProviderForGenerateTrustedPropertiesToken()
     {
         return [
             'Simple Case - Empty' => [
@@ -90,7 +90,7 @@ class MvcPropertyMappingConfigurationServiceTest extends UnitTestCase
      *
      * @return array
      */
-    public function dataProviderForgenerateTrustedPropertiesTokenWithUnallowedValues()
+    public function dataProviderForGenerateTrustedPropertiesTokenWithUnallowedValues()
     {
         return [
             'Overriding form fields (string overridden by array) - 1' => [
@@ -119,7 +119,7 @@ class MvcPropertyMappingConfigurationServiceTest extends UnitTestCase
 
     /**
      * @test
-     * @dataProvider dataProviderForgenerateTrustedPropertiesToken
+     * @dataProvider dataProviderForGenerateTrustedPropertiesToken
      */
     public function generateTrustedPropertiesTokenGeneratesTheCorrectHashesInNormalOperation($input, $expected)
     {
@@ -134,7 +134,7 @@ class MvcPropertyMappingConfigurationServiceTest extends UnitTestCase
      * @param $input
      * @param $expectExceptionCode
      * @test
-     * @dataProvider dataProviderForgenerateTrustedPropertiesTokenWithUnallowedValues
+     * @dataProvider dataProviderForGenerateTrustedPropertiesTokenWithUnallowedValues
      */
     public function generateTrustedPropertiesTokenThrowsExceptionInWrongCases($input, $expectExceptionCode)
     {
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
index 3f486eb014a8e094b8b23db78cf78faf73a31ae0..0a44057078bbe7fc5eb5cafe192b0d3cb746e726 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/RequestTest.php
@@ -262,7 +262,7 @@ class RequestTest extends UnitTestCase
                 ],
                 'TYPO3\\CMS\\Ext\\Controller\\FooController',
             ],
-            'Vendor TYPO3\CMS, extension, subpackage, controlle given' => [
+            'Vendor TYPO3\CMS, extension, subpackage, controller given' => [
                 [
                     'extensionName' => 'Fluid',
                     'subpackageKey' => 'ViewHelpers\\Widget',
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
index 336c7ac7fa4ea42827becae0f79a79e8743186b1..d9fb3e1ab618356a8e78510a7742a59a603b5fff 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
@@ -767,7 +767,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function conversionOfTansientObjectsIsInvoked()
+    public function conversionOfTransientObjectsIsInvoked()
     {
         $mockValueObject = new ValueObjectFixture();
         $mockValueObject->name = 'foo';
@@ -782,7 +782,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function conversionOfTansientObjectsThrowsExceptionForOtherThanValueObjects()
+    public function conversionOfTransientObjectsThrowsExceptionForOtherThanValueObjects()
     {
         $this->expectException(InvalidArgumentValueException::class);
         $this->expectExceptionCode(1260881688);
@@ -796,7 +796,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function tansientObjectsAreConvertedToAnArrayOfProperties()
+    public function transientObjectsAreConvertedToAnArrayOfProperties()
     {
         $mockValueObject = new ValueObjectFixture();
         $mockValueObject->name = 'foo';
@@ -809,7 +809,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function tansientObjectsWithObjectStorageAreConvertedToAnArrayOfProperties()
+    public function transientObjectsWithObjectStorageAreConvertedToAnArrayOfProperties()
     {
         $mockValueObject = new ValueObjectFixture();
         $objectStorage = new ObjectStorage();
@@ -839,7 +839,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function tansientObjectsAreRecursivelyConverted()
+    public function transientObjectsAreRecursivelyConverted()
     {
         $mockInnerValueObject2 = new ValueObjectFixture();
         $mockInnerValueObject2->name = 'foo';
@@ -867,7 +867,7 @@ class UriBuilderTest extends UnitTestCase
     /**
      * @test
      */
-    public function removeDefaultControllerAndActionDoesNotModifyArgumentsifSpecifiedControlerAndActionIsNotEqualToDefaults()
+    public function removeDefaultControllerAndActionDoesNotModifyArgumentsIfSpecifiedControllerAndActionIsNotEqualToDefaults()
     {
         $this->mockExtensionService->expects(self::atLeastOnce())->method('getDefaultControllerNameByPlugin')->with('ExtensionName', 'PluginName')->willReturn('DefaultController');
         $this->mockExtensionService->expects(self::atLeastOnce())->method('getDefaultActionNameByPluginAndController')->with('ExtensionName', 'PluginName', 'SomeController')->willReturn('defaultAction');
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
index 5bfa0d797926ef2f83291514651acbe2f270c09b..f1b004153951b81c98203f59eb9f6087fd9cdc4e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
@@ -335,7 +335,7 @@ class PersistenceManagerTest extends UnitTestCase
 			class  ' . $className . 'Repository extends \\TYPO3\\CMS\\Extbase\\Persistence\\Repository {}
 		');
         $classNameWithNamespace = __NAMESPACE__ . '\\Domain\\Model\\' . $className;
-        $repositorClassNameWithNamespace = __NAMESPACE__ . '\\Domain\\Repository\\' . $className . 'Repository';
+        $repositoryClassNameWithNamespace = __NAMESPACE__ . '\\Domain\\Repository\\' . $className . 'Repository';
 
         $psrContainer = $this->getMockBuilder(\Psr\Container\ContainerInterface::class)
             ->setMethods(['has', 'get'])
@@ -346,7 +346,7 @@ class PersistenceManagerTest extends UnitTestCase
         $changedEntities = new ObjectStorage();
         $entity1 = new $classNameWithNamespace();
         /** @var RepositoryInterface|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $repository */
-        $repository = $this->getAccessibleMock($repositorClassNameWithNamespace, ['dummy'], [$this->mockObjectManager]);
+        $repository = $this->getAccessibleMock($repositoryClassNameWithNamespace, ['dummy'], [$this->mockObjectManager]);
         $repository->_set('objectType', get_class($entity1));
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Backend|MockObject $mockBackend */
         $mockBackend = $this->getMockBuilder(Backend::class)
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
index f004694d5bed918e52f112f3b44faab512a3edbe..41e9c9296fbe3407f01e8bb71c1e4374f6dad533 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
@@ -311,10 +311,10 @@ class Typo3DbQueryParserTest extends UnitTestCase
     {
         $connectionProphet = $this->prophesize(Connection::class);
         $connectionProphet->quoteIdentifier(Argument::cetera())->willReturnArgument(0);
-        $querBuilderProphet = $this->prophesize(QueryBuilder::class, $connectionProphet->reveal());
+        $queryBuilderProphet = $this->prophesize(QueryBuilder::class, $connectionProphet->reveal());
         $expr = GeneralUtility::makeInstance(ExpressionBuilder::class, $connectionProphet->reveal());
-        $querBuilderProphet->expr()->willReturn($expr);
-        return $querBuilderProphet;
+        $queryBuilderProphet->expr()->willReturn($expr);
+        return $queryBuilderProphet;
     }
 
     /**
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
index 06a68d8f5c4f726e50b0e000112ddc6c3c6f9c63..10de310dc761c96ab76b65c43b14e26aa91e3f77 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
@@ -162,7 +162,7 @@ class RepositoryTest extends UnitTestCase
     /**
      * @test
      */
-    public function findByidentifierReturnsResultOfGetObjectByIdentifierCallFromBackend()
+    public function findByIdentifierReturnsResultOfGetObjectByIdentifierCallFromBackend()
     {
         $identifier = '42';
         $object = new \stdClass();
diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
index a3685ae529b3ad9efef169ec39b4ae96f03d8ddb..e90fb89beea72343d440bb18b9b7d0b8813bfe37 100644
--- a/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
@@ -396,7 +396,7 @@ class ExtensionUtilityTest extends UnitTestCase
                 ],
                 'TYPO3\\CMS\\Ext\\Controller\\FooController',
             ],
-            'Vendor TYPO3\CMS, extension, subpackage, controlle given' => [
+            'Vendor TYPO3\CMS, extension, subpackage, controller given' => [
                 [
                     'vendorName' => 'TYPO3\\CMS',
                     'extensionName' => 'Fluid',
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
index b505306e4759c665e1feaebd56a3d593fe9f6690..174d319b9f7155540d3e58afd34d2bdfbd16a7f4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
@@ -156,7 +156,7 @@ class CollectionValidatorTest extends UnitTestCase
     /**
      * @test
      */
-    public function collectionValidatorIsValidEarlyReturnsOnUnitializedLazyObjectStorages()
+    public function collectionValidatorIsValidEarlyReturnsOnUninitializedLazyObjectStorages()
     {
         // todo: this test is rather complex, consider making it a functional test with fixtures
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
index 40ba8e4be137e5fc8929471d4efd7a848226332e..5eb63d1cd76945ff5866d9020382ba00d6f98852 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
@@ -131,7 +131,7 @@ class ConjunctionValidatorTest extends UnitTestCase
     /**
      * @test
      */
-    public function countReturnesTheNumberOfValidatorsContainedInTheConjunction()
+    public function countReturnsTheNumberOfValidatorsContainedInTheConjunction()
     {
         $validatorConjunction = new ConjunctionValidator();
         $validator1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
index 9fccaa08a4d5eb834e94b4f75fa08a138d0d3352..cd347d0b09b741fc296e5e148411bac6ce94dcf3 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/DisjunctionValidatorTest.php
@@ -46,7 +46,7 @@ class DisjunctionValidatorTest extends UnitTestCase
     /**
      * @test
      */
-    public function validateReturnsAllErrorsIfAllValidatorsReturnErrrors()
+    public function validateReturnsAllErrorsIfAllValidatorsReturnErrors()
     {
         $validatorDisjunction = new \TYPO3\CMS\Extbase\Validation\Validator\DisjunctionValidator([]);
         $error1 = new \TYPO3\CMS\Extbase\Error\Error('Error', 123);
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
index 9ac988ffdf69c6c14a837a1ffe97bd0254257922..28019632c41c83ad37d8df9e4ee9aef0a3919d5a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
@@ -131,7 +131,7 @@ class StringLengthValidatorTest extends UnitTestCase
     /**
      * @test
      */
-    public function stringLengthValidatorReturnsNoErrorsfTheStringLengthIsEqualToMaxLength()
+    public function stringLengthValidatorReturnsNoErrorsIfTheStringLengthIsEqualToMaxLength()
     {
         $validator = new StringLengthValidator(['minimum' => 1, 'maximum' => 10]);
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorClassNameResolverTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorClassNameResolverTest.php
index 476aa7d7a0c75ff9d5902e0b51ff23f96dbf6f7e..5b27ccdcc68d06e14726b60fa58282b986fde089 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorClassNameResolverTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/ValidatorClassNameResolverTest.php
@@ -76,7 +76,7 @@ class ValidatorClassNameResolverTest extends UnitTestCase
     /**
      * @test
      */
-    public function resolveThrowsNoSuchValidatorExceptionDueToClassInheritence(): void
+    public function resolveThrowsNoSuchValidatorExceptionDueToClassInheritance(): void
     {
         $this->expectExceptionCode(1365776838);
         $this->expectExceptionMessage(sprintf(