diff --git a/config/set/downgrade-php73.php b/config/set/downgrade-php73.php
index d64935ca0da4..6fd54b9cc090 100644
--- a/config/set/downgrade-php73.php
+++ b/config/set/downgrade-php73.php
@@ -2,11 +2,10 @@
 
 declare(strict_types=1);
 
-use Rector\DowngradePhp73\Rector\FuncCall\DowngradeTrailingCommasInFunctionCalls;
-use Rector\DowngradePhp73\Rector\String_\DowngradeFlexibleHeredocSyntax;
+use Rector\DowngradePhp73\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
-    $services->set(DowngradeFlexibleHeredocSyntax::class);
+    $services->set(DowngradeTrailingCommasInFunctionCallsRector::class);
 };
diff --git a/rules/downgrade-php73/src/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php b/rules/downgrade-php73/src/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php
new file mode 100644
index 000000000000..27d944da1438
--- /dev/null
+++ b/rules/downgrade-php73/src/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DowngradePhp73\Rector\FuncCall;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\FuncCall;
+use Rector\Core\Rector\AbstractRector;
+use Rector\Core\RectorDefinition\CodeSample;
+use Rector\Core\RectorDefinition\RectorDefinition;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+
+/**
+ * @see \Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector\DowngradeTrailingCommasInFunctionCallsRectorTest
+ */
+final class DowngradeTrailingCommasInFunctionCallsRector extends AbstractRector
+{
+    public function getDefinition(): RectorDefinition
+    {
+        return new RectorDefinition(
+            'Remove trailing commas in function calls', [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function __construct(string $value)
+    {
+        $compacted = compact(
+            'posts',
+            'units',
+        );
+    }
+}
+CODE_SAMPLE
+                    , <<<'CODE_SAMPLE'
+class SomeClass
+{
+    public function __construct(string $value)
+    {
+        $compacted = compact(
+            'posts',
+            'units'
+        );
+    }
+}
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getNodeTypes(): array
+    {
+        return [FuncCall::class];
+    }
+
+    public function refactor(Node $node): ?Node
+    {
+        $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        return $node;
+    }
+}
diff --git a/rules/downgrade-php73/src/Rector/String_/DowngradeFlexibleHeredocSyntax.php b/rules/downgrade-php73/src/Rector/String_/DowngradeFlexibleHeredocSyntax.php
deleted file mode 100644
index fadd5a45ff80..000000000000
--- a/rules/downgrade-php73/src/Rector/String_/DowngradeFlexibleHeredocSyntax.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\DowngradePhp73\Rector\String_;
-
-use PhpParser\Node;
-use PhpParser\Node\Scalar\String_;
-use Rector\Core\Rector\AbstractRector;
-use Rector\Core\RectorDefinition\CodeSample;
-use Rector\Core\RectorDefinition\RectorDefinition;
-use Rector\NodeTypeResolver\Node\AttributeKey;
-
-/**
- * @see https://wiki.php.net/rfc/flexible_heredoc_nowdoc_syntaxes
- * @see \Rector\Php73\Tests\Rector\String_\SensitiveHereNowDocRector\SensitiveHereNowDocRectorTest
- */
-final class DowngradeFlexibleHeredocSyntax extends AbstractRector
-{
-    /**
-     * @var string
-     */
-    private const WRAP_SUFFIX = '_WRAP';
-
-    public function getDefinition(): RectorDefinition
-    {
-        return new RectorDefinition('Changes heredoc/nowdoc that contains closing word to safe wrapper name', [
-            new CodeSample(
-                <<<'CODE_SAMPLE'
-$query = <<<SQL
-    SELECT *
-    FROM `table`
-    WHERE `column` = true;
-    SQL;
-CODE_SAMPLE
-                ,
-                <<<'CODE_SAMPLE'
-$query = <<<SQL
-SELECT *
-FROM `table`
-WHERE `column` = true;
-SQL;
-CODE_SAMPLE
-            ),
-        ]);
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getNodeTypes(): array
-    {
-        return [String_::class];
-    }
-
-    /**
-     * @param String_ $node
-     */
-    public function refactor(Node $node): ?Node
-    {
-        if (! in_array($node->getAttribute(AttributeKey::KIND), [String_::KIND_HEREDOC, String_::KIND_NOWDOC], true)) {
-            return null;
-        }
-
-        $node->setAttribute('docIndentation', '');
-        $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
-
-        return $node;
-    }
-}
diff --git a/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/DowngradeTrailingCommasInFunctionCallsRectorTest.php b/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/DowngradeTrailingCommasInFunctionCallsRectorTest.php
new file mode 100644
index 000000000000..1685dd3abc88
--- /dev/null
+++ b/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/DowngradeTrailingCommasInFunctionCallsRectorTest.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector;
+
+use Iterator;
+use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
+use Rector\Core\ValueObject\PhpVersionFeature;
+use Rector\DowngradePhp73\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector;
+use Symplify\SmartFileSystem\SmartFileInfo;
+
+final class DowngradeTrailingCommasInFunctionCallsRectorTest extends AbstractRectorTestCase
+{
+    /**
+     * @requires PHP >= 7.3
+     * @dataProvider provideData()
+     */
+    public function test(SmartFileInfo $fileInfo): void
+    {
+        $this->doTestFileInfo($fileInfo);
+    }
+
+    public function provideData(): Iterator
+    {
+        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    protected function getRectorClass(): string
+    {
+        return DowngradeTrailingCommasInFunctionCallsRector::class;
+    }
+
+    protected function getPhpVersion(): string
+    {
+        return '7.2';
+//        TODO: create constant
+//        return PhpVersionFeature::;
+    }
+}
diff --git a/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/fixture.php.inc b/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/fixture.php.inc
new file mode 100644
index 000000000000..99c2eadddf33
--- /dev/null
+++ b/rules/downgrade-php73/tests/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/fixture.php.inc
@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector\Fixture;
+
+class FixtureClass
+{
+    public function run()
+    {
+        $compacted = compact('posts','units',);
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeTrailingCommasInFunctionCallsRector\Fixture;
+
+class FixtureClass
+{
+    public function run()
+    {
+        $compacted = compact('posts', 'units');
+    }
+}
+
+?>
diff --git a/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/DowngradeFlexibleHeredocSyntaxTest.php b/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/DowngradeFlexibleHeredocSyntaxTest.php
deleted file mode 100644
index e72c2d718f2f..000000000000
--- a/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/DowngradeFlexibleHeredocSyntaxTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Rector\Php73\Tests\Rector\String_\SensitiveHereNowDocRector;
-
-use Iterator;
-use Rector\Core\Testing\PHPUnit\AbstractRectorTestCase;
-use Rector\DowngradePhp73\Rector\String_\DowngradeFlexibleHeredocSyntax;
-use Symplify\SmartFileSystem\SmartFileInfo;
-
-final class DowngradeFlexibleHeredocSyntaxTest extends AbstractRectorTestCase
-{
-    /**
-     * @dataProvider provideData()
-     */
-    public function test(SmartFileInfo $fileInfo): void
-    {
-        $this->doTestFileInfo($fileInfo);
-    }
-
-    public function provideData(): Iterator
-    {
-        return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture');
-    }
-
-    protected function getRectorClass(): string
-    {
-        return DowngradeFlexibleHeredocSyntax::class;
-    }
-}
diff --git a/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/Fixture/fixture.php.inc b/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/Fixture/fixture.php.inc
deleted file mode 100644
index 5c6151045cb7..000000000000
--- a/rules/downgrade-php73/tests/Rector/String_/DowngradeFlexibleHeredocSyntax/Fixture/fixture.php.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeFlexibleHeredocSyntax\Fixture;
-
-class FixtureClass
-{
-    public function run()
-    {
-        $query = <<<SQL
-        SELECT *
-        FROM `table`
-        WHERE `column` = true;
-        SQL;
-    }
-}
-
-?>
------
-<?php
-
-namespace Rector\DowngradePhp73\Tests\Rector\FuncCall\DowngradeFlexibleHeredocSyntax\Fixture;
-
-class FixtureClass
-{
-    public function run()
-    {
-        $query = <<<SQL
-SELECT *
-FROM `table`
-WHERE `column` = true;
-SQL;
-    }
-}
-
-?>