diff --git a/framework/core/src/Api/Controller/ListUsersController.php b/framework/core/src/Api/Controller/ListUsersController.php
index 1dadbb103..f953e33b4 100644
--- a/framework/core/src/Api/Controller/ListUsersController.php
+++ b/framework/core/src/Api/Controller/ListUsersController.php
@@ -14,7 +14,7 @@ namespace Flarum\Api\Controller;
 use Flarum\Api\UrlGenerator;
 use Flarum\User\Exception\PermissionDeniedException;
 use Flarum\Search\SearchCriteria;
-use Flarum\Core\User\Search\UserSearcher;
+use Flarum\User\Search\UserSearcher;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
diff --git a/framework/core/src/Event/ConfigureUserSearch.php b/framework/core/src/Event/ConfigureUserSearch.php
index 309f60c10..1b9a235e4 100644
--- a/framework/core/src/Event/ConfigureUserSearch.php
+++ b/framework/core/src/Event/ConfigureUserSearch.php
@@ -12,12 +12,12 @@
 namespace Flarum\Event;
 
 use Flarum\Search\SearchCriteria;
-use Flarum\Core\User\Search\UserSearch;
+use Flarum\User\Search\UserSearch;
 
 class ConfigureUserSearch
 {
     /**
-     * @var \Flarum\Core\User\Search\UserSearch
+     * @var \Flarum\User\Search\UserSearch
      */
     public $search;
 
diff --git a/framework/core/src/Post/Post.php b/framework/core/src/Post/Post.php
index 468a708fb..c85538582 100755
--- a/framework/core/src/Post/Post.php
+++ b/framework/core/src/Post/Post.php
@@ -11,11 +11,11 @@
 
 namespace Flarum\Post;
 
-use Flarum\Core\User;
 use Flarum\Foundation\EventGeneratorTrait;
 use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Database\AbstractModel;
 use Flarum\Post\Event\Deleted;
+use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
 
 /**
diff --git a/framework/core/src/Search/SearchServiceProvider.php b/framework/core/src/Search/SearchServiceProvider.php
index 9b2ded54b..71d316d54 100644
--- a/framework/core/src/Search/SearchServiceProvider.php
+++ b/framework/core/src/Search/SearchServiceProvider.php
@@ -37,14 +37,14 @@ class SearchServiceProvider extends AbstractServiceProvider
 
     public function registerUserGambits()
     {
-        $this->app->when('Flarum\Core\User\Search\UserSearcher')
+        $this->app->when('Flarum\User\Search\UserSearcher')
             ->needs('Flarum\Search\GambitManager')
             ->give(function (Container $app) {
                 $gambits = new GambitManager($app);
 
-                $gambits->setFulltextGambit('Flarum\Core\User\Search\Gambit\FulltextGambit');
-                $gambits->add('Flarum\Core\User\Search\Gambit\EmailGambit');
-                $gambits->add('Flarum\Core\User\Search\Gambit\GroupGambit');
+                $gambits->setFulltextGambit('Flarum\User\Search\Gambit\FulltextGambit');
+                $gambits->add('Flarum\User\Search\Gambit\EmailGambit');
+                $gambits->add('Flarum\User\Search\Gambit\GroupGambit');
 
                 $app->make('events')->fire(
                     new ConfigureUserGambits($gambits)
diff --git a/framework/core/src/User/EmailToken.php b/framework/core/src/User/EmailToken.php
index e0383f2ff..f60d35c89 100644
--- a/framework/core/src/User/EmailToken.php
+++ b/framework/core/src/User/EmailToken.php
@@ -64,7 +64,7 @@ class EmailToken extends AbstractModel
      */
     public function user()
     {
-        return $this->belongsTo('Flarum\Core\User');
+        return $this->belongsTo('Flarum\User');
     }
 
     /**
diff --git a/framework/core/src/User/PasswordToken.php b/framework/core/src/User/PasswordToken.php
index 190d1d27a..53b955eda 100644
--- a/framework/core/src/User/PasswordToken.php
+++ b/framework/core/src/User/PasswordToken.php
@@ -59,6 +59,6 @@ class PasswordToken extends AbstractModel
      */
     public function user()
     {
-        return $this->belongsTo('Flarum\Core\User');
+        return $this->belongsTo('Flarum\User');
     }
 }
diff --git a/framework/core/src/User/Search/Gambit/EmailGambit.php b/framework/core/src/User/Search/Gambit/EmailGambit.php
index 3d12c02ed..c44ebc1ba 100644
--- a/framework/core/src/User/Search/Gambit/EmailGambit.php
+++ b/framework/core/src/User/Search/Gambit/EmailGambit.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\User\Search\Gambit;
+namespace Flarum\User\Search\Gambit;
 
