diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 54be7ba686..53b28bc6a8 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -139,7 +139,7 @@
 
     <!-- This test file specifically *needs* Windows line endings for testing purposes. -->
     <rule ref="Generic.Files.LineEndings.InvalidEOLChar">
-        <exclude-pattern>tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest\.php</exclude-pattern>
+        <exclude-pattern>tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest\.php</exclude-pattern>
     </rule>
 
     <!-- Avoid false positive with this sniff detecting itself -->
diff --git a/tests/Core/Tokenizer/AbstractTokenizerTestCase.php b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
similarity index 98%
rename from tests/Core/Tokenizer/AbstractTokenizerTestCase.php
rename to tests/Core/Tokenizers/AbstractTokenizerTestCase.php
index 0f829182ba..a7c1a6b091 100644
--- a/tests/Core/Tokenizer/AbstractTokenizerTestCase.php
+++ b/tests/Core/Tokenizers/AbstractTokenizerTestCase.php
@@ -10,7 +10,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers;
 
 use PHP_CodeSniffer\Files\DummyFile;
 use PHP_CodeSniffer\Ruleset;
diff --git a/tests/Core/Tokenizer/Comment/CommentTestCase.php b/tests/Core/Tokenizers/Comment/CommentTestCase.php
similarity index 97%
rename from tests/Core/Tokenizer/Comment/CommentTestCase.php
rename to tests/Core/Tokenizers/Comment/CommentTestCase.php
index 0dbd977156..625029db16 100644
--- a/tests/Core/Tokenizer/Comment/CommentTestCase.php
+++ b/tests/Core/Tokenizers/Comment/CommentTestCase.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding1Test.inc b/tests/Core/Tokenizers/Comment/LiveCoding1Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/LiveCoding1Test.inc
rename to tests/Core/Tokenizers/Comment/LiveCoding1Test.inc
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding1Test.php b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
similarity index 97%
rename from tests/Core/Tokenizer/Comment/LiveCoding1Test.php
rename to tests/Core/Tokenizers/Comment/LiveCoding1Test.php
index 8f9b8e844b..32dbe1426f 100644
--- a/tests/Core/Tokenizer/Comment/LiveCoding1Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding1Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding2Test.inc b/tests/Core/Tokenizers/Comment/LiveCoding2Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/LiveCoding2Test.inc
rename to tests/Core/Tokenizers/Comment/LiveCoding2Test.inc
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding2Test.php b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
similarity index 97%
rename from tests/Core/Tokenizer/Comment/LiveCoding2Test.php
rename to tests/Core/Tokenizers/Comment/LiveCoding2Test.php
index 16b9ac3422..258b3190b0 100644
--- a/tests/Core/Tokenizer/Comment/LiveCoding2Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding2Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding3Test.inc b/tests/Core/Tokenizers/Comment/LiveCoding3Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/LiveCoding3Test.inc
rename to tests/Core/Tokenizers/Comment/LiveCoding3Test.inc
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding3Test.php b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
similarity index 96%
rename from tests/Core/Tokenizer/Comment/LiveCoding3Test.php
rename to tests/Core/Tokenizers/Comment/LiveCoding3Test.php
index 29924ebcfa..7edfbb4583 100644
--- a/tests/Core/Tokenizer/Comment/LiveCoding3Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding3Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding4Test.inc b/tests/Core/Tokenizers/Comment/LiveCoding4Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/LiveCoding4Test.inc
rename to tests/Core/Tokenizers/Comment/LiveCoding4Test.inc
diff --git a/tests/Core/Tokenizer/Comment/LiveCoding4Test.php b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
similarity index 97%
rename from tests/Core/Tokenizer/Comment/LiveCoding4Test.php
rename to tests/Core/Tokenizers/Comment/LiveCoding4Test.php
index 470c7d9c3a..7e5087df8e 100644
--- a/tests/Core/Tokenizer/Comment/LiveCoding4Test.php
+++ b/tests/Core/Tokenizers/Comment/LiveCoding4Test.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that unclosed docblocks during live coding are handled correctly.
diff --git a/tests/Core/Tokenizer/Comment/MultiLineDocBlockTest.inc b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/MultiLineDocBlockTest.inc
rename to tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.inc
diff --git a/tests/Core/Tokenizer/Comment/MultiLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
similarity index 99%
rename from tests/Core/Tokenizer/Comment/MultiLineDocBlockTest.php
rename to tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
index 04e69cb52a..9c05c7c108 100644
--- a/tests/Core/Tokenizer/Comment/MultiLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/MultiLineDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that multiline docblocks are tokenized correctly.
diff --git a/tests/Core/Tokenizer/Comment/PhpcsAnnotationsInDocBlockTest.inc b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/PhpcsAnnotationsInDocBlockTest.inc
rename to tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.inc
diff --git a/tests/Core/Tokenizer/Comment/PhpcsAnnotationsInDocBlockTest.php b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
similarity index 99%
rename from tests/Core/Tokenizer/Comment/PhpcsAnnotationsInDocBlockTest.php
rename to tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
index f0e2ce6914..22fb56f5f9 100644
--- a/tests/Core/Tokenizer/Comment/PhpcsAnnotationsInDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/PhpcsAnnotationsInDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that PHPCS native annotations in docblocks are tokenized correctly.
diff --git a/tests/Core/Tokenizer/Comment/SingleLineDocBlockTest.inc b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Comment/SingleLineDocBlockTest.inc
rename to tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.inc
diff --git a/tests/Core/Tokenizer/Comment/SingleLineDocBlockTest.php b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
similarity index 99%
rename from tests/Core/Tokenizer/Comment/SingleLineDocBlockTest.php
rename to tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
index e90b573d23..4551f4ec97 100644
--- a/tests/Core/Tokenizer/Comment/SingleLineDocBlockTest.php
+++ b/tests/Core/Tokenizers/Comment/SingleLineDocBlockTest.php
@@ -7,7 +7,7 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Comment;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Comment;
 
 /**
  * Tests that single line docblocks are tokenized correctly.
diff --git a/tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.inc b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.inc
rename to tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.inc
diff --git a/tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.php b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.php
rename to tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
index 5277dade14..da64f643ba 100644
--- a/tests/Core/Tokenizer/PHP/AnonClassParenthesisOwnerTest.php
+++ b/tests/Core/Tokenizers/PHP/AnonClassParenthesisOwnerTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class AnonClassParenthesisOwnerTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/ArrayKeywordTest.inc b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/ArrayKeywordTest.inc
rename to tests/Core/Tokenizers/PHP/ArrayKeywordTest.inc
diff --git a/tests/Core/Tokenizer/PHP/ArrayKeywordTest.php b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/ArrayKeywordTest.php
rename to tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
index 37528d6d70..e19c2ffbf7 100644
--- a/tests/Core/Tokenizer/PHP/ArrayKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/ArrayKeywordTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class ArrayKeywordTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/AttributesTest.inc b/tests/Core/Tokenizers/PHP/AttributesTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/AttributesTest.inc
rename to tests/Core/Tokenizers/PHP/AttributesTest.inc
diff --git a/tests/Core/Tokenizer/PHP/AttributesTest.php b/tests/Core/Tokenizers/PHP/AttributesTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/AttributesTest.php
rename to tests/Core/Tokenizers/PHP/AttributesTest.php
index 24b7f07953..43952b6281 100644
--- a/tests/Core/Tokenizer/PHP/AttributesTest.php
+++ b/tests/Core/Tokenizers/PHP/AttributesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class AttributesTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/BackfillEnumTest.inc b/tests/Core/Tokenizers/PHP/BackfillEnumTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillEnumTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillEnumTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillEnumTest.php b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/BackfillEnumTest.php
rename to tests/Core/Tokenizers/PHP/BackfillEnumTest.php
index d97a90b807..9b313ca694 100644
--- a/tests/Core/Tokenizer/PHP/BackfillEnumTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillEnumTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillEnumTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.inc b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.php b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
similarity index 97%
rename from tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.php
rename to tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
index 64c82be3e4..7dc3e1392e 100644
--- a/tests/Core/Tokenizer/PHP/BackfillExplicitOctalNotationTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillExplicitOctalNotationTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillExplicitOctalNotationTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/BackfillFnTokenTest.inc b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillFnTokenTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillFnTokenTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillFnTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/BackfillFnTokenTest.php
rename to tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
index f268bedd8c..e595f2927d 100644
--- a/tests/Core/Tokenizer/PHP/BackfillFnTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillFnTokenTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillFnTokenTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.inc b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.php b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.php
rename to tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
index 42076c0422..ca6d27b3db 100644
--- a/tests/Core/Tokenizer/PHP/BackfillMatchTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillMatchTokenTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class BackfillMatchTokenTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.inc b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.php b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.php
rename to tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
index 53146730c7..92bc59bcc4 100644
--- a/tests/Core/Tokenizer/PHP/BackfillNumericSeparatorTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillNumericSeparatorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class BackfillNumericSeparatorTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/BackfillReadonlyTest.inc b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BackfillReadonlyTest.inc
rename to tests/Core/Tokenizers/PHP/BackfillReadonlyTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BackfillReadonlyTest.php b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/BackfillReadonlyTest.php
rename to tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
index 7756afaf08..89dc3e19d1 100644
--- a/tests/Core/Tokenizer/PHP/BackfillReadonlyTest.php
+++ b/tests/Core/Tokenizers/PHP/BackfillReadonlyTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BackfillReadonlyTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/BitwiseOrTest.inc b/tests/Core/Tokenizers/PHP/BitwiseOrTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/BitwiseOrTest.inc
rename to tests/Core/Tokenizers/PHP/BitwiseOrTest.inc
diff --git a/tests/Core/Tokenizer/PHP/BitwiseOrTest.php b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/BitwiseOrTest.php
rename to tests/Core/Tokenizers/PHP/BitwiseOrTest.php
index 0648d61323..3c9fa50a6a 100644
--- a/tests/Core/Tokenizer/PHP/BitwiseOrTest.php
+++ b/tests/Core/Tokenizers/PHP/BitwiseOrTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class BitwiseOrTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.inc b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.inc
rename to tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.inc
diff --git a/tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.php
rename to tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
index 57eb349546..103e5ec916 100644
--- a/tests/Core/Tokenizer/PHP/ContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/ContextSensitiveKeywordsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class ContextSensitiveKeywordsTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesParseError1Test.inc b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DNFTypesParseError1Test.inc
rename to tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.inc
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesParseError1Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
similarity index 95%
rename from tests/Core/Tokenizer/PHP/DNFTypesParseError1Test.php
rename to tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
index fe1761c890..9ceefc4a5f 100644
--- a/tests/Core/Tokenizer/PHP/DNFTypesParseError1Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError1Test.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DNFTypesParseError1Test extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesParseError2Test.inc b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DNFTypesParseError2Test.inc
rename to tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.inc
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesParseError2Test.php b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/DNFTypesParseError2Test.php
rename to tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
index b0a62cf4aa..163215e465 100644
--- a/tests/Core/Tokenizer/PHP/DNFTypesParseError2Test.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesParseError2Test.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class DNFTypesParseError2Test extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesTest.inc b/tests/Core/Tokenizers/PHP/DNFTypesTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DNFTypesTest.inc
rename to tests/Core/Tokenizers/PHP/DNFTypesTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DNFTypesTest.php b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/DNFTypesTest.php
rename to tests/Core/Tokenizers/PHP/DNFTypesTest.php
index e1a9aaddf8..75e1b1dbdc 100644
--- a/tests/Core/Tokenizer/PHP/DNFTypesTest.php
+++ b/tests/Core/Tokenizers/PHP/DNFTypesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class DNFTypesTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/DefaultKeywordTest.inc b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DefaultKeywordTest.inc
rename to tests/Core/Tokenizers/PHP/DefaultKeywordTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DefaultKeywordTest.php b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/DefaultKeywordTest.php
rename to tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
index c32d337547..c398aa6cb2 100644
--- a/tests/Core/Tokenizer/PHP/DefaultKeywordTest.php
+++ b/tests/Core/Tokenizers/PHP/DefaultKeywordTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DefaultKeywordTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/DoubleArrowTest.inc b/tests/Core/Tokenizers/PHP/DoubleArrowTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DoubleArrowTest.inc
rename to tests/Core/Tokenizers/PHP/DoubleArrowTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DoubleArrowTest.php b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/DoubleArrowTest.php
rename to tests/Core/Tokenizers/PHP/DoubleArrowTest.php
index 2d050d2518..5258d9c165 100644
--- a/tests/Core/Tokenizer/PHP/DoubleArrowTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleArrowTest.php
@@ -9,9 +9,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DoubleArrowTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.inc b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.inc
rename to tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.inc
diff --git a/tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.php b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.php
rename to tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
index 6fb3643f95..aa0817a466 100644
--- a/tests/Core/Tokenizer/PHP/DoubleQuotedStringTest.php
+++ b/tests/Core/Tokenizers/PHP/DoubleQuotedStringTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class DoubleQuotedStringTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/EnumCaseTest.inc b/tests/Core/Tokenizers/PHP/EnumCaseTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/EnumCaseTest.inc
rename to tests/Core/Tokenizers/PHP/EnumCaseTest.inc
diff --git a/tests/Core/Tokenizer/PHP/EnumCaseTest.php b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/EnumCaseTest.php
rename to tests/Core/Tokenizers/PHP/EnumCaseTest.php
index f80e19dc32..6836ea05e5 100644
--- a/tests/Core/Tokenizer/PHP/EnumCaseTest.php
+++ b/tests/Core/Tokenizers/PHP/EnumCaseTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class EnumCaseTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/FinallyTest.inc b/tests/Core/Tokenizers/PHP/FinallyTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/FinallyTest.inc
rename to tests/Core/Tokenizers/PHP/FinallyTest.inc
diff --git a/tests/Core/Tokenizer/PHP/FinallyTest.php b/tests/Core/Tokenizers/PHP/FinallyTest.php
similarity index 96%
rename from tests/Core/Tokenizer/PHP/FinallyTest.php
rename to tests/Core/Tokenizers/PHP/FinallyTest.php
index d74c781ae3..e73dde122a 100644
--- a/tests/Core/Tokenizer/PHP/FinallyTest.php
+++ b/tests/Core/Tokenizers/PHP/FinallyTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class FinallyTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/GotoLabelTest.inc b/tests/Core/Tokenizers/PHP/GotoLabelTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/GotoLabelTest.inc
rename to tests/Core/Tokenizers/PHP/GotoLabelTest.inc
diff --git a/tests/Core/Tokenizer/PHP/GotoLabelTest.php b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
similarity index 97%
rename from tests/Core/Tokenizer/PHP/GotoLabelTest.php
rename to tests/Core/Tokenizers/PHP/GotoLabelTest.php
index 8e6a5f5ceb..1b74220144 100644
--- a/tests/Core/Tokenizer/PHP/GotoLabelTest.php
+++ b/tests/Core/Tokenizers/PHP/GotoLabelTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class GotoLabelTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/HeredocNowdocTest.inc b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/HeredocNowdocTest.inc
rename to tests/Core/Tokenizers/PHP/HeredocNowdocTest.inc
diff --git a/tests/Core/Tokenizer/PHP/HeredocNowdocTest.php b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/HeredocNowdocTest.php
rename to tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
index 4c56b6983f..0de122e7e1 100644
--- a/tests/Core/Tokenizer/PHP/HeredocNowdocTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocNowdocTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
diff --git a/tests/Core/Tokenizer/PHP/HeredocParseErrorTest.inc b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/HeredocParseErrorTest.inc
rename to tests/Core/Tokenizers/PHP/HeredocParseErrorTest.inc
diff --git a/tests/Core/Tokenizer/PHP/HeredocParseErrorTest.php b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
similarity index 90%
rename from tests/Core/Tokenizer/PHP/HeredocParseErrorTest.php
rename to tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
index 7cca49aac3..877706fb42 100644
--- a/tests/Core/Tokenizer/PHP/HeredocParseErrorTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocParseErrorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 /**
  * Tests the tokenization for an unclosed heredoc construct.
diff --git a/tests/Core/Tokenizer/PHP/HeredocStringTest.inc b/tests/Core/Tokenizers/PHP/HeredocStringTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/HeredocStringTest.inc
rename to tests/Core/Tokenizers/PHP/HeredocStringTest.inc
diff --git a/tests/Core/Tokenizer/PHP/HeredocStringTest.php b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/HeredocStringTest.php
rename to tests/Core/Tokenizers/PHP/HeredocStringTest.php
index 75f64d4799..c31c175380 100644
--- a/tests/Core/Tokenizer/PHP/HeredocStringTest.php
+++ b/tests/Core/Tokenizers/PHP/HeredocStringTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class HeredocStringTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.inc b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.inc
rename to tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.inc
diff --git a/tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.php b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.php
rename to tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
index 14d0c6da51..df124e9137 100644
--- a/tests/Core/Tokenizer/PHP/NamedFunctionCallArgumentsTest.php
+++ b/tests/Core/Tokenizers/PHP/NamedFunctionCallArgumentsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class NamedFunctionCallArgumentsTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.inc b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.inc
rename to tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.inc
diff --git a/tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.php b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
similarity index 97%
rename from tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.php
rename to tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
index 95bfc154ea..368fee4dbc 100644
--- a/tests/Core/Tokenizer/PHP/NullsafeObjectOperatorTest.php
+++ b/tests/Core/Tokenizers/PHP/NullsafeObjectOperatorTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class NullsafeObjectOperatorTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.inc b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.inc
rename to tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.inc
diff --git a/tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.php b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.php
rename to tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
index 3eff0e96d6..872fab0d78 100644
--- a/tests/Core/Tokenizer/PHP/OtherContextSensitiveKeywordsTest.php
+++ b/tests/Core/Tokenizers/PHP/OtherContextSensitiveKeywordsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 /**
  * Tests the conversion of PHPCS native context sensitive keyword tokens to T_STRING.
diff --git a/tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.inc b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.inc
rename to tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.inc
diff --git a/tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.php b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.php
rename to tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
index 4045f775a4..06a130c249 100644
--- a/tests/Core/Tokenizer/PHP/ResolveSimpleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/ResolveSimpleTokenTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 /**
diff --git a/tests/Core/Tokenizer/PHP/ShortArrayTest.inc b/tests/Core/Tokenizers/PHP/ShortArrayTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/ShortArrayTest.inc
rename to tests/Core/Tokenizers/PHP/ShortArrayTest.inc
diff --git a/tests/Core/Tokenizer/PHP/ShortArrayTest.php b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/ShortArrayTest.php
rename to tests/Core/Tokenizers/PHP/ShortArrayTest.php
index 06e76621ff..da9c7c1040 100644
--- a/tests/Core/Tokenizer/PHP/ShortArrayTest.php
+++ b/tests/Core/Tokenizers/PHP/ShortArrayTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class ShortArrayTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.inc b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.inc
rename to tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.inc
diff --git a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.php
rename to tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
index ec287745f2..ad7d9ceb31 100644
--- a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceTest.php
@@ -13,9 +13,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class StableCommentWhitespaceTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.inc b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.inc
rename to tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.inc
diff --git a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.php b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.php
rename to tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
index 989bcd0f47..816fc571a4 100644
--- a/tests/Core/Tokenizer/PHP/StableCommentWhitespaceWinTest.php
+++ b/tests/Core/Tokenizers/PHP/StableCommentWhitespaceWinTest.php
@@ -10,9 +10,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class StableCommentWhitespaceWinTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/TypeIntersectionTest.inc b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/TypeIntersectionTest.inc
rename to tests/Core/Tokenizers/PHP/TypeIntersectionTest.inc
diff --git a/tests/Core/Tokenizer/PHP/TypeIntersectionTest.php b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
similarity index 98%
rename from tests/Core/Tokenizer/PHP/TypeIntersectionTest.php
rename to tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
index 99c96edce4..8ed951de85 100644
--- a/tests/Core/Tokenizer/PHP/TypeIntersectionTest.php
+++ b/tests/Core/Tokenizers/PHP/TypeIntersectionTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class TypeIntersectionTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/PHP/TypedConstantsTest.inc b/tests/Core/Tokenizers/PHP/TypedConstantsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/TypedConstantsTest.inc
rename to tests/Core/Tokenizers/PHP/TypedConstantsTest.inc
diff --git a/tests/Core/Tokenizer/PHP/TypedConstantsTest.php b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/TypedConstantsTest.php
rename to tests/Core/Tokenizers/PHP/TypedConstantsTest.php
index 60c21b9dc9..29a1fc7ad4 100644
--- a/tests/Core/Tokenizer/PHP/TypedConstantsTest.php
+++ b/tests/Core/Tokenizers/PHP/TypedConstantsTest.php
@@ -12,9 +12,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class TypedConstantsTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/PHP/UndoNamespacedNameSingleTokenTest.inc b/tests/Core/Tokenizers/PHP/UndoNamespacedNameSingleTokenTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/PHP/UndoNamespacedNameSingleTokenTest.inc
rename to tests/Core/Tokenizers/PHP/UndoNamespacedNameSingleTokenTest.inc
diff --git a/tests/Core/Tokenizer/PHP/UndoNamespacedNameSingleTokenTest.php b/tests/Core/Tokenizers/PHP/UndoNamespacedNameSingleTokenTest.php
similarity index 99%
rename from tests/Core/Tokenizer/PHP/UndoNamespacedNameSingleTokenTest.php
rename to tests/Core/Tokenizers/PHP/UndoNamespacedNameSingleTokenTest.php
index 6decc164fe..18a88fe8e9 100644
--- a/tests/Core/Tokenizer/PHP/UndoNamespacedNameSingleTokenTest.php
+++ b/tests/Core/Tokenizers/PHP/UndoNamespacedNameSingleTokenTest.php
@@ -17,9 +17,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\PHP;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\PHP;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 use PHP_CodeSniffer\Util\Tokens;
 
 final class UndoNamespacedNameSingleTokenTest extends AbstractTokenizerTestCase
diff --git a/tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.inc b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.inc
rename to tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
similarity index 99%
rename from tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
rename to tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
index 7198690ddf..9fee3c5f59 100644
--- a/tests/Core/Tokenizer/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateParenthesisNestingMapDNFTypesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class CreateParenthesisNestingMapDNFTypesTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.inc b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.inc
rename to tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
similarity index 93%
rename from tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.php
rename to tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
index a2357db8ae..fb9f049396 100644
--- a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocCloserTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocCloserTest.php
@@ -7,16 +7,18 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 /**
  * Heredoc/nowdoc closer token test.
  *
  * @requires PHP 7.3
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
  */
