diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index d89013fa5023de3b81a398474051c350fd1b33ad..3b76e50c2e8ca58ea625bd5b8fc0566d123e7551 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -1092,7 +1092,7 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap
 
     HEADERS += \
-        src/Airmap/AirMapAdvisories.h \
+        src/Airmap/AirMapAdvisoryManager.h \
         src/Airmap/AirMapFlightManager.h \
         src/Airmap/AirMapManager.h \
         src/Airmap/AirMapRestrictionManager.h \
@@ -1102,11 +1102,11 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap/AirMapTelemetry.h \
         src/Airmap/AirMapTrafficMonitor.h \
         src/Airmap/AirMapVehicleManager.h \
-        src/Airmap/AirMapWeatherInformation.h \
+        src/Airmap/AirMapWeatherInfoManager.h \
         src/Airmap/LifetimeChecker.h \
 
     SOURCES += \
-        src/Airmap/AirMapAdvisories.cc \
+        src/Airmap/AirMapAdvisoryManager.cc \
         src/Airmap/AirMapFlightManager.cc \
         src/Airmap/AirMapManager.cc \
         src/Airmap/AirMapRestrictionManager.cc \
@@ -1116,7 +1116,7 @@ contains (DEFINES, QGC_AIRMAP_ENABLED) {
         src/Airmap/AirMapTelemetry.cc \
         src/Airmap/AirMapTrafficMonitor.cc \
         src/Airmap/AirMapVehicleManager.cc \
-        src/Airmap/AirMapWeatherInformation.cc \
+        src/Airmap/AirMapWeatherInfoManager.cc \
 
 } else {
     RESOURCES += \
diff --git a/src/Airmap/AirmapAdvisories.cc b/src/Airmap/AirMapAdvisoryManager.cc
similarity index 92%
rename from src/Airmap/AirmapAdvisories.cc
rename to src/Airmap/AirMapAdvisoryManager.cc
index 7bea37f031960664289c4098a10a7b01f0262ed3..c9b585cb3b92acad768cbadfb3cad7599353d7c9 100644
--- a/src/Airmap/AirmapAdvisories.cc
+++ b/src/Airmap/AirMapAdvisoryManager.cc
@@ -7,7 +7,7 @@
  *
  ****************************************************************************/
 
-#include "AirMapAdvisories.h"
+#include "AirMapAdvisoryManager.h"
 #include "AirMapManager.h"
 
 #define ADVISORY_UPDATE_DISTANCE    500     //-- 500m threshold for updates
@@ -22,7 +22,7 @@ AirMapAdvisory::AirMapAdvisory(QObject* parent)
 }
 
 //-----------------------------------------------------------------------------
-AirMapAdvisories::AirMapAdvisories(AirMapSharedState& shared, QObject *parent)
+AirMapAdvisoryManager::AirMapAdvisoryManager(AirMapSharedState& shared, QObject *parent)
     : AirspaceAdvisoryProvider(parent)
     , _valid(false)
     , _shared(shared)
@@ -31,7 +31,7 @@ AirMapAdvisories::AirMapAdvisories(AirMapSharedState& shared, QObject *parent)
 
 //-----------------------------------------------------------------------------
 void
