diff --git a/src/blackcore/context/contextownaircraftimpl.cpp b/src/blackcore/context/contextownaircraftimpl.cpp
index 975a46b64..11cc6cfc8 100644
--- a/src/blackcore/context/contextownaircraftimpl.cpp
+++ b/src/blackcore/context/contextownaircraftimpl.cpp
@@ -62,7 +62,7 @@ namespace BlackCore
 
             if (sApp && sApp->getWebDataServices())
             {
-                connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CContextOwnAircraft::allSwiftWebDataRead);
+                connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CContextOwnAircraft::allSwiftWebDataRead);
             }
 
             // Init own aircraft
diff --git a/src/blackcore/simulatorcommon.cpp b/src/blackcore/simulatorcommon.cpp
index 6499a6e36..4830cfcbe 100644
--- a/src/blackcore/simulatorcommon.cpp
+++ b/src/blackcore/simulatorcommon.cpp
@@ -79,7 +79,7 @@ namespace BlackCore
         // swift data
         if (sApp && sApp->hasWebDataServices())
         {
-            connect(sApp->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CSimulatorCommon::onSwiftDbAllDataRead, Qt::QueuedConnection);
+            connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CSimulatorCommon::onSwiftDbAllDataRead, Qt::QueuedConnection);
             connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbAirportsRead, this, &CSimulatorCommon::onSwiftDbAirportsRead, Qt::QueuedConnection);
             connect(sApp->getWebDataServices(), &CWebDataServices::swiftDbModelMatchingEntitiesRead, this, &CSimulatorCommon::onSwiftDbModelMatchingEntitiesRead, Qt::QueuedConnection);
         }
diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp
index 7c3b3e718..b7aba8042 100644
--- a/src/blackcore/webdataservices.cpp
+++ b/src/blackcore/webdataservices.cpp
@@ -1248,7 +1248,7 @@ namespace BlackCore
         const int allUsedEntities = static_cast<int>(this->allDbEntitiesForUsedReaders());
         if (((static_cast<int>(m_swiftDbEntitiesRead)) & allUsedEntities) == allUsedEntities)
         {
-            emit this->allSwiftDbDataRead();
+            emit this->swiftDbAllDataRead();
         }
 
         // individual signals
diff --git a/src/blackcore/webdataservices.h b/src/blackcore/webdataservices.h
index bace8b62c..ee8822c68 100644
--- a/src/blackcore/webdataservices.h
+++ b/src/blackcore/webdataservices.h
@@ -472,7 +472,7 @@ namespace BlackCore
         //! \name Simplified read signals
         //! @{
         //! All swift DB data have been read
-        void allSwiftDbDataRead();
+        void swiftDbAllDataRead();
 
         //! Shared info objects read
         void sharedInfoObjectsRead();
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.cpp b/src/blackgui/components/aircraftcombinedtypeselector.cpp
index d6806b254..1e9c3e7e9 100644
--- a/src/blackgui/components/aircraftcombinedtypeselector.cpp
+++ b/src/blackgui/components/aircraftcombinedtypeselector.cpp
@@ -28,12 +28,12 @@ namespace BlackGui
             ui(new Ui::CAircraftCombinedTypeSelector)
         {
             ui->setupUi(this);
-            connect(ui->le_CombinedType, &QLineEdit::editingFinished, this, &CAircraftCombinedTypeSelector::ps_CombinedTypeEntered);
-            connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::ps_CombinedTypeEntered);
+            connect(ui->le_CombinedType, &QLineEdit::editingFinished, this, &CAircraftCombinedTypeSelector::combinedTypeEntered);
+            connect(ui->le_CombinedType, &QLineEdit::returnPressed, this, &CAircraftCombinedTypeSelector::combinedTypeEntered);
 
