diff --git a/src/presentation/CMakeLists.txt b/src/presentation/CMakeLists.txt
--- a/src/presentation/CMakeLists.txt
+++ b/src/presentation/CMakeLists.txt
@@ -7,14 +7,14 @@
     contextpagemodel.cpp
     errorhandler.cpp
     errorhandlingmodelbase.cpp
+    inboxpagemodel.cpp
     metatypes.cpp
     pagemodel.cpp
     projectpagemodel.cpp
     querytreemodelbase.cpp
     runningtaskmodelinterface.cpp
     runningtaskmodel.cpp
     taskfilterproxymodel.cpp
-    taskinboxpagemodel.cpp
     tasklistmodel.cpp
     taskapplicationmodel.cpp
     workdaypagemodel.cpp
diff --git a/src/presentation/availablepagesmodel.cpp b/src/presentation/availablepagesmodel.cpp
--- a/src/presentation/availablepagesmodel.cpp
+++ b/src/presentation/availablepagesmodel.cpp
@@ -37,25 +37,25 @@
 
 #include "presentation/availablepagessortfilterproxymodel.h"
 #include "presentation/contextpagemodel.h"
+#include "presentation/inboxpagemodel.h"
 #include "presentation/metatypes.h"
 #include "presentation/projectpagemodel.h"
 #include "presentation/querytreemodel.h"
-#include "presentation/taskinboxpagemodel.h"
 #include "presentation/workdaypagemodel.h"
 
 #include "utils/jobhandler.h"
 #include "utils/datetime.h"
 
 using namespace Presentation;
 
 AvailablePagesModel::AvailablePagesModel(const Domain::DataSourceQueries::Ptr &dataSourceQueries,
-                                                 const Domain::ProjectQueries::Ptr &projectQueries,
-                                                 const Domain::ProjectRepository::Ptr &projectRepository,
-                                                 const Domain::ContextQueries::Ptr &contextQueries,
-                                                 const Domain::ContextRepository::Ptr &contextRepository,
-                                                 const Domain::TaskQueries::Ptr &taskQueries,
-                                                 const Domain::TaskRepository::Ptr &taskRepository,
-                                                 QObject *parent)
+                                         const Domain::ProjectQueries::Ptr &projectQueries,
+                                         const Domain::ProjectRepository::Ptr &projectRepository,
+                                         const Domain::ContextQueries::Ptr &contextQueries,
+                                         const Domain::ContextRepository::Ptr &contextRepository,
+                                         const Domain::TaskQueries::Ptr &taskQueries,
+                                         const Domain::TaskRepository::Ptr &taskRepository,
+                                         QObject *parent)
     : QObject(parent),
       m_pageListModel(Q_NULLPTR),
       m_sortProxyModel(Q_NULLPTR),
