diff --git a/extensions/suspend/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/suspend/migrations/2017_07_22_000000_add_default_permissions.php
index 6c7201dd8..7f39b1fce 100644
--- a/extensions/suspend/migrations/2017_07_22_000000_add_default_permissions.php
+++ b/extensions/suspend/migrations/2017_07_22_000000_add_default_permissions.php
@@ -9,8 +9,8 @@
  * file that was distributed with this source code.
  */
 
-use Flarum\Core\Group;
 use Flarum\Database\Migration;
+use Flarum\Group\Group;
 
 return Migration::addPermissions([
     'user.suspend' => Group::MODERATOR_ID
diff --git a/extensions/suspend/src/Access/UserPolicy.php b/extensions/suspend/src/Access/UserPolicy.php
index 5708b5bfb..6493776ed 100644
--- a/extensions/suspend/src/Access/UserPolicy.php
+++ b/extensions/suspend/src/Access/UserPolicy.php
@@ -11,8 +11,8 @@
 
 namespace Flarum\Suspend\Access;
 
-use Flarum\Core\Access\AbstractPolicy;
-use Flarum\Core\User;
+use Flarum\User\AbstractPolicy;
+use Flarum\User\User;
 
 class UserPolicy extends AbstractPolicy
 {
diff --git a/extensions/suspend/src/Listener/AddClientAssets.php b/extensions/suspend/src/Listener/AddClientAssets.php
index 4a80dacc2..5db7850ee 100644
--- a/extensions/suspend/src/Listener/AddClientAssets.php
+++ b/extensions/suspend/src/Listener/AddClientAssets.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Suspend\Listener;
 
-use Flarum\Event\ConfigureWebApp;
+use Flarum\Frontend\Event\Rendering;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddClientAssets
@@ -21,13 +21,10 @@ class AddClientAssets
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(ConfigureWebApp::class, [$this, 'addAssets']);
+        $events->listen(Rendering::class, [$this, 'addAssets']);
     }
 
-    /**
-     * @param ConfigureClientView $event
-     */
-    public function addAssets(ConfigureWebApp $event)
+    public function addAssets(Rendering $event)
     {
         if ($event->isForum()) {
             $event->addAssets([
diff --git a/extensions/suspend/src/Listener/AddUserSuspendAttributes.php b/extensions/suspend/src/Listener/AddUserSuspendAttributes.php
index 5049b81af..2d9865723 100755
--- a/extensions/suspend/src/Listener/AddUserSuspendAttributes.php
+++ b/extensions/suspend/src/Listener/AddUserSuspendAttributes.php
@@ -11,10 +11,10 @@
 
 namespace Flarum\Suspend\Listener;
 
+use Flarum\Api\Event\Serializing;
 use Flarum\Api\Serializer\UserSerializer;
-use Flarum\Core\User;
 use Flarum\Event\ConfigureModelDates;
-use Flarum\Event\PrepareApiAttributes;
+use Flarum\User\User;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class AddUserSuspendAttributes
@@ -25,7 +25,7 @@ class AddUserSuspendAttributes
     public function subscribe(Dispatcher $events)
     {
         $events->listen(ConfigureModelDates::class, [$this, 'addDates']);
-        $events->listen(PrepareApiAttributes::class, [$this, 'addAttributes']);
+        $events->listen(Serializing::class, [$this, 'addAttributes']);
     }
 
     /**
@@ -39,9 +39,9 @@ class AddUserSuspendAttributes
     }
 
     /**
-     * @param PrepareApiAttributes $event
+     * @param Serializing $event
      */
-    public function addAttributes(PrepareApiAttributes $event)
+    public function addAttributes(Serializing $event)
     {
         if ($event->isSerializer(UserSerializer::class)) {
             $canSuspend = $event->actor->can('suspend', $event->model);
diff --git a/extensions/suspend/src/Listener/RevokeAccessFromSuspendedUsers.php b/extensions/suspend/src/Listener/RevokeAccessFromSuspendedUsers.php
index f9349f36b..2587d5b73 100755
--- a/extensions/suspend/src/Listener/RevokeAccessFromSuspendedUsers.php
+++ b/extensions/suspend/src/Listener/RevokeAccessFromSuspendedUsers.php
@@ -12,8 +12,8 @@
 namespace Flarum\Suspend\Listener;
 
 use Carbon\Carbon;
-use Flarum\Core\Group;
 use Flarum\Event\PrepareUserGroups;
+use Flarum\Group\Group;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class RevokeAccessFromSuspendedUsers
diff --git a/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php b/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
index 8c90fcdbe..4ef02d412 100755
--- a/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
+++ b/extensions/suspend/src/Listener/SaveSuspensionToDatabase.php
@@ -12,9 +12,9 @@
 namespace Flarum\Suspend\Listener;
 
 use DateTime;
-use Flarum\Core\Access\AssertPermissionTrait;
-use Flarum\Event\UserWillBeSaved;
 use Flarum\Suspend\SuspendValidator;
+use Flarum\User\AssertPermissionTrait;
+use Flarum\User\Event\Saving;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class SaveSuspensionToDatabase
@@ -41,13 +41,13 @@ class SaveSuspensionToDatabase
      */
     public function subscribe(Dispatcher $events)
     {
-        $events->listen(UserWillBeSaved::class, [$this, 'whenUserWillBeSaved']);
+        $events->listen(Saving::class, [$this, 'whenSavingUser']);
     }
 
     /**
-     * @param UserWillBeSaved $event
+     * @param Saving $event
      */
-    public function whenUserWillBeSaved(UserWillBeSaved $event)
+    public function whenSavingUser(Saving $event)
     {
         $attributes = array_get($event->data, 'attributes', []);
 
diff --git a/extensions/suspend/src/SuspendValidator.php b/extensions/suspend/src/SuspendValidator.php
index 57daf0dd2..761c0b9e1 100644
--- a/extensions/suspend/src/SuspendValidator.php
+++ b/extensions/suspend/src/SuspendValidator.php
@@ -11,7 +11,7 @@
 
 namespace Flarum\Suspend;
 
-use Flarum\Core\Validator\AbstractValidator;
+use Flarum\Foundation\AbstractValidator;
 
 class SuspendValidator extends AbstractValidator
 {