diff --git a/src/blackcore/contextapplicationproxy.h b/src/blackcore/contextapplicationproxy.h
index 3adcb155b..71f634e9d 100644
--- a/src/blackcore/contextapplicationproxy.h
+++ b/src/blackcore/contextapplicationproxy.h
@@ -64,7 +64,7 @@ namespace BlackCore
         //! \copydoc IContextApplication::registerApplication
         virtual BlackMisc::CIdentifier registerApplication(const BlackMisc::CIdentifier &application) override;
 
-        //! \copydoc IContextApplication::unRegisterApplication
+        //! \copydoc IContextApplication::unregisterApplication
         virtual void unregisterApplication(const BlackMisc::CIdentifier &application) override;
 
         //! \copydoc IContextApplication::getRegisteredApplications
diff --git a/src/blackcore/contextaudioimpl.h b/src/blackcore/contextaudioimpl.h
index c816f4649..6a9f6dc6c 100644
--- a/src/blackcore/contextaudioimpl.h
+++ b/src/blackcore/contextaudioimpl.h
@@ -82,28 +82,28 @@ namespace BlackCore
         //! \copydoc IContextAudio::setCurrentAudioDevice()
         virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;
 
-        //! \copydoc IContext::setVoiceOutputVolume
+        //! \copydoc IContextAudio::setVoiceOutputVolume
         virtual void setVoiceOutputVolume(int volume) override;
 
-        //! \copydoc IContext::getVoiceOutputVolume
+        //! \copydoc IContextAudio::getVoiceOutputVolume
         virtual int getVoiceOutputVolume() const override;
 
-        //! \copydoc ICOntext::setMute
+        //! \copydoc IContextAudio::setMute
         virtual void setMute(bool muted) override;
 
         //! \copydoc IContextAudio::isMuted()
         virtual bool isMuted() const override;
 
-        //! \copydoc IContextAudio::playSelcalTone()
+        //! \copydoc IContextAudio::playSelcalTone
         virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) const override;
 
-        //! \copydoc IContextAudio::playNotification()
+        //! \copydoc IContextAudio::playNotification
         virtual void playNotification(BlackMisc::Audio::CNotificationSounds::Notification notification, bool considerSettings) const override;
 
-        //! \copydoc IContextAudio::enableAudioLoopback()
+        //! \copydoc IContextAudio::enableAudioLoopback
         virtual void enableAudioLoopback(bool enable = true) override;
 
-        //! \copydoc ICOntextAudio::isAudioLoopbackEnabled
+        //! \copydoc IContextAudio::isAudioLoopbackEnabled
         virtual bool isAudioLoopbackEnabled() const override;
 
         //! \addtogroup commandline
diff --git a/src/blackcore/contextaudioproxy.h b/src/blackcore/contextaudioproxy.h
index 5e0f9cd3c..0fba5a11b 100644
--- a/src/blackcore/contextaudioproxy.h
+++ b/src/blackcore/contextaudioproxy.h
@@ -84,10 +84,10 @@ namespace BlackCore
         //! \copydoc IContextAudio::setCurrentAudioDevice()
         virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDeviceInfo &audioDevice) override;
 
-        //!\copydoc IContext::setVoiceOutputVolume
+        //!\copydoc IContextAudio::setVoiceOutputVolume
         virtual void setVoiceOutputVolume(int volume) override;
 
-        //! \copydoc IContext::getVoiceOutputVolume
+        //! \copydoc IContextAudio::getVoiceOutputVolume
         virtual int getVoiceOutputVolume() const override;
 
         //! \copydoc IContextAudio::setMute
diff --git a/src/blackcore/contextnetworkimpl.h b/src/blackcore/contextnetworkimpl.h
index dd2344ae5..ed1fdee59 100644
--- a/src/blackcore/contextnetworkimpl.h
+++ b/src/blackcore/contextnetworkimpl.h
@@ -70,7 +70,7 @@ namespace BlackCore
         //! \ingroup remoteaircraftprovider
         virtual BlackMisc::Aviation::CCallsignSet remoteAircraftSupportingParts() const override;
 
-        //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::connectSignals
+        //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::connectRemoteAircraftProviderSignals
         //! \ingroup remoteaircraftprovider
         virtual QList<QMetaObject::Connection> connectRemoteAircraftProviderSignals(
             QObject *receiver,
@@ -117,7 +117,7 @@ namespace BlackCore
         //! \copydoc IContextNetwork::getAtcStationsBooked()
         virtual BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const override;
 
-        //! \copydoc IContextNetwork::getAircraftInRange
+        //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRange
         //! \ingroup remoteaircraftprovider
         virtual BlackMisc::Simulation::CSimulatedAircraftList getAircraftInRange() const override;
 
@@ -125,11 +125,11 @@ namespace BlackCore
         //! \ingroup remoteaircraftprovider
         virtual int getAircraftInRangeCount() const override;
 
-        //! \copydoc IContextNetwork::getAircraftInRangeForCallsign
+        //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeForCallsign
         //! \ingroup remoteaircraftprovider
         virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
 
-        //! \copydoc IContextNetwork::getAircraftinRangeModelForCallsign
+        //! \copydoc BlackMisc::Simulation::IRemoteAircraftProvider::getAircraftInRangeModelForCallsign
         //! \ingroup remoteaircraftprovider
         virtual BlackMisc::Simulation::CAircraftModel getAircraftInRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
 
@@ -186,13 +186,13 @@ namespace BlackCore
         //! \copydoc IContextNetwork::getUsersForCallsigns
         virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
 
-        //! \copydoc IContextNetwork::getUsersForCallsign
+        //! \copydoc IContextNetwork::getUserForCallsign
         virtual BlackMisc::Network::CUser getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const override;
 
         //! \copydoc IContextNetwork::getOtherClients
         virtual BlackMisc::Network::CClientList getOtherClients() const override;
 
-        //! \copydoc IContextNetwork::getOtherClientForCallsigns
+        //! \copydoc IContextNetwork::getOtherClientsForCallsigns
         virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
 
         //! \copydoc IContextNetwork::getVatsimFsdServers
diff --git a/src/blackcore/contextnetworkproxy.h b/src/blackcore/contextnetworkproxy.h
index a11187a99..6dba3e23e 100644
--- a/src/blackcore/contextnetworkproxy.h
+++ b/src/blackcore/contextnetworkproxy.h
@@ -126,7 +126,7 @@ namespace BlackCore
         //! \copydoc IContextNetwork::getVatsimFsdServers
         virtual BlackMisc::Network::CServerList getVatsimFsdServers() const override;
 
-        //! \copydoc IContextNetwork::getOtherClientForCallsigns
+        //! \copydoc IContextNetwork::getOtherClientsForCallsigns
         virtual BlackMisc::Network::CClientList getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const override;
 
         //! \copydoc IContextNetwork::requestDataUpdates
diff --git a/src/blackcore/contextownaircraftimpl.h b/src/blackcore/contextownaircraftimpl.h
index 8a7ed6ce3..c3b5003aa 100644
--- a/src/blackcore/contextownaircraftimpl.h
+++ b/src/blackcore/contextownaircraftimpl.h
@@ -41,31 +41,31 @@ namespace BlackCore
         //! Destructor
         virtual ~CContextOwnAircraft();
 
-        //! \copydoc IOwnAircraftProvider::getOwnAircraftPosition
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftPosition
         //! \ingroup ownaircraftprovider
         virtual BlackMisc::Geo::CCoordinateGeodetic getOwnAircraftPosition() const override;
 
-        //! \copydoc IOwnAircraftProvider::getOwnAircraftParts
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftParts
         //! \ingroup ownaircraftprovider
         virtual BlackMisc::Aviation::CAircraftParts getOwnAircraftParts() const;
 
-        //! \copydoc IOwnAircraftProvider::getOwnAircraftModel
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getOwnAircraftModel
         //! \ingroup ownaircraftprovider
         virtual BlackMisc::Simulation::CAircraftModel getOwnAircraftModel() const;
 
-        //! \copydoc IOwnAircraftProvider::getDistanceToOwnAircraft
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::getDistanceToOwnAircraft
         //! \ingroup ownaircraftprovider
         virtual BlackMisc::PhysicalQuantities::CLength getDistanceToOwnAircraft(const BlackMisc::Geo::ICoordinateGeodetic &position) const override;
 
-        //! \copydoc IOwnAircraftProvider::updateOwnModel
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::updateOwnModel
         //! \ingroup ownaircraftprovider
         virtual bool updateOwnModel(const BlackMisc::Simulation::CAircraftModel &model) override;
 
-        //! \copydoc IOwnAircraftProvider::updateOwnSituation
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::updateOwnSituation
         //! \ingroup ownaircraftprovider
         virtual bool updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
 
-        //! \copydoc IOwnAircraftProvider::updateOwnParts
+        //! \copydoc BlackMisc::Simulation::IOwnAircraftProvider::updateOwnParts
         //! \ingroup ownaircraftprovider
         virtual bool updateOwnParts(const BlackMisc::Aviation::CAircraftParts &parts) override;
 
@@ -82,7 +82,7 @@ namespace BlackCore
         //! \ingroup ownaircraftprovider
         virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) override;
 
-        //! \copydoc IContextOwnAircraft::updatePosition
+        //! \copydoc IContextOwnAircraft::updateOwnPosition
         virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override;
 
         //! \copydoc IContextOwnAircraft::updateCockpit
@@ -91,10 +91,10 @@ namespace BlackCore
         //! \copydoc IContextOwnAircraft::updateSelcal
         virtual bool updateSelcal(const BlackMisc::Aviation::CSelcal &selcal, const BlackMisc::CIdentifier &originator) override;
 
-        //! \copydoc IContextOwnAircraft::updateComFrequency
+        //! \copydoc IContextOwnAircraft::updateActiveComFrequency
         virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
 
-        //! \copydoc IContextOwnAircraft::updatePilot
+        //! \copydoc IContextOwnAircraft::updateOwnAircraftPilot
         virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override;
 
         //! \copydoc IContextOwnAircraft::setAudioOutputVolume
diff --git a/src/blackcore/contextownaircraftproxy.h b/src/blackcore/contextownaircraftproxy.h
index 4c9ae3ad8..33ae70232 100644
--- a/src/blackcore/contextownaircraftproxy.h
+++ b/src/blackcore/contextownaircraftproxy.h
@@ -35,16 +35,16 @@ namespace BlackCore
         //! \copydoc IContextOwnAircraft::getOwnAircraft()
         virtual BlackMisc::Simulation::CSimulatedAircraft getOwnAircraft() const override;
 
-        //! \copydoc IContextOwnAircraft::updatePosition
+        //! \copydoc IContextOwnAircraft::updateOwnPosition
         virtual bool updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) override;
 
         //! \copydoc IContextOwnAircraft::updateCockpit
         virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override;
 
-        //! \copydoc IContextOwnAircraft::updateComFrequency
+        //! \copydoc IContextOwnAircraft::updateActiveComFrequency
         virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
 
-        //! \copydoc IContextOwnAircraft::updatePilot
+        //! \copydoc IContextOwnAircraft::updateOwnAircraftPilot
         virtual bool updateOwnAircraftPilot(const BlackMisc::Network::CUser &pilot) override;
 
         //! \copydoc IContextOwnAircraft::updateSelcal
@@ -56,7 +56,7 @@ namespace BlackCore
         //! \copydoc IContextOwnAircraft::updateOwnIcaoCodes
         virtual bool updateOwnIcaoCodes(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode, const BlackMisc::Aviation::CAirlineIcaoCode &airlineIcaoCode) override;
 
-        //! \copydoc IContextOwnAircraft::setAudioOutputVolumes
+        //! \copydoc IContextOwnAircraft::setAudioOutputVolume
         virtual void setAudioOutputVolume(int outputVolume) override;
 
         //! \copydoc IContextOwnAircraft::setAudioVoiceRoomOverrideUrls
diff --git a/src/blackcore/contextsimulatorimpl.h b/src/blackcore/contextsimulatorimpl.h
index 37a71b2f0..8982b6460 100644
--- a/src/blackcore/contextsimulatorimpl.h
+++ b/src/blackcore/contextsimulatorimpl.h
@@ -117,7 +117,7 @@ namespace BlackCore
         //! \copydoc IContextSimulator::iconForModel
         virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override;
 
-        //! \copydoc ISimulator::enableDebuggingMessages
+        //! \copydoc ISimulator::enableDebugMessages
         virtual void enableDebugMessages(bool driver, bool interpolator) override;
 
         //! \copydoc IContextSimulator::highlightAircraft
diff --git a/src/blackcore/contextsimulatorproxy.h b/src/blackcore/contextsimulatorproxy.h
index da1825e2d..39f43b27a 100644
--- a/src/blackcore/contextsimulatorproxy.h
+++ b/src/blackcore/contextsimulatorproxy.h
@@ -86,7 +86,7 @@ namespace BlackCore
         //! \copydoc IContextSimulator::getMaxRenderedAircraft
         virtual int getMaxRenderedAircraft() const override;
 
-        //! \copydoc IContextSimulator::setMaxRenderedRemoteAircraft
+        //! \copydoc IContextSimulator::setMaxRenderedAircraft
         virtual void setMaxRenderedAircraft(int number) override;
 
         //! \copydoc IContextSimulator::setMaxRenderedDistance
@@ -119,7 +119,7 @@ namespace BlackCore
         //! \copydoc IContextSimulator::highlightAircraft
         virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
 
-        //! \copydoc ISimulator::enableDebuggingMessages
+        //! \copydoc ISimulator::enableDebugMessages
         virtual void enableDebugMessages(bool driver, bool interpolator) override;
     };
 } // namespace BlackCore
