diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/array_map_named_params.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/array_map_named_params.php.inc
similarity index 54%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/array_map_named_params.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/array_map_named_params.php.inc
index de77b5f1b0b..326534eaa8d 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/array_map_named_params.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/array_map_named_params.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 $items = [1, 2, 3];
 $result = array_map(array: $items, callback: fn ($item) => $item * 2);
@@ -9,7 +9,7 @@ $result = array_map(array: $items, callback: fn ($item) => $item * 2);
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 $items = [1, 2, 3];
 $result = array_map(callback: fn ($item) => $item * 2, array: $items);
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/fixture.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/fixture.php.inc
similarity index 60%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/fixture.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/fixture.php.inc
index d146cf5fff3..f7ffce9d893 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/fixture.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/fixture.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function run($foo = null, $bar = null, $baz = null) {}
 
@@ -12,7 +12,7 @@ run($foo, baz: $baz, bar: $bar);
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function run($foo = null, $bar = null, $baz = null) {}
 
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_attribute.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_attribute.php.inc
new file mode 100644
index 00000000000..e7343bfa676
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_attribute.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Source\MyAttribute;
+
+#[MyAttribute(bar: 1, foo: 2)]
+#[MyAttribute(1, baz: 2, bar: 3)]
+class SkipAttribute
+{
+}
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_first_class_callable.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_first_class_callable.php.inc
similarity index 58%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_first_class_callable.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_first_class_callable.php.inc
index 63eb6f1a324..e5794d7e31d 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_first_class_callable.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_first_class_callable.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function skip_first_class_callable($foo = null, $bar = null, $baz = null) {}
 
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_single_arg.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_single_arg.php.inc
similarity index 54%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_single_arg.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_single_arg.php.inc
index 3c219643946..5697c44e351 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_single_arg.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_single_arg.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function skip_single_arg(?string $foo = null) {}
 
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_sorted.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_sorted.php.inc
similarity index 62%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_sorted.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_sorted.php.inc
index 31c3646e817..924780a9e35 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_sorted.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/skip_sorted.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function skip_sorted($foo = null, $bar = null, $baz = null) {}
 
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/variadic.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/variadic.php.inc
similarity index 54%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/variadic.php.inc
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/variadic.php.inc
index 2ebfd893a6e..305cb865430 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/variadic.php.inc
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Fixture/variadic.php.inc
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function variadic($title, ...$params) {}
 
