diff --git a/src/blackcore/context_simulator_impl.cpp b/src/blackcore/context_simulator_impl.cpp
index 85fb2a14c..97f165d12 100644
--- a/src/blackcore/context_simulator_impl.cpp
+++ b/src/blackcore/context_simulator_impl.cpp
@@ -159,7 +159,7 @@ namespace BlackCore
         else if (plugin.size() > 1)
         {
             return this->loadSimulatorPlugin(
-                       this->getIContextSettings()->getSimulatorSettings().getSelectedDriver()
+                       this->getIContextSettings()->getSimulatorSettings().getSelectedPlugin()
                    );
         }
         else
@@ -262,7 +262,7 @@ namespace BlackCore
         IContextSettings::SettingsType settingsType = static_cast<IContextSettings::SettingsType>(type);
         if (settingsType == IContextSettings::SettingsSimulator)
         {
-            CSimulatorInfo driver = this->getIContextSettings()->getSimulatorSettings().getSelectedDriver();
+            CSimulatorInfo driver = this->getIContextSettings()->getSimulatorSettings().getSelectedPlugin();
             if (this->loadSimulatorPlugin(driver))
             {
                 QString m = QString("Driver loaded: '%1'").arg(driver.toQString(true));
diff --git a/src/blacksim/setsimulator.cpp b/src/blacksim/setsimulator.cpp
index cabda59b7..2c2802f5f 100644
--- a/src/blacksim/setsimulator.cpp
+++ b/src/blacksim/setsimulator.cpp
@@ -22,7 +22,7 @@ namespace BlackSim
         {
             Q_UNUSED(i18n);
             QString s("Sel.driver:");
-            s.append(" ").append(m_selectedDriver.toQString(i18n));
+            s.append(" ").append(m_selectedPlugin.toQString(i18n));
             return s;
         }
 
@@ -122,7 +122,7 @@ namespace BlackSim
          */
         void CSettingsSimulator::initDefaultValues()
         {
-            this->m_selectedDriver = CSimulatorInfo::FSX();
+            this->m_selectedPlugin = CSimulatorInfo::FSX();
         }
 
         /*
@@ -149,9 +149,9 @@ namespace BlackSim
                     if (command == CSettingUtilities::CmdUpdate())
                     {
                         CSimulatorInfo v = value.value<CSimulatorInfo>();
-                        changedFlag = (v != this->m_selectedDriver);
+                        changedFlag = (v != this->m_selectedPlugin);
                         msgs.push_back(CSettingUtilities::valueChangedMessage(changedFlag, "selected driver"));
-                        this->m_selectedDriver = v;
+                        this->m_selectedPlugin = v;
                         return msgs;
                     }
                     return msgs;
diff --git a/src/blacksim/setsimulator.h b/src/blacksim/setsimulator.h
index fbe1547a1..13582bb81 100644
--- a/src/blacksim/setsimulator.h
+++ b/src/blacksim/setsimulator.h
@@ -38,10 +38,10 @@ namespace BlackSim
             virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
 
             //! Selected driver
-            BlackSim::CSimulatorInfo getSelectedDriver() const { return this->m_selectedDriver; }
+            BlackSim::CSimulatorInfo getSelectedPlugin() const { return this->m_selectedPlugin; }
 
             //! Selected driver
-            bool setSelectedDriver(const BlackSim::CSimulatorInfo &driver) { this->m_selectedDriver = driver; }
+            void setSelectedPlugin(const BlackSim::CSimulatorInfo &plugin) { this->m_selectedPlugin = plugin; }
 
             //! Equal operator ==
             bool operator ==(const CSettingsSimulator &other) const;
@@ -91,13 +91,13 @@ namespace BlackSim
 
         private:
             BLACK_ENABLE_TUPLE_CONVERSION(CSettingsSimulator)
-            BlackSim::CSimulatorInfo m_selectedDriver;
+            BlackSim::CSimulatorInfo m_selectedPlugin;
         };
 
     } // namespace
 } // namespace
 
 Q_DECLARE_METATYPE(BlackSim::Settings::CSettingsSimulator)
-BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::Settings::CSettingsSimulator, (o.m_selectedDriver))
+BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::Settings::CSettingsSimulator, (o.m_selectedPlugin))
 
 #endif // guard