diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp
index 7ada997b1..8da108ec9 100644
--- a/samples/blackmiscdbus/servicetool.cpp
+++ b/samples/blackmiscdbus/servicetool.cpp
@@ -228,9 +228,9 @@ namespace BlackSample
             user.setCallsign(cs);
             CClient client(user);
             client.setCapability(true, CClient::FsdWithInterimPositions);
-            client.setCapability(true, CClient::FsdWithModelDescription);
-            QString myFooModel = QString("fooModel %1").arg(i);
-            client.setAircraftModel(CAircraftModel(myFooModel, CAircraftModel::TypeQueriedFromNetwork));
+            client.setCapability(true, CClient::FsdWithIcaoCodes);
+            const QString myFooModel = QString("fooModel %1").arg(i);
+            client.setQueriedModelString(myFooModel);
             list.push_back(client);
         }
         return list;
diff --git a/src/blackcore/network.h b/src/blackcore/network.h
index a3e4a1f5c..86f14d934 100644
--- a/src/blackcore/network.h
+++ b/src/blackcore/network.h
@@ -77,7 +77,7 @@ namespace BlackCore
         {
             AcceptsAtisResponses        = 1 << 0,
             SupportsInterimPosUpdates   = 1 << 1,
-            SupportsModelDescriptions   = 1 << 2,
+            SupportsIcaoCodes           = 1 << 2,
             SupportsAircraftConfigs     = 1 << 3
         };
 
diff --git a/src/blackcore/networkvatlib.cpp b/src/blackcore/networkvatlib.cpp
index d73771fcb..16679da65 100644
--- a/src/blackcore/networkvatlib.cpp
+++ b/src/blackcore/networkvatlib.cpp
@@ -956,7 +956,7 @@ namespace BlackCore
         int flags = 0;
         if (capabilityFlags & vatCapsAtcInfo) { flags |= AcceptsAtisResponses; }
         if (capabilityFlags & vatCapsInterminPos) { flags |= SupportsInterimPosUpdates; }
-        if (capabilityFlags & vatCapsModelDesc) { flags |= SupportsModelDescriptions; }
+        if (capabilityFlags & vatCapsModelDesc) { flags |= SupportsIcaoCodes; }
         if (capabilityFlags & vatCapsAircraftConfig) { flags |= SupportsAircraftConfigs; }
         emit cbvar_cast(cbvar)->capabilitiesReplyReceived(cbvar_cast(cbvar)->fromFSD(callsign), flags);
     }
diff --git a/src/blackmisc/network/client.cpp b/src/blackmisc/network/client.cpp
index 4f4fbc28f..df4b43857 100644
--- a/src/blackmisc/network/client.cpp
+++ b/src/blackmisc/network/client.cpp
@@ -50,7 +50,7 @@ namespace BlackMisc
             QStringList sl;
             if (this->hasCapability(FsdAtisCanBeReceived)) sl << "ATIS";
             if (this->hasCapability(FsdWithInterimPositions)) sl << "interim pos.";
-            if (this->hasCapability(FsdWithModelDescription)) sl << "model";
+            if (this->hasCapability(FsdWithIcaoCodes)) sl << "ICAO";
             if (this->hasCapability(FsdWithAircraftConfig)) sl << "aircraft config";
             if (sl.isEmpty()) return "";
             return sl.join(", ");
diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h
index e820a8975..dae72e45b 100644
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -54,7 +54,7 @@ namespace BlackMisc
             enum Capabilities
             {
                 FsdWithInterimPositions = BlackMisc::CPropertyIndex::GlobalIndexAbuseMode,
-                FsdWithModelDescription,
+                FsdWithIcaoCodes, //!< basically means it is a pilot client handling ICAO code pacakages
                 FsdAtisCanBeReceived,
                 FsdWithAircraftConfig
             };