Shorten names of classes in Logic namespace

The Logic prefix of the old class names is now redundant, remove it.

Change-Id: Ic68ae529e83bd0e571e333a66dfec8339cda3c14
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

14 files changed, 116 insertions, 116 deletions

diff --git a/src/logic/logiccallbackjob.cpp b/src/logic/callbackjob.cpp
index 5dcd64c31..77e23b3a0 100644
--- a/src/logic/logiccallbackjob.cpp
+++ b/src/logic/callbackjob.cpp
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#include "logiccallbackjob_p.h"
-#include "logicmanager_p.h"
+#include "callbackjob_p.h"
+#include "manager_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DLogic {
 namespace Logic {
 
-LogicCallbackJob::LogicCallbackJob()
+CallbackJob::CallbackJob()
     : QAspectJob()
     , m_logicManager(Q_NULLPTR)
 {
 }
 
-void LogicCallbackJob::setLogicManager(LogicManager *manager)
+void CallbackJob::setManager(Manager *manager)
 {
     m_logicManager = manager;
 }
 
-void LogicCallbackJob::run()
+void CallbackJob::run()
 {
     Q_ASSERT(m_logicManager);
     m_logicManager->triggerLogicFrameUpdates();
diff --git a/src/logic/logiccallbackjob_p.h b/src/logic/callbackjob_p.h
index 63c6390a7..3b128ba6b 100644
--- a/src/logic/logiccallbackjob_p.h
+++ b/src/logic/callbackjob_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_LOGICCALLBACKJOB_P_H
-#define QT3DLOGIC_LOGIC_LOGICCALLBACKJOB_P_H
+#ifndef QT3DLOGIC_LOGIC_CALLBACKJOB_P_H
+#define QT3DLOGIC_LOGIC_CALLBACKJOB_P_H
 
 #include <Qt3DCore/qaspectjob.h>
 
@@ -44,18 +44,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class LogicManager;
+class Manager;
 
-class LogicCallbackJob : public Qt3D::QAspectJob
+class CallbackJob : public Qt3D::QAspectJob
 {
 public:
-    LogicCallbackJob();
-    void setLogicManager(LogicManager *manager);
+    CallbackJob();
+    void setManager(Manager *manager);
 
     void run() Q_DECL_OVERRIDE;
 
 private:
-    LogicManager *m_logicManager;
+    Manager *m_logicManager;
 };
 
 } // namespace Logic
@@ -63,4 +63,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_LOGICCALLBACKJOB_P_H
+#endif // QT3DLOGIC_LOGIC_CALLBACKJOB_P_H
diff --git a/src/logic/logicexecutor.cpp b/src/logic/executor.cpp
index f134ff512..a14e8d201 100644
--- a/src/logic/logicexecutor.cpp
+++ b/src/logic/executor.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "logicexecutor_p.h"
+#include "executor_p.h"
 #include <Qt3DLogic/qlogiccomponent.h>
 #include <Qt3DCore/qnode.h>
 #include <Qt3DCore/private/qscene_p.h>
@@ -47,13 +47,13 @@ using namespace Qt3D;
 namespace Qt3DLogic {
 namespace Logic {
 
-LogicExecutor::LogicExecutor(QObject *parent)
+Executor::Executor(QObject *parent)
     : QObject(parent)
     , m_scene(Q_NULLPTR)
 {
 }
 
-void LogicExecutor::clearQueueAndProceed()
+void Executor::clearQueueAndProceed()
 {
     // Clear the queue of nodes to process frame updates for (throw the work away).
     // If the semaphore is acquired, release it to allow the logic job and hence the
@@ -63,12 +63,12 @@ void LogicExecutor::clearQueueAndProceed()
         m_semaphore->release();
 }
 
-void LogicExecutor::enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds)
+void Executor::enqueueLogicFrameUpdates(const QVector<Qt3D::QNodeId> &nodeIds)
 {
     m_nodeIds = nodeIds;
 }
 
-bool LogicExecutor::event(QEvent *e)
+bool Executor::event(QEvent *e)
 {
     if (e->type() == QEvent::User) {
         processLogicFrameUpdates();
@@ -83,7 +83,7 @@ bool LogicExecutor::event(QEvent *e)
 
    Called from context of main thread
 */
-void LogicExecutor::processLogicFrameUpdates()
+void Executor::processLogicFrameUpdates()
 {
     Q_ASSERT(m_scene);
     Q_ASSERT(m_semaphore);
@@ -94,7 +94,7 @@ void LogicExecutor::processLogicFrameUpdates()
             logicComponent->onFrameUpdate();
     }
 
-    // Release the semaphore so the calling LogicManager can continue
+    // Release the semaphore so the calling Manager can continue
     m_semaphore->release();
 }
 
diff --git a/src/logic/logicexecutor_p.h b/src/logic/executor_p.h
index 7dc61ad5e..d952c1a49 100644
--- a/src/logic/logicexecutor_p.h
+++ b/src/logic/executor_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_LOGICEXECUTOR_P_H
-#define QT3DLOGIC_LOGIC_LOGICEXECUTOR_P_H
+#ifndef QT3DLOGIC_LOGIC_EXECUTOR_P_H
+#define QT3DLOGIC_LOGIC_EXECUTOR_P_H
 
 #include <QtCore/qobject.h>
 #include <QtCore/qcoreevent.h>
@@ -60,11 +60,11 @@ public:
     {}
 };
 
-class LogicExecutor : public QObject
+class Executor : public QObject
 {
     Q_OBJECT
 public:
-    explicit LogicExecutor(QObject *parent = 0);
+    explicit Executor(QObject *parent = 0);
 
     void setScene(Qt3D::QScene *scene) { m_scene = scene; }
     void setSemephore(QSemaphore *semaphore) { m_semaphore = semaphore; }
@@ -88,4 +88,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_LOGICEXECUTOR_P_H
+#endif // QT3DLOGIC_LOGIC_EXECUTOR_P_H
diff --git a/src/logic/handle_types_p.h b/src/logic/handle_types_p.h
index 309864589..dafd154c3 100644
--- a/src/logic/handle_types_p.h
+++ b/src/logic/handle_types_p.h
@@ -44,8 +44,8 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class LogicHandler;
-typedef Qt3D::QHandle<LogicHandler, 16> HLogicHandler;
+class Handler;
+typedef Qt3D::QHandle<Handler, 16> HHandler;
 
 } // namespace Logic
 } // namespace Qt3D
diff --git a/src/logic/logichandler.cpp b/src/logic/handler.cpp
index b01345dbc..d5a94b0e8 100644
--- a/src/logic/logichandler.cpp
+++ b/src/logic/handler.cpp
@@ -34,9 +34,9 @@
 **
 ****************************************************************************/
 
-#include "logichandler_p.h"
-#include "logicmanager_p.h"
-#include "logicmanagers_p.h"
+#include "handler_p.h"
+#include "manager_p.h"
+#include "managers_p.h"
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
@@ -44,44 +44,44 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-LogicHandler::LogicHandler()
+Handler::Handler()
     : m_logicManager(Q_NULLPTR)
 {
 }
 
-void LogicHandler::updateFromPeer(Qt3D::QNode *peer)
+void Handler::updateFromPeer(Qt3D::QNode *peer)
 {
     Q_UNUSED(peer);
 }
 
-void LogicHandler::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Handler::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     Q_UNUSED(e);
 }
 
