diff --git a/samples/misc/samplescontainer.cpp b/samples/misc/samplescontainer.cpp
index 37e7479a1..75a9ab5ea 100644
--- a/samples/misc/samplescontainer.cpp
+++ b/samples/misc/samplescontainer.cpp
@@ -69,7 +69,7 @@ namespace swift::sample
         atcList.push_back(station1);
         CAtcStation station1Cpy(station1);
         CFrequency changedFrequency(118.25, CFrequencyUnit::MHz());
-        CPropertyIndexVariantMap vm(CAtcStation::IndexFrequency, CVariant::from(changedFrequency));
+        CPropertyIndexVariantMap vm(CAtcStation::IndexFrequency, CVariant::fromValue(changedFrequency));
 
         // demonstration apply
         CPropertyIndexList changedProperties;
diff --git a/src/core/airspacemonitor.cpp b/src/core/airspacemonitor.cpp
index a4ccacfe0..5dd2134a9 100644
--- a/src/core/airspacemonitor.cpp
+++ b/src/core/airspacemonitor.cpp
@@ -466,7 +466,7 @@ namespace swift::core
     {
         if (!this->isConnectedAndNotShuttingDown() || callsign.isEmpty()) { return; }
         const CVoiceCapabilities voiceCaps = sApp->getWebDataServices()->getVoiceCapabilityForCallsign(callsign);
-        CPropertyIndexVariantMap vm(CClient::IndexCapabilities, CVariant::from(clientCaps));
+        CPropertyIndexVariantMap vm(CClient::IndexCapabilities, CVariant::fromValue(clientCaps));
         vm.addValue({ CClient::IndexVoiceCapabilities }, voiceCaps);
         this->updateOrAddClient(callsign, vm, false);
 
@@ -1433,7 +1433,7 @@ namespace swift::core
 
         // update
         const CPropertyIndexVariantMap vm({ CSimulatedAircraft::IndexCom1System, CComSystem::IndexActiveFrequency },
-                                          CVariant::from(frequency));
+                                          CVariant::fromValue(frequency));
         this->updateAircraftInRange(callsign, vm);
     }
 
diff --git a/src/gui/components/logcomponent.cpp b/src/gui/components/logcomponent.cpp
index 101b74a7e..5231aea46 100644
--- a/src/gui/components/logcomponent.cpp
+++ b/src/gui/components/logcomponent.cpp
@@ -56,7 +56,7 @@ namespace swift::gui::components
         });
         connect(ui->comp_StatusMessages, &CStatusMessagesDetail::filterChanged, this, [this](const CVariant &filter) {
             clearMessages();
-            m_history.setFilter(filter.to<CLogPattern>());
+            m_history.setFilter(filter.value<CLogPattern>());
         });
         m_history.setFilter(CLogPattern().withSeverityAtOrAbove(CStatusMessage::SeverityInfo));
         m_history.initialize(sApp->getDataLinkDBus());
diff --git a/src/gui/components/mappingcomponent.cpp b/src/gui/components/mappingcomponent.cpp
index 246085534..9683cd83c 100644
--- a/src/gui/components/mappingcomponent.cpp
+++ b/src/gui/components/mappingcomponent.cpp
@@ -240,7 +240,7 @@ namespace swift::gui::components
     void CMappingComponent::onChangedSimulatedAircraftInView(const CVariant &object, const CPropertyIndex &index)
     {
         if (!index.contains(CSimulatedAircraft::IndexEnabled)) { return; } // we only deal with enabled/disabled here
-        const auto sa = object.to<CSimulatedAircraft>(); // changed in GUI
+        const auto sa = object.value<CSimulatedAircraft>(); // changed in GUI
         const CSimulatedAircraft saFromBackend =
             sGui->getIContextNetwork()->getAircraftInRangeForCallsign(sa.getCallsign());
         if (!saFromBackend.hasValidCallsign()) { return; } // obviously deleted
diff --git a/src/gui/components/textmessagecomponent.cpp b/src/gui/components/textmessagecomponent.cpp
index 37b2a3fc3..51bbf41c4 100644
--- a/src/gui/components/textmessagecomponent.cpp
+++ b/src/gui/components/textmessagecomponent.cpp
@@ -203,7 +203,7 @@ namespace swift::gui::components
                 if (msgSettings.popupSelcalMessages())
                 {
                     CStatusMessage msg = CLogMessage(this).info(u"SELCAL received");
-                    this->emitDisplayInInfoWindow(CVariant::from(msg), 3s);
+                    this->emitDisplayInInfoWindow(CVariant::fromValue(msg), 3s);
                 }
                 continue;
             }
@@ -300,7 +300,7 @@ namespace swift::gui::components
                 {
                     if (msgSettings.popup(message, ownAircraft))
                     {
-                        this->emitDisplayInInfoWindow(CVariant::from(message), 15s);
+                        this->emitDisplayInInfoWindow(CVariant::fromValue(message), 15s);
                     }
                 }
             } // message
diff --git a/src/gui/models/columnformatters.cpp b/src/gui/models/columnformatters.cpp
index 8c341e2f2..eb31b924b 100644
--- a/src/gui/models/columnformatters.cpp
+++ b/src/gui/models/columnformatters.cpp
@@ -57,24 +57,24 @@ namespace swift::gui::models
         if (type == QMetaType::QImage)
         {
             const auto img = dataCVariant.value<QImage>();
-            return CVariant::from(QPixmap::fromImage(img));
+            return CVariant::fromValue(QPixmap::fromImage(img));
         }
 
         // Our CIcon class
         if (dataCVariant.canConvert<CIcon>())
         {
             const auto i = dataCVariant.value<CIcon>();
-            return CVariant::from(i.toPixmap());
+            return CVariant::fromValue(i.toPixmap());
         }
 
         // nope
