diff --git a/src/blackgui/menus/aircraftmodelmenus.cpp b/src/blackgui/menus/aircraftmodelmenus.cpp
index 1931ab856..9d377602d 100644
--- a/src/blackgui/menus/aircraftmodelmenus.cpp
+++ b/src/blackgui/menus/aircraftmodelmenus.cpp
@@ -307,7 +307,7 @@ namespace BlackGui
 
             if (!filtered)
             {
-                this->modelsTargetSetable()->setModels(consolidated, sim);
+                this->modelsTargetSetable()->setModelsForSimulator(consolidated, sim);
             }
             else
             {
@@ -317,7 +317,7 @@ namespace BlackGui
                 }
                 else
                 {
-                    this->modelsTargetUpdatable()->updateModels(consolidated, sim);
+                    this->modelsTargetUpdatable()->updateModelsForSimulator(consolidated, sim);
                 }
             }
             this->modelView()->hideLoadIndicator(i);
@@ -338,7 +338,7 @@ namespace BlackGui
             const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), true);
             const CSimulatorInfo sim(this->getSimulator());
 
-            this->modelsTargetUpdatable()->updateModels(consolidated, sim);
+            this->modelsTargetUpdatable()->updateModelsForSimulator(consolidated, sim);
             this->modelView()->hideLoadIndicator(i);
         }
 
@@ -360,14 +360,14 @@ namespace BlackGui
             return sim;
         }
 
-        IModelsPerSimulatorSetable *CConsolidateWithSimulatorModels::modelsTargetSetable() const
+        IModelsForSimulatorSetable *CConsolidateWithSimulatorModels::modelsTargetSetable() const
         {
-            return qobject_cast<IModelsPerSimulatorSetable *>(m_modelsTarget);
+            return qobject_cast<IModelsForSimulatorSetable *>(m_modelsTarget);
         }
 
-        IModelsPerSimulatorUpdatable *CConsolidateWithSimulatorModels::modelsTargetUpdatable() const
+        IModelsForSimulatorUpdatable *CConsolidateWithSimulatorModels::modelsTargetUpdatable() const
         {
-            return qobject_cast<IModelsPerSimulatorUpdatable *>(m_modelsTarget);
+            return qobject_cast<IModelsForSimulatorUpdatable *>(m_modelsTarget);
         }
 
         ISimulatorSelectable *CConsolidateWithSimulatorModels::simulatorSelectable() const
diff --git a/src/blackgui/menus/aircraftmodelmenus.h b/src/blackgui/menus/aircraftmodelmenus.h
index 29387010c..bb01332c0 100644
--- a/src/blackgui/menus/aircraftmodelmenus.h
+++ b/src/blackgui/menus/aircraftmodelmenus.h
@@ -140,8 +140,8 @@ namespace BlackGui
             //! Simulator
             BlackMisc::Simulation::CSimulatorInfo getSimulator() const;
 
-            BlackMisc::Simulation::IModelsPerSimulatorSetable   *modelsTargetSetable() const;
-            BlackMisc::Simulation::IModelsPerSimulatorUpdatable *modelsTargetUpdatable() const;
+            BlackMisc::Simulation::IModelsForSimulatorSetable   *modelsTargetSetable() const;
+            BlackMisc::Simulation::IModelsForSimulatorUpdatable *modelsTargetUpdatable() const;
             BlackMisc::Simulation::ISimulatorSelectable *simulatorSelectable() const;
             BlackGui::Components::CDbMappingComponent *getMappingComponent() const;
 
diff --git a/src/blackmisc/simulation/aircraftmodelinterfaces.h b/src/blackmisc/simulation/aircraftmodelinterfaces.h
index 872eaa2b4..d9a5cca35 100644
--- a/src/blackmisc/simulation/aircraftmodelinterfaces.h
+++ b/src/blackmisc/simulation/aircraftmodelinterfaces.h
@@ -32,23 +32,23 @@ namespace BlackMisc
         {
         public:
             //! Update models
-            virtual void updateModels(const CAircraftModelList &models) = 0;
+            virtual int updateModels(const CAircraftModelList &models) = 0;
         };
 
         //! Interface to "something" backing models, which can be set
-        class BLACKMISC_EXPORT IModelsPerSimulatorSetable
+        class BLACKMISC_EXPORT IModelsForSimulatorSetable
         {
         public:
             //! Set models
-            virtual void setModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
+            virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
         };
 
         //! Interface to "something" backing models, which can be modified (updated)
-        class BLACKMISC_EXPORT IModelsPerSimulatorUpdatable
+        class BLACKMISC_EXPORT IModelsForSimulatorUpdatable
         {
         public:
             //! Set models
-            virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
+            virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
         };
 
         //! Interface to "something" allowing a simulator selection
@@ -63,8 +63,8 @@ namespace BlackMisc
 
 Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsSetable, "org.swift-project.blackmisc.simulation.imodelssetable")
 Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsUpdatable, "org.swift-project.blackmisc.simulation.imodelsupdateable")
-Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsPerSimulatorSetable, "org.swift-project.blackmisc.simulation.imodelspersimulatorsetable")
-Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsPerSimulatorUpdatable, "org.swift-project.blackmisc.simulation.imodelspersimulatorupdatabale")
+Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsForSimulatorSetable, "org.swift-project.blackmisc.simulation.IModelsForSimulatorSetable")
+Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsForSimulatorUpdatable, "org.swift-project.blackmisc.simulation.imodelspersimulatorupdatabale")
 Q_DECLARE_INTERFACE(BlackMisc::Simulation::ISimulatorSelectable, "org.swift-project.blackmisc.simulation.isimulatorselectable")
 
 #endif // guard