-LogicHandlerFunctor::LogicHandlerFunctor(LogicManager *manager)
+HandlerFunctor::HandlerFunctor(Manager *manager)
     : m_manager(manager)
 {
 }
 
-Qt3D::QBackendNode *LogicHandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3D::QBackendNode *HandlerFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
-    LogicHandler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id());
+    Handler *handler = m_manager->logicHandlerManager()->getOrCreateResource(frontend->id());
     handler->setFactory(factory);
-    handler->setLogicManager(m_manager);
+    handler->setManager(m_manager);
     handler->setPeer(frontend);
-    m_manager->appendLogicHandler(handler);
+    m_manager->appendHandler(handler);
     return handler;
 }
 
-Qt3D::QBackendNode *LogicHandlerFunctor::get(const Qt3D::QNodeId &id) const
+Qt3D::QBackendNode *HandlerFunctor::get(const Qt3D::QNodeId &id) const
 {
     return m_manager->logicHandlerManager()->lookupResource(id);
 }
 
-void LogicHandlerFunctor::destroy(const Qt3D::QNodeId &id) const
+void HandlerFunctor::destroy(const Qt3D::QNodeId &id) const
 {
-    m_manager->removeLogicHandler(id);
+    m_manager->removeHandler(id);
 }
 
 } // namespace Logic
diff --git a/src/logic/logichandler_p.h b/src/logic/handler_p.h
index 9f8b9ff60..17e0faf73 100644
--- a/src/logic/logichandler_p.h
+++ b/src/logic/handler_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_LOGICHANDLER_H
-#define QT3DLOGIC_LOGIC_LOGICHANDLER_H
+#ifndef QT3DLOGIC_LOGIC_HANDLER_H
+#define QT3DLOGIC_LOGIC_HANDLER_H
 
 #include <Qt3DCore/qbackendnode.h>
 #include <Qt3DCore/qnodeid.h>
@@ -46,37 +46,37 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class LogicManager;
+class Manager;
 
-class LogicHandler : public Qt3D::QBackendNode
+class Handler : public Qt3D::QBackendNode
 {
 public:
-    LogicHandler();
+    Handler();
 
     void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
-    void setLogicManager(LogicManager *manager) { m_logicManager = manager; }
-    LogicManager *logicManager() const { return m_logicManager; }
+    void setManager(Manager *manager) { m_logicManager = manager; }
+    Manager *logicManager() const { return m_logicManager; }
 
 protected:
     void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    LogicManager *m_logicManager;
+    Manager *m_logicManager;
 };
 
 
-class LogicHandlerFunctor : public Qt3D::QBackendNodeFunctor
+class HandlerFunctor : public Qt3D::QBackendNodeFunctor
 {
 public:
-    explicit LogicHandlerFunctor(LogicManager *handler);
+    explicit HandlerFunctor(Manager *handler);
 
     Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_OVERRIDE;
     Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
     void destroy(const Qt3D::QNodeId &id) const Q_DECL_OVERRIDE;
 
 private:
-    LogicManager *m_manager;
+    Manager *m_manager;
 };
 
 } // namespace Logic
@@ -84,4 +84,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_LOGICHANDLER_H
+#endif // QT3DLOGIC_LOGIC_HANDLER_H
diff --git a/src/logic/logic.pri b/src/logic/logic.pri
index 3d2e4aeeb..b8291f075 100644
--- a/src/logic/logic.pri
+++ b/src/logic/logic.pri
@@ -6,17 +6,17 @@ HEADERS += \
     $$PWD/qlogicaspect_p.h \
     $$PWD/qlogiccomponent.h \
     $$PWD/handle_types_p.h \
-    $$PWD/logicmanagers_p.h \
-    $$PWD/logichandler_p.h \
-    $$PWD/logicmanager_p.h \
     $$PWD/qlogiccomponent_p.h \
-    $$PWD/logiccallbackjob_p.h \
-    $$PWD/logicexecutor_p.h
+    $$PWD/callbackjob_p.h \
+    $$PWD/executor_p.h \
+    $$PWD/handler_p.h \
+    $$PWD/manager_p.h \
+    $$PWD/managers_p.h
 
 SOURCES += \
     $$PWD/qlogicaspect.cpp \
     $$PWD/qlogiccomponent.cpp \