-        return CVariant::from(QPixmap());
+        return CVariant::fromValue(QPixmap());
     }
 
     CVariant CDefaultFormatter::alignmentRole() const
     {
-        if (this->hasAlignment()) { return CVariant::from(m_alignment); }
-        return CVariant::from(alignDefault()); // default
+        if (this->hasAlignment()) { return CVariant::fromValue(m_alignment); }
+        return CVariant::fromValue(alignDefault()); // default
     }
 
     CVariant CDefaultFormatter::checkStateRole(const CVariant &value) const
@@ -127,13 +127,13 @@ namespace swift::gui::models
 
     const CVariant &CDefaultFormatter::emptyStringVariant()
     {
-        static const CVariant e = CVariant::from(QString());
+        static const CVariant e = CVariant::fromValue(QString());
         return e;
     }
 
     const CVariant &CDefaultFormatter::emptyPixmapVariant()
     {
-        static const CVariant e = CVariant::from(QPixmap());
+        static const CVariant e = CVariant::fromValue(QPixmap());
         return e;
     }
 
@@ -275,7 +275,7 @@ namespace swift::gui::models
             static const CVariant iv("invalid");
             return iv;
         }
-        return CVariant::from(QStringLiteral("Invalid type: '%1'").arg(dataCVariant.typeName()));
+        return CVariant::fromValue(QStringLiteral("Invalid type: '%1'").arg(dataCVariant.typeName()));
     }
 
     Qt::ItemFlags CDelegateFormatter::flags(Qt::ItemFlags flags, bool editable) const
@@ -376,7 +376,7 @@ namespace swift::gui::models
 
     CVariant CAltitudeFormatter::displayRole(const CVariant &altitude) const
     {
-        auto alt(altitude.to<CAltitude>());
+        auto alt(altitude.value<CAltitude>());
         if (m_flightLevel) { alt.toFlightLevel(); }
         else { alt.switchUnit(m_unit); }
         return alt.toQString(m_useI18n);
@@ -395,7 +395,7 @@ namespace swift::gui::models
 
     CVariant CColorFormatter::decorationRole(const CVariant &dataCVariant) const
     {
-        const auto rgbColor(dataCVariant.to<CRgbColor>());
+        const auto rgbColor(dataCVariant.value<CRgbColor>());
         if (!rgbColor.isValid()) { return emptyPixmapVariant(); }
         return CVariant::fromValue(rgbColor.toPixmap());
     }
@@ -403,7 +403,7 @@ namespace swift::gui::models
     CVariant CColorFormatter::tooltipRole(const CVariant &dataCVariant) const
     {
         static const CVariant empty(CVariant::fromValue(QPixmap()));
-        const auto rgbColor(dataCVariant.to<CRgbColor>());
+        const auto rgbColor(dataCVariant.value<CRgbColor>());
         if (!rgbColor.isValid()) { return emptyStringVariant(); }
         return rgbColor.hex(true);
     }
diff --git a/src/gui/models/columnformatters.h b/src/gui/models/columnformatters.h
index d00f60273..bd7a80012 100644
--- a/src/gui/models/columnformatters.h
+++ b/src/gui/models/columnformatters.h
@@ -232,8 +232,8 @@ namespace swift::gui::models
         CBoolTextFormatter(int alignment = alignDefault(), const QString &trueName = "true",
                            const QString &falseName = "false", const QList<int> &supportedRoles = roleDisplay())
             : CDefaultFormatter(alignment, false, supportedRoles),
-              m_trueNameVariant(swift::misc::CVariant::from(trueName)),
-              m_falseNameVariant(swift::misc::CVariant::from(falseName))
+              m_trueNameVariant(swift::misc::CVariant::fromValue(trueName)),
+              m_falseNameVariant(swift::misc::CVariant::fromValue(falseName))
         {}
 
         //! \copydoc CDefaultFormatter::displayRole
diff --git a/src/gui/models/namevariantpairlistmodel.cpp b/src/gui/models/namevariantpairlistmodel.cpp
index 1af89ba9f..5638e2fa7 100644
--- a/src/gui/models/namevariantpairlistmodel.cpp
+++ b/src/gui/models/namevariantpairlistmodel.cpp
@@ -82,6 +82,6 @@ namespace swift::gui::models
         if (rowIndex < 0) { return false; }
         QModelIndex i = this->index(rowIndex, 0);
         const CNameVariantPair cv = this->at(i);
-        return value == CVariant::from(cv);
+        return value == CVariant::fromValue(cv);
     }
 } // namespace swift::gui::models
diff --git a/src/gui/models/statusmessagefilter.cpp b/src/gui/models/statusmessagefilter.cpp
index e452a036f..9147160fe 100644
--- a/src/gui/models/statusmessagefilter.cpp
+++ b/src/gui/models/statusmessagefilter.cpp
@@ -54,9 +54,10 @@ namespace swift::gui::models
         {
             if (CLogPattern::allHumanReadableNames().contains(m_category))
             {
-                return CVariant::from(CLogPattern::fromHumanReadableName(m_category).withSeverityAtOrAbove(m_severity));
+                return CVariant::fromValue(
+                    CLogPattern::fromHumanReadableName(m_category).withSeverityAtOrAbove(m_severity));
             }
-            return CVariant::from(CLogPattern::exactMatch(m_category).withSeverityAtOrAbove(m_severity));
+            return CVariant::fromValue(CLogPattern::exactMatch(m_category).withSeverityAtOrAbove(m_severity));
         }
 
         CLogCategoryList categories = CLogCategoryList::fromQStringList(CLogCategories::allSpecialCategories());
