--- a/OrthancStone/Sources/Loaders/LoaderStateMachine.h	Tue Nov 10 16:41:11 2020 +0100
+++ b/OrthancStone/Sources/Loaders/LoaderStateMachine.h	Tue Nov 10 16:55:22 2020 +0100
@@ -50,7 +50,7 @@
      an answer is received. 
   */
 
-  class LoaderStateMachine : public OrthancStone::ObserverBase<LoaderStateMachine>
+  class LoaderStateMachine : public ObserverBase<LoaderStateMachine>
   {
   public:
     class State : public Orthanc::IDynamicObject
@@ -69,7 +69,7 @@
       {
       }
 
-      void Schedule(OrthancStone::OracleCommandBase* command) const
+      void Schedule(OracleCommandBase* command) const
       {
         that_.Schedule(command);
       }
@@ -80,14 +80,14 @@
         return dynamic_cast<T&>(that_);
       }
       
-      virtual void Handle(const OrthancStone::OrthancRestApiCommand::SuccessMessage& message);
+      virtual void Handle(const OrthancRestApiCommand::SuccessMessage& message);
       
-      virtual void Handle(const OrthancStone::GetOrthancImageCommand::SuccessMessage& message);
+      virtual void Handle(const GetOrthancImageCommand::SuccessMessage& message);
       
-      virtual void Handle(const OrthancStone::GetOrthancWebViewerJpegCommand::SuccessMessage& message);
+      virtual void Handle(const GetOrthancWebViewerJpegCommand::SuccessMessage& message);
     };
 
-    void Schedule(OrthancStone::OracleCommandBase* command);
+    void Schedule(OracleCommandBase* command);
 
     void Start();
 
@@ -96,14 +96,14 @@
 
     void Clear();
 
-    void HandleExceptionMessage(const OrthancStone::OracleCommandExceptionMessage& message);
+    void HandleExceptionMessage(const OracleCommandExceptionMessage& message);
 
     template <typename T>
     void HandleSuccessMessage(const T& message);
 
-    typedef std::list<OrthancStone::IOracleCommand*>  PendingCommands;
+    typedef std::list<IOracleCommand*>  PendingCommands;
 
-    OrthancStone::ILoadersContext&  loadersContext_;
+    ILoadersContext&  loadersContext_;
     bool                            active_;
     unsigned int                    simultaneousDownloads_;
     PendingCommands                 pendingCommands_;
@@ -111,7 +111,7 @@
 
 
   public:
-    explicit LoaderStateMachine(OrthancStone::ILoadersContext& loadersContext);
+    explicit LoaderStateMachine(ILoadersContext& loadersContext);
 
     void PostConstructor();