-final class HeredocNowdocCloserTest extends AbstractTokenizerTestCase
+final class CreatePositionMapHeredocNowdocCloserTest extends AbstractTokenizerTestCase
 {
 
 
@@ -27,7 +29,6 @@ final class HeredocNowdocCloserTest extends AbstractTokenizerTestCase
      * @param array<string, int|string|null> $expected   Expectations for the token array.
      *
      * @dataProvider dataHeredocNowdocCloserTabReplacement
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
diff --git a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.inc b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.inc
rename to tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.php b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
similarity index 93%
rename from tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.php
rename to tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
index 49f1dab6c0..2da5670314 100644
--- a/tests/Core/Tokenizer/Tokenizer/HeredocNowdocOpenerTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreatePositionMapHeredocNowdocOpenerTest.php
@@ -7,14 +7,16 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 /**
  * Heredoc/nowdoc opener token test.
+ *
+ * @covers PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
  */
-final class HeredocNowdocOpenerTest extends AbstractTokenizerTestCase
+final class CreatePositionMapHeredocNowdocOpenerTest extends AbstractTokenizerTestCase
 {
 
 
@@ -25,7 +27,6 @@ final class HeredocNowdocOpenerTest extends AbstractTokenizerTestCase
      * @param array<string, int|string|null> $expected   Expectations for the token array.
      *
      * @dataProvider dataHeredocNowdocOpenerTabReplacement
-     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
      *
      * @return void
      */
diff --git a/tests/Core/Tokenizer/Tokenizer/CreateTokenMapArrayParenthesesTest.inc b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/CreateTokenMapArrayParenthesesTest.inc
rename to tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/CreateTokenMapArrayParenthesesTest.php b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
similarity index 98%
rename from tests/Core/Tokenizer/Tokenizer/CreateTokenMapArrayParenthesesTest.php
rename to tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
index e362448c9d..4b7ac382a3 100644
--- a/tests/Core/Tokenizer/Tokenizer/CreateTokenMapArrayParenthesesTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/CreateTokenMapArrayParenthesesTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class CreateTokenMapArrayParenthesesTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
similarity index 98%
rename from tests/Core/Tokenizer/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
index 042ee609ff..7fa4ba5567 100644
--- a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapCaseKeywordConditionsTest.php
@@ -7,9 +7,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class RecurseScopeMapCaseKeywordConditionsTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.inc b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.inc
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
similarity index 99%
rename from tests/Core/Tokenizer/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
index fb3a76afbf..064ce8f407 100644
--- a/tests/Core/Tokenizer/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapDefaultKeywordConditionsTest.php
@@ -8,9 +8,9 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
 final class RecurseScopeMapDefaultKeywordConditionsTest extends AbstractTokenizerTestCase
 {
diff --git a/tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.inc b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.inc
similarity index 100%
rename from tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.inc
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.inc
diff --git a/tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
similarity index 95%
rename from tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php
rename to tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
index dba98cdb02..8ed593bf99 100644
--- a/tests/Core/Tokenizer/Tokenizer/ScopeSettingWithNamespaceOperatorTest.php
+++ b/tests/Core/Tokenizers/Tokenizer/RecurseScopeMapWithNamespaceOperatorTest.php
@@ -7,11 +7,11 @@
  * @license   https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
  */
 
-namespace PHP_CodeSniffer\Tests\Core\Tokenizer\Tokenizer;
+namespace PHP_CodeSniffer\Tests\Core\Tokenizers\Tokenizer;
 
-use PHP_CodeSniffer\Tests\Core\Tokenizer\AbstractTokenizerTestCase;
+use PHP_CodeSniffer\Tests\Core\Tokenizers\AbstractTokenizerTestCase;
 
-final class ScopeSettingWithNamespaceOperatorTest extends AbstractTokenizerTestCase
+final class RecurseScopeMapWithNamespaceOperatorTest extends AbstractTokenizerTestCase
 {