@@ -87,9 +87,9 @@
     QObjectPtr object = index.data(QueryTreeModelBase::ObjectRole).value<QObjectPtr>();
 
     if (object == m_inboxObject) {
-        auto inboxPageModel = new TaskInboxPageModel(m_taskQueries,
-                                                     m_taskRepository,
-                                                     this);
+        auto inboxPageModel = new InboxPageModel(m_taskQueries,
+                                                 m_taskRepository,
+                                                 this);
         inboxPageModel->setErrorHandler(errorHandler());
         return inboxPageModel;
     } else if (object == m_workdayObject) {
diff --git a/src/presentation/taskinboxpagemodel.h b/src/presentation/inboxpagemodel.h
rename from src/presentation/taskinboxpagemodel.h
rename to src/presentation/inboxpagemodel.h
--- a/src/presentation/taskinboxpagemodel.h
+++ b/src/presentation/inboxpagemodel.h
@@ -22,23 +22,23 @@
 */
 
 
-#ifndef PRESENTATION_TASKINBOXPAGEMODEL_H
-#define PRESENTATION_TASKINBOXPAGEMODEL_H
+#ifndef PRESENTATION_INBOXPAGEMODEL_H
+#define PRESENTATION_INBOXPAGEMODEL_H
 
 #include "presentation/pagemodel.h"
 
 #include "domain/taskqueries.h"
 #include "domain/taskrepository.h"
 
 namespace Presentation {
 
-class TaskInboxPageModel : public PageModel
+class InboxPageModel : public PageModel
 {
     Q_OBJECT
 public:
-    explicit TaskInboxPageModel(const Domain::TaskQueries::Ptr &taskQueries,
-                                const Domain::TaskRepository::Ptr &taskRepository,
-                                QObject *parent = Q_NULLPTR);
+    explicit InboxPageModel(const Domain::TaskQueries::Ptr &taskQueries,
+                            const Domain::TaskRepository::Ptr &taskRepository,
+                            QObject *parent = Q_NULLPTR);
 
     Domain::Task::Ptr addItem(const QString &title, const QModelIndex &parentIndex = QModelIndex()) Q_DECL_OVERRIDE;
     void removeItem(const QModelIndex &index) Q_DECL_OVERRIDE;
@@ -53,4 +53,4 @@
 
 }
 
-#endif // PRESENTATION_TASKINBOXPAGEMODEL_H
+#endif // PRESENTATION_INBOXPAGEMODEL_H
diff --git a/src/presentation/taskinboxpagemodel.cpp b/src/presentation/inboxpagemodel.cpp
rename from src/presentation/taskinboxpagemodel.cpp
rename to src/presentation/inboxpagemodel.cpp
--- a/src/presentation/taskinboxpagemodel.cpp
+++ b/src/presentation/inboxpagemodel.cpp
@@ -22,7 +22,7 @@
 */
 
 
-#include "taskinboxpagemodel.h"
+#include "inboxpagemodel.h"
 
 #include <QMimeData>
 
@@ -32,16 +32,16 @@
 
 using namespace Presentation;
 
-TaskInboxPageModel::TaskInboxPageModel(const Domain::TaskQueries::Ptr &taskQueries,
-                                       const Domain::TaskRepository::Ptr &taskRepository,
-                                       QObject *parent)
+InboxPageModel::InboxPageModel(const Domain::TaskQueries::Ptr &taskQueries,
+                               const Domain::TaskRepository::Ptr &taskRepository,
+                               QObject *parent)
     : PageModel(parent),
       m_taskQueries(taskQueries),
       m_taskRepository(taskRepository)
 {
 }
 
-Domain::Task::Ptr TaskInboxPageModel::addItem(const QString &title, const QModelIndex &parentIndex)
+Domain::Task::Ptr InboxPageModel::addItem(const QString &title, const QModelIndex &parentIndex)
 {
     const auto parentData = parentIndex.data(QueryTreeModelBase::ObjectRole);
     const auto parentTask = parentData.value<Domain::Task::Ptr>();
@@ -55,25 +55,25 @@
     return task;
 }
 
-void TaskInboxPageModel::removeItem(const QModelIndex &index)
+void InboxPageModel::removeItem(const QModelIndex &index)
 {
     QVariant data = index.data(QueryTreeModelBase::ObjectRole);
     auto task = data.value<Domain::Task::Ptr>();
     Q_ASSERT(task);
     const auto job = m_taskRepository->remove(task);
     installHandler(job, i18n("Cannot remove task %1 from Inbox", task->title()));
 }
 
-void TaskInboxPageModel::promoteItem(const QModelIndex &index)
+void InboxPageModel::promoteItem(const QModelIndex &index)
 {
     QVariant data = index.data(QueryTreeModelBase::ObjectRole);
     auto task = data.value<Domain::Task::Ptr>();
     Q_ASSERT(task);
     const auto job = m_taskRepository->promoteToProject(task);
     installHandler(job, i18n("Cannot promote task %1 to be a project", task->title()));
 }
 
-QAbstractItemModel *TaskInboxPageModel::createCentralListModel()
+QAbstractItemModel *InboxPageModel::createCentralListModel()
 {
     using AdditionalInfo = Domain::QueryResult<Domain::DataSource::Ptr>::Ptr;
 
diff --git a/tests/units/presentation/CMakeLists.txt b/tests/units/presentation/CMakeLists.txt
--- a/tests/units/presentation/CMakeLists.txt
+++ b/tests/units/presentation/CMakeLists.txt
@@ -6,14 +6,14 @@
   availablesourcesmodeltest
   errorhandlertest
   errorhandlingmodelbasetest
+  inboxpagemodeltest
   metatypestest
   pagemodeltest
   projectpagemodeltest
   querytreemodeltest
   runningtaskmodeltest
   taskapplicationmodeltest
   taskfilterproxymodeltest
-  taskinboxpagemodeltest
   tasklistmodeltest
   contextpagemodeltest
   workdaypagemodeltest
diff --git a/tests/units/presentation/availablepagesmodeltest.cpp b/tests/units/presentation/availablepagesmodeltest.cpp
--- a/tests/units/presentation/availablepagesmodeltest.cpp
+++ b/tests/units/presentation/availablepagesmodeltest.cpp
@@ -35,9 +35,9 @@
 #include "presentation/availablepagesmodel.h"
 #include "presentation/contextpagemodel.h"
 #include "presentation/errorhandler.h"
+#include "presentation/inboxpagemodel.h"
 #include "presentation/projectpagemodel.h"
 #include "presentation/querytreemodelbase.h"
-#include "presentation/taskinboxpagemodel.h"
 #include "presentation/workdaypagemodel.h"
 
 #include "testlib/fakejob.h"
@@ -386,7 +386,7 @@
         const QModelIndex inboxIndex = model->index(0, 0);
 
         QObject *inboxPage = pages.createPageForIndex(inboxIndex);
-        QVERIFY(qobject_cast<Presentation::TaskInboxPageModel*>(inboxPage));
+        QVERIFY(qobject_cast<Presentation::InboxPageModel*>(inboxPage));
     }
 
     void shouldCreateWorkdayPage()
diff --git a/tests/units/presentation/taskinboxpagemodeltest.cpp b/tests/units/presentation/inboxpagemodeltest.cpp
rename from tests/units/presentation/taskinboxpagemodeltest.cpp
rename to tests/units/presentation/inboxpagemodeltest.cpp
--- a/tests/units/presentation/taskinboxpagemodeltest.cpp
+++ b/tests/units/presentation/inboxpagemodeltest.cpp
@@ -32,7 +32,7 @@
 #include "domain/taskqueries.h"
 #include "domain/taskrepository.h"
 
-#include "presentation/taskinboxpagemodel.h"
+#include "presentation/inboxpagemodel.h"
 #include "presentation/errorhandler.h"
 
 #include "testlib/fakejob.h"
@@ -51,7 +51,7 @@
     QString m_message;
 };
 
-class TaskInboxPageModelTest : public QObject
+class InboxPageModelTest : public QObject
 {
     Q_OBJECT
 private slots:
@@ -82,7 +82,7 @@
 
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         // WHEN
@@ -181,7 +181,7 @@
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
         taskRepositoryMock(&Domain::TaskRepository::create).when(any<Domain::Task::Ptr>()).thenReturn(new FakeJob(this));
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         // WHEN
@@ -217,7 +217,7 @@
                                                                       any<Domain::Task::Ptr>())
                                                                 .thenReturn(new FakeJob(this));
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         // WHEN
@@ -246,7 +246,7 @@
         job->setExpectedError(KJob::KilledJobError, QStringLiteral("Foo"));
         taskRepositoryMock(&Domain::TaskRepository::create).when(any<Domain::Task::Ptr>()).thenReturn(job);
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         FakeErrorHandler errorHandler;
@@ -281,7 +281,7 @@
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
         taskRepositoryMock(&Domain::TaskRepository::remove).when(task2).thenReturn(new FakeJob(this));
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         // WHEN
@@ -316,7 +316,7 @@
         job->setExpectedError(KJob::KilledJobError, QStringLiteral("Foo"));
         taskRepositoryMock(&Domain::TaskRepository::remove).when(task2).thenReturn(job);
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
         FakeErrorHandler errorHandler;
         inbox.setErrorHandler(&errorHandler);
@@ -351,7 +351,7 @@
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
         taskRepositoryMock(&Domain::TaskRepository::promoteToProject).when(task2).thenReturn(new FakeJob(this));
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         // WHEN
@@ -386,7 +386,7 @@
         job->setExpectedError(KJob::KilledJobError, QStringLiteral("Foo"));
         taskRepositoryMock(&Domain::TaskRepository::promoteToProject).when(task2).thenReturn(job);
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
         FakeErrorHandler errorHandler;
         inbox.setErrorHandler(&errorHandler);
@@ -419,7 +419,7 @@
         taskQueriesMock(&Domain::TaskQueries::findDataSource).when(any<Domain::Task::Ptr>()).thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         QAbstractItemModel *model = inbox.centralListModel();
@@ -458,7 +458,7 @@
         taskQueriesMock(&Domain::TaskQueries::findDataSource).when(any<Domain::Task::Ptr>()).thenReturn(Domain::QueryResult<Domain::DataSource::Ptr>::Ptr());
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         QAbstractItemModel *model = inbox.centralListModel();
@@ -517,7 +517,7 @@
 
         Utils::MockObject<Domain::TaskRepository> taskRepositoryMock;
 
-        Presentation::TaskInboxPageModel inbox(taskQueriesMock.getInstance(),
+        Presentation::InboxPageModel inbox(taskQueriesMock.getInstance(),
                                                taskRepositoryMock.getInstance());
 
         QAbstractItemModel *model = inbox.centralListModel();
@@ -545,6 +545,6 @@
     }
 };
 
-ZANSHIN_TEST_MAIN(TaskInboxPageModelTest)
+ZANSHIN_TEST_MAIN(InboxPageModelTest)
 
-#include "taskinboxpagemodeltest.moc"
+#include "inboxpagemodeltest.moc"