@@ -71,6 +72,6 @@ namespace swift::gui::models
             return strings.isEmpty() ? QString {} : *strings.begin();
         });
 
-        return CVariant::from(CLogPattern::anyOf(categories.join(humanCats)).withSeverityAtOrAbove(m_severity));
+        return CVariant::fromValue(CLogPattern::anyOf(categories.join(humanCats)).withSeverityAtOrAbove(m_severity));
     }
 } // namespace swift::gui::models
diff --git a/src/gui/views/aircraftmodelview.cpp b/src/gui/views/aircraftmodelview.cpp
index d6d77c859..199b5beab 100644
--- a/src/gui/views/aircraftmodelview.cpp
+++ b/src/gui/views/aircraftmodelview.cpp
@@ -80,21 +80,21 @@ namespace swift::gui::views
     int CAircraftModelView::applyToSelected(const CLivery &livery)
     {
         if (!hasSelection()) { return 0; }
-        const int c = this->updateSelected(CVariant::from(livery), CAircraftModel::IndexLivery);
+        const int c = this->updateSelected(CVariant::fromValue(livery), CAircraftModel::IndexLivery);
         return c;
     }
 
     int CAircraftModelView::applyToSelected(const CAircraftIcaoCode &icao)
     {
         if (!hasSelection()) { return 0; }
-        const int c = this->updateSelected(CVariant::from(icao), CAircraftModel::IndexAircraftIcaoCode);
+        const int c = this->updateSelected(CVariant::fromValue(icao), CAircraftModel::IndexAircraftIcaoCode);
         return c;
     }
 
     int CAircraftModelView::applyToSelected(const CDistributor &distributor)
     {
         if (!hasSelection()) { return 0; }
-        const int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
+        const int c = this->updateSelected(CVariant::fromValue(distributor), CAircraftModel::IndexDistributor);
         return c;
     }
 
diff --git a/src/gui/views/viewbase.cpp b/src/gui/views/viewbase.cpp
index 29dd3ffe0..93ee03776 100644
--- a/src/gui/views/viewbase.cpp
+++ b/src/gui/views/viewbase.cpp
@@ -318,7 +318,7 @@ namespace swift::gui::views
 
         const int currentRows = this->rowCount();
         const ContainerType selected(this->selectedObjects());
-        const CVariant deletedObjsVariant = CVariant::from(selected);
+        const CVariant deletedObjsVariant = CVariant::fromValue(selected);
         int delta = 0;
 
         if (!this->hasFilter() && currentRows == this->selectedRowCount())
@@ -619,7 +619,7 @@ namespace swift::gui::views
     template <class T>
     int CViewBase<T>::performUpdateContainer(const swift::misc::CVariant &variant, bool sort, bool resize)
     {
-        auto c(variant.to<ContainerType>());
+        auto c(variant.value<ContainerType>());
         return this->updateContainer(c, sort, resize);
     }
 
@@ -808,7 +808,7 @@ namespace swift::gui::views
         if (!this->hasSelection()) { return; }
         const ContainerType selection = this->selectedObjects();
         if (selection.isEmpty()) { return; }
-        const CVariant copyJson = CVariant::from(selection);
+        const CVariant copyJson = CVariant::fromValue(selection);
         const QString json = copyJson.toJsonString();
         clipboard->setText(json);
     }
diff --git a/src/misc/logpattern.h b/src/misc/logpattern.h
index 0ce6720eb..bc463f436 100644
--- a/src/misc/logpattern.h
+++ b/src/misc/logpattern.h
@@ -98,7 +98,7 @@ namespace swift::misc
         bool match(const CStatusMessage &message) const;
 
         //! This class acts as a SharedState filter when stored in a CVariant.
-        bool matches(const CVariant &message) const { return match(message.to<CStatusMessage>()); }
+        bool matches(const CVariant &message) const { return match(message.value<CStatusMessage>()); }
 
         //! Technical category names matched by this pattern.
         QSet<QString> getCategoryStrings() const { return m_strings; }
