diff --git a/src/Dao/AbstractDao.php b/src/Dao/AbstractDao.php
index 4a4a0cf5..69226125 100644
--- a/src/Dao/AbstractDao.php
+++ b/src/Dao/AbstractDao.php
@@ -3,12 +3,12 @@ namespace Szurubooru\Dao;
 use Szurubooru\Dao\EntityConverters\IEntityConverter;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Result;
 
 abstract class AbstractDao implements ICrudDao, IBatchDao
 {
diff --git a/src/Dao/PostDao.php b/src/Dao/PostDao.php
index b2a31d7d..55aa96a5 100644
--- a/src/Dao/PostDao.php
+++ b/src/Dao/PostDao.php
@@ -7,8 +7,8 @@ use Szurubooru\Dao\UserDao;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
 use Szurubooru\Entities\Post;
-use Szurubooru\SearchServices\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Filters\PostFilter;
+use Szurubooru\Search\Requirements\Requirement;
 use Szurubooru\Services\ThumbnailService;
 
 class PostDao extends AbstractDao implements ICrudDao
diff --git a/src/Dao/TagDao.php b/src/Dao/TagDao.php
index dc46ce4a..9d723aaa 100644
--- a/src/Dao/TagDao.php
+++ b/src/Dao/TagDao.php
@@ -5,8 +5,8 @@ use Szurubooru\Dao\EntityConverters\TagEntityConverter;
 use Szurubooru\DatabaseConnection;
 use Szurubooru\Entities\Entity;
 use Szurubooru\Entities\Tag;
-use Szurubooru\SearchServices\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
+use Szurubooru\Search\Filters\TagFilter;
+use Szurubooru\Search\Requirements\Requirement;
 
 class TagDao extends AbstractDao implements ICrudDao
 {
diff --git a/src/Routes/Comments/GetComments.php b/src/Routes/Comments/GetComments.php
index 7458a312..55e86ee9 100644
--- a/src/Routes/Comments/GetComments.php
+++ b/src/Routes/Comments/GetComments.php
@@ -2,9 +2,9 @@
 namespace Szurubooru\Routes\Comments;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Filters\PostFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
diff --git a/src/Routes/Comments/GetPostComments.php b/src/Routes/Comments/GetPostComments.php
index df635931..7687d137 100644
--- a/src/Routes/Comments/GetPostComments.php
+++ b/src/Routes/Comments/GetPostComments.php
@@ -2,9 +2,9 @@
 namespace Szurubooru\Routes\Comments;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Filters\CommentFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Filters\CommentFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\CommentService;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
diff --git a/src/Routes/GetHistory.php b/src/Routes/GetHistory.php
index 95357470..3604b49b 100644
--- a/src/Routes/GetHistory.php
+++ b/src/Routes/GetHistory.php
@@ -3,7 +3,7 @@ namespace Szurubooru\Routes;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
 use Szurubooru\Routes\AbstractRoute;
-use Szurubooru\SearchServices\Parsers\SnapshotSearchParser;
+use Szurubooru\Search\Parsers\SnapshotSearchParser;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\ViewProxies\SnapshotViewProxy;
diff --git a/src/Routes/Posts/GetPosts.php b/src/Routes/Posts/GetPosts.php
index 0c4b65d0..8e5ad955 100644
--- a/src/Routes/Posts/GetPosts.php
+++ b/src/Routes/Posts/GetPosts.php
@@ -3,7 +3,7 @@ namespace Szurubooru\Routes\Posts;
 use Szurubooru\Config;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\PostSearchParser;
+use Szurubooru\Search\Parsers\PostSearchParser;
 use Szurubooru\Services\PostService;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\ViewProxies\PostViewProxy;
diff --git a/src/Routes/Tags/GetTags.php b/src/Routes/Tags/GetTags.php
index 79e9da20..5a4ec930 100644
--- a/src/Routes/Tags/GetTags.php
+++ b/src/Routes/Tags/GetTags.php
@@ -2,7 +2,7 @@
 namespace Szurubooru\Routes\Tags;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\TagSearchParser;
+use Szurubooru\Search\Parsers\TagSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\TagService;
 use Szurubooru\ViewProxies\TagViewProxy;
diff --git a/src/Routes/Users/GetUser.php b/src/Routes/Users/GetUser.php
index 35890e23..c9c4a46b 100644
--- a/src/Routes/Users/GetUser.php
+++ b/src/Routes/Users/GetUser.php
@@ -1,7 +1,7 @@
 <?php
 namespace Szurubooru\Routes\Users;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\UserSearchParser;
+use Szurubooru\Search\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
 use Szurubooru\ViewProxies\UserViewProxy;
diff --git a/src/Routes/Users/GetUsers.php b/src/Routes/Users/GetUsers.php
index d5ee55c6..624e3717 100644
--- a/src/Routes/Users/GetUsers.php
+++ b/src/Routes/Users/GetUsers.php
@@ -3,7 +3,7 @@ namespace Szurubooru\Routes\Users;
 use Szurubooru\Config;
 use Szurubooru\Helpers\InputReader;
 use Szurubooru\Privilege;
-use Szurubooru\SearchServices\Parsers\UserSearchParser;
+use Szurubooru\Search\Parsers\UserSearchParser;
 use Szurubooru\Services\PrivilegeService;
 use Szurubooru\Services\UserService;
 use Szurubooru\ViewProxies\UserViewProxy;
diff --git a/src/SearchServices/Filters/BasicFilter.php b/src/Search/Filters/BasicFilter.php
similarity index 90%
rename from src/SearchServices/Filters/BasicFilter.php
rename to src/Search/Filters/BasicFilter.php
index 082d1dea..41100c83 100644
--- a/src/SearchServices/Filters/BasicFilter.php
+++ b/src/Search/Filters/BasicFilter.php
@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
-use Szurubooru\SearchServices\Requirements\Requirement;
+namespace Szurubooru\Search\Filters;
+use Szurubooru\Search\Requirements\Requirement;
 
 class BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Filters/CommentFilter.php b/src/Search/Filters/CommentFilter.php
similarity index 83%
rename from src/SearchServices/Filters/CommentFilter.php
rename to src/Search/Filters/CommentFilter.php
index a65d0751..7346425c 100644
--- a/src/SearchServices/Filters/CommentFilter.php
+++ b/src/Search/Filters/CommentFilter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class CommentFilter extends BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Filters/IFilter.php b/src/Search/Filters/IFilter.php
similarity index 80%
rename from src/SearchServices/Filters/IFilter.php
rename to src/Search/Filters/IFilter.php
index c9f7bf5d..31fed929 100644
--- a/src/SearchServices/Filters/IFilter.php
+++ b/src/Search/Filters/IFilter.php
@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
-use Szurubooru\SearchServices\Requirements\Requirement;
+namespace Szurubooru\Search\Filters;
+use Szurubooru\Search\Requirements\Requirement;
 
 interface IFilter
 {
diff --git a/src/SearchServices/Filters/PostFilter.php b/src/Search/Filters/PostFilter.php
similarity index 96%
rename from src/SearchServices/Filters/PostFilter.php
rename to src/Search/Filters/PostFilter.php
index 1311877d..38e82f7a 100644
--- a/src/SearchServices/Filters/PostFilter.php
+++ b/src/Search/Filters/PostFilter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class PostFilter extends BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Filters/SnapshotFilter.php b/src/Search/Filters/SnapshotFilter.php
similarity index 85%
rename from src/SearchServices/Filters/SnapshotFilter.php
rename to src/Search/Filters/SnapshotFilter.php
index 3ee369ff..4fd14e60 100644
--- a/src/SearchServices/Filters/SnapshotFilter.php
+++ b/src/Search/Filters/SnapshotFilter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class SnapshotFilter extends BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Filters/TagFilter.php b/src/Search/Filters/TagFilter.php
similarity index 89%
rename from src/SearchServices/Filters/TagFilter.php
rename to src/Search/Filters/TagFilter.php
index 92b91169..7d3b32ee 100644
--- a/src/SearchServices/Filters/TagFilter.php
+++ b/src/Search/Filters/TagFilter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class TagFilter extends BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Filters/UserFilter.php b/src/Search/Filters/UserFilter.php
similarity index 84%
rename from src/SearchServices/Filters/UserFilter.php
rename to src/Search/Filters/UserFilter.php
index 3868a4c2..cc87e3e7 100644
--- a/src/SearchServices/Filters/UserFilter.php
+++ b/src/Search/Filters/UserFilter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Filters;
+namespace Szurubooru\Search\Filters;
 
 class UserFilter extends BasicFilter implements IFilter
 {
diff --git a/src/SearchServices/Parsers/AbstractSearchParser.php b/src/Search/Parsers/AbstractSearchParser.php
similarity index 90%
rename from src/SearchServices/Parsers/AbstractSearchParser.php
rename to src/Search/Parsers/AbstractSearchParser.php
index eed3a0e1..394c8f4b 100644
--- a/src/SearchServices/Parsers/AbstractSearchParser.php
+++ b/src/Search/Parsers/AbstractSearchParser.php
@@ -1,13 +1,13 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\InputReader;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementRangedValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementRangedValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 abstract class AbstractSearchParser
 {
diff --git a/src/SearchServices/Parsers/PostSearchParser.php b/src/Search/Parsers/PostSearchParser.php
similarity index 96%
rename from src/SearchServices/Parsers/PostSearchParser.php
rename to src/Search/Parsers/PostSearchParser.php
index fc7dab5d..1843585e 100644
--- a/src/SearchServices/Parsers/PostSearchParser.php
+++ b/src/Search/Parsers/PostSearchParser.php
@@ -1,13 +1,13 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\PostFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Filters\PostFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\PrivilegeService;
 
diff --git a/src/SearchServices/Parsers/SnapshotSearchParser.php b/src/Search/Parsers/SnapshotSearchParser.php
similarity index 79%
rename from src/SearchServices/Parsers/SnapshotSearchParser.php
rename to src/Search/Parsers/SnapshotSearchParser.php
index 4d683589..2b531e81 100644
--- a/src/SearchServices/Parsers/SnapshotSearchParser.php
+++ b/src/Search/Parsers/SnapshotSearchParser.php
@@ -1,12 +1,12 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\Helpers\EnumHelper;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class SnapshotSearchParser extends AbstractSearchParser
 {
diff --git a/src/SearchServices/Parsers/TagSearchParser.php b/src/Search/Parsers/TagSearchParser.php
similarity index 78%
rename from src/SearchServices/Parsers/TagSearchParser.php
rename to src/Search/Parsers/TagSearchParser.php
index ebc7869a..45f5be27 100644
--- a/src/SearchServices/Parsers/TagSearchParser.php
+++ b/src/Search/Parsers/TagSearchParser.php
@@ -1,12 +1,12 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Filters\TagFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class TagSearchParser extends AbstractSearchParser
 {
diff --git a/src/SearchServices/Parsers/UserSearchParser.php b/src/Search/Parsers/UserSearchParser.php
similarity index 74%
rename from src/SearchServices/Parsers/UserSearchParser.php
rename to src/Search/Parsers/UserSearchParser.php
index e24dc39b..6a360c5a 100644
--- a/src/SearchServices/Parsers/UserSearchParser.php
+++ b/src/Search/Parsers/UserSearchParser.php
@@ -1,10 +1,10 @@
 <?php
-namespace Szurubooru\SearchServices\Parsers;
+namespace Szurubooru\Search\Parsers;
 use Szurubooru\NotSupportedException;
-use Szurubooru\SearchServices\Filters\IFilter;
-use Szurubooru\SearchServices\Filters\UserFilter;
-use Szurubooru\SearchServices\Tokens\NamedSearchToken;
-use Szurubooru\SearchServices\Tokens\SearchToken;
+use Szurubooru\Search\Filters\IFilter;
+use Szurubooru\Search\Filters\UserFilter;
+use Szurubooru\Search\Tokens\NamedSearchToken;
+use Szurubooru\Search\Tokens\SearchToken;
 
 class UserSearchParser extends AbstractSearchParser
 {
diff --git a/src/SearchServices/Requirements/IRequirementValue.php b/src/Search/Requirements/IRequirementValue.php
similarity index 57%
rename from src/SearchServices/Requirements/IRequirementValue.php
rename to src/Search/Requirements/IRequirementValue.php
index 3fefa125..17befaa8 100644
--- a/src/SearchServices/Requirements/IRequirementValue.php
+++ b/src/Search/Requirements/IRequirementValue.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 interface IRequirementValue
 {
diff --git a/src/SearchServices/Requirements/Requirement.php b/src/Search/Requirements/Requirement.php
similarity index 90%
rename from src/SearchServices/Requirements/Requirement.php
rename to src/Search/Requirements/Requirement.php
index e7ee1e80..e73c35a7 100644
--- a/src/SearchServices/Requirements/Requirement.php
+++ b/src/Search/Requirements/Requirement.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class Requirement
 {
diff --git a/src/SearchServices/Requirements/RequirementCompositeValue.php b/src/Search/Requirements/RequirementCompositeValue.php
similarity index 86%
rename from src/SearchServices/Requirements/RequirementCompositeValue.php
rename to src/Search/Requirements/RequirementCompositeValue.php
index fdc91da7..6de957f9 100644
--- a/src/SearchServices/Requirements/RequirementCompositeValue.php
+++ b/src/Search/Requirements/RequirementCompositeValue.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementCompositeValue implements IRequirementValue
 {
diff --git a/src/SearchServices/Requirements/RequirementRangedValue.php b/src/Search/Requirements/RequirementRangedValue.php
similarity index 90%
rename from src/SearchServices/Requirements/RequirementRangedValue.php
rename to src/Search/Requirements/RequirementRangedValue.php
index 678462d8..4035e2d5 100644
--- a/src/SearchServices/Requirements/RequirementRangedValue.php
+++ b/src/Search/Requirements/RequirementRangedValue.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementRangedValue implements IRequirementValue
 {
diff --git a/src/SearchServices/Requirements/RequirementSingleValue.php b/src/Search/Requirements/RequirementSingleValue.php
similarity index 87%
rename from src/SearchServices/Requirements/RequirementSingleValue.php
rename to src/Search/Requirements/RequirementSingleValue.php
index 73cf9d7b..5a59616b 100644
--- a/src/SearchServices/Requirements/RequirementSingleValue.php
+++ b/src/Search/Requirements/RequirementSingleValue.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Requirements;
+namespace Szurubooru\Search\Requirements;
 
 class RequirementSingleValue implements IRequirementValue
 {
diff --git a/src/SearchServices/Result.php b/src/Search/Result.php
similarity index 91%
rename from src/SearchServices/Result.php
rename to src/Search/Result.php
index 98f92b49..1563bf94 100644
--- a/src/SearchServices/Result.php
+++ b/src/Search/Result.php
@@ -1,6 +1,6 @@
 <?php
-namespace Szurubooru\SearchServices;
-use Szurubooru\SearchServices\Filters\IFilter;
+namespace Szurubooru\Search;
+use Szurubooru\Search\Filters\IFilter;
 
 class Result
 {
diff --git a/src/SearchServices/Tokens/NamedSearchToken.php b/src/Search/Tokens/NamedSearchToken.php
similarity index 81%
rename from src/SearchServices/Tokens/NamedSearchToken.php
rename to src/Search/Tokens/NamedSearchToken.php
index f13b21a3..2bbe63a4 100644
--- a/src/SearchServices/Tokens/NamedSearchToken.php
+++ b/src/Search/Tokens/NamedSearchToken.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Tokens;
+namespace Szurubooru\Search\Tokens;
 
 class NamedSearchToken extends SearchToken
 {
diff --git a/src/SearchServices/Tokens/SearchToken.php b/src/Search/Tokens/SearchToken.php
similarity index 88%
rename from src/SearchServices/Tokens/SearchToken.php
rename to src/Search/Tokens/SearchToken.php
index 6c616545..cdde59aa 100644
--- a/src/SearchServices/Tokens/SearchToken.php
+++ b/src/Search/Tokens/SearchToken.php
@@ -1,5 +1,5 @@
 <?php
-namespace Szurubooru\SearchServices\Tokens;
+namespace Szurubooru\Search\Tokens;
 
 class SearchToken
 {
diff --git a/src/Services/CommentService.php b/src/Services/CommentService.php
index cd10b12a..ca6d7aed 100644
--- a/src/Services/CommentService.php
+++ b/src/Services/CommentService.php
@@ -4,7 +4,7 @@ use Szurubooru\Dao\CommentDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Comment;
 use Szurubooru\Entities\Post;
-use Szurubooru\SearchServices\Filters\CommentFilter;
+use Szurubooru\Search\Filters\CommentFilter;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\TimeService;
 use Szurubooru\Validator;
diff --git a/src/Services/HistoryService.php b/src/Services/HistoryService.php
index cd784f9d..d737917b 100644
--- a/src/Services/HistoryService.php
+++ b/src/Services/HistoryService.php
@@ -3,7 +3,7 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\SnapshotDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\TimeService;
 
diff --git a/src/Services/PostHistoryService.php b/src/Services/PostHistoryService.php
index dbad36e6..40832fa6 100644
--- a/src/Services/PostHistoryService.php
+++ b/src/Services/PostHistoryService.php
@@ -3,9 +3,9 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Post;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Filters\SnapshotFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\PostSnapshotProvider;
 
diff --git a/src/Services/PostService.php b/src/Services/PostService.php
index 86d7c7f4..eed27e86 100644
--- a/src/Services/PostService.php
+++ b/src/Services/PostService.php
@@ -11,11 +11,11 @@ use Szurubooru\FormData\PostEditFormData;
 use Szurubooru\FormData\UploadFormData;
 use Szurubooru\Helpers\MimeHelper;
 use Szurubooru\Helpers\TypeHelper;
-use Szurubooru\SearchServices\Filters\PostFilter;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Filters\PostFilter;
+use Szurubooru\Search\Filters\SnapshotFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\AuthService;
 use Szurubooru\Services\PostHistoryService;
 use Szurubooru\Services\ImageConverter;
diff --git a/src/Services/TagHistoryService.php b/src/Services/TagHistoryService.php
index d06d1b45..262a80df 100644
--- a/src/Services/TagHistoryService.php
+++ b/src/Services/TagHistoryService.php
@@ -3,9 +3,9 @@ namespace Szurubooru\Services;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Tag;
 use Szurubooru\Entities\Snapshot;
-use Szurubooru\SearchServices\Filters\SnapshotFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Filters\SnapshotFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
 use Szurubooru\Services\HistoryService;
 use Szurubooru\Services\TagSnapshotProvider;
 
diff --git a/src/Services/TagService.php b/src/Services/TagService.php
index 25959a70..68251b75 100644
--- a/src/Services/TagService.php
+++ b/src/Services/TagService.php
@@ -6,7 +6,7 @@ use Szurubooru\Dao\TagDao;
 use Szurubooru\Dao\TransactionManager;
 use Szurubooru\Entities\Tag;
 use Szurubooru\FormData\TagEditFormData;
-use Szurubooru\SearchServices\Filters\TagFilter;
+use Szurubooru\Search\Filters\TagFilter;
 use Szurubooru\Services\TimeService;
 use Szurubooru\Validator;
 
diff --git a/src/Services/UserService.php b/src/Services/UserService.php
index 3b33d5ff..af760a0b 100644
--- a/src/Services/UserService.php
+++ b/src/Services/UserService.php
@@ -9,7 +9,7 @@ use Szurubooru\FormData\RegistrationFormData;
 use Szurubooru\FormData\UserEditFormData;
 use Szurubooru\Helpers\MimeHelper;
 use Szurubooru\Helpers\EnumHelper;
-use Szurubooru\SearchServices\Filters\UserFilter;
+use Szurubooru\Search\Filters\UserFilter;
 use Szurubooru\Services\EmailService;
 use Szurubooru\Services\PasswordService;
 use Szurubooru\Services\TimeService;
diff --git a/tests/Dao/TagDaoFilterTest.php b/tests/Dao/TagDaoFilterTest.php
index ea138953..a1084804 100644
--- a/tests/Dao/TagDaoFilterTest.php
+++ b/tests/Dao/TagDaoFilterTest.php
@@ -2,11 +2,11 @@
 namespace Szurubooru\Tests\Dao;
 use Szurubooru\Dao\TagDao;
 use Szurubooru\Entities\Tag;
-use Szurubooru\SearchServices\Filters\TagFilter;
-use Szurubooru\SearchServices\Requirements\Requirement;
-use Szurubooru\SearchServices\Requirements\RequirementSingleValue;
-use Szurubooru\SearchServices\Requirements\RequirementCompositeValue;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Filters\TagFilter;
+use Szurubooru\Search\Requirements\Requirement;
+use Szurubooru\Search\Requirements\RequirementSingleValue;
+use Szurubooru\Search\Requirements\RequirementCompositeValue;
+use Szurubooru\Search\Result;
 use Szurubooru\Tests\AbstractDatabaseTestCase;
 
 final class TagDaoFilterTest extends AbstractDatabaseTestCase
diff --git a/tests/Dao/UserDaoFilterTest.php b/tests/Dao/UserDaoFilterTest.php
index 9fa4456f..49f2cb8a 100644
--- a/tests/Dao/UserDaoFilterTest.php
+++ b/tests/Dao/UserDaoFilterTest.php
@@ -2,8 +2,8 @@
 namespace Szurubooru\Tests\Dao;
 use Szurubooru\Dao\PublicFileDao;
 use Szurubooru\Dao\UserDao;
-use Szurubooru\SearchServices\Filters\UserFilter;
-use Szurubooru\SearchServices\Result;
+use Szurubooru\Search\Filters\UserFilter;
+use Szurubooru\Search\Result;
 use Szurubooru\Services\ThumbnailService;
 use Szurubooru\Tests\AbstractDatabaseTestCase;
 
diff --git a/tests/SearchServices/UserSearchParserTest.php b/tests/SearchServices/UserSearchParserTest.php
index 10b256f5..bfde61e9 100644
--- a/tests/SearchServices/UserSearchParserTest.php
+++ b/tests/SearchServices/UserSearchParserTest.php
@@ -1,8 +1,8 @@
 <?php
 namespace Szurubooru\Tests\SearchService;
 use \Szurubooru\Helpers\InputReader;
-use \Szurubooru\SearchServices\Filters\UserFilter;
-use \Szurubooru\SearchServices\Parsers\UserSearchParser;
+use \Szurubooru\Search\Filters\UserFilter;
+use \Szurubooru\Search\Parsers\UserSearchParser;
 use \Szurubooru\Tests\AbstractTestCase;
 
 final class UserSearchParserTest extends AbstractTestCase