-    $$PWD/logichandler.cpp \
-    $$PWD/logicmanager.cpp \
-    $$PWD/logiccallbackjob.cpp \
-    $$PWD/logicexecutor.cpp
+    $$PWD/manager.cpp \
+    $$PWD/handler.cpp \
+    $$PWD/executor.cpp \
+    $$PWD/callbackjob.cpp
diff --git a/src/logic/logicmanager.cpp b/src/logic/manager.cpp
index 67ef7be21..7802fc0de 100644
--- a/src/logic/logicmanager.cpp
+++ b/src/logic/manager.cpp
@@ -34,10 +34,10 @@
 **
 ****************************************************************************/
 
-#include "logicmanager_p.h"
+#include "manager_p.h"
 #include "qlogicaspect.h"
-#include <Qt3DLogic/private/logicexecutor_p.h>
-#include <Qt3DLogic/private/logicmanagers_p.h>
+#include <Qt3DLogic/private/executor_p.h>
+#include <Qt3DLogic/private/managers_p.h>
 #include <QtCore/qcoreapplication.h>
 
 #include <QDebug>
@@ -48,40 +48,40 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-LogicManager::LogicManager()
-    : m_logicHandlerManager(new LogicHandlerManager)
+Manager::Manager()
+    : m_logicHandlerManager(new HandlerManager)
     , m_semaphore(1)
 {
     m_semaphore.acquire();
 }
 
-LogicManager::~LogicManager()
+Manager::~Manager()
 {
 }
 
-void LogicManager::setExecutor(LogicExecutor *executor)
+void Manager::setExecutor(Executor *executor)
 {
     m_executor = executor;
     if (m_executor)
         m_executor->setSemephore(&m_semaphore);
 }
 
-void LogicManager::appendLogicHandler(LogicHandler *handler)
+void Manager::appendHandler(Handler *handler)
 {
-    HLogicHandler handle = m_logicHandlerManager->lookupHandle(handler->peerUuid());
+    HHandler handle = m_logicHandlerManager->lookupHandle(handler->peerUuid());
     m_logicHandlers.append(handle);
     m_logicComponentIds.append(handler->peerUuid());
 }
 
-void LogicManager::removeLogicHandler(const Qt3D::QNodeId &id)
+void Manager::removeHandler(const Qt3D::QNodeId &id)
 {
-    HLogicHandler handle = m_logicHandlerManager->lookupHandle(id);
+    HHandler handle = m_logicHandlerManager->lookupHandle(id);
     m_logicComponentIds.removeAll(id);
     m_logicHandlers.removeAll(handle);
     m_logicHandlerManager->releaseResource(id);
 }
 