diff --git a/src/blackcore/data/globalsetup.h b/src/blackcore/data/globalsetup.h
index 665123fc5..f8a0eaed0 100644
--- a/src/blackcore/data/globalsetup.h
+++ b/src/blackcore/data/globalsetup.h
@@ -115,16 +115,16 @@ namespace BlackCore
             //! Productive settings?
             void setDevelopment(bool development) { m_development  = development; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! To string
             QString convertToQString(const QString &separator, bool i18n = false) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Schema version
diff --git a/src/blackcore/data/updateinfo.h b/src/blackcore/data/updateinfo.h
index c28e0b2ad..cfe92d906 100644
--- a/src/blackcore/data/updateinfo.h
+++ b/src/blackcore/data/updateinfo.h
@@ -78,16 +78,16 @@ namespace BlackCore
             //! Productive settings?
             void setDevelopment(bool development) { m_development  = development; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! To string
             QString convertToQString(const QString &separator, bool i18n = false) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         private:
diff --git a/src/blackcore/interpolatorlinear.h b/src/blackcore/interpolatorlinear.h
index f67a76d5c..e5186c825 100644
--- a/src/blackcore/interpolatorlinear.h
+++ b/src/blackcore/interpolatorlinear.h
@@ -30,7 +30,7 @@ namespace BlackCore
             IInterpolator(provider, "CInterpolatorLinear", parent)
         {}
 
-        //! \copydoc IInterpolator::getCurrentInterpolatedSituation
+        //! \copydoc IInterpolator::getInterpolatedSituation
         virtual BlackMisc::Aviation::CAircraftSituation getInterpolatedSituation(const BlackMisc::Aviation::CCallsign &callsign, qint64 currentTimeSinceEpoc, bool vtolAiracraft, InterpolationStatus &status) const override;
 
         //! Log category
diff --git a/src/blackcore/setupreader.h b/src/blackcore/setupreader.h
index 536579773..931d3ec72 100644
--- a/src/blackcore/setupreader.h
+++ b/src/blackcore/setupreader.h
@@ -41,10 +41,10 @@ namespace BlackCore
         void versionSynchronized(bool success);
 
     protected slots:
-        //! \copydoc CThreadedReader::initialize
+        //! \copydoc BlackMisc::CThreadedReader::initialize
         virtual void initialize() override;
 
-        //! \copydoc CThreadedReader::cleanup
+        //! \copydoc BlackMisc::CThreadedReader::cleanup
         virtual void cleanup() override;
 
     private slots:
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index f8c23aadb..9a59b9245 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -276,7 +276,7 @@ namespace BlackCore
         //! Create a new instance of a driver
         //! \param info                      metadata about simulator
         //! \param ownAircraftProvider       in memory access to own aircraft data
-        //! \param renderedAircraftProvider  in memory access to rendered aircraft data such as situation history and aircraft itself
+        //! \param remoteAircraftProvider    in memory access to rendered aircraft data such as situation history and aircraft itself
         //! \param pluginStorageProvider     in memory access to persistent plugin data store
         //! \return driver instance
         virtual ISimulator *create(
diff --git a/src/blackcore/simulatorcommon.h b/src/blackcore/simulatorcommon.h
index 5e67d1a63..9115fa15e 100644
--- a/src/blackcore/simulatorcommon.h
+++ b/src/blackcore/simulatorcommon.h
@@ -66,34 +66,34 @@ namespace BlackCore
         //! \copydoc ISimulator::isMaxDistanceRestricted
         virtual bool isMaxDistanceRestricted() const override;
 
-        //! \copydoc ISimulator::enableDebuggingMessages
+        //! \copydoc ISimulator::enableDebugMessages
         virtual void enableDebugMessages(bool driverMessages, bool interpolatorMessages) override;
 
         //! \copydoc ISimulator::getInstalledModelsCount
         virtual int getInstalledModelsCount() const override;
 
-        //! \copydoc IContextSimulator::highlightAircraft
+        //! \copydoc ISimulator::highlightAircraft
         virtual void highlightAircraft(const BlackMisc::Simulation::CSimulatedAircraft &aircraftToHighlight, bool enableHighlight, const BlackMisc::PhysicalQuantities::CTime &displayTime) override;
 
-        //! \copydoc IContextSimulator::isRenderingEnabled
+        //! \copydoc ISimulator::isRenderingEnabled
         virtual bool isRenderingEnabled() const override;
 
-        //! \copydoc IContextSimulator::isRenderingRestricted
+        //! \copydoc ISimulator::isRenderingRestricted
         virtual bool isRenderingRestricted() const override;
 
-        //! \copydoc IContextSimulator::getSimulatorPluginInfo
+        //! \copydoc ISimulator::getSimulatorPluginInfo
         virtual const BlackMisc::Simulation::CSimulatorPluginInfo &getSimulatorPluginInfo() const override;
 
-        //! \copydoc IContextSimulator::getSimulatorSetup
+        //! \copydoc ISimulator::getSimulatorSetup
         virtual const BlackMisc::Simulation::CSimulatorSetup &getSimulatorSetup() const override;
 
-        //! \copydoc IContextSimulator::unload
+        //! \copydoc ISimulator::unload
         virtual void unload();
 
         //! \copydoc IContextSimulator::deleteAllRenderingRestrictions
         virtual void deleteAllRenderingRestrictions() override;
 
-        //! \copydoc IContextSimulator::physicallyRemoveRemoteAircraft
+        //! \copydoc ISimulator::physicallyRemoveMultipleRemoteAircraft
         virtual int physicallyRemoveMultipleRemoteAircraft(const BlackMisc::Aviation::CCallsignSet &callsigns) override;
 
     protected slots:
@@ -120,10 +120,10 @@ namespace BlackCore
                          BlackMisc::IPluginStorageProvider *pluginStorageProvider,
                          QObject *parent);
 
-        //! \copydoc IContextSimulator::logicallyAddRemoteAircraft
+        //! \copydoc ISimulator::logicallyAddRemoteAircraft
         virtual bool logicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft) override;
 
-        //! \copydoc IContextSimulator::logicallyRemoveRemoteAircraft
+        //! \copydoc ISimulator::logicallyRemoveRemoteAircraft
         virtual bool logicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
 
         //! Blink the highlighted aircraft
diff --git a/src/blackcore/vatsimbookingreader.h b/src/blackcore/vatsimbookingreader.h
index b2d81cacb..445e28ced 100644
--- a/src/blackcore/vatsimbookingreader.h
+++ b/src/blackcore/vatsimbookingreader.h
@@ -44,7 +44,7 @@ namespace BlackCore
         void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
 
     protected:
-        //! \copydoc CThreadedReader::cleanup
+        //! \copydoc BlackMisc::CThreadedReader::cleanup
         virtual void cleanup() override;
 
     private slots:
diff --git a/src/blackcore/vatsimdatafilereader.h b/src/blackcore/vatsimdatafilereader.h
index 3a636af53..fb17862fb 100644
--- a/src/blackcore/vatsimdatafilereader.h
+++ b/src/blackcore/vatsimdatafilereader.h
@@ -113,7 +113,7 @@ namespace BlackCore
         void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
 
     protected:
-        //! \copydoc CThreadedReader::cleanup
+        //! \copydoc BlackMisc::CThreadedReader::cleanup
         virtual void cleanup() override;
 
     private slots:
diff --git a/src/blackcore/vatsimmetarreader.h b/src/blackcore/vatsimmetarreader.h
index 277a4c4ba..8ea35c618 100644
--- a/src/blackcore/vatsimmetarreader.h
+++ b/src/blackcore/vatsimmetarreader.h
@@ -57,7 +57,7 @@ namespace BlackCore
         void dataRead(BlackMisc::Network::CEntityFlags::Entity entity, BlackMisc::Network::CEntityFlags::ReadState state, int number);
 
     protected:
-        //! \copydoc CThreadedReader::cleanup
+        //! \copydoc BlackMisc::CThreadedReader::cleanup
         virtual void cleanup() override;
 
     private slots:
diff --git a/src/blackcore/voicechannelvatlib.h b/src/blackcore/voicechannelvatlib.h
index b04ec994d..0c2a142fd 100644
--- a/src/blackcore/voicechannelvatlib.h
+++ b/src/blackcore/voicechannelvatlib.h
@@ -47,7 +47,7 @@ namespace BlackCore
         //! \copydoc IVoiceChannel::getVoiceRoomCallsigns
         virtual BlackMisc::Aviation::CCallsignSet getVoiceRoomCallsigns() const override;
 
-        //! \copydoc IVoiceChannel::setMyAircraftCallsign
+        //! \copydoc IVoiceChannel::setOwnAircraftCallsign
         virtual void setOwnAircraftCallsign(const BlackMisc::Aviation::CCallsign &callsign) override;
 
         //! \copydoc IVoiceChannel::getVoiceRoom
diff --git a/src/blackgui/components/aircraftcomponent.h b/src/blackgui/components/aircraftcomponent.h
index 7de296e6d..643945833 100644
--- a/src/blackgui/components/aircraftcomponent.h
+++ b/src/blackgui/components/aircraftcomponent.h
@@ -62,7 +62,7 @@ namespace BlackGui
             void stopTimer() { Q_ASSERT(this->m_updateTimer); this->m_updateTimer->stopTimer(); }
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/atcstationcomponent.h b/src/blackgui/components/atcstationcomponent.h
index 56fe04a61..4d935a11f 100644
--- a/src/blackgui/components/atcstationcomponent.h
+++ b/src/blackgui/components/atcstationcomponent.h
@@ -68,7 +68,7 @@ namespace BlackGui
             //! Get METAR for given ICAO airport code
             void getMetar(const QString &airportIcaoCode);
 
-            //! \copydoc CAtcStationListModel::changedAtcStationConnectionStatus
+            //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
             void changedAtcStationOnlineConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
 
         protected:
diff --git a/src/blackgui/components/audiosetupcomponent.h b/src/blackgui/components/audiosetupcomponent.h
index bae14c707..23fbcc006 100644
--- a/src/blackgui/components/audiosetupcomponent.h
+++ b/src/blackgui/components/audiosetupcomponent.h
@@ -43,7 +43,7 @@ namespace BlackGui
             bool playNotificationSounds() const;
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/cockpitcomponent.h b/src/blackgui/components/cockpitcomponent.h
index bfac015f8..dd27e5296 100644
--- a/src/blackgui/components/cockpitcomponent.h
+++ b/src/blackgui/components/cockpitcomponent.h
@@ -37,7 +37,7 @@ namespace BlackGui
             //! Destructor
             ~CCockpitComponent();
 
-            //! \copydoc CDockWidgetInfoArea::setParentDockWidgetInfoArea
+            //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
             virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget) override;
 
             //! Is the info area shown?
diff --git a/src/blackgui/components/dbaircrafticaoselectorcomponent.h b/src/blackgui/components/dbaircrafticaoselectorcomponent.h
index 838673292..87b165d28 100644
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.h
+++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.h
@@ -43,7 +43,7 @@ namespace BlackGui
             //! Destructor
             ~CDbAircraftIcaoSelectorComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Current aircraft ICAO
diff --git a/src/blackgui/components/dbairlineicaoselectorbase.h b/src/blackgui/components/dbairlineicaoselectorbase.h
index a531691e6..1aaaa4588 100644
--- a/src/blackgui/components/dbairlineicaoselectorbase.h
+++ b/src/blackgui/components/dbairlineicaoselectorbase.h
@@ -37,7 +37,7 @@ namespace BlackGui
             //! Destructor
             virtual ~CDbAirlineIcaoSelectorBase();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Current airline ICAO
diff --git a/src/blackgui/components/dbautostashingcomponent.h b/src/blackgui/components/dbautostashingcomponent.h
index 80be535eb..4775a0181 100644
--- a/src/blackgui/components/dbautostashingcomponent.h
+++ b/src/blackgui/components/dbautostashingcomponent.h
@@ -49,7 +49,7 @@ namespace BlackGui
             //! Destructor
             ~CDbAutoStashingComponent();
 
-            //! \copydoc CWebDataServicesAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! At least run once and completed
diff --git a/src/blackgui/components/dbcountryselectorcomponent.h b/src/blackgui/components/dbcountryselectorcomponent.h
index 339beb37b..8c66f595c 100644
--- a/src/blackgui/components/dbcountryselectorcomponent.h
+++ b/src/blackgui/components/dbcountryselectorcomponent.h
@@ -43,7 +43,7 @@ namespace BlackGui
             //! Destructor
             ~CDbCountrySelectorComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Current country
diff --git a/src/blackgui/components/dbdistributorselectorcomponent.h b/src/blackgui/components/dbdistributorselectorcomponent.h
index c206e9341..63ca90977 100644
--- a/src/blackgui/components/dbdistributorselectorcomponent.h
+++ b/src/blackgui/components/dbdistributorselectorcomponent.h
@@ -43,7 +43,7 @@ namespace BlackGui
             //! Destructor
             ~CDbDistributorSelectorComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Current distributor
diff --git a/src/blackgui/components/dbliveryselectorcomponent.h b/src/blackgui/components/dbliveryselectorcomponent.h
index 9f1b69c76..e51239697 100644
--- a/src/blackgui/components/dbliveryselectorcomponent.h
+++ b/src/blackgui/components/dbliveryselectorcomponent.h
@@ -43,7 +43,7 @@ namespace BlackGui
             //! Destructor
             ~CDbLiverySelectorComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Current livery
diff --git a/src/blackgui/components/dbmappingcomponent.h b/src/blackgui/components/dbmappingcomponent.h
index 3f0f13a9a..69ae16571 100644
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -64,7 +64,7 @@ namespace BlackGui
             //! Destructor
             ~CDbMappingComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override;
 
             //! Graceful shutdown
diff --git a/src/blackgui/components/dbstashcomponent.h b/src/blackgui/components/dbstashcomponent.h
index 46669d046..a95526c78 100644
--- a/src/blackgui/components/dbstashcomponent.h
+++ b/src/blackgui/components/dbstashcomponent.h
@@ -49,7 +49,7 @@ namespace BlackGui
             //! Destructor
             ~CDbStashComponent();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override;
 
             //! Graceful shutdown
diff --git a/src/blackgui/components/enableforruntime.h b/src/blackgui/components/enableforruntime.h
index d1145d3c1..60634859f 100644
--- a/src/blackgui/components/enableforruntime.h
+++ b/src/blackgui/components/enableforruntime.h
@@ -108,7 +108,7 @@ namespace BlackGui
             //! \remarks use this methods to hook up signal/slots with runtime
             virtual void runtimeHasBeenSet() {}
 
-            //! \copydoc CRuntime::hasRemoteApplicationContext
+            //! \copydoc BlackCore::CRuntime::hasRemoteApplicationContext
             bool hasRemoteApplicationContext() const { return this->m_runtime->hasRemoteApplicationContext(); }
 
             //! Play a given notification sound