-use Flarum\User\UserRepository;
 use Flarum\Search\AbstractRegexGambit;
 use Flarum\Search\AbstractSearch;
-use Flarum\Core\User\Search\UserSearch;
+use Flarum\User\Search\UserSearch;
+use Flarum\User\UserRepository;
 use LogicException;
 
 class EmailGambit extends AbstractRegexGambit
diff --git a/framework/core/src/User/Search/Gambit/FulltextGambit.php b/framework/core/src/User/Search/Gambit/FulltextGambit.php
index 0d2c02baa..a41821693 100644
--- a/framework/core/src/User/Search/Gambit/FulltextGambit.php
+++ b/framework/core/src/User/Search/Gambit/FulltextGambit.php
@@ -9,11 +9,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\User\Search\Gambit;
+namespace Flarum\User\Search\Gambit;
 
-use Flarum\User\UserRepository;
 use Flarum\Search\AbstractSearch;
 use Flarum\Search\GambitInterface;
+use Flarum\User\UserRepository;
 
 class FulltextGambit implements GambitInterface
 {
diff --git a/framework/core/src/User/Search/Gambit/GroupGambit.php b/framework/core/src/User/Search/Gambit/GroupGambit.php
index 317ea8232..e690d93e5 100644
--- a/framework/core/src/User/Search/Gambit/GroupGambit.php
+++ b/framework/core/src/User/Search/Gambit/GroupGambit.php
@@ -9,12 +9,12 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\User\Search\Gambit;
+namespace Flarum\User\Search\Gambit;
 
 use Flarum\Group\GroupRepository;
 use Flarum\Search\AbstractRegexGambit;
 use Flarum\Search\AbstractSearch;
-use Flarum\Core\User\Search\UserSearch;
+use Flarum\User\Search\UserSearch;
 use LogicException;
 
 class GroupGambit extends AbstractRegexGambit
diff --git a/framework/core/src/User/Search/UserSearch.php b/framework/core/src/User/Search/UserSearch.php
index d26620f5e..d3a7ba28b 100644
--- a/framework/core/src/User/Search/UserSearch.php
+++ b/framework/core/src/User/Search/UserSearch.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\User\Search;
+namespace Flarum\User\Search;
 
 use Flarum\Search\AbstractSearch;
 
diff --git a/framework/core/src/User/Search/UserSearcher.php b/framework/core/src/User/Search/UserSearcher.php
index 13b0838aa..2cb5cab2b 100644
--- a/framework/core/src/User/Search/UserSearcher.php
+++ b/framework/core/src/User/Search/UserSearcher.php
@@ -9,9 +9,8 @@
  * file that was distributed with this source code.
  */
 
-namespace Flarum\Core\User\Search;
+namespace Flarum\User\Search;
 
-use Flarum\Core\User\Search\UserSearch;
 use Flarum\User\UserRepository;
 use Flarum\Search\ApplySearchParametersTrait;
 use Flarum\Search\GambitManager;
@@ -28,7 +27,7 @@ class UserSearcher
     use ApplySearchParametersTrait;
 
     /**
-     * @var \Flarum\Search\GambitManager
+     * @var GambitManager
      */
     protected $gambits;
 
@@ -38,10 +37,10 @@ class UserSearcher
     protected $users;
 
     /**
-     * @param \Flarum\Search\GambitManager $gambits
+     * @param GambitManager $gambits
      * @param \Flarum\User\UserRepository $users
      */
-    public function __construct(\Flarum\Search\GambitManager $gambits, UserRepository $users)
+    public function __construct(GambitManager $gambits, UserRepository $users)
     {
         $this->gambits = $gambits;
         $this->users = $users;
@@ -52,9 +51,9 @@ class UserSearcher
      * @param int|null $limit
      * @param int $offset
      * @param array $load An array of relationships to load on the results.
-     * @return \Flarum\Search\SearchResults
+     * @return SearchResults
      */
-    public function search(\Flarum\Search\SearchCriteria $criteria, $limit = null, $offset = 0, array $load = [])
+    public function search(SearchCriteria $criteria, $limit = null, $offset = 0, array $load = [])
     {
         $actor = $criteria->actor;
 
@@ -83,6 +82,6 @@ class UserSearcher
 
         $users->load($load);
 
-        return new \Flarum\Search\SearchResults($users, $areMoreResults);
+        return new SearchResults($users, $areMoreResults);
     }
 }