-void LogicManager::triggerLogicFrameUpdates()
+void Manager::triggerLogicFrameUpdates()
 {
     Q_ASSERT(m_executor);
 
@@ -91,7 +91,7 @@ void LogicManager::triggerLogicFrameUpdates()
         return;
 
     // Trigger the main thread to process logic frame updates for each
-    // logic component and then wait until done. The LogicExecutor will
+    // logic component and then wait until done. The Executor will
     // release the semaphore when it has completed its work.
     m_executor->enqueueLogicFrameUpdates(m_logicComponentIds);
     qApp->postEvent(m_executor, new FrameUpdateEvent);
diff --git a/src/logic/logicmanager_p.h b/src/logic/manager_p.h
index ae7ce8f87..7402e0e75 100644
--- a/src/logic/logicmanager_p.h
+++ b/src/logic/manager_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_LOGICMANAGER_H
-#define QT3DLOGIC_LOGIC_LOGICMANAGER_H
+#ifndef QT3DLOGIC_LOGIC_MANAGER_H
+#define QT3DLOGIC_LOGIC_MANAGER_H
 
 #include <Qt3DLogic/qt3dlogic_global.h>
 #include <Qt3DLogic/private/handle_types_p.h>
@@ -52,31 +52,31 @@ class QLogicAspect;
 
 namespace Logic {
 
-class LogicExecutor;
-class LogicHandlerManager;
+class Executor;
+class HandlerManager;
 
-class LogicManager
+class Manager
 {
 public:
-    LogicManager();
-    ~LogicManager();
+    Manager();
+    ~Manager();
 
     void setLogicAspect(QLogicAspect *logicAspect) { m_logicAspect = logicAspect; }
-    void setExecutor(LogicExecutor *executor);
+    void setExecutor(Executor *executor);
 
-    LogicHandlerManager *logicHandlerManager() const { return m_logicHandlerManager.data(); }
+    HandlerManager *logicHandlerManager() const { return m_logicHandlerManager.data(); }
 
-    void appendLogicHandler(LogicHandler *handler);
-    void removeLogicHandler(const Qt3D::QNodeId &id);
+    void appendHandler(Handler *handler);
+    void removeHandler(const Qt3D::QNodeId &id);
 
     void triggerLogicFrameUpdates();
 
 private:
-    QScopedPointer<LogicHandlerManager> m_logicHandlerManager;
-    QVector<HLogicHandler> m_logicHandlers;
+    QScopedPointer<HandlerManager> m_logicHandlerManager;
+    QVector<HHandler> m_logicHandlers;
     QVector<Qt3D::QNodeId> m_logicComponentIds;
     QLogicAspect *m_logicAspect;
-    LogicExecutor *m_executor;
+    Executor *m_executor;
     QSemaphore m_semaphore;
 };
 
@@ -85,4 +85,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_LOGICMANAGER_H
+#endif // QT3DLOGIC_LOGIC_MANAGER_H
diff --git a/src/logic/logicmanagers_p.h b/src/logic/managers_p.h
index 5cebe9055..a8b0298c2 100644
--- a/src/logic/logicmanagers_p.h
+++ b/src/logic/managers_p.h
@@ -34,12 +34,12 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_LOGICMANAGERS_P_H
-#define QT3DLOGIC_LOGIC_LOGICMANAGERS_P_H
+#ifndef QT3DLOGIC_LOGIC_MANAGERS_P_H
+#define QT3DLOGIC_LOGIC_MANAGERS_P_H
 
 #include <QtGlobal>
 #include <Qt3DLogic/private/handle_types_p.h>
-#include <Qt3DLogic/private/logichandler_p.h>
+#include <Qt3DLogic/private/handler_p.h>
 #include <Qt3DCore/private/qresourcemanager_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -47,14 +47,14 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 namespace Logic {
 
-class LogicHandlerManager : public Qt3D::QResourceManager<
-        LogicHandler,
+class HandlerManager : public Qt3D::QResourceManager<
+        Handler,
         Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy>
 {
 public:
-    LogicHandlerManager() {}
+    HandlerManager() {}
 };
 
 } // namespace Logic
@@ -62,5 +62,5 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_LOGICMANAGERS_P_H
+#endif // QT3DLOGIC_LOGIC_MANAGERS_P_H
 
diff --git a/src/logic/qlogicaspect.cpp b/src/logic/qlogicaspect.cpp
index 2c2341685..be94a3ac0 100644
--- a/src/logic/qlogicaspect.cpp
+++ b/src/logic/qlogicaspect.cpp
@@ -36,9 +36,9 @@
 
 #include "qlogicaspect.h"
 #include "qlogicaspect_p.h"
-#include "logicexecutor_p.h"
-#include "logichandler_p.h"
-#include "logicmanager_p.h"
+#include "executor_p.h"
+#include "handler_p.h"
+#include "manager_p.h"
 #include "qlogiccomponent.h"
 
 #include <Qt3DCore/qnodevisitor.h>
@@ -68,12 +68,12 @@ QLogicAspectPrivate::QLogicAspectPrivate()
     : QAbstractAspectPrivate()
     , m_time(0)
     , m_initialized(false)
-    , m_manager(new Logic::LogicManager)
-    , m_executor(new Logic::LogicExecutor)
-    , m_callbackJob(new Logic::LogicCallbackJob)
+    , m_manager(new Logic::Manager)
+    , m_executor(new Logic::Executor)
+    , m_callbackJob(new Logic::CallbackJob)
 {
     m_aspectType = QAbstractAspect::AspectOther;
-    m_callbackJob->setLogicManager(m_manager.data());
+    m_callbackJob->setManager(m_manager.data());
     m_manager->setExecutor(m_executor.data());
 }
 
@@ -94,7 +94,7 @@ QLogicAspect::QLogicAspect(QLogicAspectPrivate &dd, QObject *parent)
 
 void QLogicAspect::registerBackendTypes()
 {
-    registerBackendType<QLogicComponent>(QBackendNodeFunctorPtr(new Logic::LogicHandlerFunctor(d_func()->m_manager.data())));
+    registerBackendType<QLogicComponent>(QBackendNodeFunctorPtr(new Logic::HandlerFunctor(d_func()->m_manager.data())));
 }
 
 QVector<QAspectJobPtr> QLogicAspect::jobsToExecute(qint64 time)
diff --git a/src/logic/qlogicaspect_p.h b/src/logic/qlogicaspect_p.h
index 37246119f..da8bdaf6d 100644
--- a/src/logic/qlogicaspect_p.h
+++ b/src/logic/qlogicaspect_p.h
@@ -34,11 +34,11 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DLOGIC_LOGIC_QLOGICASPECT_P_H
-#define QT3DLOGIC_LOGIC_QLOGICASPECT_P_H
+#ifndef QT3DLOGIC_QLOGICASPECT_P_H
+#define QT3DLOGIC_QLOGICASPECT_P_H
 
 #include <Qt3DCore/private/qabstractaspect_p.h>
-#include <Qt3DLogic/private/logiccallbackjob_p.h>
+#include <Qt3DLogic/private/callbackjob_p.h>
 #include <QtCore/qsharedpointer.h>
 
 QT_BEGIN_NAMESPACE
@@ -46,8 +46,8 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DLogic {
 
 namespace Logic {
-class LogicExecutor;
-class LogicManager;
+class Executor;
+class Manager;
 }
 
 class QLogicAspectPrivate : public Qt3D::QAbstractAspectPrivate
@@ -58,14 +58,14 @@ class QLogicAspectPrivate : public Qt3D::QAbstractAspectPrivate
 
     qint64 m_time;
     bool m_initialized;
-    QScopedPointer<Logic::LogicManager> m_manager;
-    QScopedPointer<Logic::LogicExecutor> m_executor;
-    QSharedPointer<Logic::LogicCallbackJob> m_callbackJob;
+    QScopedPointer<Logic::Manager> m_manager;
+    QScopedPointer<Logic::Executor> m_executor;
+    QSharedPointer<Logic::CallbackJob> m_callbackJob;
 };
 
 } // namespace Qt3DLogic
 
 QT_END_NAMESPACE
 
-#endif // QT3DLOGIC_LOGIC_QLOGICASPECT_P_H
+#endif // QT3DLOGIC_QLOGICASPECT_P_H
 
diff --git a/src/logic/qlogiccomponent.h b/src/logic/qlogiccomponent.h
index 233b50472..9497d4921 100644
--- a/src/logic/qlogiccomponent.h
+++ b/src/logic/qlogiccomponent.h
@@ -48,7 +48,7 @@ class QLogicAspect;
 class QLogicComponentPrivate;
 
 namespace Logic {
-class LogicExecutor;
+class Executor;
 }
 
 class QT3DLOGICSHARED_EXPORT QLogicComponent : public Qt3D::QComponent
@@ -71,7 +71,7 @@ private:
 
     virtual void onFrameUpdate();
 
-    friend class Logic::LogicExecutor;
+    friend class Logic::Executor;
 };
 
 } // namespace Qt3DLogic