diff --git a/src/misc/pq/pqstring.cpp b/src/misc/pq/pqstring.cpp
index 6f4cecff6..faa74d843 100644
--- a/src/misc/pq/pqstring.cpp
+++ b/src/misc/pq/pqstring.cpp
@@ -50,55 +50,55 @@ namespace swift::misc::physical_quantities
         if (CMeasurementUnit::isValidUnitSymbol<CAccelerationUnit>(unit))
         {
             const CAcceleration pq(numberD, CMeasurementUnit::unitFromSymbol<CAccelerationUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CAngleUnit>(unit))
         {
             const CAngle pq(numberD, CMeasurementUnit::unitFromSymbol<CAngleUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CFrequencyUnit>(unit))
         {
             const CFrequency pq(numberD, CMeasurementUnit::unitFromSymbol<CFrequencyUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CLengthUnit>(unit))
         {
             const CLength pq(numberD, CMeasurementUnit::unitFromSymbol<CLengthUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CMassUnit>(unit))
         {
             const CMass pq(numberD, CMeasurementUnit::unitFromSymbol<CMassUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CPressureUnit>(unit))
         {
             const CPressure pq(numberD, CMeasurementUnit::unitFromSymbol<CPressureUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CSpeedUnit>(unit))
         {
             const CSpeed pq(numberD, CMeasurementUnit::unitFromSymbol<CSpeedUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CTimeUnit>(unit))
         {
             const CTime pq(numberD, CMeasurementUnit::unitFromSymbol<CTimeUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
 
         if (CMeasurementUnit::isValidUnitSymbol<CTemperatureUnit>(unit))
         {
             const CTemperature pq(numberD, CMeasurementUnit::unitFromSymbol<CTemperatureUnit>(unit, false));
-            return CVariant::from(pq);
+            return CVariant::fromValue(pq);
         }
         return v;
     }
diff --git a/src/misc/propertyindexvariantmap.h b/src/misc/propertyindexvariantmap.h
index 328123177..0860bd2f7 100644
--- a/src/misc/propertyindexvariantmap.h
+++ b/src/misc/propertyindexvariantmap.h
@@ -107,7 +107,7 @@ namespace swift::misc
         template <typename T, typename = std::enable_if_t<!std::is_same_v<T, CVariant>>>
         bool matches(const T &value) const
         {
-            return matchesVariant(CVariant::from(value));
+            return matchesVariant(CVariant::fromValue(value));
         }
 
         //! Map
diff --git a/src/misc/sharedstate/listjournal.cpp b/src/misc/sharedstate/listjournal.cpp
index d5afb0c6d..49968e524 100644
--- a/src/misc/sharedstate/listjournal.cpp
+++ b/src/misc/sharedstate/listjournal.cpp
@@ -13,7 +13,7 @@ namespace swift::misc::shared_state
     {
         dataLink->publish(m_mutator.data());
         dataLink->subscribe(m_observer.data());
-        m_observer->setEventSubscription(CVariant::from(CAnyMatch()));
+        m_observer->setEventSubscription(CVariant::fromValue(CAnyMatch()));
     }
 
     CVariant CGenericListJournal::handleRequest(const CVariant &filter)
@@ -23,7 +23,7 @@ namespace swift::misc::shared_state
         {
             copy.removeIf([&filter](const CVariant &v) { return !filter.matches(v); });
         }
-        return CVariant::from(copy);
+        return CVariant::fromValue(copy);
     }
 
     void CGenericListJournal::handleEvent(const CVariant &param) { m_value.push_back(param); }
diff --git a/src/misc/sharedstate/listmutator.h b/src/misc/sharedstate/listmutator.h
index 8a4db646a..1670a8f63 100644
--- a/src/misc/sharedstate/listmutator.h
+++ b/src/misc/sharedstate/listmutator.h
@@ -54,7 +54,10 @@ namespace swift::misc::shared_state
 
     public:
         //! Add list element.
-        void addElement(const typename T::value_type &value) { CGenericListMutator::addElement(CVariant::from(value)); }
+        void addElement(const typename T::value_type &value)
+        {
+            CGenericListMutator::addElement(CVariant::fromValue(value));
+        }
     };
 } // namespace swift::misc::shared_state
 
diff --git a/src/misc/sharedstate/listobserver.cpp b/src/misc/sharedstate/listobserver.cpp
index caa924fcd..30f862749 100644
--- a/src/misc/sharedstate/listobserver.cpp
+++ b/src/misc/sharedstate/listobserver.cpp
@@ -27,7 +27,7 @@ namespace swift::misc::shared_state
     {
         m_observer->requestAsync(m_observer->eventSubscription(), [this](const CVariant &list) {
             QMutexLocker lock(&m_listMutex);
-            m_list = list.to<CVariantList>();
+            m_list = list.value<CVariantList>();
             lock.unlock();
             onGenericElementsReplaced(allValues());
         });
diff --git a/src/misc/sharedstate/listobserver.h b/src/misc/sharedstate/listobserver.h
index 91e4784b8..fe5b08860 100644
--- a/src/misc/sharedstate/listobserver.h
+++ b/src/misc/sharedstate/listobserver.h
@@ -74,10 +74,10 @@ namespace swift::misc::shared_state
         }
 
         //! Set filter to choose list elements.
-        void setFilter(const U &filter) { CGenericListObserver::setFilter(CVariant::from(filter)); }
+        void setFilter(const U &filter) { CGenericListObserver::setFilter(CVariant::fromValue(filter)); }
 
         //! Get list value containing all elements matching the filter.
-        T allValues() const { return CVariant::from(CGenericListObserver::allValues()).template to<T>(); }
+        T allValues() const { return CVariant::fromValue(CGenericListObserver::allValues()).template value<T>(); }
 
         //! Called when an element matching the filter is added to the list.
         virtual void onElementAdded(const typename T::value_type &value) = 0;
@@ -86,7 +86,11 @@ namespace swift::misc::shared_state
         virtual void onElementsReplaced(const T &values) = 0;
 
     private:
-        void onGenericElementAdded(const CVariant &value) final { onElementAdded(value.to<typename T::value_type>()); }
+        void onGenericElementAdded(const CVariant &value) final
+        {
+            onElementAdded(value.value<typename T::value_type>());
+        }
+
         void onGenericElementsReplaced(const CVariantList &values) final { onElementsReplaced(values.to<T>()); }
     };
 } // namespace swift::misc::shared_state
diff --git a/src/misc/sharedstate/scalarjournal.cpp b/src/misc/sharedstate/scalarjournal.cpp
index d44933e76..7d4bfe509 100644
--- a/src/misc/sharedstate/scalarjournal.cpp
+++ b/src/misc/sharedstate/scalarjournal.cpp
@@ -13,7 +13,7 @@ namespace swift::misc::shared_state
     {
         dataLink->publish(m_mutator.data());
         dataLink->subscribe(m_observer.data());
-        m_observer->setEventSubscription(CVariant::from(CAnyMatch()));
+        m_observer->setEventSubscription(CVariant::fromValue(CAnyMatch()));
         m_mutator->postEvent(m_value);
     }
 
diff --git a/src/misc/sharedstate/scalarmutator.h b/src/misc/sharedstate/scalarmutator.h
index 9688e6c8e..0ce53a581 100644
--- a/src/misc/sharedstate/scalarmutator.h
+++ b/src/misc/sharedstate/scalarmutator.h
@@ -54,7 +54,7 @@ namespace swift::misc::shared_state
 
     public:
         //! Set scalar value.
-        void setValue(const T &value) { CGenericScalarMutator::setValue(CVariant::from(value)); }
+        void setValue(const T &value) { CGenericScalarMutator::setValue(CVariant::fromValue(value)); }
     };
 } // namespace swift::misc::shared_state
 
diff --git a/src/misc/sharedstate/scalarobserver.cpp b/src/misc/sharedstate/scalarobserver.cpp
index 98529a8be..514a004b6 100644
--- a/src/misc/sharedstate/scalarobserver.cpp
+++ b/src/misc/sharedstate/scalarobserver.cpp
@@ -12,7 +12,7 @@ namespace swift::misc::shared_state
     void CGenericScalarObserver::initialize(IDataLink *dataLink)
     {
         dataLink->subscribe(m_observer.data());
-        m_observer->setEventSubscription(CVariant::from(CAnyMatch()));
+        m_observer->setEventSubscription(CVariant::fromValue(CAnyMatch()));
         connect(dataLink->watcher(), &CDataLinkConnectionWatcher::connected, this,
                 &CGenericScalarObserver::reconstruct);
         if (dataLink->watcher()->isConnected()) { reconstruct(); }
diff --git a/src/misc/sharedstate/scalarobserver.h b/src/misc/sharedstate/scalarobserver.h
index 65b822947..82ec9c98b 100644
--- a/src/misc/sharedstate/scalarobserver.h
+++ b/src/misc/sharedstate/scalarobserver.h
@@ -61,13 +61,13 @@ namespace swift::misc::shared_state
 
     public:
         //! Get scalar value.
-        T value() const { return CGenericScalarObserver::value().template to<T>(); }
+        T value() const { return CGenericScalarObserver::value().template value<T>(); }
 
     private:
         //! Called when the scalar value changes.
         virtual void onValueChanged(const T &value) = 0;
 
-        void onGenericValueChanged(const CVariant &value) final { onValueChanged(value.to<T>()); }
+        void onGenericValueChanged(const CVariant &value) final { onValueChanged(value.value<T>()); }
     };
 } // namespace swift::misc::shared_state
 
