diff --git a/ecs.yml b/ecs.yml
index 0070a2ef03e..8ee091170d9 100644
--- a/ecs.yml
+++ b/ecs.yml
@@ -106,7 +106,7 @@ parameters:
             - '*NodeVisitor.php'
             - '*CompilerPass.php'
             - 'packages/Php/src/Rector/Unset_/UnsetCastRector.php'
-            - 'packages/Php/src/Rector/String_/BarewordStringRector.php'
+            - 'packages/Php/src/Rector/ConstFetch/BarewordStringRector.php'
             # array type check
             - 'src/RectorDefinition/RectorDefinition.php'
 
diff --git a/packages/Php/src/Rector/String_/BarewordStringRector.php b/packages/Php/src/Rector/ConstFetch/BarewordStringRector.php
similarity index 98%
rename from packages/Php/src/Rector/String_/BarewordStringRector.php
rename to packages/Php/src/Rector/ConstFetch/BarewordStringRector.php
index adc090b52d1..5dbf17d685b 100644
--- a/packages/Php/src/Rector/String_/BarewordStringRector.php
+++ b/packages/Php/src/Rector/ConstFetch/BarewordStringRector.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector\String_;
+namespace Rector\Php\Rector\ConstFetch;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
diff --git a/packages/Php/src/Rector/String/SensitiveHereNowDocRector.php b/packages/Php/src/Rector/String_/SensitiveHereNowDocRector.php
similarity index 98%
rename from packages/Php/src/Rector/String/SensitiveHereNowDocRector.php
rename to packages/Php/src/Rector/String_/SensitiveHereNowDocRector.php
index 3a19f516d2e..3f4a7036f4e 100644
--- a/packages/Php/src/Rector/String/SensitiveHereNowDocRector.php
+++ b/packages/Php/src/Rector/String_/SensitiveHereNowDocRector.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Rector\String;
+namespace Rector\Php\Rector\String_;
 
 use Nette\Utils\Strings;
 use PhpParser\Node;
diff --git a/packages/Php/tests/Rector/String_/BarewordStringRector/BarewordStringRectorTest.php b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
similarity index 83%
rename from packages/Php/tests/Rector/String_/BarewordStringRector/BarewordStringRectorTest.php
rename to packages/Php/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
index f0cac9495cb..873504f9bf6 100644
--- a/packages/Php/tests/Rector/String_/BarewordStringRector/BarewordStringRectorTest.php
+++ b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/BarewordStringRectorTest.php
@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\String_\BarewordStringRector;
+namespace Rector\Php\Tests\Rector\ConstFetch\BarewordStringRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\String_\BarewordStringRector
+ * @covers \Rector\Php\Rector\ConstFetch\BarewordStringRector
  */
 final class BarewordStringRectorTest extends AbstractRectorTestCase
 {
diff --git a/packages/Php/tests/Rector/String_/BarewordStringRector/Correct/correct.php.inc b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/Correct/correct.php.inc
similarity index 100%
rename from packages/Php/tests/Rector/String_/BarewordStringRector/Correct/correct.php.inc
rename to packages/Php/tests/Rector/ConstFetch/BarewordStringRector/Correct/correct.php.inc
diff --git a/packages/Php/tests/Rector/String_/BarewordStringRector/Wrong/wrong.php.inc b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/Wrong/wrong.php.inc
similarity index 100%
rename from packages/Php/tests/Rector/String_/BarewordStringRector/Wrong/wrong.php.inc
rename to packages/Php/tests/Rector/ConstFetch/BarewordStringRector/Wrong/wrong.php.inc
diff --git a/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/config.yml b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/config.yml
new file mode 100644
index 00000000000..ffb94efbdc6
--- /dev/null
+++ b/packages/Php/tests/Rector/ConstFetch/BarewordStringRector/config.yml
@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\ConstFetch\BarewordStringRector: ~
diff --git a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/config.yml b/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/config.yml
deleted file mode 100644
index 3f858250573..00000000000
--- a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\String\SensitiveHereNowDocRector: ~
diff --git a/packages/Php/tests/Rector/String_/BarewordStringRector/config.yml b/packages/Php/tests/Rector/String_/BarewordStringRector/config.yml
deleted file mode 100644
index c6027121106..00000000000
--- a/packages/Php/tests/Rector/String_/BarewordStringRector/config.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-services:
-    Rector\Php\Rector\String_\BarewordStringRector: ~
diff --git a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/Correct/correct.php.inc b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/Correct/correct.php.inc
similarity index 100%
rename from packages/Php/tests/Rector/String/SensitiveHereNowDocRector/Correct/correct.php.inc
rename to packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/Correct/correct.php.inc
diff --git a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
similarity index 82%
rename from packages/Php/tests/Rector/String/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
rename to packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
index 713eb6912b9..f6660d1d2d9 100644
--- a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
+++ b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/SensitiveHereNowDocRectorTest.php
@@ -1,12 +1,12 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Php\Tests\Rector\String\SensitiveHereNowDocRector;
+namespace Rector\Php\Tests\Rector\String_\SensitiveHereNowDocRector;
 
 use Iterator;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
 /**
- * @covers \Rector\Php\Rector\String\SensitiveHereNowDocRector
+ * @covers \Rector\Php\Rector\String_\SensitiveHereNowDocRector
  */
 final class SensitiveHereNowDocRectorTest extends AbstractRectorTestCase
 {
diff --git a/packages/Php/tests/Rector/String/SensitiveHereNowDocRector/Wrong/wrong.php.inc b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/Wrong/wrong.php.inc
similarity index 100%
rename from packages/Php/tests/Rector/String/SensitiveHereNowDocRector/Wrong/wrong.php.inc
rename to packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/Wrong/wrong.php.inc
diff --git a/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/config.yml b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/config.yml
new file mode 100644
index 00000000000..d96a5b0a0ff
--- /dev/null
+++ b/packages/Php/tests/Rector/String_/SensitiveHereNowDocRector/config.yml
@@ -0,0 +1,2 @@
+services:
+    Rector\Php\Rector\String_\SensitiveHereNowDocRector: ~