diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp
index 1f8823bff..4c4f53fca 100644
--- a/src/blackmisc/simulation/aircraftmodelloader.cpp
+++ b/src/blackmisc/simulation/aircraftmodelloader.cpp
@@ -34,8 +34,8 @@ namespace BlackMisc
             m_caches.setCurrentSimulator(simulator);
 
             // first connect is an internal connection to log info about load status
-            connect(this, &IAircraftModelLoader::loadingFinished, this, &IAircraftModelLoader::ps_loadFinished);
-            connect(&m_caches, &IMultiSimulatorModelCaches::cacheChanged, this, &IAircraftModelLoader::ps_cacheChanged);
+            connect(this, &IAircraftModelLoader::loadingFinished, this, &IAircraftModelLoader::loadFinished);
+            connect(&m_caches, &IMultiSimulatorModelCaches::cacheChanged, this, &IAircraftModelLoader::cacheChanged);
         }
 
         QString IAircraftModelLoader::enumToString(IAircraftModelLoader::LoadFinishedInfo info)
@@ -109,7 +109,7 @@ namespace BlackMisc
             }
         }
 
-        void IAircraftModelLoader::ps_loadFinished(const CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, LoadFinishedInfo info)
+        void IAircraftModelLoader::loadFinished(const CStatusMessage &status, const BlackMisc::Simulation::CSimulatorInfo &simulator, LoadFinishedInfo info)
         {
             Q_UNUSED(info);
 
@@ -127,7 +127,7 @@ namespace BlackMisc
             }
         }
 
-        void IAircraftModelLoader::ps_cacheChanged(const CSimulatorInfo &simInfo)
+        void IAircraftModelLoader::cacheChanged(const CSimulatorInfo &simInfo)
         {
             static const CStatusMessage status(this, CStatusMessage::SeverityInfo, "Cached changed");
             emit this->loadingFinished(status, simInfo, CacheLoaded);
diff --git a/src/blackmisc/simulation/aircraftmodelloader.h b/src/blackmisc/simulation/aircraftmodelloader.h
index 1f5f21e84..9ac45fd29 100644
--- a/src/blackmisc/simulation/aircraftmodelloader.h
+++ b/src/blackmisc/simulation/aircraftmodelloader.h
@@ -94,7 +94,7 @@ namespace BlackMisc
 
             //! Start the loading process from disk.
             //! Optional DB models can be passed and used for data consolidation.
-            void startLoading(LoadMode mode = InBackgroundWithCache, const ModelConsolidation &modelConsolidation = {}, const QString &directory = {});
+            void startLoading(LoadMode mode = InBackgroundWithCache, const ModelConsolidation &modelConsolidation = {}, const QStringList &modelDirectories = {});
 
             //! Loading finished?
             virtual bool isLoadingFinished() const = 0;
@@ -190,7 +190,13 @@ namespace BlackMisc
             BlackMisc::CStatusMessage clearCache();
 
             //! Start the loading process from disk
-            virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QString &directory) = 0;
+            virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidation &modelConsolidation, const QStringList &modelDirectories) = 0;
+
+            //! Loading finished, also logs messages
+            void loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, LoadFinishedInfo info);
+
+            //! A cache has been changed
+            void cacheChanged(const CSimulatorInfo &simInfo);
 
             std::atomic<bool> m_cancelLoading { false };            //!< flag, requesting to cancel loading
             std::atomic<bool> m_loadingInProgress { false };        //!< Loading in progress
@@ -198,13 +204,6 @@ namespace BlackMisc
             Data::CModelCaches m_caches { false, this };            //!< caches used with this loader
             Settings::CMultiSimulatorSettings m_settings { this };  //!< settings
             CStatusMessageList m_loadingMessages;                   //!< loading messages
-
-        protected slots:
-            //! Loading finished, also logs messages
-            void ps_loadFinished(const CStatusMessage &status, const CSimulatorInfo &simulator, LoadFinishedInfo info);
-
-            //! A cache has been changed
-            void ps_cacheChanged(const CSimulatorInfo &simInfo);
         };
     } // ns
 } // ns