diff --git a/src/misc/simulation/remoteaircraftprovider.cpp b/src/misc/simulation/remoteaircraftprovider.cpp
index 7b12cb0b9..22bccfe03 100644
--- a/src/misc/simulation/remoteaircraftprovider.cpp
+++ b/src/misc/simulation/remoteaircraftprovider.cpp
@@ -531,7 +531,7 @@ namespace swift::misc::simulation
                                                       const CIdentifier &originator)
     {
         if (CIdentifiable::isMyIdentifier(originator)) { return false; }
-        const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::from(model));
+        const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexModel, CVariant::fromValue(model));
         const int c = this->updateAircraftInRange(callsign, vm);
         return c > 0;
     }
@@ -540,7 +540,7 @@ namespace swift::misc::simulation
                                                              const CIdentifier &originator)
     {
         if (CIdentifiable::isMyIdentifier(originator)) { return false; }
-        const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexNetworkModel, CVariant::from(model));
+        const CPropertyIndexVariantMap vm(CSimulatedAircraft::IndexNetworkModel, CVariant::fromValue(model));
         const int c = this->updateAircraftInRange(callsign, vm);
         return c > 0;
     }
diff --git a/src/misc/test/testdata.cpp b/src/misc/test/testdata.cpp
index 6d2176091..f179c5f0e 100644
--- a/src/misc/test/testdata.cpp
+++ b/src/misc/test/testdata.cpp
@@ -36,9 +36,9 @@ namespace swift::misc::test
 
     const CVariantList &CTestData::getCVariantList()
     {
-        static const CVariantList vl({ CVariant::from(CLength(100, CLengthUnit::m())),
-                                       CVariant::from(CSpeed(200, CSpeedUnit::m_s())),
-                                       CVariant::from(CTestData::getCoordinateMunichTower()) });
+        static const CVariantList vl({ CVariant::fromValue(CLength(100, CLengthUnit::m())),
+                                       CVariant::fromValue(CSpeed(200, CSpeedUnit::m_s())),
+                                       CVariant::fromValue(CTestData::getCoordinateMunichTower()) });
         return vl;
     }
 
diff --git a/src/misc/test/testing.cpp b/src/misc/test/testing.cpp
index 2a36ae353..d877885ec 100644
--- a/src/misc/test/testing.cpp
+++ b/src/misc/test/testing.cpp
@@ -54,17 +54,17 @@ namespace swift::misc::test
         CAtcStation station;
         if (byPropertyIndex)
         {
-            station.setPropertyByIndex(CAtcStation::IndexCallsign, CVariant::from(CCallsign(cs)));
-            station.setPropertyByIndex(CAtcStation::IndexController, CVariant::from(user));
+            station.setPropertyByIndex(CAtcStation::IndexCallsign, CVariant::fromValue(CCallsign(cs)));
+            station.setPropertyByIndex(CAtcStation::IndexController, CVariant::fromValue(user));
             station.setPropertyByIndex(CAtcStation::IndexFrequency,
-                                       CVariant::from(CFrequency(f, CFrequencyUnit::MHz())));
-            station.setPropertyByIndex(CAtcStation::IndexRange, CVariant::from(CLength(50, CLengthUnit::km())));
-            station.setPropertyByIndex(CAtcStation::IndexPosition, CVariant::from(geoPos));
-            station.setPropertyByIndex(CAtcStation::IndexIsOnline, CVariant::from(false));
+                                       CVariant::fromValue(CFrequency(f, CFrequencyUnit::MHz())));
+            station.setPropertyByIndex(CAtcStation::IndexRange, CVariant::fromValue(CLength(50, CLengthUnit::km())));
+            station.setPropertyByIndex(CAtcStation::IndexPosition, CVariant::fromValue(geoPos));
+            station.setPropertyByIndex(CAtcStation::IndexIsOnline, CVariant::fromValue(false));
             station.setPropertyByIndex(CAtcStation::IndexRelativeDistance,
-                                       CVariant::from(CLength(index + 1, CLengthUnit::NM())));
-            station.setPropertyByIndex(CAtcStation::IndexAtis, CVariant::from(atis));
-            station.setPropertyByIndex(CAtcStation::IndexMetar, CVariant::from(metar));
+                                       CVariant::fromValue(CLength(index + 1, CLengthUnit::NM())));
+            station.setPropertyByIndex(CAtcStation::IndexAtis, CVariant::fromValue(atis));
+            station.setPropertyByIndex(CAtcStation::IndexMetar, CVariant::fromValue(metar));
         }
         else
         {
diff --git a/src/misc/valuecache.h b/src/misc/valuecache.h
index 9ea9ec37c..f6c54c0bb 100644
--- a/src/misc/valuecache.h
+++ b/src/misc/valuecache.h
@@ -373,8 +373,8 @@ namespace swift::misc
         CCached(CValueCache *cache, const QString &key, const QString &name, F validator, const T &defaultValue,
                 U *owner)
             : m_page(&private_ns::CValuePage::getPageFor(owner, cache)),
-              m_element(
-                  &m_page->createElement(key, name, qMetaTypeId<T>(), wrap(validator), CVariant::from(defaultValue)))
+              m_element(&m_page->createElement(key, name, qMetaTypeId<T>(), wrap(validator),
+                                               CVariant::fromValue(defaultValue)))
         {
             if (isInitialized()) { cache->setHumanReadableName(getKey(), name); }
         }
@@ -410,13 +410,13 @@ namespace swift::misc
         //! Write a new value. Must be called from the thread in which the owner lives.
         CStatusMessage set(const T &value, qint64 timestamp = 0)
         {
-            return m_page->setValue(*m_element, CVariant::from(value), timestamp);
+            return m_page->setValue(*m_element, CVariant::fromValue(value), timestamp);
         }
 
         //! Write and save in the same step. Must be called from the thread in which the owner lives.
         CStatusMessage setAndSave(const T &value, qint64 timestamp = 0)
         {
-            return m_page->setValue(*m_element, CVariant::from(value), timestamp, true);
+            return m_page->setValue(*m_element, CVariant::fromValue(value), timestamp, true);
         }
 
         //! Save using the currently set value. Must be called from the thread in which the owner lives.
@@ -474,7 +474,7 @@ namespace swift::misc
         template <typename F>
         static private_ns::CValuePage::Validator wrap(F func)
         {
-            return [func](const CVariant &value, QString &reason) -> bool { return func(value.to<T>(), reason); };
+            return [func](const CVariant &value, QString &reason) -> bool { return func(value.value<T>(), reason); };
         }
         static private_ns::CValuePage::Validator wrap(std::nullptr_t) { return {}; }
 
diff --git a/src/misc/variant.h b/src/misc/variant.h
index 6e5b4f28b..d19cacb98 100644
--- a/src/misc/variant.h
+++ b/src/misc/variant.h
@@ -84,7 +84,7 @@ namespace swift::misc
         //! Move-construct from a QVariant.
         CVariant(QVariant &&var) noexcept : m_v(std::move(var)) {}
 
-        //! Avoid unexpected implicit cast to QVariant::Type. (Use CVariant::from() instead.)
+        //! Avoid unexpected implicit cast to QVariant::Type. (Use CVariant::fromValue() instead.)
         CVariant(int) = delete;
 
         //! Implicit conversion from QString.
@@ -139,14 +139,6 @@ namespace swift::misc
             return CVariant(QVariant::fromValue(std::forward<T>(value)));
         }
 
-        //! Synonym for fromValue().
-        template <typename T>
-        static CVariant from(T &&value)
-        {
-            static_assert(!std::is_same_v<CVariant, std::decay_t<T>>, "CVariant is an illegal type!");
-            return CVariant(QVariant::fromValue(std::forward<T>(value)));
-        }
-
         //! Change the value.
         template <typename T>
         void setValue(T &&value)
@@ -154,13 +146,6 @@ namespace swift::misc
             m_v.setValue(std::forward<T>(value));
         }
 
-        //! Synonym for setValue().
-        template <typename T>
-        void set(T &&value)
-        {
-            m_v.setValue(std::forward<T>(value));
-        }
-
         //! Return the value converted to the type T.
         template <typename T>
         T value() const
@@ -168,13 +153,6 @@ namespace swift::misc
             return to(tag<T>());
         }
 
-        //! Synonym for value().
-        template <typename T>
-        T to() const
-        {
-            return to(tag<T>());
-        }
-
         //! Returns the value converted to the type T, or a default if it can not be converted.
         //! \details Parameter is passed by value to avoid odr-using the argument in case it is
         //!          an inline-initialized static const integral data member without a definition (§9.4.2/3).