diff --git a/src/blackgui/components/infobarstatuscomponent.h b/src/blackgui/components/infobarstatuscomponent.h
index 947c96621..bc305d1bd 100644
--- a/src/blackgui/components/infobarstatuscomponent.h
+++ b/src/blackgui/components/infobarstatuscomponent.h
@@ -48,7 +48,7 @@ namespace BlackGui
             void setDBusTooltip(const QString &tooltip);
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private:
diff --git a/src/blackgui/components/mainkeypadareacomponent.h b/src/blackgui/components/mainkeypadareacomponent.h
index 08e278740..f84ac4cea 100644
--- a/src/blackgui/components/mainkeypadareacomponent.h
+++ b/src/blackgui/components/mainkeypadareacomponent.h
@@ -69,7 +69,7 @@ namespace BlackGui
             void onMainInfoAreaChanged(int currentTabIndex, QList<int> dockedIndexes, QList<int> floatingIndexes);
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/mappingcomponent.h b/src/blackgui/components/mappingcomponent.h
index 0d310c9ba..d476783cf 100644
--- a/src/blackgui/components/mappingcomponent.h
+++ b/src/blackgui/components/mappingcomponent.h
@@ -52,7 +52,7 @@ namespace BlackGui
             //! Numer of models
             int countAircraftModels() const;
 
-            //! \copydoc CListModelBase::getModelsStartsWith
+            //! Find models starting with
             BlackMisc::Simulation::CAircraftModelList findModelsStartingWith(const QString modelName, Qt::CaseSensitivity cs);
 
         signals:
@@ -60,7 +60,7 @@ namespace BlackGui
             void requestTextMessageWidget(const BlackMisc::Aviation::CCallsign &callsign);
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/registercomponent.h b/src/blackgui/components/registercomponent.h
index d391c6d16..960ea8cf7 100644
--- a/src/blackgui/components/registercomponent.h
+++ b/src/blackgui/components/registercomponent.h
@@ -35,7 +35,7 @@ namespace BlackGui
             ~CRegisterComponent();
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/settingscomponent.h b/src/blackgui/components/settingscomponent.h
index 67db00fb0..3dd9b8399 100644
--- a/src/blackgui/components/settingscomponent.h
+++ b/src/blackgui/components/settingscomponent.h
@@ -85,7 +85,7 @@ namespace BlackGui
             void setSettingsTab(SettingTab tab);
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/settingsnetworkcomponent.h b/src/blackgui/components/settingsnetworkcomponent.h
index db5f1ef0c..ab81c50c7 100644
--- a/src/blackgui/components/settingsnetworkcomponent.h
+++ b/src/blackgui/components/settingsnetworkcomponent.h
@@ -38,7 +38,7 @@ namespace BlackGui
             ~CSettingsNetworkComponent();
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             virtual void runtimeHasBeenSet() override;
 
         private:
diff --git a/src/blackgui/components/settingssimulatorcomponent.h b/src/blackgui/components/settingssimulatorcomponent.h
index 260e58ecb..71613a724 100644
--- a/src/blackgui/components/settingssimulatorcomponent.h
+++ b/src/blackgui/components/settingssimulatorcomponent.h
@@ -36,7 +36,7 @@ namespace BlackGui
             ~CSettingsSimulatorComponent();
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet()
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet()
             virtual void runtimeHasBeenSet() override;
 
         private slots:
diff --git a/src/blackgui/components/textmessagecomponent.h b/src/blackgui/components/textmessagecomponent.h
index 470072f27..7c6661c43 100644
--- a/src/blackgui/components/textmessagecomponent.h
+++ b/src/blackgui/components/textmessagecomponent.h
@@ -75,7 +75,7 @@ namespace BlackGui
             void showCorrespondingTab(const BlackMisc::Aviation::CCallsign &callsign);
 
         protected:
-            //! \copydoc CRuntimeBasedComponent::runtimeHasBeenSet
+            //! \copydoc CEnableForRuntime::runtimeHasBeenSet
             void runtimeHasBeenSet() override;
 
         private:
diff --git a/src/blackgui/dockwidgetinfoarea.h b/src/blackgui/dockwidgetinfoarea.h
index 4ed076985..e02e00eb9 100644
--- a/src/blackgui/dockwidgetinfoarea.h
+++ b/src/blackgui/dockwidgetinfoarea.h
@@ -48,7 +48,7 @@ namespace BlackGui
         //! Contribute to menu
         virtual void addToContextMenu(QMenu *contextMenu) const override;
 
-        //! \copydoc CDockWidget::initalFloating
+        //! \copydoc CDockWidget::initialFloating
         virtual void initialFloating() override;
 
     private:
diff --git a/src/blackgui/editors/aircrafticaoform.h b/src/blackgui/editors/aircrafticaoform.h
index 12dd3e5db..c582f6778 100644
--- a/src/blackgui/editors/aircrafticaoform.h
+++ b/src/blackgui/editors/aircrafticaoform.h
@@ -61,7 +61,7 @@ namespace BlackGui
             //! Clear
             void clear();
 
-            //! \copydoc CWebDataServicesAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
         public slots:
diff --git a/src/blackgui/editors/airlineicaoform.h b/src/blackgui/editors/airlineicaoform.h
index 22662e8c9..6e68af3ed 100644
--- a/src/blackgui/editors/airlineicaoform.h
+++ b/src/blackgui/editors/airlineicaoform.h
@@ -64,7 +64,7 @@ namespace BlackGui
             //! Clear
             void clear();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
         signals:
diff --git a/src/blackgui/editors/distributorform.h b/src/blackgui/editors/distributorform.h
index 1c9495a76..87fc54bdb 100644
--- a/src/blackgui/editors/distributorform.h
+++ b/src/blackgui/editors/distributorform.h
@@ -61,7 +61,7 @@ namespace BlackGui
             //! Clear
             void clear();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider);
 
         public slots:
diff --git a/src/blackgui/editors/liveryform.h b/src/blackgui/editors/liveryform.h
index 526681103..cf3a1fb76 100644
--- a/src/blackgui/editors/liveryform.h
+++ b/src/blackgui/editors/liveryform.h
@@ -39,7 +39,7 @@ namespace BlackGui
             //! Destructor
             ~CLiveryForm();
 
-            //! \copydoc CWebDataServicesAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *provider) override;
 
             //! Value
diff --git a/src/blackgui/filters/aircrafticaofilterbar.h b/src/blackgui/filters/aircrafticaofilterbar.h
index 1d8497457..c984db435 100644
--- a/src/blackgui/filters/aircrafticaofilterbar.h
+++ b/src/blackgui/filters/aircrafticaofilterbar.h
@@ -41,10 +41,10 @@ namespace BlackGui
             //! Destructor
             ~CAircraftIcaoFilterBar();
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
-            //! \copydoc CFilterWidget::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAircraftIcaoCodeList> > createModelFilter() const;
 
             //! Filter by ICAO object as default values
diff --git a/src/blackgui/filters/aircraftmodelfilterbar.h b/src/blackgui/filters/aircraftmodelfilterbar.h
index bcc3d7c17..b9e91636a 100644
--- a/src/blackgui/filters/aircraftmodelfilterbar.h
+++ b/src/blackgui/filters/aircraftmodelfilterbar.h
@@ -41,7 +41,7 @@ namespace BlackGui
             //! Destructor
             ~CAircraftModelFilterBar();
 
-            //! \copydoc IModelFilter::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Simulation::CAircraftModelList>> createModelFilter() const override;
 
             //! Set the provider
diff --git a/src/blackgui/filters/aircraftmodelfilterdialog.h b/src/blackgui/filters/aircraftmodelfilterdialog.h
index 509514460..1f4de9e87 100644
--- a/src/blackgui/filters/aircraftmodelfilterdialog.h
+++ b/src/blackgui/filters/aircraftmodelfilterdialog.h
@@ -39,7 +39,7 @@ namespace BlackGui
             //! Destructor
             ~CAircraftModelFilterDialog();
 
-            //! \copydoc IModelFilterProvider::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Simulation::CAircraftModelList>> createModelFilter() const override;
 
             //! Set the provider
diff --git a/src/blackgui/filters/airlineicaofilterbar.h b/src/blackgui/filters/airlineicaofilterbar.h
index 4d95484eb..1ad49ae9b 100644
--- a/src/blackgui/filters/airlineicaofilterbar.h
+++ b/src/blackgui/filters/airlineicaofilterbar.h
@@ -42,10 +42,10 @@ namespace BlackGui
             //! Destructor
             ~CAirlineIcaoFilterBar();
 
-            //! \copydoc IModelFilter::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CAirlineIcaoCodeList>> createModelFilter() const override;
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Filter default values by ICAO code
diff --git a/src/blackgui/filters/countryfilterbar.h b/src/blackgui/filters/countryfilterbar.h
index 005f3100f..dcec23180 100644
--- a/src/blackgui/filters/countryfilterbar.h
+++ b/src/blackgui/filters/countryfilterbar.h
@@ -39,10 +39,10 @@ namespace BlackGui
             //! Destructor
             ~CCountryFilterBar();
 
-            //! \copydoc IModelFilter::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::CCountryList>> createModelFilter() const override;
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
         public slots:
diff --git a/src/blackgui/filters/liveryfilterbar.h b/src/blackgui/filters/liveryfilterbar.h
index b829b0064..cc8975825 100644
--- a/src/blackgui/filters/liveryfilterbar.h
+++ b/src/blackgui/filters/liveryfilterbar.h
@@ -41,10 +41,10 @@ namespace BlackGui
             //! Destructor
             ~CLiveryFilterBar();
 
-            //! \copydoc IModelFilter::getModelFilter
+            //! \copydoc Models::IModelFilterProvider::createModelFilter
             virtual std::unique_ptr<BlackGui::Models::IModelFilter<BlackMisc::Aviation::CLiveryList>> createModelFilter() const override;
 
-            //! \copydoc CWebDataReaderAware::setProvider
+            //! \copydoc BlackMisc::Network::CWebDataServicesAware::setProvider
             virtual void setProvider(BlackMisc::Network::IWebDataServicesProvider *webDataReaderProvider) override;
 
             //! Filter by livery as default values
diff --git a/src/blackgui/models/actionhotkeylistmodel.h b/src/blackgui/models/actionhotkeylistmodel.h
index 69f6c004a..e7712b195 100644
--- a/src/blackgui/models/actionhotkeylistmodel.h
+++ b/src/blackgui/models/actionhotkeylistmodel.h
@@ -41,7 +41,7 @@ namespace BlackGui
             //! \copydoc QAbstractTableModel::rowCount
             int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-            //! \copydoc QAbstractTableModel::columCount
+            //! \copydoc QAbstractTableModel::columnCount
             int columnCount(const QModelIndex &parent = QModelIndex()) const override;
 
             //! \copydoc QAbstractTableModel::data
diff --git a/src/blackgui/models/columnformatters.h b/src/blackgui/models/columnformatters.h
index 78762894c..cdfcedfbe 100644
--- a/src/blackgui/models/columnformatters.h
+++ b/src/blackgui/models/columnformatters.h
@@ -306,7 +306,7 @@ namespace BlackGui
             //! Constructor
             CPhysiqalQuantiyFormatter(MU unit = MU::defaultUnit(), int digits = 2, int alignment = alignRightVCenter(), bool withUnit = true, bool i18n = true, QList<int> supportedRoles = roleDisplay()) : CValueObjectFormatter(alignment, i18n, supportedRoles), m_unit(unit), m_digits(digits), m_withUnit(withUnit) {}
 
