diff --git a/utils/phpstan-extensions/config/phpstan-extensions.neon b/utils/phpstan-extensions/config/phpstan-extensions.neon
index 27ce597c667..5224aab0baa 100644
--- a/utils/phpstan-extensions/config/phpstan-extensions.neon
+++ b/utils/phpstan-extensions/config/phpstan-extensions.neon
@@ -4,11 +4,11 @@ services:
         tags: [phpstan.rules.rule]
 
     -
-        class: Rector\PHPStanExtensions\Rule\ClassMethod\PreventParentMethodVisibilityOverrideRule
+        class: Rector\PHPStanExtensions\Rule\PreventParentMethodVisibilityOverrideRule
         tags: [phpstan.rules.rule]
 
     -
-         class: Rector\PHPStanExtensions\Rule\ClassLike\KeepRectorNamespaceForRectorRule
+         class: Rector\PHPStanExtensions\Rule\KeepRectorNamespaceForRectorRule
          tags: [phpstan.rules.rule]
 
     - Rector\PHPStanExtensions\Utils\PHPStanValueResolver
diff --git a/utils/phpstan-extensions/src/Rule/ClassLike/KeepRectorNamespaceForRectorRule.php b/utils/phpstan-extensions/src/Rule/KeepRectorNamespaceForRectorRule.php
similarity index 91%
rename from utils/phpstan-extensions/src/Rule/ClassLike/KeepRectorNamespaceForRectorRule.php
rename to utils/phpstan-extensions/src/Rule/KeepRectorNamespaceForRectorRule.php
index 91b3f2428b3..1635ed6e4b4 100644
--- a/utils/phpstan-extensions/src/Rule/ClassLike/KeepRectorNamespaceForRectorRule.php
+++ b/utils/phpstan-extensions/src/Rule/KeepRectorNamespaceForRectorRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Rule\ClassLike;
+namespace Rector\PHPStanExtensions\Rule;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
@@ -11,7 +11,7 @@ use PHPStan\Analyser\Scope;
 use PHPStan\Rules\Rule;
 
 /**
- * @see \Rector\PHPStanExtensions\Tests\Rule\ClassLike\KeepRectorNamespaceForRectorRuleTest
+ * @see \Rector\PHPStanExtensions\Tests\Rule\KeepRectorNamespaceForRectorRule\KeepRectorNamespaceForRectorRuleTest
  */
 final class KeepRectorNamespaceForRectorRule implements Rule
 {
diff --git a/utils/phpstan-extensions/src/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRule.php b/utils/phpstan-extensions/src/Rule/PreventParentMethodVisibilityOverrideRule.php
similarity index 93%
rename from utils/phpstan-extensions/src/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRule.php
rename to utils/phpstan-extensions/src/Rule/PreventParentMethodVisibilityOverrideRule.php
index d3a9bf8a8ad..250d1e7fd6b 100644
--- a/utils/phpstan-extensions/src/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRule.php
+++ b/utils/phpstan-extensions/src/Rule/PreventParentMethodVisibilityOverrideRule.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Rule\ClassMethod;
+namespace Rector\PHPStanExtensions\Rule;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
@@ -12,7 +12,7 @@ use Rector\Core\Exception\NotImplementedException;
 use ReflectionMethod;
 
 /**
- * @see \Rector\PHPStanExtensions\Tests\Rule\ClassMethod\PreventParentMethodVisibilityOverrideRuleTest
+ * @see \Rector\PHPStanExtensions\Tests\Rule\PreventParentMethodVisibilityOverrideRule\PreventParentMethodVisibilityOverrideRuleTest
  */
 final class PreventParentMethodVisibilityOverrideRule implements Rule
 {
diff --git a/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/ClassInCorrectNamespaceRector.php b/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/ClassInCorrectNamespaceRector.php
deleted file mode 100644
index a035df8f01b..00000000000
--- a/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/ClassInCorrectNamespaceRector.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassLike\Source\Rector;
-
-final class ClassInCorrectNamespaceRector
-{
-
-}
diff --git a/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/WrongClass.php b/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/WrongClass.php
deleted file mode 100644
index 3eeedebed35..00000000000
--- a/utils/phpstan-extensions/tests/Rule/ClassLike/Source/Rector/WrongClass.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassLike\Source\Rector;
-
-final class WrongClass
-{
-
-}
diff --git a/utils/phpstan-extensions/tests/Rule/ClassLike/KeepRectorNamespaceForRectorRuleTest.php b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/KeepRectorNamespaceForRectorRuleTest.php
similarity index 84%
rename from utils/phpstan-extensions/tests/Rule/ClassLike/KeepRectorNamespaceForRectorRuleTest.php
rename to utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/KeepRectorNamespaceForRectorRuleTest.php
index 21717554f59..41de2217379 100644
--- a/utils/phpstan-extensions/tests/Rule/ClassLike/KeepRectorNamespaceForRectorRuleTest.php
+++ b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/KeepRectorNamespaceForRectorRuleTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassLike;
+namespace Rector\PHPStanExtensions\Tests\Rule\KeepRectorNamespaceForRectorRule;
 
 use Iterator;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use Rector\PHPStanExtensions\Rule\ClassLike\KeepRectorNamespaceForRectorRule;
+use Rector\PHPStanExtensions\Rule\KeepRectorNamespaceForRectorRule;
 
 final class KeepRectorNamespaceForRectorRuleTest extends RuleTestCase
 {
diff --git a/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/ClassInCorrectNamespaceRector.php b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/ClassInCorrectNamespaceRector.php
new file mode 100644
index 00000000000..3a0be8cb512
--- /dev/null
+++ b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/ClassInCorrectNamespaceRector.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPStanExtensions\Tests\Rule\KeepRectorNamespaceForRectorRule\Source\Rector;
+
+final class ClassInCorrectNamespaceRector
+{
+
+}
diff --git a/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/WrongClass.php b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/WrongClass.php
new file mode 100644
index 00000000000..ee8d428380c
--- /dev/null
+++ b/utils/phpstan-extensions/tests/Rule/KeepRectorNamespaceForRectorRule/Source/Rector/WrongClass.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\PHPStanExtensions\Tests\Rule\KeepRectorNamespaceForRectorRule\Source\Rector;
+
+final class WrongClass
+{
+
+}
diff --git a/utils/phpstan-extensions/tests/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRuleTest.php b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/PreventParentMethodVisibilityOverrideRuleTest.php
similarity index 85%
rename from utils/phpstan-extensions/tests/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRuleTest.php
rename to utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/PreventParentMethodVisibilityOverrideRuleTest.php
index 7202c58860a..474a331c94d 100644
--- a/utils/phpstan-extensions/tests/Rule/ClassMethod/PreventParentMethodVisibilityOverrideRuleTest.php
+++ b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/PreventParentMethodVisibilityOverrideRuleTest.php
@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassMethod;
+namespace Rector\PHPStanExtensions\Tests\Rule\PreventParentMethodVisibilityOverrideRule;
 
 use Iterator;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use Rector\PHPStanExtensions\Rule\ClassMethod\PreventParentMethodVisibilityOverrideRule;
+use Rector\PHPStanExtensions\Rule\PreventParentMethodVisibilityOverrideRule;
 
 final class PreventParentMethodVisibilityOverrideRuleTest extends RuleTestCase
 {
diff --git a/utils/phpstan-extensions/tests/Rule/ClassMethod/Source/ClassWithOverridingVisibility.php b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/ClassWithOverridingVisibility.php
similarity index 59%
rename from utils/phpstan-extensions/tests/Rule/ClassMethod/Source/ClassWithOverridingVisibility.php
rename to utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/ClassWithOverridingVisibility.php
index 0c9cf41b2d7..e0b6e638e30 100644
--- a/utils/phpstan-extensions/tests/Rule/ClassMethod/Source/ClassWithOverridingVisibility.php
+++ b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/ClassWithOverridingVisibility.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassMethod\Source;
+namespace Rector\PHPStanExtensions\Tests\Rule\PreventParentMethodVisibilityOverrideRule\Source;
 
 final class ClassWithOverridingVisibility extends GoodVisibility
 {
diff --git a/utils/phpstan-extensions/tests/Rule/ClassMethod/Source/GoodVisibility.php b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/GoodVisibility.php
similarity index 53%
rename from utils/phpstan-extensions/tests/Rule/ClassMethod/Source/GoodVisibility.php
rename to utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/GoodVisibility.php
index f5f14f603ae..e319cc23686 100644
--- a/utils/phpstan-extensions/tests/Rule/ClassMethod/Source/GoodVisibility.php
+++ b/utils/phpstan-extensions/tests/Rule/PreventParentMethodVisibilityOverrideRule/Source/GoodVisibility.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\PHPStanExtensions\Tests\Rule\ClassMethod\Source;
+namespace Rector\PHPStanExtensions\Tests\Rule\PreventParentMethodVisibilityOverrideRule\Source;
 
 abstract class GoodVisibility
 {