diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h
index 4e63420b3..fc1465fac 100644
--- a/src/blackcore/context_simulator_impl.h
+++ b/src/blackcore/context_simulator_impl.h
@@ -20,7 +20,7 @@
 namespace BlackCore
 {
     /*!
-     * \brief Network simulator concrete implementation
+     * Network simulator concrete implementation
      */
     class CContextSimulator : public IContextSimulator
     {
@@ -30,7 +30,7 @@ namespace BlackCore
         friend class IContextSimulator;
 
     public:
-        //! \brief Destructor
+        //! Destructor
         virtual ~CContextSimulator();
 
     public slots:
diff --git a/src/blackgui/settingssimulatorcomponent.cpp b/src/blackgui/settingssimulatorcomponent.cpp
index da4059357..bf6e89753 100644
--- a/src/blackgui/settingssimulatorcomponent.cpp
+++ b/src/blackgui/settingssimulatorcomponent.cpp
@@ -36,9 +36,9 @@ namespace BlackGui
         if (this->getIContextSimulator())
         {
             QStringList plugins = this->getIContextSimulator()->getAvailableSimulatorPlugins().toStringList(true);
-            CSimulatorInfo currentDriver = this->getIContextSimulator()->getSimulatorInfo();
+            CSimulatorInfo currentPlugin = this->getIContextSimulator()->getSimulatorInfo();
             this->ui->cb_Plugins->addItems(plugins);
-            this->setCurrentPlugin(currentDriver);
+            this->setCurrentPlugin(currentPlugin);
 
             // disable / enable driver specific GUI parts
             bool fsxDriver =