diff --git a/src/blackcore/context/contextapplicationempty.h b/src/blackcore/context/contextapplicationempty.h
index 929994ce1..599266de1 100644
--- a/src/blackcore/context/contextapplicationempty.h
+++ b/src/blackcore/context/contextapplicationempty.h
@@ -56,7 +56,7 @@ namespace BlackCore
             }
 
             //! \copydoc IContextApplication::getAllLogSubscriptions
-            virtual CLogSubscriptionHash getAllLogSubscriptions() const override
+            virtual BlackCore::Context::CLogSubscriptionHash getAllLogSubscriptions() const override
             {
                 logEmptyContextWarning(Q_FUNC_INFO);
                 return CLogSubscriptionHash();
diff --git a/src/blackcore/context/contextapplicationimpl.h b/src/blackcore/context/contextapplicationimpl.h
index 3f0ee31e9..1b98cdaac 100644
--- a/src/blackcore/context/contextapplicationimpl.h
+++ b/src/blackcore/context/contextapplicationimpl.h
@@ -49,7 +49,7 @@ namespace BlackCore
             virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin) override;
             virtual void addLogSubscription(const BlackMisc::CIdentifier &subscriber, const BlackMisc::CLogPattern &pattern) override;
             virtual void removeLogSubscription(const BlackMisc::CIdentifier &subscriber, const BlackMisc::CLogPattern &pattern) override;
-            virtual CLogSubscriptionHash getAllLogSubscriptions() const override;
+            virtual BlackCore::Context::CLogSubscriptionHash getAllLogSubscriptions() const override;
             virtual void synchronizeLogSubscriptions() override;
             virtual void changeSettings(const BlackMisc::CValueCachePacket &settings, const BlackMisc::CIdentifier &origin) override;
             virtual BlackMisc::CValueCachePacket getAllSettings() const override;
diff --git a/src/blackcore/context/contextapplicationproxy.h b/src/blackcore/context/contextapplicationproxy.h
index 0abee1bdd..e6d543685 100644
--- a/src/blackcore/context/contextapplicationproxy.h
+++ b/src/blackcore/context/contextapplicationproxy.h
@@ -54,7 +54,7 @@ namespace BlackCore
             virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::CIdentifier &origin) override;
             virtual void addLogSubscription(const BlackMisc::CIdentifier &subscriber, const BlackMisc::CLogPattern &pattern) override;
             virtual void removeLogSubscription(const BlackMisc::CIdentifier &subscriber, const BlackMisc::CLogPattern &pattern) override;
-            virtual CLogSubscriptionHash getAllLogSubscriptions() const override;
+            virtual BlackCore::Context::CLogSubscriptionHash getAllLogSubscriptions() const override;
             virtual void synchronizeLogSubscriptions() override;
             virtual void changeSettings(const BlackMisc::CValueCachePacket &settings, const BlackMisc::CIdentifier &origin) override;
             virtual BlackMisc::CValueCachePacket getAllSettings() const override;
diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h
index 84ff31eb8..380789877 100644
--- a/src/blackcore/context/contextsimulator.h
+++ b/src/blackcore/context/contextsimulator.h
@@ -133,7 +133,7 @@ namespace BlackCore
 
             //! Get simulator status as enum
             //! \fixme To be removed with Qt 5.5 when getSimualtorStatus directly provides the enum
-            ISimulator::SimulatorStatus getSimulatorStatusEnum() const;
+            BlackCore::ISimulator::SimulatorStatus getSimulatorStatusEnum() const;
 
             //! Simulator setup
             virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const = 0;