diff --git a/framework/core/src/Database/Console/MigrateCommand.php b/framework/core/src/Database/Console/MigrateCommand.php
index 11c0126ec..dbd99c300 100644
--- a/framework/core/src/Database/Console/MigrateCommand.php
+++ b/framework/core/src/Database/Console/MigrateCommand.php
@@ -12,7 +12,12 @@
 namespace Flarum\Database\Console;
 
 use Flarum\Console\AbstractCommand;
+use Flarum\Database\Migrator;
+use Flarum\Extension\ExtensionManager;
 use Flarum\Foundation\Application;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\Schema\Builder;
 
 class MigrateCommand extends AbstractCommand
 {
@@ -55,16 +60,16 @@ class MigrateCommand extends AbstractCommand
 
     public function upgrade()
     {
-        $this->app->bind('Illuminate\Database\Schema\Builder', function ($app) {
-            return $app->make('Illuminate\Database\ConnectionInterface')->getSchemaBuilder();
+        $this->app->bind(Builder::class, function ($app) {
+            return $app->make(ConnectionInterface::class)->getSchemaBuilder();
         });
 
-        $migrator = $this->app->make('Flarum\Database\Migrator');
+        $migrator = $this->app->make(Migrator::class);
         $migrator->setOutput($this->output);
 
         $migrator->run(__DIR__.'/../../../migrations');
 
-        $extensions = $this->app->make('Flarum\Extension\ExtensionManager');
+        $extensions = $this->app->make(ExtensionManager::class);
         $extensions->getMigrator()->setOutput($this->output);
 
         foreach ($extensions->getEnabledExtensions() as $name => $extension) {
@@ -75,7 +80,7 @@ class MigrateCommand extends AbstractCommand
             }
         }
 
-        $this->app->make('Flarum\Settings\SettingsRepositoryInterface')->set('version', $this->app->version());
+        $this->app->make(SettingsRepositoryInterface::class)->set('version', $this->app->version());
 
         $this->info('Publishing assets...');
 
diff --git a/framework/core/src/Extension/ExtensionManager.php b/framework/core/src/Extension/ExtensionManager.php
index 6682612d1..338b1a756 100644
--- a/framework/core/src/Extension/ExtensionManager.php
+++ b/framework/core/src/Extension/ExtensionManager.php
@@ -21,6 +21,8 @@ use Flarum\Foundation\Application;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Container\Container;
 use Illuminate\Contracts\Events\Dispatcher;
+use Illuminate\Database\ConnectionInterface;
+use Illuminate\Database\Schema\Builder;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
@@ -227,8 +229,8 @@ class ExtensionManager
      */
     public function migrate(Extension $extension, $direction = 'up')
     {
-        $this->app->bind('Illuminate\Database\Schema\Builder', function ($container) {
-            return $container->make('Illuminate\Database\ConnectionInterface')->getSchemaBuilder();
+        $this->app->bind(Builder::class, function ($container) {
+            return $container->make(ConnectionInterface::class)->getSchemaBuilder();
         });
 
         $extension->migrate($this->migrator, $direction);
diff --git a/framework/core/src/Foundation/Application.php b/framework/core/src/Foundation/Application.php
index 1ab76681a..70b8f98f1 100644
--- a/framework/core/src/Foundation/Application.php
+++ b/framework/core/src/Foundation/Application.php
@@ -185,7 +185,7 @@ class Application extends Container implements ApplicationContract
 
         $this->instance('app', $this);
 
-        $this->instance('Illuminate\Container\Container', $this);
+        $this->instance(Container::class, $this);
     }
 
     /**
diff --git a/framework/core/src/User/User.php b/framework/core/src/User/User.php
index ce6b8de7d..5f60bcbc4 100644
--- a/framework/core/src/User/User.php
+++ b/framework/core/src/User/User.php
@@ -15,14 +15,17 @@ use Carbon\Carbon;
 use DomainException;
 use Flarum\Database\AbstractModel;
 use Flarum\Database\ScopeVisibilityTrait;
+use Flarum\Discussion\Discussion;
 use Flarum\Event\ConfigureUserPreferences;
 use Flarum\Event\GetDisplayName;
 use Flarum\Event\PrepareUserGroups;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Group\Group;
 use Flarum\Group\Permission;
+use Flarum\Http\AccessToken;
 use Flarum\Http\UrlGenerator;
 use Flarum\Notification\Notification;
+use Flarum\Post\Post;
 use Flarum\User\Event\Activated;
 use Flarum\User\Event\AvatarChanged;
 use Flarum\User\Event\CheckingPassword;
@@ -571,7 +574,7 @@ class User extends AbstractModel
      */
     public function posts()
     {
-        return $this->hasMany('Flarum\Post\Post');
+        return $this->hasMany(Post::class);
     }
 
     /**
@@ -581,7 +584,7 @@ class User extends AbstractModel
      */
     public function discussions()
     {
-        return $this->hasMany('Flarum\Discussion\Discussion');
+        return $this->hasMany(Discussion::class);
     }
 
     /**
@@ -591,7 +594,7 @@ class User extends AbstractModel
      */
     public function read()
     {
-        return $this->belongsToMany('Flarum\Discussion\Discussion');
+        return $this->belongsToMany(Discussion::class);
     }
 
     /**
@@ -601,7 +604,7 @@ class User extends AbstractModel
      */
     public function groups()
     {
-        return $this->belongsToMany('Flarum\Group\Group');
+        return $this->belongsToMany(Group::class);
     }
 
     /**
@@ -611,7 +614,7 @@ class User extends AbstractModel
      */
     public function notifications()
     {
-        return $this->hasMany('Flarum\Notification\Notification');
+        return $this->hasMany(Notification::class);
     }
 
     /**
@@ -664,7 +667,7 @@ class User extends AbstractModel
      */
     public function accessTokens()
     {
-        return $this->hasMany('Flarum\Http\AccessToken');
+        return $this->hasMany(AccessToken::class);
     }
 
     /**