-            //! \copydoc CValueObjectFormatter::displayRole
+            //! \copydoc BlackGui::Models::CDefaultFormatter::displayRole
             virtual BlackMisc::CVariant displayRole(const BlackMisc::CVariant &physicalQuantity) const override
             {
                 if (physicalQuantity.canConvert<PQ>())
diff --git a/src/blackgui/models/listmodelbase.h b/src/blackgui/models/listmodelbase.h
index 2d01a3976..86e2d7ce9 100644
--- a/src/blackgui/models/listmodelbase.h
+++ b/src/blackgui/models/listmodelbase.h
@@ -219,7 +219,7 @@ namespace BlackGui
             //! Remove object
             virtual void remove(const ObjectType &object);
 
-            //! \copydoc BlackMisc::ContainerBase::removeIf
+            //! \copydoc BlackMisc::CContainerBase::removeIf
             template <class K0, class V0, class... KeysValues>
             int removeIf(K0 k0, V0 v0, KeysValues... keysValues)
             {
@@ -238,10 +238,10 @@ namespace BlackGui
             //! \copydoc QStandardItemModel::mimeData
             virtual QMimeData *mimeData(const QModelIndexList &indexes) const override;
 
-            //! \copydoc CListModelBaseNonTemplate::toJosn
+            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJson
             virtual QJsonObject toJson() const override;
 
-            //! \copydoc CListModelBaseNonTemplate::toJsonString
+            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::toJsonString
             virtual QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented) const override;
 
             //! Filter available
@@ -254,10 +254,10 @@ namespace BlackGui
             void takeFilterOwnership(std::unique_ptr<IModelFilter<ContainerType> > &filter);
 
         protected:
-            //! \copydoc CListModelBaseNonTemplate::CListModelBaseNonTemplate
+            //! Constructor
             CListModelBase(const QString &translationContext, QObject *parent = nullptr);
 
-            //! \copydoc CModelBaseNonTemplate::performUpdateContainer
+            //! \copydoc BlackGui::Models::CListModelBaseNonTemplate::performUpdateContainer
             virtual int performUpdateContainer(const BlackMisc::CVariant &variant, bool sort) override;
 
             //! Update filtered container
diff --git a/src/blackgui/models/listmodeldbobjects.h b/src/blackgui/models/listmodeldbobjects.h
index b50ac2a6f..ef7c3997d 100644
--- a/src/blackgui/models/listmodeldbobjects.h
+++ b/src/blackgui/models/listmodeldbobjects.h
@@ -39,7 +39,7 @@ namespace BlackGui
             //! Set color for highlighting
             void setHighlightColor(QColor color) { m_highlightColor = color; }
 
-            //! \copydoc CListModelBase::data
+            //! Get data for index and role
             virtual QVariant data(const QModelIndex &index, int role) const override;
 
             //! DB key for given index
@@ -49,7 +49,7 @@ namespace BlackGui
             bool isHighlightIndex(const QModelIndex &index) const;
 
         protected:
-            //! \copydoc CListModelDbObjectsNonTemplate::CListModelDbObjectsNonTemplate
+            //! Constructor
             CListModelDbObjects(const QString &translationContext, QObject *parent = nullptr);
 
         private:
diff --git a/src/blackgui/views/aircraftmodelview.h b/src/blackgui/views/aircraftmodelview.h
index 58050eaf6..abd716662 100644
--- a/src/blackgui/views/aircraftmodelview.h
+++ b/src/blackgui/views/aircraftmodelview.h
@@ -67,14 +67,14 @@ namespace BlackGui
             //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(const QStringList &)
             void setHighlightModelStrings(const QStringList &highlightModels);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelsStrings(bool)
+            //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStrings(bool)
             void setHighlightModelStrings(bool highlight);
 
             //! \copydoc BlackGui::Models::CAircraftModelListModel::setHighlightModelStringsColor
             void setHighlightModelStringsColor(const QBrush &brush);
 
-            //! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModelsStrings
             bool highlightModelsStrings() const;
+            //! \copydoc BlackGui::Models::CAircraftModelListModel::highlightModelStrings
 
         signals:
             //! Request to stash if applicable
diff --git a/src/blackgui/views/atcstationview.h b/src/blackgui/views/atcstationview.h
index 3e1a226dc..026a25d47 100644
--- a/src/blackgui/views/atcstationview.h
+++ b/src/blackgui/views/atcstationview.h
@@ -44,7 +44,7 @@ namespace BlackGui
             void requestTextMessageWidget(const BlackMisc::Aviation::CCallsign &callsign);
 
         public slots:
-            //! \copydoc CAtcStationListModel::changedAtcStationConnectionStatus
+            //! \copydoc Models::CAtcStationListModel::changedAtcStationConnectionStatus
             void changedAtcStationConnectionStatus(const BlackMisc::Aviation::CAtcStation &station, bool added);
 
         protected:
diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h
index f45352813..6d5f33ebd 100644
--- a/src/blackgui/views/viewbase.h
+++ b/src/blackgui/views/viewbase.h
@@ -110,13 +110,13 @@ namespace BlackGui
             //! Allow to drag and/or drop value objects
             virtual void allowDragDropValueObjects(bool allowDrag, bool allowDrop);
 
-            //! \copydoc CDockWidget::allowDrop
+            //! \copydoc CDropBase::allowDrop
             virtual void allowDrop(bool allow) override;
 
-            //! \copydoc CDockWidget::isDropAllowed
+            //! \copydoc CDropBase::isDropAllowed
             virtual bool isDropAllowed() const override;
 
-            //! \copydoc CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
+            //! \copydoc Components::CEnableForDockWidgetInfoArea::setParentDockWidgetInfoArea
             virtual bool setParentDockWidgetInfoArea(BlackGui::CDockWidgetInfoArea *parentDockableWidget);
 
             //! Resize mode
@@ -191,7 +191,7 @@ namespace BlackGui
             //! Menus
             Menu getMenu() const { return this->m_menus; }
 
-            //! \copydoc QTableView::setSelectionModel();
+            //! \copydoc QTableView::setSelectionModel
             virtual void setSelectionModel(QItemSelectionModel *model) override;
 
             //! Main application window widget if any
@@ -256,7 +256,7 @@ namespace BlackGui
 
             //! Method creating the menu
             //! \remarks override this method to contribute to the menu
-            //! \sa CViewBaseNonTemplate::ps_customMenuRequested
+            //! \sa BlackGui::Views::CViewBaseNonTemplate::ps_customMenuRequested
             virtual void customMenu(QMenu &menu) const;
 
             //! \copydoc QTableView::paintEvent
@@ -430,13 +430,13 @@ namespace BlackGui
             //! Access to container
             const ContainerType &container() const;
 
-            //! \copydoc BlackGui::Models::ListModelBase::containerOrFilteredContainer
+            //! \copydoc BlackGui::Models::CListModelBase::containerOrFilteredContainer
             const ContainerType &containerOrFilteredContainer() const;
 
             //! Selected objects
             ContainerType selectedObjects() const;
 
-            //! \copydoc CViewBaseNonTemplate::removeSelectedRows
+            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::removeSelectedRows
             //! \remarks Actually a slot, but not defined as such as the template does not support Q_OBJECT
             virtual int removeSelectedRows() override;
 
@@ -476,7 +476,7 @@ namespace BlackGui
             //! Column count
             int columnCount() const;
 
-            //! \copydoc CViewBaseNonTemplate::isEmpty
+            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::isEmpty
             virtual bool isEmpty() const override;
 
             //! Convert to JSON
diff --git a/src/blackgui/views/viewdbobjects.h b/src/blackgui/views/viewdbobjects.h
index fa7478741..52db07a88 100644
--- a/src/blackgui/views/viewdbobjects.h
+++ b/src/blackgui/views/viewdbobjects.h
@@ -44,11 +44,11 @@ namespace BlackGui
             //! Constructor
             explicit CViewWithDbObjects(QWidget *parent = nullptr);
 
-            //! \copydoc QWidget::customMenu
+            //! \copydoc BlackGui::Views::CViewBaseNonTemplate::customMenu
             virtual void customMenu(QMenu &menu) const override;
 
         protected slots:
-            //! \copydoc CViewBaseNonTemplate::ps_toggleHighlightDbData
+            //! \copydoc BlackGui::Views::CViewBase::ps_toggleHighlightDbData
             virtual void ps_toggleHighlightDbData() override;
         };
     } // namespace
diff --git a/src/blackmisc/audio/audiodeviceinfo.h b/src/blackmisc/audio/audiodeviceinfo.h
index 576f552b0..8eb334fbe 100644
--- a/src/blackmisc/audio/audiodeviceinfo.h
+++ b/src/blackmisc/audio/audiodeviceinfo.h
@@ -78,7 +78,7 @@ namespace BlackMisc
                 return CAudioDeviceInfo(InputDevice, defaultDeviceIndex(), "default");
             }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/audio/settings/settingsaudio.h b/src/blackmisc/audio/settings/settingsaudio.h
index 674c31aa4..0fdb138bb 100644
--- a/src/blackmisc/audio/settings/settingsaudio.h
+++ b/src/blackmisc/audio/settings/settingsaudio.h
@@ -37,13 +37,13 @@ namespace BlackMisc
                 //! Notification flag (play notification?)
                 void setNotificationFlag(BlackMisc::Audio::CNotificationSounds::Notification notification, bool value);
 
-                //! \copydoc BlackCore::IContextSettings::value
+                //! Settings value
                 BlackMisc::CStatusMessage value(const QString &path, const QString &command, const BlackMisc::CVariant &value, bool &changedFlag);
 
                 //! Init with meaningful default values
                 void initDefaultValues();
 
-                //! \copydoc CValueObject::convertToQString
+                //! \copydoc BlackMisc::Mixin::String::toQString
                 QString convertToQString(bool i18n = false) const;
 
             private:
diff --git a/src/blackmisc/audio/voiceroom.h b/src/blackmisc/audio/voiceroom.h
index b41d7d1c1..8542cb39d 100644
--- a/src/blackmisc/audio/voiceroom.h
+++ b/src/blackmisc/audio/voiceroom.h
@@ -86,10 +86,10 @@ namespace BlackMisc
             //! Is ATIS voice channel
             bool isAtis() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Protocol prefix "vvl"
@@ -101,7 +101,7 @@ namespace BlackMisc
              */
             static const QString &protocolComplete() { static QString p("vvl://"); return p; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h
index ab2eb33e1..e31877a1f 100644
--- a/src/blackmisc/aviation/aircraftengine.h
+++ b/src/blackmisc/aviation/aircraftengine.h
@@ -42,7 +42,7 @@ namespace BlackMisc
             //! Set to on/off
             void setOn(bool on) { m_on = on; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/aircraftenginelist.h b/src/blackmisc/aviation/aircraftenginelist.h
index 472e9375d..941c52399 100644
--- a/src/blackmisc/aviation/aircraftenginelist.h
+++ b/src/blackmisc/aviation/aircraftenginelist.h
@@ -46,10 +46,10 @@ namespace BlackMisc
             //! Engine number 1..x on?
             bool isEngineOn(int engineNumber) const;
 
-            //! \copydoc CValueObject::toJson
+            //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
             QJsonObject toJson() const;
 
-            //! \copydoc CValueObject::convertFromJson
+            //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
             void convertFromJson(const QJsonObject &json);
 
         };
diff --git a/src/blackmisc/aviation/aircrafticaocode.h b/src/blackmisc/aviation/aircrafticaocode.h
index 6e5f515db..86ce053e8 100644
--- a/src/blackmisc/aviation/aircrafticaocode.h
+++ b/src/blackmisc/aviation/aircrafticaocode.h
@@ -216,16 +216,16 @@ namespace BlackMisc
             //! Matches ICAO, IATA, family?
             bool matchesDesignatorIataOrFamily(const QString &icaoIataOrFamily) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
             int comparePropertyByIndex(const CAircraftIcaoCode &compareValue, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Update missing parts
diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h
index 89260bd58..45cd953de 100644
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -42,10 +42,10 @@ namespace BlackMisc
             //! Constructor
             CAircraftLights(bool strobeOn, bool landingOn, bool taxiOn, bool beaconOn, bool navOn, bool logoOn);
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Strobes lights on?
@@ -96,7 +96,7 @@ namespace BlackMisc
             //! Returns object with all lights switched off
             static CAircraftLights allLightsOff();
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h
index 9e080f71c..e32f38aa3 100644
--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -50,10 +50,10 @@ namespace BlackMisc
                   m_spoilersOut(spoilersOut), m_isOnGround(onGround)
             {}
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
@@ -110,7 +110,7 @@ namespace BlackMisc
             //! Set aircraft on ground
             void setOnGround(bool onGround) { m_isOnGround = onGround; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h
index 6f8f0e3a7..6de3cb4fc 100644
--- a/src/blackmisc/aviation/aircraftsituation.h
+++ b/src/blackmisc/aviation/aircraftsituation.h
@@ -64,10 +64,10 @@ namespace BlackMisc
                                const BlackMisc::PhysicalQuantities::CAngle &bank = {},
                                const BlackMisc::PhysicalQuantities::CSpeed &gs = {});
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Get position
@@ -76,23 +76,23 @@ namespace BlackMisc
             //! Set position
             void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; }
 
-            //! \copydoc ICoordinateGeodetic::latitude()
+            //! \copydoc Geo::ICoordinateGeodetic::latitude()
             virtual BlackMisc::Geo::CLatitude latitude() const override { return this->m_position.latitude(); }
 
-            //! \copydoc ICoordinateGeodetic::longitude()
+            //! \copydoc Geo::ICoordinateGeodetic::longitude()
             virtual BlackMisc::Geo::CLongitude longitude() const override { return this->m_position.longitude(); }
 
             //! Guess if aircraft is "on ground"
             virtual bool isOnGroundGuessed() const;
 
-            //! \copydoc ICoordinateGeodetic::geodeticHeight
+            //! \copydoc Geo::ICoordinateGeodetic::geodeticHeight
             //! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
             const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_position.geodeticHeight(); }
 
-            //! \copydoc ICoordinateGeodetic::normalVector
+            //! \copydoc Geo::ICoordinateGeodetic::normalVector
             virtual QVector3D normalVector() const override { return this->m_position.normalVector(); }
 
-            //! \copydoc ICoordinateGeodetic::normalVectorDouble
+            //! \copydoc Geo::ICoordinateGeodetic::normalVectorDouble
             virtual std::array<double, 3> normalVectorDouble() const override { return this->m_position.normalVectorDouble(); }
 
             //! Elevation
@@ -143,7 +143,7 @@ namespace BlackMisc
             //! Corresponding callsign
             void setCallsign(const BlackMisc::Aviation::CCallsign &callsign);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/airlineicaocode.h b/src/blackmisc/aviation/airlineicaocode.h
index 732d6b5bc..0e604d5cd 100644
--- a/src/blackmisc/aviation/airlineicaocode.h
+++ b/src/blackmisc/aviation/airlineicaocode.h
@@ -150,16 +150,16 @@ namespace BlackMisc
             //! Comined string with key
             QString getCombinedStringWithKey() const;
 
-            //! \copydoc CValueObject::toIcon
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon
             CIcon toIcon() const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
diff --git a/src/blackmisc/aviation/airport.h b/src/blackmisc/aviation/airport.h
index 65b00f794..99c4bc582 100644
--- a/src/blackmisc/aviation/airport.h
+++ b/src/blackmisc/aviation/airport.h
@@ -77,41 +77,41 @@ namespace BlackMisc
             //! \sa setGeodeticHeight
             void setElevation(const BlackMisc::PhysicalQuantities::CLength &elevation) { return this->m_position.setGeodeticHeight(elevation); }
 
-            //! \copydoc ICoordinateGeodetic::geodeticHeight
+            //! \copydoc Geo::ICoordinateGeodetic::geodeticHeight
             //! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
             const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override { return this->m_position.geodeticHeight(); }
 
             //! Valid ICAO code
             bool hasValidIcaoCode() const { return !this->getIcao().isEmpty(); }
 
-            //! \copydoc ICoordinateGeodetic::latitude
+            //! \copydoc Geo::ICoordinateGeodetic::latitude
             virtual BlackMisc::Geo::CLatitude latitude() const override
             {
                 return this->getPosition().latitude();
             }
 
-            //! \copydoc ICoordinateGeodetic::longitude
+            //! \copydoc Geo::ICoordinateGeodetic::longitude
             virtual BlackMisc::Geo::CLongitude longitude() const override
             {
                 return this->getPosition().longitude();
             }
 
-            //! \copydoc ICoordinateGeodetic::normalVector
+            //! \copydoc Geo::ICoordinateGeodetic::normalVector
             virtual QVector3D normalVector() const override { return this->getPosition().normalVector(); }
 
-            //! \copydoc ICoordinateGeodetic::normalVectorDouble
+            //! \copydoc Geo::ICoordinateGeodetic::normalVectorDouble
             virtual std::array<double, 3> normalVectorDouble() const override { return this->getPosition().normalVectorDouble(); }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
             int comparePropertyByIndex(const CAirport &compareValue, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/airporticaocode.h b/src/blackmisc/aviation/airporticaocode.h
index c385658f1..e6073f3a6 100644
--- a/src/blackmisc/aviation/airporticaocode.h
+++ b/src/blackmisc/aviation/airporticaocode.h
@@ -51,7 +51,7 @@ namespace BlackMisc
             //! Valid ICAO designator
             static bool isValidIcaoDesignator(const QString &icaoCode);
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
             //! Compare for index
diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h
index fceaf6a53..21a20bda3 100644
--- a/src/blackmisc/aviation/altitude.h
+++ b/src/blackmisc/aviation/altitude.h
@@ -57,7 +57,7 @@ namespace BlackMisc
                 FlightLevel         //!< Flight level
             };
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Default constructor: 0 Altitude true
@@ -90,13 +90,13 @@ namespace BlackMisc
             //! Flightlevel to MSL
             void toMeanSeaLevel();
 
-            //! \copydoc CValueObject::parseFromString(const QString &value)
+            //! Parse value from string
             void parseFromString(const QString &value);
 
-            //! \copydoc CValueObject::parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode)
+            //! Parse value from string, with specified separator
             void parseFromString(const QString &value, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode);
 
-            //! \copydoc CValueObject::toIcon
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon
             BlackMisc::CIcon toIcon() const;
 
         private:
diff --git a/src/blackmisc/aviation/atcstation.h b/src/blackmisc/aviation/atcstation.h
index 44697fde8..06400fd9c 100644
--- a/src/blackmisc/aviation/atcstation.h
+++ b/src/blackmisc/aviation/atcstation.h
@@ -67,7 +67,7 @@ namespace BlackMisc
                         bool isOnline = false, const QDateTime &bookedFromUtc = QDateTime(),  const QDateTime &bookedUntilUtc = QDateTime(),
                         const CInformationMessage &atis = CInformationMessage(CInformationMessage::ATIS), const CInformationMessage &metar = CInformationMessage(CInformationMessage::METAR));
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); }
 
             //! Has booking times?
@@ -220,29 +220,29 @@ namespace BlackMisc
             //! Set booked until
             void setBookedUntilUtc(const QDateTime &until) { this->m_bookedUntilUtc = until; }
 
-            //! \copydoc ICoordinateGeodetic::latitude
+            //! \copydoc Geo::ICoordinateGeodetic::latitude
             virtual BlackMisc::Geo::CLatitude latitude() const override;
 
-            //! \copydoc ICoordinateGeodetic::longitude
+            //! \copydoc Geo::ICoordinateGeodetic::longitude
             virtual BlackMisc::Geo::CLongitude longitude() const override;
 
-            //! \copydoc ICoordinateGeodetic::geodeticHeight
+            //! \copydoc Geo::ICoordinateGeodetic::geodeticHeight
             //! \remarks this should be used for elevation as depicted here: http://en.wikipedia.org/wiki/Altitude#mediaviewer/File:Vertical_distances.svg
             const BlackMisc::PhysicalQuantities::CLength &geodeticHeight() const override;
 
-            //! \copydoc ICoordinateGeodetic::normalVector
+            //! \copydoc Geo::ICoordinateGeodetic::normalVector
             virtual QVector3D normalVector() const override;
 
-            //! \copydoc ICoordinateGeodetic::normalVectorDouble
+            //! \copydoc Geo::ICoordinateGeodetic::normalVectorDouble
             virtual std::array<double, 3> normalVectorDouble() const override;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/callsign.h b/src/blackmisc/aviation/callsign.h
index 6dd416ef5..1c0b68423 100644
--- a/src/blackmisc/aviation/callsign.h
+++ b/src/blackmisc/aviation/callsign.h
@@ -108,13 +108,13 @@ namespace BlackMisc
             //! Equals callsign string?
             bool equalsString(const QString &callsignString) const;
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             BlackMisc::CIcon toIcon() const { return convertToIcon(*this); }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
@@ -147,7 +147,7 @@ namespace BlackMisc
             //! Representing icon
             static const CIcon &convertToIcon(const CCallsign &callsign);
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
         protected:
diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h
index 0d561475a..1555bec9b 100644
--- a/src/blackmisc/aviation/flightplan.h
+++ b/src/blackmisc/aviation/flightplan.h
@@ -179,10 +179,10 @@ namespace BlackMisc
             //! Get remarks string
             const QString &getRemarks() const { return m_remarks; }
 
-            //! \copydoc CValueObject::toIcon
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon
             CIcon toIcon() const;
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/heading.h b/src/blackmisc/aviation/heading.h
index bacc55945..b7464e5de 100644
--- a/src/blackmisc/aviation/heading.h
+++ b/src/blackmisc/aviation/heading.h
@@ -52,7 +52,7 @@ namespace BlackMisc
                 True = 1        //!< true north
             };
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! \brief Default constructor: 0 heading true
diff --git a/src/blackmisc/aviation/informationmessage.h b/src/blackmisc/aviation/informationmessage.h
index 79cd14dfa..2c952e204 100644
--- a/src/blackmisc/aviation/informationmessage.h
+++ b/src/blackmisc/aviation/informationmessage.h
@@ -90,7 +90,7 @@ namespace BlackMisc
             //! Is empty?
             bool isEmpty() const { return this->m_message.isEmpty(); }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/livery.h b/src/blackmisc/aviation/livery.h