@@ -10,7 +10,7 @@ variadic(foo: $foo, title: $title, bar: $bar);
 -----
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Fixture;
 
 function variadic($title, ...$params) {}
 
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/SortNamedParamRectorTest.php b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/SortCallLikeNamedArgsRectorTest.php
similarity index 77%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/SortNamedParamRectorTest.php
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/SortCallLikeNamedArgsRectorTest.php
index 5604b0425a8..d2c7c41d4c8 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/SortNamedParamRectorTest.php
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/SortCallLikeNamedArgsRectorTest.php
@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-final class SortNamedParamRectorTest extends AbstractRectorTestCase
+final class SortCallLikeNamedArgsRectorTest extends AbstractRectorTestCase
 {
     #[DataProvider('provideData')]
     public function test(string $filePath): void
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Source/MyAttribute.php b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Source/MyAttribute.php
similarity index 59%
rename from rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Source/MyAttribute.php
rename to rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Source/MyAttribute.php
index e700fab0922..eb8df9d7ebb 100644
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Source/MyAttribute.php
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/Source/MyAttribute.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Source;
+namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\Source;
 
 #[\Attribute]
 class MyAttribute
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/config/configured_rule.php
new file mode 100644
index 00000000000..06c7979548e
--- /dev/null
+++ b/rules-tests/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector/config/configured_rule.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector;
+use Rector\Config\RectorConfig;
+
+return RectorConfig::configure()
+    ->withRules([SortCallLikeNamedArgsRector::class]);
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_attribute.php.inc b/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_attribute.php.inc
deleted file mode 100644
index 722559061f8..00000000000
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/Fixture/skip_attribute.php.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Fixture;
-
-use Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\Source\MyAttribute;
-
-#[MyAttribute(bar: 1, foo: 2)]
-#[MyAttribute(1, baz: 2, bar: 3)]
-class SkipAttribute
-{
-}
diff --git a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/config/configured_rule.php b/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/config/configured_rule.php
deleted file mode 100644
index fc24c03ea77..00000000000
--- a/rules-tests/CodeQuality/Rector/FuncCall/SortNamedParamRector/config/configured_rule.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Rector\CodeQuality\Rector\FuncCall\SortNamedParamRector;
-use Rector\Config\RectorConfig;
-
-return RectorConfig::configure()
-    ->withRules([SortNamedParamRector::class]);
diff --git a/rules/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector.php b/rules/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector.php
new file mode 100644
index 00000000000..de840c38697
--- /dev/null
+++ b/rules/CodeQuality/Rector/FuncCall/SortCallLikeNamedArgsRector.php
@@ -0,0 +1,100 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\CodeQuality\Rector\FuncCall;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\FuncCall;
+use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\New_;
+use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\MethodReflection;
+use Rector\CodeQuality\NodeManipulator\NamedArgsSorter;
+use Rector\NodeAnalyzer\ArgsAnalyzer;
+use Rector\Rector\AbstractRector;
+use Rector\Reflection\ReflectionResolver;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+/**
+ * @see \Rector\Tests\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector\SortCallLikeNamedArgsRectorTest
+ */
+final class SortCallLikeNamedArgsRector extends AbstractRector
+{
+    public function __construct(
+        private readonly ReflectionResolver $reflectionResolver,
+        private readonly ArgsAnalyzer $argsAnalyzer,
+        private readonly NamedArgsSorter $namedArgsSorter,
+    ) {
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Sort named arguments to match their order in a function or method call or class constructors',
+            [
+                new CodeSample(
+                    <<<'CODE_SAMPLE'
+function run($foo = null, $bar = null, $baz = null) {}
+
+run(bar: $bar, foo: $foo);
+CODE_SAMPLE
+                    ,
+                    <<<'CODE_SAMPLE'
+function run($foo = null, $bar = null, $baz = null) {}
+
+run(foo: $foo, bar: $bar);
+CODE_SAMPLE
+                ),
+            ]
+        );
+    }
+
+    /**
+     * @return array<class-string<Node>>
+     */
+    public function getNodeTypes(): array
+    {
+        return [MethodCall::class, StaticCall::class, New_::class, FuncCall::class];
+    }
+
+    /**
+     * @param MethodCall|StaticCall|New_|FuncCall $node
+     */
+    public function refactor(Node $node): ?Node
+    {
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
+        $args = $node->getArgs();
+        if (count($args) <= 1) {
+            return null;
+        }
+
+        if (! $this->argsAnalyzer->hasNamedArg($args)) {
+            return null;
+        }
+
+        if ($node instanceof New_) {
+            $functionLikeReflection = $this->reflectionResolver->resolveMethodReflectionFromNew($node);
+        } else {
+            $functionLikeReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($node);
+        }
+
+        if (! $functionLikeReflection instanceof MethodReflection && ! $functionLikeReflection instanceof FunctionReflection) {
+            return null;
+        }
+
+        $args = $this->namedArgsSorter->sortArgsToMatchReflectionParameters($args, $functionLikeReflection);
+        if ($node->args === $args) {
+            return null;
+        }
+
+        $node->args = $args;
+
+        return $node;
+    }
+}
diff --git a/rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php b/rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php
index 1605646a474..f6d8c7e2f3b 100644
--- a/rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php
+++ b/rules/CodeQuality/Rector/FuncCall/SortNamedParamRector.php
@@ -9,27 +9,17 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
-use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Reflection\MethodReflection;
-use Rector\CodeQuality\NodeManipulator\NamedArgsSorter;
-use Rector\NodeAnalyzer\ArgsAnalyzer;
+use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
+use Rector\Exception\ShouldNotHappenException;
 use Rector\Rector\AbstractRector;
-use Rector\Reflection\ReflectionResolver;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 /**
- * @see \Rector\Tests\CodeQuality\Rector\FuncCall\SortNamedParamRector\SortNamedParamRectorTest
+ * @deprecated as renamed to SortCallLikeNamedArgsRector
  */
-final class SortNamedParamRector extends AbstractRector
+final class SortNamedParamRector extends AbstractRector implements DeprecatedInterface
 {
-    public function __construct(
-        private readonly ReflectionResolver $reflectionResolver,
-        private readonly ArgsAnalyzer $argsAnalyzer,
-        private readonly NamedArgsSorter $namedArgsSorter,
-    ) {
-    }
-
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -65,36 +55,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($node->isFirstClassCallable()) {
-            return null;
-        }
-
-        $args = $node->getArgs();
-        if (count($args) <= 1) {
-            return null;
-        }
-
-        if (! $this->argsAnalyzer->hasNamedArg($args)) {
-            return null;
-        }
-
-        if ($node instanceof New_) {
-            $functionLikeReflection = $this->reflectionResolver->resolveMethodReflectionFromNew($node);
-        } else {
-            $functionLikeReflection = $this->reflectionResolver->resolveFunctionLikeReflectionFromCall($node);
-        }
-
-        if (! $functionLikeReflection instanceof MethodReflection && ! $functionLikeReflection instanceof FunctionReflection) {
-            return null;
-        }
-
-        $args = $this->namedArgsSorter->sortArgsToMatchReflectionParameters($args, $functionLikeReflection);
-        if ($node->args === $args) {
-            return null;
-        }
-
-        $node->args = $args;
-
-        return $node;
+        throw new ShouldNotHappenException(sprintf(
+            '%s is deprecated as renamed to "%s".',
+            self::class,
+            SortCallLikeNamedArgsRector::class
+        ));
     }
 }
diff --git a/src/Config/Level/CodeQualityLevel.php b/src/Config/Level/CodeQualityLevel.php
index 7678cd3de08..b2aa1c8a9e6 100644
--- a/src/Config/Level/CodeQualityLevel.php
+++ b/src/Config/Level/CodeQualityLevel.php
@@ -5,6 +5,7 @@
 namespace Rector\Config\Level;
 
 use Rector\CodeQuality\Rector\Assign\CombinedAssignRector;
+use Rector\CodeQuality\Rector\Attribute\SortAttributeNamedArgsRector;
 use Rector\CodeQuality\Rector\BooleanAnd\RemoveUselessIsObjectCheckRector;
 use Rector\CodeQuality\Rector\BooleanAnd\RepeatedAndNotEqualToNotInArrayRector;
 use Rector\CodeQuality\Rector\BooleanAnd\SimplifyEmptyArrayCheckRector;
@@ -45,7 +46,7 @@
 use Rector\CodeQuality\Rector\FuncCall\SimplifyRegexPatternRector;
 use Rector\CodeQuality\Rector\FuncCall\SimplifyStrposLowerRector;
 use Rector\CodeQuality\Rector\FuncCall\SingleInArrayToCompareRector;
-use Rector\CodeQuality\Rector\FuncCall\SortNamedParamRector;
+use Rector\CodeQuality\Rector\FuncCall\SortCallLikeNamedArgsRector;
 use Rector\CodeQuality\Rector\FuncCall\UnwrapSprintfOneArgumentRector;
 use Rector\CodeQuality\Rector\Identical\BooleanNotIdenticalToNotIdenticalRector;
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
@@ -179,7 +180,8 @@ final class CodeQualityLevel
         CompleteMissingIfElseBracketRector::class,
         RemoveUselessIsObjectCheckRector::class,
         ConvertStaticToSelfRector::class,
-        SortNamedParamRector::class,
+        SortCallLikeNamedArgsRector::class,
+        SortAttributeNamedArgsRector::class,
         RemoveReadonlyPropertyVisibilityOnReadonlyClassRector::class,
     ];