@@ -398,10 +376,10 @@ namespace swift::misc::private_ns
             }
 
             QMetaType::registerConverter<T, QVector<CVariant>>([](const T &list) -> QVector<CVariant> {
-                return list.transform([](const typename T::value_type &v) { return CVariant::from(v); });
+                return list.transform([](const typename T::value_type &v) { return CVariant::fromValue(v); });
             });
             QMetaType::registerConverter<QVector<CVariant>, T>([](const QVector<CVariant> &list) -> T {
-                return makeRange(list).transform([](const CVariant &v) { return v.to<typename T::value_type>(); });
+                return makeRange(list).transform([](const CVariant &v) { return v.value<typename T::value_type>(); });
             });
         }
     }
diff --git a/src/misc/variantlist.h b/src/misc/variantlist.h
index c67f59c56..444fe5d81 100644
--- a/src/misc/variantlist.h
+++ b/src/misc/variantlist.h
@@ -47,14 +47,14 @@ namespace swift::misc
         template <typename T>
         T to() const
         {
-            return CVariant::from(*this).template to<T>();
+            return CVariant::fromValue(*this).template value<T>();
         }
 
         //! Convert from a sequence type by converting all elements.
         template <typename T>
         static CVariantList from(const T &list)
         {
-            return CVariant::from(list).template to<CVariantList>();
+            return CVariant::fromValue(list).template value<CVariantList>();
         }
 
         //! \copydoc swift::misc::CValueObject::registerMetadata
diff --git a/tests/misc/testsharedstate/testsharedstate.h b/tests/misc/testsharedstate/testsharedstate.h
index c9c89825e..e968208b7 100644
--- a/tests/misc/testsharedstate/testsharedstate.h
+++ b/tests/misc/testsharedstate/testsharedstate.h
@@ -26,7 +26,7 @@ namespace MiscTest
     public:
         bool matches(const swift::misc::CVariant &value) const
         {
-            return value.canConvert<unsigned>() && (value.to<unsigned>() & m_mask);
+            return value.canConvert<unsigned>() && (value.value<unsigned>() & m_mask);
         }
         QString convertToQString(bool = false) const { return QString::number(m_mask); }
         CTestFilter(unsigned mask = ~0u) : m_mask(mask) {}