-AirMapAdvisories::setROI(const QGeoCoordinate& center, double radiusMeters)
+AirMapAdvisoryManager::setROI(const QGeoCoordinate& center, double radiusMeters)
 {
     //-- If first time or we've moved more than ADVISORY_UPDATE_DISTANCE, ask for updates.
     if(!_lastRoiCenter.isValid() || _lastRoiCenter.distanceTo(center) > ADVISORY_UPDATE_DISTANCE) {
@@ -52,7 +52,7 @@ adv_sort(QObject* a, QObject* b)
 
 //-----------------------------------------------------------------------------
 void
-AirMapAdvisories::_requestAdvisories(const QGeoCoordinate& coordinate, double radiusMeters)
+AirMapAdvisoryManager::_requestAdvisories(const QGeoCoordinate& coordinate, double radiusMeters)
 {
     qCDebug(AirMapManagerLog) << "Advisories Request";
     if (!_shared.client()) {
diff --git a/src/Airmap/AirmapAdvisories.h b/src/Airmap/AirMapAdvisoryManager.h
similarity index 89%
rename from src/Airmap/AirmapAdvisories.h
rename to src/Airmap/AirMapAdvisoryManager.h
index b8d4f28e147ff70a0e0b951c5136b8ba1b0efac4..b6f305010ab63067e2a7682fb5c43a4dd2e438d6 100644
--- a/src/Airmap/AirmapAdvisories.h
+++ b/src/Airmap/AirMapAdvisoryManager.h
@@ -21,7 +21,7 @@
 #include "airmap/status.h"
 
 /**
- * @file AirMapAdvisories.h
+ * @file AirMapAdvisoryManager.h
  * Advisory information provided by AirMap.
  */
 
@@ -29,7 +29,7 @@
 class AirMapAdvisory : public AirspaceAdvisory
 {
     Q_OBJECT
-    friend class AirMapAdvisories;
+    friend class AirMapAdvisoryManager;
 public:
     AirMapAdvisory (QObject* parent = NULL);
     QString         id              () override { return _id; }
@@ -48,11 +48,11 @@ private:
 };
 
 //-----------------------------------------------------------------------------
-class AirMapAdvisories : public AirspaceAdvisoryProvider, public LifetimeChecker
+class AirMapAdvisoryManager : public AirspaceAdvisoryProvider, public LifetimeChecker
 {
     Q_OBJECT
 public:
-    AirMapAdvisories                    (AirMapSharedState &shared, QObject *parent = nullptr);
+    AirMapAdvisoryManager                    (AirMapSharedState &shared, QObject *parent = nullptr);
     bool                valid           () override { return _valid; }
     AdvisoryColor       airspaceColor   () override { return _airspaceColor; }
     QmlObjectListModel* airspaces       () override { return &_airspaces; }
diff --git a/src/Airmap/AirMapManager.cc b/src/Airmap/AirMapManager.cc
index 9a1cafdf541d2350acc1974e6e7c7df7c6c618fa..493cdd3476b0b0069b024861a072ee21d1b5a1e8 100644
--- a/src/Airmap/AirMapManager.cc
+++ b/src/Airmap/AirMapManager.cc
@@ -8,8 +8,8 @@
  ****************************************************************************/
 
 #include "AirMapManager.h"
-#include "AirMapAdvisories.h"
-#include "AirMapWeatherInformation.h"
+#include "AirMapAdvisoryManager.h"
+#include "AirMapWeatherInfoManager.h"
 #include "AirMapRestrictionManager.h"
 #include "AirMapRulesetsManager.h"
 #include "AirMapSettings.h"
@@ -131,15 +131,15 @@ AirMapManager::instantiateRulesetsProvider()
 AirspaceWeatherInfoProvider*
 AirMapManager::instatiateAirspaceWeatherInfoProvider()
 {
-    AirMapWeatherInformation* weatherInfo = new AirMapWeatherInformation(_shared);
-    connect(weatherInfo, &AirMapWeatherInformation::error, this, &AirMapManager::_error);
+    AirMapWeatherInfoManager* weatherInfo = new AirMapWeatherInfoManager(_shared);
+    connect(weatherInfo, &AirMapWeatherInfoManager::error, this, &AirMapManager::_error);
     return weatherInfo;
 }
 
 AirspaceAdvisoryProvider*
 AirMapManager::instatiateAirspaceAdvisoryProvider()
 {
-    AirMapAdvisories* advisories = new AirMapAdvisories(_shared);
-    connect(advisories, &AirMapAdvisories::error, this, &AirMapManager::_error);
+    AirMapAdvisoryManager* advisories = new AirMapAdvisoryManager(_shared);
+    connect(advisories, &AirMapAdvisoryManager::error, this, &AirMapManager::_error);
     return advisories;
 }
diff --git a/src/Airmap/AirMapWeatherInformation.cc b/src/Airmap/AirMapWeatherInfoManager.cc
similarity index 91%
rename from src/Airmap/AirMapWeatherInformation.cc
rename to src/Airmap/AirMapWeatherInfoManager.cc
index 8b0b8dcb01b77eee37234b344b73b6b006e6e96c..d309a8c708f1023cd87a61cb3d3c1c486b0d85e1 100644
--- a/src/Airmap/AirMapWeatherInformation.cc
+++ b/src/Airmap/AirMapWeatherInfoManager.cc
@@ -7,7 +7,7 @@
  *
  ****************************************************************************/
 
-#include "AirMapWeatherInformation.h"
+#include "AirMapWeatherInfoManager.h"
 #include "AirMapManager.h"
 
 #define WEATHER_UPDATE_DISTANCE 50000                   //-- 50km threshold for weather updates
@@ -15,7 +15,7 @@
 
 using namespace airmap;
 
-AirMapWeatherInformation::AirMapWeatherInformation(AirMapSharedState& shared, QObject *parent)
+AirMapWeatherInfoManager::AirMapWeatherInfoManager(AirMapSharedState& shared, QObject *parent)
     : AirspaceWeatherInfoProvider(parent)
     , _valid(false)
     , _shared(shared)
@@ -23,7 +23,7 @@ AirMapWeatherInformation::AirMapWeatherInformation(AirMapSharedState& shared, QO
 }
 
 void
-AirMapWeatherInformation::setROI(const QGeoCoordinate& center)
+AirMapWeatherInfoManager::setROI(const QGeoCoordinate& center)
 {
     //-- If first time or we've moved more than WEATHER_UPDATE_DISTANCE, ask for weather updates.
     if(!_lastRoiCenter.isValid() || _lastRoiCenter.distanceTo(center) > WEATHER_UPDATE_DISTANCE) {
@@ -40,7 +40,7 @@ AirMapWeatherInformation::setROI(const QGeoCoordinate& center)
 }
 
 void
-AirMapWeatherInformation::_requestWeatherUpdate(const QGeoCoordinate& coordinate)
+AirMapWeatherInfoManager::_requestWeatherUpdate(const QGeoCoordinate& coordinate)
 {
     qCDebug(AirMapManagerLog) << "Request Weather";
     if (!_shared.client()) {
diff --git a/src/Airmap/AirMapWeatherInformation.h b/src/Airmap/AirMapWeatherInfoManager.h
similarity index 92%
rename from src/Airmap/AirMapWeatherInformation.h
rename to src/Airmap/AirMapWeatherInfoManager.h
index e7a884ba768293f8826d1cd982a70627740a9562..d078e2db0155efaae57c1d326548e2ddea43ee3d 100644
--- a/src/Airmap/AirMapWeatherInformation.h
+++ b/src/Airmap/AirMapWeatherInfoManager.h
@@ -20,15 +20,15 @@
 #include "airmap/status.h"
 
 /**
- * @file AirMapWeatherInformation.h
+ * @file AirMapWeatherInfoManager.h
  * Weather information provided by AirMap.
  */
 
-class AirMapWeatherInformation : public AirspaceWeatherInfoProvider, public LifetimeChecker
+class AirMapWeatherInfoManager : public AirspaceWeatherInfoProvider, public LifetimeChecker
 {
     Q_OBJECT
 public:
-    AirMapWeatherInformation(AirMapSharedState &shared, QObject *parent = nullptr);
+    AirMapWeatherInfoManager(AirMapSharedState &shared, QObject *parent = nullptr);
 
     bool        valid           () override { return _valid; }
     QString     condition       () override { return QString::fromStdString(_weather.condition); }