-            connect(ui->cb_EngineCount, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox);
-            connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox);
-            connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::ps_ChangedComboBox);
+            connect(ui->cb_EngineCount, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
+            connect(ui->cb_EngineType, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
+            connect(ui->cb_Type, &QComboBox::currentTextChanged, this, &CAircraftCombinedTypeSelector::changedComboBox);
 
             ui->le_CombinedType->setValidator(new CUpperCaseValidator(this));
         }
@@ -84,13 +84,13 @@ namespace BlackGui
             return ct2;
         }
 
-        void CAircraftCombinedTypeSelector::ps_CombinedTypeEntered()
+        void CAircraftCombinedTypeSelector::combinedTypeEntered()
         {
             QString cc(ui->le_CombinedType->text().trimmed().toUpper());
             this->setCombinedType(cc);
         }
 
-        void CAircraftCombinedTypeSelector::ps_ChangedComboBox(const QString &text)
+        void CAircraftCombinedTypeSelector::changedComboBox(const QString &text)
         {
             Q_UNUSED(text);
             QString ct(getCombinedTypeFromComboBoxes());
diff --git a/src/blackgui/components/aircraftcombinedtypeselector.h b/src/blackgui/components/aircraftcombinedtypeselector.h
index d73ec7f98..56e34dc60 100644
--- a/src/blackgui/components/aircraftcombinedtypeselector.h
+++ b/src/blackgui/components/aircraftcombinedtypeselector.h
@@ -40,7 +40,7 @@ namespace BlackGui
             explicit CAircraftCombinedTypeSelector(QWidget *parent = nullptr);
 
             //! Destructor
-            ~CAircraftCombinedTypeSelector();
+            virtual ~CAircraftCombinedTypeSelector();
 
             //! Set comined code, e.g. L1P
             void setCombinedType(const QString &combinedCode);
@@ -57,14 +57,13 @@ namespace BlackGui
             //! Get the combined type, e.g. "L2P"
             QString getCombinedType() const;
 
-        private slots:
+        private:
             //! Code has been entered
-            void ps_CombinedTypeEntered();
+            void combinedTypeEntered();
 
             //! Changed combobox
-            void ps_ChangedComboBox(const QString &text);
+            void changedComboBox(const QString &text);
 
-        private:
             //! Combined type from comboboxes
             QString getCombinedTypeFromComboBoxes() const;
 
diff --git a/src/blackgui/components/dbquickmappingwizard.cpp b/src/blackgui/components/dbquickmappingwizard.cpp
index a448b9166..2b425a1eb 100644
--- a/src/blackgui/components/dbquickmappingwizard.cpp
+++ b/src/blackgui/components/dbquickmappingwizard.cpp
@@ -45,7 +45,7 @@ namespace BlackGui
             ui->editor_AircraftModel->allowDrop(false);
             ui->editor_AircraftModel->setReadOnly(true);
 
-            connect(sGui->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CDbQuickMappingWizard::ps_webDataRead);
+            connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CDbQuickMappingWizard::ps_webDataRead);
             connect(sGui->getWebDataServices()->getDatabaseWriter(), &CDatabaseWriter::publishedModels, this, &CDbQuickMappingWizard::ps_publishedModels);
 
             connect(this, &CDbQuickMappingWizard::currentIdChanged, this, &CDbQuickMappingWizard::ps_currentWizardPageChanged);
diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp
index 6d456e78f..01d61e687 100644
--- a/src/blackgui/components/flightplancomponent.cpp
+++ b/src/blackgui/components/flightplancomponent.cpp
@@ -133,7 +133,7 @@ namespace BlackGui
             connect(ui->cb_Tcas, &QCheckBox::released, this, &CFlightPlanComponent::prefixCheckBoxChanged);
 
             // web services
-            connect(sGui->getWebDataServices(), &CWebDataServices::allSwiftDbDataRead, this, &CFlightPlanComponent::swiftWebDataRead);
+            connect(sGui->getWebDataServices(), &CWebDataServices::swiftDbAllDataRead, this, &CFlightPlanComponent::swiftWebDataRead);
 
             // init GUI
             this->resetFlightPlan();