index 34f3a3497..6fa9de9dc 100644
--- a/src/blackmisc/aviation/livery.h
+++ b/src/blackmisc/aviation/livery.h
@@ -109,16 +109,16 @@ namespace BlackMisc
             //! Matches combined code
             bool matchesCombinedCode(const QString &candidate) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
             int comparePropertyByIndex(const CLivery &compareValue, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Complete data?
diff --git a/src/blackmisc/aviation/modulator.h b/src/blackmisc/aviation/modulator.h
index 87f172baa..6b14b0af8 100644
--- a/src/blackmisc/aviation/modulator.h
+++ b/src/blackmisc/aviation/modulator.h
@@ -79,13 +79,13 @@ namespace BlackMisc
             //! Are set values valid?
             virtual bool validValues() const { return true; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Destructor
diff --git a/src/blackmisc/aviation/selcal.h b/src/blackmisc/aviation/selcal.h
index 1694ad501..946c6ad31 100644
--- a/src/blackmisc/aviation/selcal.h
+++ b/src/blackmisc/aviation/selcal.h
@@ -70,7 +70,7 @@ namespace BlackMisc
             //! All valid code pairs: AB, AC, AD ...
             static const QStringList &codePairs();
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/track.h b/src/blackmisc/aviation/track.h
index 02039c532..c6e7a33a9 100644
--- a/src/blackmisc/aviation/track.h
+++ b/src/blackmisc/aviation/track.h
@@ -81,7 +81,7 @@ namespace BlackMisc
             //! \brief Get reference north (magnetic or true)
             ReferenceNorth getReferenceNorth() const { return m_north; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/aviation/transponder.h b/src/blackmisc/aviation/transponder.h
index ee9783b05..ab962a971 100644
--- a/src/blackmisc/aviation/transponder.h
+++ b/src/blackmisc/aviation/transponder.h
@@ -154,10 +154,10 @@ namespace BlackMisc
                 return CTransponder(transponderCode, mode);
             }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Is valid transponder code?
@@ -166,7 +166,7 @@ namespace BlackMisc
             //! Is valid transponder code?
             static bool isValidTransponderCode(qint32 transponderMode);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h
index 2603d68b2..f5ad93fa1 100644
--- a/src/blackmisc/containerbase.h
+++ b/src/blackmisc/containerbase.h
@@ -104,7 +104,7 @@ namespace BlackMisc
         //! Simplifies composition, returns 0 for performance
         friend uint qHash(const C<T> &) { return 0; }
 
-        //! \copydoc CValueObject::toJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
         QJsonObject toJson() const
         {
             QJsonArray array;
@@ -124,7 +124,7 @@ namespace BlackMisc
             return jsonDoc.toJson(format);
         }
 
-        //! \copydoc CValueObject::convertFromJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
         void convertFromJson(const QJsonObject &json)
         {
             derived().clear();
@@ -144,7 +144,7 @@ namespace BlackMisc
             this->convertFromJson(BlackMisc::Json::jsonObjectFromString(jsonString));
         }
 
-        //! \copydoc BlackMisc::CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const
         {
             QString str;
diff --git a/src/blackmisc/country.h b/src/blackmisc/country.h
index 35bd308c0..1e98844c1 100644
--- a/src/blackmisc/country.h
+++ b/src/blackmisc/country.h
@@ -72,13 +72,13 @@ namespace BlackMisc
         //! Matches country name
         bool matchesCountryName(const QString &name) const;
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare for index
diff --git a/src/blackmisc/datastore.h b/src/blackmisc/datastore.h
index 15a528e8f..39051873f 100644
--- a/src/blackmisc/datastore.h
+++ b/src/blackmisc/datastore.h
@@ -71,10 +71,10 @@ namespace BlackMisc
         //! Is a key available?
         static bool existsKey(const QJsonObject &json, const QString &prefix = QString());
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare by index
@@ -126,10 +126,10 @@ namespace BlackMisc
         //! Is a key available?
         static bool existsKey(const QJsonObject &json, const QString &prefix = QString());
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare by index
diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h
index 1206d07d3..def73ccbc 100644
--- a/src/blackmisc/dictionary.h
+++ b/src/blackmisc/dictionary.h
@@ -231,7 +231,7 @@ namespace BlackMisc
             }
         }
 
-        //! \copydoc CValueObject::toJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
         QJsonObject toJson() const
         {
             QJsonArray array;
@@ -245,7 +245,7 @@ namespace BlackMisc
             return json;
         }
 
-        //! \copydoc CValueObject::convertFromJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
         void convertFromJson(const QJsonObject &json)
         {
             QJsonArray array = json.value("associativecontainerbase").toArray();
@@ -410,7 +410,7 @@ namespace BlackMisc
         //! Test for inequality.
         friend bool operator !=(const CDictionary &a, const CDictionary &b) { return !(a == b); }
 
-        //! \copydoc BlackMisc::CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const
         {
             QString str;
diff --git a/src/blackmisc/geo/coordinategeodetic.h b/src/blackmisc/geo/coordinategeodetic.h
index c149856ec..5f7de854e 100644
--- a/src/blackmisc/geo/coordinategeodetic.h
+++ b/src/blackmisc/geo/coordinategeodetic.h
@@ -68,7 +68,7 @@ namespace BlackMisc
             //! Normal vector with double precision
             virtual std::array<double, 3> normalVectorDouble() const = 0;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
             //! Latitude as string
@@ -174,10 +174,10 @@ namespace BlackMisc
             //! \copydoc ICoordinateGeodetic::normalVectorDouble
             virtual std::array<double, 3> normalVectorDouble() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Switch unit of height
@@ -204,7 +204,7 @@ namespace BlackMisc
             //! Coordinate by WGS84 position data
             static CCoordinateGeodetic fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const BlackMisc::PhysicalQuantities::CLength &geodeticHeight = {});
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/geo/earthangle.h b/src/blackmisc/geo/earthangle.h
index 34127da95..f410e7c03 100644
--- a/src/blackmisc/geo/earthangle.h
+++ b/src/blackmisc/geo/earthangle.h
@@ -46,7 +46,7 @@ namespace BlackMisc
             //! Multiply operator *
             LATorLON operator *(double multiply) const;
 
-            //! \copydoc CValueObject::toIcon
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon
             CIcon toIcon() const;
 
             /*!
@@ -67,7 +67,7 @@ namespace BlackMisc
             CEarthAngle(const BlackMisc::PhysicalQuantities::CAngle &angle);
 
         public:
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/geo/latitude.h b/src/blackmisc/geo/latitude.h
index 9fbd4de61..e12b756a2 100644
--- a/src/blackmisc/geo/latitude.h
+++ b/src/blackmisc/geo/latitude.h
@@ -36,7 +36,7 @@ namespace BlackMisc
             BLACKMISC_DECLARE_USING_MIXIN_STRING(CLatitude)
             BLACKMISC_DECLARE_USING_MIXIN_INDEX(CLatitude)
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const
             {
                 QString s(CEarthAngle::convertToQString(i18n));
diff --git a/src/blackmisc/geo/longitude.h b/src/blackmisc/geo/longitude.h
index e97ecf921..940d9d354 100644
--- a/src/blackmisc/geo/longitude.h
+++ b/src/blackmisc/geo/longitude.h
@@ -36,7 +36,7 @@ namespace BlackMisc
             BLACKMISC_DECLARE_USING_MIXIN_STRING(CLongitude)
             BLACKMISC_DECLARE_USING_MIXIN_INDEX(CLongitude)
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const
             {
                 QString s(CEarthAngle::convertToQString(i18n));
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index 53d45cf36..26fc9c6b0 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -119,7 +119,7 @@ namespace BlackMisc
         //! Implicit conversion
         operator QPixmap() const { return this->toPixmap(); }
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
         //! Icon for given index
diff --git a/src/blackmisc/identifier.h b/src/blackmisc/identifier.h
index c17f4821e..139b9998c 100644
--- a/src/blackmisc/identifier.h
+++ b/src/blackmisc/identifier.h
@@ -83,13 +83,13 @@ namespace BlackMisc
         //! Check if originating from the same process name
         bool isFromSameProcessName() const;
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
     private:
diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h
index 6de2dd788..93219ef44 100644
--- a/src/blackmisc/input/actionhotkey.h
+++ b/src/blackmisc/input/actionhotkey.h
@@ -72,13 +72,13 @@ namespace BlackMisc
             //! Is hotkey valid?
             bool isValid() const { return !m_identifier.getMachineName().isEmpty() && !m_combination.isEmpty() && !m_action.isEmpty(); }
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/input/hotkeycombination.h b/src/blackmisc/input/hotkeycombination.h
index f52dd58a8..27aff311d 100644
--- a/src/blackmisc/input/hotkeycombination.h
+++ b/src/blackmisc/input/hotkeycombination.h
@@ -70,7 +70,7 @@ namespace BlackMisc
             //! E.g. CTRL would be a subset of CTRL+D
             bool isSubsetOf(const CHotkeyCombination &other) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/input/joystickbutton.h b/src/blackmisc/input/joystickbutton.h
index 16e7bf7d1..2d6cd07ee 100644
--- a/src/blackmisc/input/joystickbutton.h
+++ b/src/blackmisc/input/joystickbutton.h
@@ -54,10 +54,10 @@ namespace BlackMisc
             //! Set button object
             void setButtonObject(const CJoystickButton &button);
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const CPropertyIndex &index) const;
 
             //! Button index to string
@@ -69,7 +69,7 @@ namespace BlackMisc
             //! Invalid button index
             static int getInvalidIndex() { return m_invalidIndex; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/input/keyboardkey.h b/src/blackmisc/input/keyboardkey.h
index 4658b1774..34f97506f 100644
--- a/src/blackmisc/input/keyboardkey.h
+++ b/src/blackmisc/input/keyboardkey.h
@@ -73,13 +73,13 @@ namespace BlackMisc
             //! Set key object
             void setKeyObject(const CKeyboardKey &key);
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h
index 09e45b68b..d4c9bf172 100644
--- a/src/blackmisc/logcategory.h
+++ b/src/blackmisc/logcategory.h
@@ -138,7 +138,7 @@ namespace BlackMisc
         //! Returns true if the category string contains the given substring.
         bool contains(const QString &substring) const { return m_string.contains(substring); }
 
-        //! \copydoc CValueObject::convertToQString()
+        //! \copydoc BlackMisc::Mixin::String::toQString()
         QString convertToQString(bool i18n = false) const;
 
     private:
diff --git a/src/blackmisc/logcategorylist.h b/src/blackmisc/logcategorylist.h
index a89150514..18be5eead 100644
--- a/src/blackmisc/logcategorylist.h
+++ b/src/blackmisc/logcategorylist.h
@@ -100,7 +100,7 @@ namespace BlackMisc
         //! Register metadata
         static void registerMetadata();
 
-        //! \copydoc BlackMisc::CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
     private:
diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h
index 9c4f85979..7303bf2cc 100644
--- a/src/blackmisc/logpattern.h
+++ b/src/blackmisc/logpattern.h
@@ -83,13 +83,13 @@ namespace BlackMisc
         //!          topological sorting algorithm, to sort patterns by their generality.
         bool isProperSubsetOf(const CLogPattern &other) const;
 
-        //! \copydoc CValueObject::convertToQString()
+        //! \copydoc BlackMisc::Mixin::String::toQString()
         QString convertToQString(bool i18n = false) const;
 
-        //! \copydoc CValueObject::marshallToDbus()
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus()
         void marshallToDbus(QDBusArgument &argument) const;
 
-        //! \copydoc CValueObject::marshallFromDbus()
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus()
         void unmarshallFromDbus(const QDBusArgument &argument);
 
         //! \copydoc CValueObject::qHash
diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h
index e60f69e63..dec5c896b 100644
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -51,19 +51,19 @@ namespace BlackMisc
         //! Set variant.
         void setVariant(const CVariant &variant) { m_variant = variant; }
 
-        //! \copydoc CValueObject::toIcon()
+        //! \copydoc BlackMisc::Mixin::Icon::toIcon()
         BlackMisc::CIcon toIcon() const;
 
         //! Has icon
         bool hasIcon() const;
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-        //! \copydoc CValueObject::convertToQString()
+        //! \copydoc BlackMisc::Mixin::String::toQString()
         QString convertToQString(bool i18n = false) const;
 
     private:
diff --git a/src/blackmisc/network/authenticateduser.h b/src/blackmisc/network/authenticateduser.h
index 0100c6355..45f2089f3 100644
--- a/src/blackmisc/network/authenticateduser.h
+++ b/src/blackmisc/network/authenticateduser.h
@@ -130,16 +130,16 @@ namespace BlackMisc
             //! Enabled
             bool isEnabled() const { return this->m_enabled; }
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             BlackMisc::CIcon toIcon() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! From our database JSON format
diff --git a/src/blackmisc/network/client.h b/src/blackmisc/network/client.h
index 38d2ab240..830324d2c 100644
--- a/src/blackmisc/network/client.h
+++ b/src/blackmisc/network/client.h
@@ -111,22 +111,22 @@ namespace BlackMisc
             //! Model
             const BlackMisc::Simulation::CAircraftModel &getAircraftModel() const { return this->m_model; }
 
-            //! \copydoc CAircraftModel::hasQueriedModelString
+            //! \copydoc Simulation::CAircraftModel::hasQueriedModelString
             bool hasQueriedModelString() const { return this->m_model.hasQueriedModelString(); }
 
             //! Set model
             void setAircraftModel(const BlackMisc::Simulation::CAircraftModel &model) { this->m_model = model; }
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             CIcon toIcon() const { return this->m_user.toIcon(); }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/network/role.h b/src/blackmisc/network/role.h
index 849fb4c22..83837a4cb 100644
--- a/src/blackmisc/network/role.h
+++ b/src/blackmisc/network/role.h
@@ -54,13 +54,13 @@ namespace BlackMisc
             //! Description
             void setDescription(const QString &description) { m_description = description.trimmed(); }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Role from DB JSON
diff --git a/src/blackmisc/network/server.h b/src/blackmisc/network/server.h
index 9b3a7b0b6..9e4e450fe 100644
--- a/src/blackmisc/network/server.h
+++ b/src/blackmisc/network/server.h
@@ -97,13 +97,13 @@ namespace BlackMisc
             //! Validate, provide details about issues
             BlackMisc::CStatusMessageList validate() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/network/textmessage.h b/src/blackmisc/network/textmessage.h
index 203a337fa..0ac9fcfb3 100644
--- a/src/blackmisc/network/textmessage.h
+++ b/src/blackmisc/network/textmessage.h
@@ -153,13 +153,13 @@ namespace BlackMisc
             //! As pixmap, required for most GUI views
             QPixmap toPixmap() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/network/url.h b/src/blackmisc/network/url.h
index 8057103ed..a51d3237f 100644
--- a/src/blackmisc/network/url.h
+++ b/src/blackmisc/network/url.h
@@ -122,13 +122,13 @@ namespace BlackMisc
             //! Switch protocol
             CUrl withSwitchedScheme(const QString &protocol, int port) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
             //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
diff --git a/src/blackmisc/network/user.h b/src/blackmisc/network/user.h
index 4f76c1a59..e76413a6c 100644
--- a/src/blackmisc/network/user.h
+++ b/src/blackmisc/network/user.h
@@ -113,13 +113,13 @@ namespace BlackMisc
             //! Set associated callsign
             void setCallsign(const BlackMisc::Aviation::CCallsign &callsign);
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             BlackMisc::CIcon toIcon() const { return this->getCallsign().toIcon(); }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare by index
@@ -137,7 +137,7 @@ namespace BlackMisc
             //! Beautify real name, e.g. "JOE DoE" -> "Joe Doe";
             static QString beautifyRealName(const QString &realName);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/network/voicecapabilities.h b/src/blackmisc/network/voicecapabilities.h
index 2c76fcb93..423b32bd6 100644
--- a/src/blackmisc/network/voicecapabilities.h
+++ b/src/blackmisc/network/voicecapabilities.h
@@ -51,7 +51,7 @@ namespace BlackMisc
             //! Is capability known
             bool isUnknown() const { return m_voiceCapabilities == Unknown; }
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             CIcon toIcon() const;
 
             //! From enum
@@ -66,7 +66,7 @@ namespace BlackMisc
             //! All capabilities as list
             static const QList<CVoiceCapabilities> &allCapabilities();
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/network/webdataservicesprovider.cpp b/src/blackmisc/network/webdataservicesprovider.cpp
index 562890b47..727ab82b6 100644
--- a/src/blackmisc/network/webdataservicesprovider.cpp
+++ b/src/blackmisc/network/webdataservicesprovider.cpp
@@ -261,7 +261,7 @@ namespace BlackMisc
             return this->m_webDataReaderProvider->getMetarForAirport(icao);
         }
 
-        int CWebDataServicesAware::getMetarCount() const
+        int CWebDataServicesAware::getMetarsCount() const
         {
             Q_ASSERT_X(this->m_webDataReaderProvider, Q_FUNC_INFO, "Missing provider");
             if (!hasProvider()) { return 0; }
diff --git a/src/blackmisc/network/webdataservicesprovider.h b/src/blackmisc/network/webdataservicesprovider.h
index 511467d49..5bcd2a668 100644
--- a/src/blackmisc/network/webdataservicesprovider.h
+++ b/src/blackmisc/network/webdataservicesprovider.h
@@ -345,8 +345,8 @@ namespace BlackMisc
             //! \copydoc IWebDataServicesProvider::getMetars
             BlackMisc::Weather::CMetarSet getMetars() const;
 
-            //! \copydoc IWebDataServicesProvider::getMetarCount
             int getMetarCount() const;
+            //! \copydoc IWebDataServicesProvider::getMetarsCount
 
             //! \copydoc IWebDataServicesProvider::updateWithVatsimDataFileData
             void updateWithVatsimDataFileData(BlackMisc::Simulation::CSimulatedAircraft &aircraftToBeUdpated) const;
diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h
index aef958895..df2b11648 100644
--- a/src/blackmisc/pixmap.h
+++ b/src/blackmisc/pixmap.h
@@ -48,7 +48,7 @@ namespace BlackMisc
         //! \copydoc CValueObject::toPixmap
         QPixmap toPixmap() const;
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
     private:
diff --git a/src/blackmisc/pluginstorageprovider.h b/src/blackmisc/pluginstorageprovider.h
index c02197f3b..24f79c420 100644
--- a/src/blackmisc/pluginstorageprovider.h
+++ b/src/blackmisc/pluginstorageprovider.h
@@ -44,7 +44,7 @@ namespace BlackMisc
             return m_pluginStorageProvider->getPluginData(obj, key);
         }
 
-        //! \copydoc IOwnAircraftProvider::ownAircraft
+        //! \copydoc IPluginStorageProvider::setPluginData
         virtual void setPluginData(const QObject *obj, const QString &key, const CVariant &value)
         {
             m_pluginStorageProvider->setPluginData(obj, key, value);
diff --git a/src/blackmisc/pq/angle.h b/src/blackmisc/pq/angle.h
index fc75f1c94..8558c076e 100644
--- a/src/blackmisc/pq/angle.h
+++ b/src/blackmisc/pq/angle.h
@@ -52,7 +52,7 @@ namespace BlackMisc
                     degrees + minutes / 100.0,
                     CAngleUnit::sexagesimalDegMin()) {}
 
-            //! \copydoc CValueObject::toIcon
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon
             BlackMisc::CIcon toIcon() const;
 
             //! Value as factor of PI (e.g. 0.5PI)
diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h
index 894ee09ba..f82d02d90 100644
--- a/src/blackmisc/pq/measurementunit.h
+++ b/src/blackmisc/pq/measurementunit.h
@@ -237,19 +237,19 @@ namespace BlackMisc
             //! Destructor
             virtual ~CMeasurementUnit() = default;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const
             {
                 return this->getSymbol(i18n);
             }
 
-            //! \copydoc CValueObject::marshallToDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
             void marshallToDbus(QDBusArgument &argument) const
             {
                 argument << this->m_symbol;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &)
             {
                 // the concrete implementations will override this default
diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h
index e4b06ab51..0a2b4e203 100644
--- a/src/blackmisc/pq/physicalquantity.h
+++ b/src/blackmisc/pq/physicalquantity.h
@@ -181,40 +181,40 @@ namespace BlackMisc
             //! Make value always negative
             void makeNegative();
 
-            //! \copydoc CValueObject::marshallToDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
             void marshallToDbus(QDBusArgument &argument) const;
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument);
 
-            //! \copydoc CValueObject::qHash
+            //! \copydoc BlackMisc::Mixin::HashByTuple::qHash
             uint getValueHash() const;
 
             //! \copydoc CValueObject::qHash
             friend uint qHash(const PQ &pq) { return pq.getValueHash(); }
 
-            //! \copydoc CValueObject::toJson
+            //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
             QJsonObject toJson() const;
 
-            //! \copydoc CValueObject::convertFromJson
+            //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
             void convertFromJson(const QJsonObject &json);
 
             //! Parse to string, with specified separator
             void parseFromString(const QString &value, CPqString::SeparatorMode mode);
 
-            //! \copydoc CValueObject::parseFromString
+            //! Parse value from string
             void parseFromString(const QString &value);
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare
             int comparePropertyByIndex(const PQ &pq, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         protected:
diff --git a/src/blackmisc/pq/pqstring.h b/src/blackmisc/pq/pqstring.h
index fca2c75b4..dc1b2564b 100644
--- a/src/blackmisc/pq/pqstring.h
+++ b/src/blackmisc/pq/pqstring.h
@@ -30,7 +30,7 @@ namespace BlackMisc
         class BLACKMISC_EXPORT CPqString : public CValueObject<CPqString>
         {
         public:
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Number separators / group separators
diff --git a/src/blackmisc/pq/units.h b/src/blackmisc/pq/units.h
index 7ad28ed12..ad8a571d6 100644
--- a/src/blackmisc/pq/units.h
+++ b/src/blackmisc/pq/units.h
@@ -144,7 +144,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -243,7 +243,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -333,7 +333,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -432,7 +432,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -548,7 +548,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -639,7 +639,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -748,7 +748,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -881,7 +881,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
@@ -955,7 +955,7 @@ namespace BlackMisc
                 return u;
             }
 
-            //! \copydoc CValueObject::unmarshallFromDbus
+            //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
             void unmarshallFromDbus(const QDBusArgument &argument)
             {
                 QString unitName;
diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h
index 6c6003411..92aa0b094 100644
--- a/src/blackmisc/propertyindex.h
+++ b/src/blackmisc/propertyindex.h
@@ -157,11 +157,11 @@ namespace BlackMisc
             return static_cast<int>(ev) == l.first();
         }
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
     protected:
-        //! \copydoc CValueObject::parseFromString
+        //! Parse indexes from string
         void parseFromString(const QString &indexes);
 
     private:
diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index 4b6ed5f16..29dacc57d 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -183,7 +183,7 @@ namespace BlackMisc
         //! \copydoc CValueObject::qHash
         friend uint qHash(const CPropertyIndexVariantMap &vm) { return vm.getValueHash(); }
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
     protected:
@@ -191,10 +191,10 @@ namespace BlackMisc
         bool m_wildcard; //!< wildcard
 
     public:
-        //! \copydoc CValueObject::marshallToDbus
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
         void marshallToDbus(QDBusArgument &argument) const;
 
-        //! \copydoc CValueObject::unmarshallFromDbus
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
         void unmarshallFromDbus(const QDBusArgument &argument);
 
     };
diff --git a/src/blackmisc/rgbcolor.h b/src/blackmisc/rgbcolor.h
index 26e6113c8..bd13b75d5 100644
--- a/src/blackmisc/rgbcolor.h
+++ b/src/blackmisc/rgbcolor.h
@@ -97,13 +97,13 @@ namespace BlackMisc
         //! Representing icon
         CIcon toIcon() const;
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare for index
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 19f852afa..d89d55c69 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -90,10 +90,10 @@ namespace BlackMisc
             //! Constructor.
             CAircraftModel(const QString &model, ModelType type, CSimulatorInfo &simulator, const QString &name, const QString &description, const BlackMisc::Aviation::CAircraftIcaoCode &icao, const BlackMisc::Aviation::CLivery &livery = BlackMisc::Aviation::CLivery());
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Can be initialized from FSD
@@ -243,7 +243,7 @@ namespace BlackMisc
             //! Validate
             BlackMisc::CStatusMessageList validate(bool withNestedObjects) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! To database JSON
diff --git a/src/blackmisc/simulation/airspaceaircraftsnapshot.h b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
index 976dbd5c0..1025958e4 100644
--- a/src/blackmisc/simulation/airspaceaircraftsnapshot.h
+++ b/src/blackmisc/simulation/airspaceaircraftsnapshot.h
@@ -75,13 +75,13 @@ namespace BlackMisc
             //! Rendering enabled or all aircraft disabled?
             bool isRenderingEnabled() const { return m_renderingEnabled; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Generating thread name
diff --git a/src/blackmisc/simulation/distributor.h b/src/blackmisc/simulation/distributor.h
index ef70aba00..ebdc77201 100644
--- a/src/blackmisc/simulation/distributor.h
+++ b/src/blackmisc/simulation/distributor.h
@@ -78,16 +78,16 @@ namespace BlackMisc
             //! Matches key or alias
             bool matchesKeyOrAlias(const CDistributor &distributor) const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
             int comparePropertyByIndex(const CDistributor &compareValue, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Complete data?
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
index 563bfc46f..a23285bae 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgentries.h
@@ -147,13 +147,13 @@ namespace BlackMisc
                 //! Thumbnail.jpg path if possible
                 QString getThumbnailFileName() const;
 
-                //! \copydoc CValueObject::propertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
                 BlackMisc::CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-                //! \copydoc CValueObject::setPropertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
                 void setPropertyByIndex(const BlackMisc::CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-                //! \copydoc CValueObject::convertToQString
+                //! \copydoc BlackMisc::Mixin::String::toQString
                 QString convertToQString(bool i18n = false) const;
 
             private:
diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
index 517f5cb3e..d5e0b6cff 100644
--- a/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
+++ b/src/blackmisc/simulation/fscommon/vpilotmodelrule.h
@@ -73,13 +73,13 @@ namespace BlackMisc
                 //! Callsign prefix
                 void setCallsignPrefix(const QString &callsign) { this->m_callsignPrefix = callsign.trimmed().toUpper(); }
 
-                //! \copydoc CValueObject::propertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
                 CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-                //! \copydoc CValueObject::setPropertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
                 void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-                //! \copydoc CValueObject::convertToQString
+                //! \copydoc BlackMisc::Mixin::String::toQString
                 QString convertToQString(bool i18n = false) const;
 
                 //! Convert into aircraft model
diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h
index afffe4370..64075603d 100644
--- a/src/blackmisc/simulation/ownaircraftprovider.h
+++ b/src/blackmisc/simulation/ownaircraftprovider.h
@@ -104,7 +104,7 @@ namespace BlackMisc
             //! \copydoc IOwnAircraftProvider::updateCockpit
             virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator);
 
-            //! \copydoc IOwnAircraftProvider::updateComFrequency
+            //! \copydoc IOwnAircraftProvider::updateActiveComFrequency
             virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator);
 
             //! \copydoc IOwnAircraftProvider::updateSelcal
diff --git a/src/blackmisc/simulation/ownaircraftproviderdummy.h b/src/blackmisc/simulation/ownaircraftproviderdummy.h
index acc97751e..4eafaa666 100644
--- a/src/blackmisc/simulation/ownaircraftproviderdummy.h
+++ b/src/blackmisc/simulation/ownaircraftproviderdummy.h
@@ -52,7 +52,7 @@ namespace BlackMisc
             //! \copydoc IOwnAircraftProvider::updateCockpit
             virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) override;
 
-            //! \copydoc IOwnAircraftProvider::updateComFrequency
+            //! \copydoc IOwnAircraftProvider::updateActiveComFrequency
             virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) override;
 
             //! \copydoc IOwnAircraftProvider::updateSelcal
diff --git a/src/blackmisc/simulation/remoteaircraftprovider.h b/src/blackmisc/simulation/remoteaircraftprovider.h
index ba9e41691..cd191f8e3 100644
--- a/src/blackmisc/simulation/remoteaircraftprovider.h
+++ b/src/blackmisc/simulation/remoteaircraftprovider.h
@@ -130,8 +130,8 @@ namespace BlackMisc
             //! \copydoc IRemoteAircraftProvider::getAircraftInRangeForCallsign
             virtual BlackMisc::Simulation::CSimulatedAircraft getAircraftInRangeForCallsign(const Aviation::CCallsign &callsign) const;
 
-            //! \copydoc IRemoteAircraftProvider::getAircraftinRangeModelForCallsign
             virtual BlackMisc::Simulation::CAircraftModel getAircraftinRangeModelForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const;
+            //! \copydoc IRemoteAircraftProvider::getAircraftInRangeModelForCallsign
 
             //! \copydoc IRemoteAircraftProvider::getLatestAirspaceAircraftSnapshot
             virtual BlackMisc::Simulation::CAirspaceAircraftSnapshot getLatestAirspaceAircraftSnapshot() const;
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index e48a27bb5..9902d457a 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -70,7 +70,7 @@ namespace BlackMisc
             //! Constructor.
             CSimulatedAircraft(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Network::CUser &user, const BlackMisc::Aviation::CAircraftSituation &situation);
 
-            //! \copydoc CValueObject::toIcon()
+            //! \copydoc BlackMisc::Mixin::Icon::toIcon()
             BlackMisc::CIcon toIcon() const { return this->m_callsign.toIcon(); }
 
             //! Get callsign.
@@ -304,10 +304,10 @@ namespace BlackMisc
             //! Combined ICAO / color string
             QString getCombinedIcaoLiveryString() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Compare for index
@@ -355,7 +355,7 @@ namespace BlackMisc
             //! Set the synchronisation flag
             void setPartsSynchronized(bool synchronized) { m_partsSynchronized = synchronized; }
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/simulation/simulatorinfo.h b/src/blackmisc/simulation/simulatorinfo.h
index dc3281af8..e0dc630b1 100644
--- a/src/blackmisc/simulation/simulatorinfo.h
+++ b/src/blackmisc/simulation/simulatorinfo.h
@@ -104,7 +104,7 @@ namespace BlackMisc
             //! Compare for index
             int comparePropertyByIndex(const CSimulatorInfo &compareValue, const CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Add simulator
diff --git a/src/blackmisc/simulation/simulatorplugininfo.h b/src/blackmisc/simulation/simulatorplugininfo.h
index 4f9bf81da..d36a341b7 100644
--- a/src/blackmisc/simulation/simulatorplugininfo.h
+++ b/src/blackmisc/simulation/simulatorplugininfo.h
@@ -56,7 +56,7 @@ namespace BlackMisc
             //! Description
             const QString &getDescription() const { return m_description; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/simulation/simulatorsetup.h b/src/blackmisc/simulation/simulatorsetup.h
index c2b7e5653..d8146b7c8 100644
--- a/src/blackmisc/simulation/simulatorsetup.h
+++ b/src/blackmisc/simulation/simulatorsetup.h
@@ -59,16 +59,16 @@ namespace BlackMisc
             //! Path where simulator is installed
             QString getSimulatorInstallationDirectory() const;
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
             //! Register metadata
             void static registerMetadata();
 
-            //! \copydoc CValueObject::convertToQString()
+            //! \copydoc BlackMisc::Mixin::String::toQString()
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h
index 03c7f0f44..d1869b4b6 100644
--- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h
+++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.h
@@ -50,7 +50,7 @@ namespace BlackMisc
                 //! Current root directory
                 QString getRootDirectory() const { return this->m_rootDirectory; }
 
-                //! \copydoc IAircraftModelLoader::getPixmapForModel
+                //! \copydoc IAircraftModelLoader::iconForModel
                 virtual BlackMisc::CPixmap iconForModel(const QString &modelName, BlackMisc::CStatusMessage &statusMessage) const override;
 
                 //! \copydoc IAircraftModelLoader::startLoading
diff --git a/src/blackmisc/simulation/xplane/navdatareference.h b/src/blackmisc/simulation/xplane/navdatareference.h
index e4ff015f6..826d23e56 100644
--- a/src/blackmisc/simulation/xplane/navdatareference.h
+++ b/src/blackmisc/simulation/xplane/navdatareference.h
@@ -46,13 +46,13 @@ namespace BlackMisc
                 virtual QVector3D normalVector() const override { return m_position.normalVector(); }
                 virtual std::array<double, 3> normalVectorDouble() const override { return this->m_position.normalVectorDouble(); }
 
-                //! \copydoc CValueObject::propertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
                 CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-                //! \copydoc CValueObject::setPropertyByIndex
+                //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
                 void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-                //! \copydoc CValueObject::convertToQString
+                //! \copydoc BlackMisc::Mixin::String::toQString
                 QString convertToQString(bool i18n = false) const;
 
             private:
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 3b5f72e00..e787605ba 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -166,10 +166,10 @@ namespace BlackMisc
         //! Severities as strings
         static const QStringList &allSeverityStrings();
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare for index
@@ -178,7 +178,7 @@ namespace BlackMisc
         //! To HTML
         QString toHtml() const;
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
         //! Representing icon
diff --git a/src/blackmisc/timestampbased.h b/src/blackmisc/timestampbased.h
index 68de4e333..3b8a46563 100644
--- a/src/blackmisc/timestampbased.h
+++ b/src/blackmisc/timestampbased.h
@@ -105,10 +105,10 @@ namespace BlackMisc
         //! Constructor
         ITimestampBased(const QDateTime &timestamp);
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
         //! Compare for index
diff --git a/src/blackmisc/valuecache.h b/src/blackmisc/valuecache.h
index cff311667..1053a072d 100644
--- a/src/blackmisc/valuecache.h
+++ b/src/blackmisc/valuecache.h
@@ -66,7 +66,7 @@ namespace BlackMisc
         //! Discard values and return as map of timestamps.
         QMap<QString, qint64> toTimestampMap() const;
 
-        //! \copydoc CValueObject::registerMetadata`
+        //! \copydoc BlackMisc::Mixin::MetaType::registerMetadata
         static void registerMetadata();
 
         //! \private Iterator behaves like a CVariantMap::const_iterator with an additional timestamp() method.
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index 1dfc19ae0..12b8fed35 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -228,7 +228,7 @@ namespace BlackMisc
         //! Convert this variant to the type with the given metatype ID and return true if successful.
         bool convert(int typeId) { return m_v.convert(typeId); }
 
-        //! \copydoc CValueObject::convertToQString
+        //! \copydoc BlackMisc::Mixin::String::toQString
         QString convertToQString(bool i18n = false) const;
 
         //! True if this variant's type is an integral type.
@@ -267,28 +267,28 @@ namespace BlackMisc
         //! Return the metatype ID of the value in this variant.
         int userType() const { return m_v.userType(); }
 
-        //! \copydoc CValueObject::toJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
         QJsonObject toJson() const;
 
-        //! \copydoc CValueObject::convertFromJson
+        //! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
         void convertFromJson(const QJsonObject &json);
 
-        //! \copydoc CValueObject::marshallToDbus
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
         void marshallToDbus(QDBusArgument &argument) const;
 
-        //! \copydoc CValueObject::unmarshallFromDbus
+        //! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
         void unmarshallFromDbus(const QDBusArgument &argument);
 
         //! \copydoc CValueObject::compare
         friend int compare(const CVariant &a, const CVariant &b) { return compareImpl(a, b); }
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index);
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::propertyByIndexAsString
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndexAsString
         QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const;
 
         //! \copydoc CValueObject::equalsPropertyByIndex
@@ -297,7 +297,7 @@ namespace BlackMisc
         //! \copydoc CValueObject::toPixmap
         QPixmap toPixmap() const;
 
-        //! \copydoc CValueObject::toIcon
+        //! \copydoc BlackMisc::Mixin::Icon::toIcon
         CIcon toIcon() const;
 
     private:
diff --git a/src/blackmisc/weather/cloudlayer.h b/src/blackmisc/weather/cloudlayer.h
index 837faacab..407e11be6 100644
--- a/src/blackmisc/weather/cloudlayer.h
+++ b/src/blackmisc/weather/cloudlayer.h
@@ -76,13 +76,13 @@ namespace BlackMisc
             //! Get coverage in %
             int getCoveragePercent() const { return m_coveragePercent; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/weather/gridpoint.h b/src/blackmisc/weather/gridpoint.h
index 7791cb51a..89b754929 100644
--- a/src/blackmisc/weather/gridpoint.h
+++ b/src/blackmisc/weather/gridpoint.h
@@ -81,13 +81,13 @@ namespace BlackMisc
             //! Get wind layers
             CWindLayerList getWindLayers() const { return m_windLayers; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/weather/metar.h b/src/blackmisc/weather/metar.h
index 4aad3e70d..fdcc0763e 100644
--- a/src/blackmisc/weather/metar.h
+++ b/src/blackmisc/weather/metar.h
@@ -133,7 +133,7 @@ namespace BlackMisc
             //! Returns the metar in a descriptive text
             QString getMetarText() const;
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
             //! Return CAVOK metar
diff --git a/src/blackmisc/weather/presentweather.h b/src/blackmisc/weather/presentweather.h
index 84e5fb58e..c3ffb57b8 100644
--- a/src/blackmisc/weather/presentweather.h
+++ b/src/blackmisc/weather/presentweather.h
@@ -115,13 +115,13 @@ namespace BlackMisc
             //! Get weather phenomenas
             int getWeatherPhenomena() const { return m_weatherPhenomena; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/weather/temperaturelayer.h b/src/blackmisc/weather/temperaturelayer.h
index 2b968c02a..ab9f11e3c 100644
--- a/src/blackmisc/weather/temperaturelayer.h
+++ b/src/blackmisc/weather/temperaturelayer.h
@@ -62,13 +62,13 @@ namespace BlackMisc
             //! Get relative humidity
             double getRelativeHumidity() const { return m_relativeHumidity; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/weather/weatherdataplugininfo.h b/src/blackmisc/weather/weatherdataplugininfo.h
index 136bb919e..f362f87f4 100644
--- a/src/blackmisc/weather/weatherdataplugininfo.h
+++ b/src/blackmisc/weather/weatherdataplugininfo.h
@@ -48,7 +48,7 @@ namespace BlackMisc
             //! Description
             const QString &getDescription() const { return m_description; }
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/blackmisc/weather/windlayer.h b/src/blackmisc/weather/windlayer.h
index 82b59ade5..28ff1d238 100644
--- a/src/blackmisc/weather/windlayer.h
+++ b/src/blackmisc/weather/windlayer.h
@@ -100,13 +100,13 @@ namespace BlackMisc
             //! Get weather phenomenas
             PhysicalQuantities::CSpeed getGustSpeed() const { return m_gustSpeed; }
 
-            //! \copydoc CValueObject::propertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
             CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-            //! \copydoc CValueObject::setPropertyByIndex
+            //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
             void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-            //! \copydoc CValueObject::convertToQString
+            //! \copydoc BlackMisc::Mixin::String::toQString
             QString convertToQString(bool i18n = false) const;
 
         private:
diff --git a/src/plugins/simulator/fs9/fs9client.h b/src/plugins/simulator/fs9/fs9client.h
index cf14ba323..5ef28579f 100644
--- a/src/plugins/simulator/fs9/fs9client.h
+++ b/src/plugins/simulator/fs9/fs9client.h
@@ -65,10 +65,10 @@ namespace BlackSimPlugin
             virtual void timerEvent(QTimerEvent *event) override;
 
         protected:
-            //! \copydoc CContinuousWorker::initialize
+            //! \copydoc BlackMisc::CContinuousWorker::initialize
             virtual void initialize() override;
 
-            //! \copydoc CContinuousWorker::cleanup
+            //! \copydoc BlackMisc::CContinuousWorker::cleanup
             virtual void cleanup() override;
 
         private:
diff --git a/src/plugins/simulator/fs9/fs9host.h b/src/plugins/simulator/fs9/fs9host.h
index b282139e5..ec1ad9c19 100644
--- a/src/plugins/simulator/fs9/fs9host.h
+++ b/src/plugins/simulator/fs9/fs9host.h
@@ -52,10 +52,10 @@ namespace BlackSimPlugin
             void statusChanged(BlackSimPlugin::Fs9::CFs9Host::HostStatus);
 
         protected:
-            //! \copydoc CContinuousWorker::initialize
+            //! \copydoc BlackMisc::CContinuousWorker::initialize
             virtual void initialize() override;
 
-            //! \copydoc CContinuousWorker::cleanup
+            //! \copydoc BlackMisc::CContinuousWorker::cleanup
             virtual void cleanup() override;
 
         private:
diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h
index 31254e558..a768ab748 100644
--- a/src/plugins/simulator/fs9/simulatorfs9.h
+++ b/src/plugins/simulator/fs9/simulatorfs9.h
@@ -50,41 +50,41 @@ namespace BlackSimPlugin
             //! Destructor
             virtual ~CSimulatorFs9() = default;
 
-            //! \copydoc ISimulator::connectTo()
+            //! \copydoc BlackCore::ISimulator::connectTo()
             virtual bool connectTo() override;
 
-            //! \copydoc ISimulator::disconnectFrom()
+            //! \copydoc BlackCore::ISimulator::disconnectFrom()
             virtual bool disconnectFrom() override;
 
-            //! \copydoc ISimulator::physicallyAddRemoteAircraft()
+            //! \copydoc BlackCore::ISimulator::physicallyAddRemoteAircraft()
             virtual bool physicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &newRemoteAircraft) override;
 
-            //! \copydoc ISimulator::physicallyRemoveRemoteAircraft()
+            //! \copydoc BlackCore::ISimulator::physicallyRemoveRemoteAircraft()
             virtual bool physicallyRemoveRemoteAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
 
             //! \copydoc BlackCore::ISimulator::physicallyRemoveAllRemoteAircraft
             virtual int physicallyRemoveAllRemoteAircraft() override;
 
-            //! \copydoc ISimulator::physicallyRenderedAircraft
+            //! \copydoc BlackCore::ISimulator::physicallyRenderedAircraft
             virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override;
 
-            //! \copydoc ISimulator::isPhysicallyRenderedAircraft
+            //! \copydoc BlackCore::ISimulator::isPhysicallyRenderedAircraft
             virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override;
 
-            //! \copydoc ISimulator::updateOwnSimulatorCockpit()
+            //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit()
             virtual bool updateOwnSimulatorCockpit(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft, const BlackMisc::CIdentifier &originator) override;
 
-            //! \copydoc ISimulator::displayStatusMessage()
+            //! \copydoc BlackCore::ISimulator::displayStatusMessage()
             virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
 
-            //! \copydoc ISimulator::displayTextMessage()
+            //! \copydoc BlackCore::ISimulator::displayTextMessage()
             virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
 
         protected:
-            //! \copydoc ISimulator::isConnected()
+            //! \copydoc BlackCore::ISimulator::isConnected()
             virtual bool isConnected() const override;
 
-            //! \copydoc ISimulator::isSimulating
+            //! \copydoc BlackCore::ISimulator::isSimulating
             virtual bool isSimulating() const override { return isConnected(); }
 
             //! Timer event
@@ -156,7 +156,7 @@ namespace BlackSimPlugin
             //! Destructor
             virtual ~CSimulatorFs9Factory();
 
-            //! \copydoc BlackCore::ISimulatorFactory::create(ownAircraftProvider, remoteAircraftProvider, parent)
+            //! \copydoc BlackCore::ISimulatorFactory::create
             virtual BlackCore::ISimulator *create(
                 const BlackMisc::Simulation::CSimulatorPluginInfo &info,
                 BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
diff --git a/src/plugins/simulator/fsx/simulatorfsxfactory.h b/src/plugins/simulator/fsx/simulatorfsxfactory.h
index 6f7e9b259..fc03d0ed1 100644
--- a/src/plugins/simulator/fsx/simulatorfsxfactory.h
+++ b/src/plugins/simulator/fsx/simulatorfsxfactory.h
@@ -39,7 +39,7 @@ namespace BlackSimPlugin
                                                   BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
                                                   BlackMisc::IPluginStorageProvider *pluginStorageProvider) override;
 
-            //! \copydoc BlackCore::ISimulatorFactory::getListener
+            //! \copydoc BlackCore::ISimulatorFactory::createListener
             virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override;
         };
 
diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h
index 57d4ca51f..4566b0052 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.h
+++ b/src/plugins/simulator/xplane/simulatorxplane.h
@@ -36,14 +36,14 @@ namespace BlackSimPlugin
             Q_OBJECT
 
         public:
-            //! \copydoc BlackCore::ISimulatorFactory::create(ownAircraftProvider, remoteAircraftProvider, parent)
+            //! Constructor
             CSimulatorXPlane(const BlackMisc::Simulation::CSimulatorPluginInfo &info,
                              BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
                              BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,
                              BlackMisc::IPluginStorageProvider *pluginStorageProvider,
                              QObject *parent = nullptr);
 
-            //! \copydoc ISimulator::isTimeSynchronized
+            //! \copydoc BlackCore::ISimulator::isTimeSynchronized
             virtual bool isTimeSynchronized() const override { return false; } // TODO: Can we query the XP intrinisc feature?
 
             //! \copydoc BlackCore::ISimulator::connectTo
@@ -52,7 +52,7 @@ namespace BlackSimPlugin
             //! \copydoc BlackCore::ISimulator::disconnectFrom
             virtual bool disconnectFrom() override;
 
-            //! \copydoc ISimulator::physicallyAddRemoteAircraft()
+            //! \copydoc BlackCore::ISimulator::physicallyAddRemoteAircraft()
             virtual bool physicallyAddRemoteAircraft(const BlackMisc::Simulation::CSimulatedAircraft &newRemoteAircraft) override;
 
             //! \copydoc BlackCore::ISimulator::physicallyRemoveRemoteAircraft
@@ -61,16 +61,16 @@ namespace BlackSimPlugin
             //! \copydoc BlackCore::ISimulator::physicallyRemoveAllRemoteAircraft
             virtual int physicallyRemoveAllRemoteAircraft() override;
 
-            //! \copydoc ISimulator::physicallyRenderedAircraft
+            //! \copydoc BlackCore::ISimulator::physicallyRenderedAircraft
             virtual BlackMisc::Aviation::CCallsignSet physicallyRenderedAircraft() const override;
 
-            //! \copydoc ISimulator::isPhysicallyRenderedAircraft
+            //! \copydoc BlackCore::ISimulator::isPhysicallyRenderedAircraft
             virtual bool isPhysicallyRenderedAircraft(const BlackMisc::Aviation::CCallsign &callsign) const override;
 
-            //! \copydoc ISimulator::changeRenderedAircraftModel
+            //! \copydoc BlackCore::ISimulator::changeRemoteAircraftModel
             virtual bool changeRemoteAircraftModel(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override;
 
-            //! \copydoc ISimulator::changeAircraftEnabled
+            //! \copydoc BlackCore::ISimulator::changeRemoteAircraftEnabled
             virtual bool changeRemoteAircraftEnabled(const BlackMisc::Simulation::CSimulatedAircraft &aircraft, const BlackMisc::CIdentifier &originator) override;
 
             //! \copydoc BlackCore::ISimulator::updateOwnSimulatorCockpit
@@ -79,52 +79,52 @@ namespace BlackSimPlugin
             //! \copydoc BlackCore::ISimulator::displayStatusMessage
             virtual void displayStatusMessage(const BlackMisc::CStatusMessage &message) const override;
 
-            //! \copydoc ISimulator::displayTextMessage
+            //! \copydoc BlackCore::ISimulator::displayTextMessage
             virtual void displayTextMessage(const BlackMisc::Network::CTextMessage &message) const override;
 
             //! \copydoc BlackCore::ISimulator::getInstalledModels
             virtual BlackMisc::Simulation::CAircraftModelList getInstalledModels() const override;
 
-            //! \copydoc ISimulator::reloadInstalledModels
+            //! \copydoc BlackCore::ISimulator::reloadInstalledModels
             virtual void reloadInstalledModels() override;
 
             //! \copydoc BlackCore::ISimulator::getAirportsInRange
             virtual BlackMisc::Aviation::CAirportList getAirportsInRange() const;
 
-            //! \copydoc ISimulator::setTimeSynchronization
+            //! \copydoc BlackCore::ISimulator::setTimeSynchronization
             virtual bool setTimeSynchronization(bool enable, const BlackMisc::PhysicalQuantities::CTime &offset) override;
 
-            //! \copydoc ISimulator::getTimeSynchronizationOffset
+            //! \copydoc BlackCore::ISimulator::getTimeSynchronizationOffset
             virtual BlackMisc::PhysicalQuantities::CTime getTimeSynchronizationOffset() const override { return BlackMisc::PhysicalQuantities::CTime(0, BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); }
 
-            //! \copydoc ISimulator::iconForModel
+            //! \copydoc BlackCore::ISimulator::iconForModel
             virtual BlackMisc::CPixmap iconForModel(const QString &modelString) const override;
 
             //! Creates an appropriate dbus connection from the string describing it
             static QDBusConnection connectionFromString(const QString &str);
 
         protected slots:
-            //! \copydoc CSimulatorCommon::ps_remoteProviderAddAircraftSituation
+            //! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderAddAircraftSituation
             virtual void ps_remoteProviderAddAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) override;
 
-            //! \copydoc CSimulatorCommon::ps_remoteProvideraddAircraftParts
+            //! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderAddAircraftParts
             virtual void ps_remoteProviderAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftParts &parts) override;
 
-            //! \copydoc CSimulatorCommon::ps_remoteProviderRemovedAircraft
+            //! \copydoc BlackCore::CSimulatorCommon::ps_remoteProviderRemovedAircraft
             virtual void ps_remoteProviderRemovedAircraft(const BlackMisc::Aviation::CCallsign &callsign) override;
 
         protected:
             //! \copydoc BlackCore::ISimulator::isConnected
             virtual bool isConnected() const override;
 
-            //! \copydoc ISimulator::isPaused
+            //! \copydoc BlackCore::ISimulator::isPaused
             virtual bool isPaused() const override
             {
                 //! \todo XP: provide correct pause state
                 return false;
             }
 
-            //! \copydoc ISimulator::isSimulating
+            //! \copydoc BlackCore::ISimulator::isSimulating
             virtual bool isSimulating() const override { return isConnected(); }
 
         private slots:
@@ -226,7 +226,7 @@ namespace BlackSimPlugin
             Q_INTERFACES(BlackCore::ISimulatorFactory)
 
         public:
-            //! \copydoc BlackCore::ISimulatorFactory::create()
+            //! \copydoc BlackCore::ISimulatorFactory::create
             virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info,
                                                   BlackMisc::Simulation::IOwnAircraftProvider    *ownAircraftProvider,
                                                   BlackMisc::Simulation::IRemoteAircraftProvider *renderedAircraftProvider,
diff --git a/src/plugins/simulator/xplane/xbusserviceproxy.h b/src/plugins/simulator/xplane/xbusserviceproxy.h
index f775c8568..b89473cfe 100644
--- a/src/plugins/simulator/xplane/xbusserviceproxy.h
+++ b/src/plugins/simulator/xplane/xbusserviceproxy.h
@@ -97,7 +97,7 @@ namespace BlackSimPlugin
             void getAircraftModelFilenameAsync(QString *o_modelFilename);
             //! @}
 
-            //! \copydoc XBus::CService::getAircraftModelLivery
+            //! \copydoc XBus::CService::getAircraftLivery
             //! @{
             QString getAircraftModelLivery() const;
             void getAircraftModelLiveryAsync(QString *o_modelLivery);
diff --git a/src/plugins/simulator/xplane/xbustrafficproxy.h b/src/plugins/simulator/xplane/xbustrafficproxy.h
index 8946ec5ca..16e74d8a1 100644
--- a/src/plugins/simulator/xplane/xbustrafficproxy.h
+++ b/src/plugins/simulator/xplane/xbustrafficproxy.h
@@ -80,8 +80,8 @@ namespace BlackSimPlugin
             //! \copydoc XBus::CTraffic::setMaxPlanes
             void setMaxPlanes(int planes);
 
-            //! \copydoc XBus::CTraffic::setDrawDistance
             void setDrawDistance(float nauticalMiles);
+            //! \copydoc XBus::CTraffic::setMaxDrawDistance
 
             //! \copydoc XBus::CTraffic::addPlane
             void addPlane(const QString &callsign, const QString &modelName, const QString &aircraftIcao, const QString &airlineIcao, const QString &livery);
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
index 3e53e994d..16ee71bfd 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfig.h
@@ -25,10 +25,10 @@ namespace BlackSimPlugin
          */
         struct XBusServer : public BlackMisc::CSettingTrait<QString>
         {
-            //! \copydoc BlackMisc::CSetting::key
+            //! \copydoc BlackMisc::CSettingTrait::key
             static const char *key() { return "xbus/server"; }
 
-            //! \copydoc BlackMisc::CSetting::defaultValue
+            //! \copydoc BlackMisc::CSettingTrait::defaultValue
             static QString defaultValue() { return QStringLiteral("session"); }
         };
 
diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h
index c373da78b..050476e9f 100644
--- a/tests/blackmisc/testvalueobject.h
+++ b/tests/blackmisc/testvalueobject.h
@@ -49,13 +49,13 @@ namespace BlackMisc
         //! Set description
         void setDescription(const QString &description) { m_description = description; }
 
-        //! \copydoc CValueObject::propertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::propertyByIndex
         CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
 
-        //! \copydoc CValueObject::setPropertyByIndex
+        //! \copydoc BlackMisc::Mixin::Index::setPropertyByIndex
         void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
 
-        //! \copydoc CValueObject::convertToQString()
+        //! \copydoc BlackMisc::Mixin::String::toQString()
         QString convertToQString(bool i18n = false) const;
 
     private: