diff --git a/packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php b/packages/upgrade/src/Rectors/FixGetSetClosureTypesRector.php
similarity index 97%
rename from packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php
rename to packages/upgrade/src/Rectors/FixGetSetClosureTypesRector.php
index 76ad8e9e40..cf0c00172a 100644
--- a/packages/upgrade/src/Forms/FixGetSetClosureTypesRector.php
+++ b/packages/upgrade/src/Rectors/FixGetSetClosureTypesRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Upgrade\Forms;
+namespace Filament\Upgrade\Rectors;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ArrowFunction;
diff --git a/packages/upgrade/src/App/MoveImportedClassesRector.php b/packages/upgrade/src/Rectors/MoveImportedClassesRector.php
similarity index 97%
rename from packages/upgrade/src/App/MoveImportedClassesRector.php
rename to packages/upgrade/src/Rectors/MoveImportedClassesRector.php
index fcc612368e..21d67513fe 100644
--- a/packages/upgrade/src/App/MoveImportedClassesRector.php
+++ b/packages/upgrade/src/Rectors/MoveImportedClassesRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Upgrade\App;
+namespace Filament\Upgrade\Rectors;
 
 use PhpParser\Node;
 use PhpParser\Node\Name;
diff --git a/packages/upgrade/src/Rectors/ReplaceParentClassRector.php b/packages/upgrade/src/Rectors/ReplaceParentClassRector.php
new file mode 100644
index 0000000000..91938e903f
--- /dev/null
+++ b/packages/upgrade/src/Rectors/ReplaceParentClassRector.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace Filament\Upgrade\Rectors;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr\ArrowFunction;
+use PhpParser\Node\Expr\Closure;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt\Class_;
+use Rector\Core\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+
+class ReplaceParentClassRector extends AbstractRector
+{
+    /**
+     * @return array<class-string, class-string>
+     */
+    public function getChanges(): array
+    {
+        return [
+            'Filament\\PluginServiceProvider' => 'Spatie\\LaravelPackageTools\\PackageServiceProvider',
+            'Filament\\Resources\\RelationManagers\\BelongsToManyRelationManager' => 'Filament\\Resources\\RelationManagers\\RelationManager',
+            'Filament\\Resources\\RelationManagers\\HasManyRelationManager' => 'Filament\\Resources\\RelationManagers\\RelationManager',
+            'Filament\\Resources\\RelationManagers\\HasManyThroughRelationManager' => 'Filament\\Resources\\RelationManagers\\RelationManager',
+            'Filament\\Resources\\RelationManagers\\MorphManyRelationManager' => 'Filament\\Resources\\RelationManagers\\RelationManager',
+            'Filament\\Resources\\RelationManagers\\MorphToManyRelationManager' => 'Filament\\Resources\\RelationManagers\\RelationManager',
+        ];
+    }
+
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+
+    public function refactor(Node $node): ?Node
+    {
+        /** @var Class_ $node */
+        $changes = $this->getChanges();
+
+        foreach ($changes as $parentClassToRemove => $parentClassToAdd) {
+            if (! $this->isName($node->extends, $parentClassToRemove)) {
+                continue;
+            }
+
+            $node->extends = new Name("\\{$parentClassToAdd}");
+
+            return $node;
+        }
+
+        return null;
+    }
+
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition(
+            'Replace the parent class with another',
+            [
+                new CodeSample(
+                    'MembersRelationManager extends BelongsToManyRelationManager',
+                    'MembersRelationManager extends RelationManager',
+                ),
+            ]
+        );
+    }
+}
diff --git a/packages/upgrade/src/SecondaryToGrayColorRector.php b/packages/upgrade/src/Rectors/SecondaryToGrayColorRector.php
similarity index 97%
rename from packages/upgrade/src/SecondaryToGrayColorRector.php
rename to packages/upgrade/src/Rectors/SecondaryToGrayColorRector.php
index 93ba69efe9..9ef749dbf1 100644
--- a/packages/upgrade/src/SecondaryToGrayColorRector.php
+++ b/packages/upgrade/src/Rectors/SecondaryToGrayColorRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Upgrade;
+namespace Filament\Upgrade\Rectors;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
diff --git a/packages/upgrade/src/App/SimpleMethodChangesRector.php b/packages/upgrade/src/Rectors/SimpleMethodChangesRector.php
similarity index 99%
rename from packages/upgrade/src/App/SimpleMethodChangesRector.php
rename to packages/upgrade/src/Rectors/SimpleMethodChangesRector.php
index a8b895dd75..223d0ce629 100644
--- a/packages/upgrade/src/App/SimpleMethodChangesRector.php
+++ b/packages/upgrade/src/Rectors/SimpleMethodChangesRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Upgrade\App;
+namespace Filament\Upgrade\Rectors;
 
 use Closure;
 use PhpParser\Node;
diff --git a/packages/upgrade/src/App/SimplePropertyChangesRector.php b/packages/upgrade/src/Rectors/SimplePropertyChangesRector.php
similarity index 98%
rename from packages/upgrade/src/App/SimplePropertyChangesRector.php
rename to packages/upgrade/src/Rectors/SimplePropertyChangesRector.php
index 701168d4a3..75bdbb884d 100644
--- a/packages/upgrade/src/App/SimplePropertyChangesRector.php
+++ b/packages/upgrade/src/Rectors/SimplePropertyChangesRector.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Filament\Upgrade\App;
+namespace Filament\Upgrade\Rectors;
 
 use Closure;
 use PhpParser\Node;
diff --git a/packages/upgrade/src/rector.php b/packages/upgrade/src/rector.php
index 6e51dacca4..5b1730f8a7 100644
--- a/packages/upgrade/src/rector.php
+++ b/packages/upgrade/src/rector.php
@@ -1,20 +1,34 @@
 <?php
 
-use Filament\Upgrade\App\MoveImportedClassesRector;
-use Filament\Upgrade\App\SimpleMethodChangesRector;
-use Filament\Upgrade\App\SimplePropertyChangesRector;
-use Filament\Upgrade\Forms\FixGetSetClosureTypesRector;
-use Filament\Upgrade\SecondaryToGrayColorRector;
+use Filament\Upgrade\Rectors;
 use Rector\Config\RectorConfig;
+use Rector\Removing\Rector\Class_\RemoveTraitUseRector;
 use Rector\Renaming\Rector\String_\RenameStringRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
-        FixGetSetClosureTypesRector::class,
-        MoveImportedClassesRector::class,
-        SecondaryToGrayColorRector::class,
-        SimpleMethodChangesRector::class,
-        SimplePropertyChangesRector::class,
+        Rectors\FixGetSetClosureTypesRector::class,
+        Rectors\MoveImportedClassesRector::class,
+        Rectors\ReplaceParentClassRector::class,
+        Rectors\SecondaryToGrayColorRector::class,
+        Rectors\SimpleMethodChangesRector::class,
+        Rectors\SimplePropertyChangesRector::class,
+    ]);
+
+    $rectorConfig->ruleWithConfiguration(RemoveTraitUseRector::class, [
+        'Filament\\Http\\Livewire\\Concerns\\CanNotify',
+        'Filament\\Resources\\Pages\\ListRecords\\Concerns\\CanCreateRecords',
+        'Filament\\Resources\\Pages\\ListRecords\\Concerns\\CanDeleteRecords',
+        'Filament\\Resources\\Pages\\ListRecords\\Concerns\\CanEditRecords',
+        'Filament\\Resources\\Pages\\ListRecords\\Concerns\\CanViewRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanAssociateRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanAttachRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanCreateRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanDeleteRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanDetachRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanDisassociateRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanEditRecords',
+        'Filament\\Resources\\RelationManagers\\Concerns\\CanViewRecords',
     ]);
 
     $rectorConfig->ruleWithConfiguration(