1 files changed, 13 insertions, 13 deletions

diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
index b79c5185..cdef9ed8 100644
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -27,10 +27,10 @@ use Kanboard\Filter\TaskStatusFilter;
 use Kanboard\Filter\TaskSubtaskAssigneeFilter;
 use Kanboard\Filter\TaskSwimlaneFilter;
 use Kanboard\Filter\TaskTitleFilter;
-use Kanboard\Model\Project;
-use Kanboard\Model\ProjectGroupRole;
-use Kanboard\Model\ProjectUserRole;
-use Kanboard\Model\User;
+use Kanboard\Model\ProjectModel;
+use Kanboard\Model\ProjectGroupRoleModel;
+use Kanboard\Model\ProjectUserRoleModel;
+use Kanboard\Model\UserModel;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 
@@ -61,7 +61,7 @@ class FilterProvider implements ServiceProviderInterface
     {
         $container['userQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(User::TABLE));
+            $builder->withQuery($c['db']->table(UserModel::TABLE));
             return $builder;
         });
 
@@ -72,26 +72,26 @@ class FilterProvider implements ServiceProviderInterface
     {
         $container['projectGroupRoleQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(ProjectGroupRole::TABLE));
+            $builder->withQuery($c['db']->table(ProjectGroupRoleModel::TABLE));
             return $builder;
         });
 
         $container['projectUserRoleQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(ProjectUserRole::TABLE));
+            $builder->withQuery($c['db']->table(ProjectUserRoleModel::TABLE));
             return $builder;
         });
 
         $container['projectQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['db']->table(Project::TABLE));
+            $builder->withQuery($c['db']->table(ProjectModel::TABLE));
             return $builder;
         });
 
         $container['projectActivityLexer'] = $container->factory(function ($c) {
             $builder = new LexerBuilder();
             $builder
-                ->withQuery($c['projectActivity']->getQuery())
+                ->withQuery($c['projectActivityModel']->getQuery())
                 ->withFilter(new ProjectActivityTaskTitleFilter(), true)
                 ->withFilter(new ProjectActivityTaskStatusFilter())
                 ->withFilter(new ProjectActivityProjectNameFilter())
@@ -108,7 +108,7 @@ class FilterProvider implements ServiceProviderInterface
 
         $container['projectActivityQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['projectActivity']->getQuery());
+            $builder->withQuery($c['projectActivityModel']->getQuery());
 
             return $builder;
         });
@@ -120,7 +120,7 @@ class FilterProvider implements ServiceProviderInterface
     {
         $container['taskQuery'] = $container->factory(function ($c) {
             $builder = new QueryBuilder();
-            $builder->withQuery($c['taskFinder']->getExtendedQuery());
+            $builder->withQuery($c['taskFinderModel']->getExtendedQuery());
             return $builder;
         });
 
@@ -128,13 +128,13 @@ class FilterProvider implements ServiceProviderInterface
             $builder = new LexerBuilder();
 
             $builder
-                ->withQuery($c['taskFinder']->getExtendedQuery())
+                ->withQuery($c['taskFinderModel']->getExtendedQuery())
                 ->withFilter(TaskAssigneeFilter::getInstance()
                     ->setCurrentUserId($c['userSession']->getId())
                 )
                 ->withFilter(new TaskCategoryFilter())
                 ->withFilter(TaskColorFilter::getInstance()
-                    ->setColorModel($c['color'])
+                    ->setColorModel($c['colorModel'])
                 )
                 ->withFilter(new TaskColumnFilter())
                 ->withFilter(new TaskCommentFilter())