diff --git a/tests/misc/testvaluecache/testvaluecache.cpp b/tests/misc/testvaluecache/testvaluecache.cpp
index 8d77e0eda..7db4c9df7 100644
--- a/tests/misc/testvaluecache/testvaluecache.cpp
+++ b/tests/misc/testvaluecache/testvaluecache.cpp
@@ -101,14 +101,14 @@ namespace MiscTest
 
     void CTestValueCache::insertAndGet()
     {
-        CVariantMap testData { { "value1", CVariant::from(1) },
-                               { "value2", CVariant::from(2) },
-                               { "value3", CVariant::from(3) } };
-        CVariantMap testData2 { { "value2", CVariant::from(42) }, { "value4", CVariant::from(4) } };
-        CVariantMap testDataCombined { { "value1", CVariant::from(1) },
-                                       { "value2", CVariant::from(42) },
-                                       { "value3", CVariant::from(3) },
-                                       { "value4", CVariant::from(4) } };
+        CVariantMap testData { { "value1", CVariant::fromValue(1) },
+                               { "value2", CVariant::fromValue(2) },
+                               { "value3", CVariant::fromValue(3) } };
+        CVariantMap testData2 { { "value2", CVariant::fromValue(42) }, { "value4", CVariant::fromValue(4) } };
+        CVariantMap testDataCombined { { "value1", CVariant::fromValue(1) },
+                                       { "value2", CVariant::fromValue(42) },
+                                       { "value3", CVariant::fromValue(3) },
+                                       { "value4", CVariant::fromValue(4) } };
 
         CValueCache cache(1);
         QVERIFY(cache.getAllValues() == CVariantMap());
@@ -243,12 +243,12 @@ namespace MiscTest
 
     void CTestValueCache::json()
     {
-        QJsonObject testJson { { "value1", CVariant::from(1).toJson() },
-                               { "value2", CVariant::from(2).toJson() },
-                               { "value3", CVariant::from(3).toJson() } };
-        CVariantMap testData { { "value1", CVariant::from(1) },
-                               { "value2", CVariant::from(2) },
-                               { "value3", CVariant::from(3) } };
+        QJsonObject testJson { { "value1", CVariant::fromValue(1).toJson() },
+                               { "value2", CVariant::fromValue(2).toJson() },
+                               { "value3", CVariant::fromValue(3).toJson() } };
+        CVariantMap testData { { "value1", CVariant::fromValue(1) },
+                               { "value2", CVariant::fromValue(2) },
+                               { "value3", CVariant::fromValue(3) } };
 
         CValueCache cache(1);
         cache.loadFromJson(testJson);
@@ -260,11 +260,11 @@ namespace MiscTest
     {
         CSimulatedAircraftList aircraft({ CSimulatedAircraft("BAW001", {}, {}) });
         CAtcStationList atcStations({ CAtcStation("EGLL_TWR") });
-        const CVariantMap testData { { "namespace1/value1", CVariant::from(1) },
-                                     { "namespace1/value2", CVariant::from(2) },
-                                     { "namespace1/value3", CVariant::from(3) },
-                                     { "namespace2/aircraft", CVariant::from(aircraft) },
-                                     { "namespace2/atcstations", CVariant::from(atcStations) } };
+        const CVariantMap testData { { "namespace1/value1", CVariant::fromValue(1) },
+                                     { "namespace1/value2", CVariant::fromValue(2) },
+                                     { "namespace1/value3", CVariant::fromValue(3) },
+                                     { "namespace2/aircraft", CVariant::fromValue(aircraft) },
+                                     { "namespace2/atcstations", CVariant::fromValue(atcStations) } };
         CValueCache cache(1);
         cache.insertValues({ testData, QDateTime::currentMSecsSinceEpoch() });
 
diff --git a/tests/misc/testvalueobject.h b/tests/misc/testvalueobject.h
index 0f089e917..2ded659fb 100644
--- a/tests/misc/testvalueobject.h
+++ b/tests/misc/testvalueobject.h
@@ -61,7 +61,7 @@ namespace swift::misc
         //! \copydoc swift::misc::mixin::Index::propertyByIndex
         CVariant propertyByIndex(const swift::misc::CPropertyIndex &index) const
         {
-            if (index.isMyself()) { return CVariant::from(*this); }
+            if (index.isMyself()) { return CVariant::fromValue(*this); }
             const auto i = index.frontCasted<ColumnIndex>();
             switch (i)
             {
@@ -76,7 +76,7 @@ namespace swift::misc
         {
             if (index.isMyself())
             {
-                (*this) = variant.to<CTestValueObject>();
+                (*this) = variant.value<CTestValueObject>();
                 return;
             }
             const auto i = index.frontCasted<ColumnIndex>();
diff --git a/tests/misc/testvariantandmap/testvariantandmap.cpp b/tests/misc/testvariantandmap/testvariantandmap.cpp
index a8b460149..40a98264c 100644
--- a/tests/misc/testvariantandmap/testvariantandmap.cpp
+++ b/tests/misc/testvariantandmap/testvariantandmap.cpp
@@ -113,10 +113,10 @@ namespace MiscTest
 
         QVERIFY2(station1 == station2, "Station should be equal");
         QVERIFY2(station1 != station3, "Station should not be equal");
-        QVERIFY2(station1qv == CVariant::from(station1), "Station should be equal (CVariant)");
-        QVERIFY2(CVariant::from(station1) == station1qv, "Station should be equal (CVariant)");
-        QVERIFY2(CVariant::from(station2) == station1qv, "Station should be equal (CVariant)");
-        QVERIFY2(CVariant::from(station3) != station1qv, "Station should be equal (CVariant)");
+        QVERIFY2(station1qv == CVariant::fromValue(station1), "Station should be equal (CVariant)");
+        QVERIFY2(CVariant::fromValue(station1) == station1qv, "Station should be equal (CVariant)");
+        QVERIFY2(CVariant::fromValue(station2) == station1qv, "Station should be equal (CVariant)");
+        QVERIFY2(CVariant::fromValue(station3) != station1qv, "Station should be equal (CVariant)");
 
         QVERIFY2(compare(station1, station1) == 0, "Station should be equal");
         QVERIFY2(compare(station1, station2) == 0, "Station should be equal");
@@ -126,31 +126,31 @@ namespace MiscTest
     void CTestVariantAndMap::variantList()
     {
         const CSequence<int> ints { 1, 2, 3 };
-        CVariant variant = CVariant::from(ints);
+        CVariant variant = CVariant::fromValue(ints);
         QVERIFY2(variant.canConvert<CVariantList>(), "Variant containing list can convert to CVariantList");
         QVERIFY2(variant.convert(qMetaTypeId<CVariantList>()), "Variant containing list can convert to CVariantList");
-        const auto variantInts = variant.to<CVariantList>();
+        const auto variantInts = variant.value<CVariantList>();
         QVERIFY2(ints.size() == variantInts.size(), "Variant list has same size as original list");
-        QVERIFY2(ints[0] == variantInts[0].to<int>(), "Variant list has same element");
+        QVERIFY2(ints[0] == variantInts[0].value<int>(), "Variant list has same element");
         QVERIFY2(variant.canConvert<CSequence<int>>(), "Variant containing can convert back");
-        QVERIFY2(ints == variant.to<CSequence<int>>(), "Variant list converted back compares equal");
+        QVERIFY2(ints == variant.value<CSequence<int>>(), "Variant list converted back compares equal");
 
         const CAirlineIcaoCodeList list { CAirlineIcaoCode("BAW"), CAirlineIcaoCode("DLH"), CAirlineIcaoCode("AAL") };
-        variant = CVariant::from(list);
+        variant = CVariant::fromValue(list);
         QVERIFY2(variant.canConvert<CVariantList>(), "Variant containing list can convert to CVariantList");
         QVERIFY2(variant.convert(qMetaTypeId<CVariantList>()), "Variant containing list can convert to CVariantList");
-        auto variantList = variant.to<CVariantList>();
+        auto variantList = variant.value<CVariantList>();
         QVERIFY2(list.size() == variantList.size(), "Variant list has same size as original list");
-        QVERIFY2(list[0] == variantList[0].to<CAirlineIcaoCode>(), "Variant list has same element");
+        QVERIFY2(list[0] == variantList[0].value<CAirlineIcaoCode>(), "Variant list has same element");
         QVERIFY2(variant.canConvert<CAirlineIcaoCodeList>(), "Variant containing can convert back");
-        QVERIFY2(list == variant.to<CAirlineIcaoCodeList>(), "Variant list converted back compares equal");
+        QVERIFY2(list == variant.value<CAirlineIcaoCodeList>(), "Variant list converted back compares equal");
     }
 
     void CTestVariantAndMap::matches()
     {
         CTestMatcher::registerMetadata();
         const CTestMatcher matcher {};
-        const CVariant variant = CVariant::from(matcher);
+        const CVariant variant = CVariant::fromValue(matcher);
         QVERIFY2(variant.matches(CVariant()), "Variant provides access to stored object's matches() method");
     }