From 9977d97a67193d341cdf6276adf48db4f99b6bb0 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Fri, 27 Mar 2015 23:03:25 +0000
Subject: [PATCH] refs #356 Renamed CValueObjectStdTuple to CValueObject.

---
 src/blackmisc/audiodeviceinfo.h               |  2 +-
 src/blackmisc/avaircraft.cpp                  |  4 +-
 src/blackmisc/avaircraft.h                    |  2 +-
 src/blackmisc/avaircrafticao.cpp              |  4 +-
 src/blackmisc/avaircrafticao.h                |  2 +-
 src/blackmisc/avaircraftsituation.cpp         |  4 +-
 src/blackmisc/avaircraftsituation.h           |  2 +-
 src/blackmisc/avairport.cpp                   |  4 +-
 src/blackmisc/avairport.h                     |  2 +-
 src/blackmisc/avairporticao.h                 |  2 +-
 src/blackmisc/avaltitude.cpp                  |  2 +-
 src/blackmisc/avaltitude.h                    | 10 +--
 src/blackmisc/avatcstation.cpp                |  4 +-
 src/blackmisc/avatcstation.h                  |  2 +-
 src/blackmisc/avcallsign.cpp                  |  4 +-
 src/blackmisc/avcallsign.h                    |  2 +-
 src/blackmisc/avflightplan.h                  |  2 +-
 src/blackmisc/avheading.h                     | 10 +--
 src/blackmisc/aviation/aircraftengine.h       |  2 +-
 src/blackmisc/aviation/aircraftlights.cpp     |  4 +-
 src/blackmisc/aviation/aircraftlights.h       |  2 +-
 src/blackmisc/aviation/aircraftparts.cpp      |  4 +-
 src/blackmisc/aviation/aircraftparts.h        |  2 +-
 src/blackmisc/avinformationmessage.h          |  2 +-
 src/blackmisc/avioadfsystem.h                 |  6 +-
 src/blackmisc/aviobase.h                      |  2 +-
 src/blackmisc/aviocomsystem.h                 |  6 +-
 src/blackmisc/aviomodulator.cpp               |  4 +-
 src/blackmisc/aviomodulator.h                 |  6 +-
 src/blackmisc/avionavsystem.h                 |  6 +-
 src/blackmisc/aviotransponder.h               | 12 +--
 src/blackmisc/avselcal.h                      |  2 +-
 src/blackmisc/avtrack.h                       | 10 +--
 src/blackmisc/blackmisc.h                     |  2 +-
 src/blackmisc/containerbase.h                 |  6 +-
 src/blackmisc/coordinateecef.h                |  8 +-
 src/blackmisc/coordinategeodetic.cpp          |  4 +-
 src/blackmisc/coordinategeodetic.h            |  2 +-
 src/blackmisc/coordinatened.h                 | 10 +--
 src/blackmisc/dictionary.h                    |  4 +-
 src/blackmisc/eveventhotkeyfunction.h         |  2 +-
 src/blackmisc/evoriginator.h                  |  4 +-
 src/blackmisc/geoearthangle.h                 |  8 +-
 src/blackmisc/geolatitude.h                   |  6 +-
 src/blackmisc/geolongitude.h                  |  6 +-
 src/blackmisc/hotkeyfunction.h                |  2 +-
 src/blackmisc/hwjoystickbutton.h              |  2 +-
 src/blackmisc/hwkeyboardkey.h                 |  2 +-
 src/blackmisc/icon.h                          |  2 +-
 src/blackmisc/logcategory.h                   |  2 +-
 src/blackmisc/logpattern.h                    |  4 +-
 src/blackmisc/mathmatrix1x3.h                 |  4 +-
 src/blackmisc/mathmatrix3x1.h                 |  4 +-
 src/blackmisc/mathmatrix3x3.h                 |  4 +-
 src/blackmisc/mathmatrixbase.h                |  4 +-
 src/blackmisc/mathvector3d.h                  |  8 +-
 src/blackmisc/mathvector3dbase.h              |  4 +-
 src/blackmisc/namevariantpair.cpp             |  4 +-
 src/blackmisc/namevariantpair.h               |  2 +-
 src/blackmisc/nwaircraftmapping.cpp           |  4 +-
 src/blackmisc/nwaircraftmapping.h             |  2 +-
 src/blackmisc/nwclient.cpp                    |  4 +-
 src/blackmisc/nwclient.h                      |  2 +-
 src/blackmisc/nwserver.h                      |  2 +-
 src/blackmisc/nwtextmessage.cpp               |  4 +-
 src/blackmisc/nwtextmessage.h                 |  2 +-
 src/blackmisc/nwuser.cpp                      |  4 +-
 src/blackmisc/nwuser.h                        |  2 +-
 src/blackmisc/nwvoicecapabilities.h           |  2 +-
 src/blackmisc/pixmap.cpp                      |  2 +-
 src/blackmisc/pixmap.h                        |  2 +-
 src/blackmisc/pqacceleration.h                |  8 +-
 src/blackmisc/pqangle.h                       | 12 +--
 src/blackmisc/pqbase.h                        |  4 +-
 src/blackmisc/pqfrequency.h                   |  8 +-
 src/blackmisc/pqlength.h                      |  8 +-
 src/blackmisc/pqmass.h                        |  8 +-
 src/blackmisc/pqphysicalquantity.cpp          |  4 +-
 src/blackmisc/pqphysicalquantity.h            |  4 +-
 src/blackmisc/pqpressure.h                    |  8 +-
 src/blackmisc/pqspeed.h                       |  8 +-
 src/blackmisc/pqstring.h                      |  2 +-
 src/blackmisc/pqtemperature.h                 |  8 +-
 src/blackmisc/pqtime.cpp                      |  4 +-
 src/blackmisc/pqtime.h                        |  8 +-
 src/blackmisc/pqunits.h                       | 72 +++++++++---------
 src/blackmisc/propertyindex.h                 |  2 +-
 src/blackmisc/propertyindexvariantmap.h       |  4 +-
 src/blackmisc/setaudio.h                      |  2 +-
 src/blackmisc/setkeyboardhotkey.cpp           |  4 +-
 src/blackmisc/setkeyboardhotkey.h             |  2 +-
 src/blackmisc/setnetwork.h                    |  2 +-
 src/blackmisc/simulation/aircraftmodel.cpp    |  4 +-
 src/blackmisc/simulation/aircraftmodel.h      |  2 +-
 .../simulation/simulatedaircraft.cpp          |  2 +-
 src/blackmisc/simulation/simulatedaircraft.h  |  2 +-
 src/blackmisc/statusmessage.cpp               |  4 +-
 src/blackmisc/statusmessage.h                 |  2 +-
 src/blackmisc/tuple.h                         |  4 +-
 src/blackmisc/tuple_private.h                 |  4 +-
 src/blackmisc/valueobject.h                   | 74 +++++++++----------
 src/blackmisc/valueobject_policy.h            | 74 +++++++++----------
 src/blackmisc/variant.h                       |  8 +-
 src/blackmisc/voiceroom.cpp                   |  4 +-
 src/blackmisc/voiceroom.h                     |  2 +-
 src/blacksim/fscommon/aircraftcfgentries.cpp  |  4 +-
 src/blacksim/fscommon/aircraftcfgentries.h    |  2 +-
 src/blacksim/setsimulator.h                   |  2 +-
 src/blacksim/simulatorinfo.h                  |  2 +-
 tests/blackmisc/testvalueobject.cpp           |  4 +-
 tests/blackmisc/testvalueobject.h             |  2 +-
 111 files changed, 330 insertions(+), 330 deletions(-)

diff --git a/src/blackmisc/audiodeviceinfo.h b/src/blackmisc/audiodeviceinfo.h
index c6588774a..168a0c73b 100644
--- a/src/blackmisc/audiodeviceinfo.h
+++ b/src/blackmisc/audiodeviceinfo.h
@@ -25,7 +25,7 @@ namespace BlackMisc
          * If you want to safe this object, use the name instead of the index, since the index can change after
          * a restart.
          */
-        class CAudioDeviceInfo : public CValueObjectStdTuple<CAudioDeviceInfo>
+        class CAudioDeviceInfo : public CValueObject<CAudioDeviceInfo>
         {
         public:
             //! Type
diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp
index 0a4ee066d..b426f01b9 100644
--- a/src/blackmisc/avaircraft.cpp
+++ b/src/blackmisc/avaircraft.cpp
@@ -190,7 +190,7 @@ namespace BlackMisc
             default:
                 return (ICoordinateGeodetic::canHandleIndex(index)) ?
                        ICoordinateGeodetic::propertyByIndex(index) :
-                       CValueObjectStdTuple::propertyByIndex(index);
+                       CValueObject::propertyByIndex(index);
             }
         }
 
@@ -232,7 +232,7 @@ namespace BlackMisc
                 this->m_parts.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h
index a1e2be503..ab03f0456 100644
--- a/src/blackmisc/avaircraft.h
+++ b/src/blackmisc/avaircraft.h
@@ -31,7 +31,7 @@ namespace BlackMisc
     {
         //! Value object encapsulating information of an aircraft
         class CAircraft :
-            public CValueObjectStdTuple<CAircraft>,
+            public CValueObject<CAircraft>,
             public BlackMisc::Geo::ICoordinateWithRelativePosition
         {
         public:
diff --git a/src/blackmisc/avaircrafticao.cpp b/src/blackmisc/avaircrafticao.cpp
index 95a0bfde0..1f8a3ace2 100644
--- a/src/blackmisc/avaircrafticao.cpp
+++ b/src/blackmisc/avaircrafticao.cpp
@@ -117,7 +117,7 @@ namespace BlackMisc
             case IndexIsVtol:
                 return CVariant::fromValue(this->isVtol());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -145,7 +145,7 @@ namespace BlackMisc
                 this->setAircraftColor(variant.value<QString>());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/avaircrafticao.h b/src/blackmisc/avaircrafticao.h
index d98b142bd..79444fc45 100644
--- a/src/blackmisc/avaircrafticao.h
+++ b/src/blackmisc/avaircrafticao.h
@@ -22,7 +22,7 @@ namespace BlackMisc
         /*!
          * Value object for ICAO classification
          */
-        class CAircraftIcao : public CValueObjectStdTuple<CAircraftIcao>
+        class CAircraftIcao : public CValueObject<CAircraftIcao>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/avaircraftsituation.cpp b/src/blackmisc/avaircraftsituation.cpp
index fe8540160..05a9ead74 100644
--- a/src/blackmisc/avaircraftsituation.cpp
+++ b/src/blackmisc/avaircraftsituation.cpp
@@ -62,7 +62,7 @@ namespace BlackMisc
             case IndexCallsign:
                 return this->m_correspondingCallsign.propertyByIndex(index.copyFrontRemoved());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -101,7 +101,7 @@ namespace BlackMisc
                 this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/avaircraftsituation.h b/src/blackmisc/avaircraftsituation.h
index ff01ee7e3..87de4c2d1 100644
--- a/src/blackmisc/avaircraftsituation.h
+++ b/src/blackmisc/avaircraftsituation.h
@@ -29,7 +29,7 @@ namespace BlackMisc
          * Value object encapsulating information of an aircraft's situation
          */
         class CAircraftSituation :
-            public CValueObjectStdTuple<CAircraftSituation>,
+            public CValueObject<CAircraftSituation>,
             public Geo::ICoordinateGeodetic, public BlackMisc::ITimestampBased
         {
         public:
diff --git a/src/blackmisc/avairport.cpp b/src/blackmisc/avairport.cpp
index 5833e9fee..36f01848e 100644
--- a/src/blackmisc/avairport.cpp
+++ b/src/blackmisc/avairport.cpp
@@ -89,7 +89,7 @@ namespace BlackMisc
             default:
                 return (ICoordinateGeodetic::canHandleIndex(index)) ?
                        ICoordinateGeodetic::propertyByIndex(index) :
-                       CValueObjectStdTuple::propertyByIndex(index);
+                       CValueObject::propertyByIndex(index);
             }
         }
 
@@ -122,7 +122,7 @@ namespace BlackMisc
                 this->m_distanceToOwnAircraft.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/avairport.h b/src/blackmisc/avairport.h
index 4caa66122..103f46132 100644
--- a/src/blackmisc/avairport.h
+++ b/src/blackmisc/avairport.h
@@ -23,7 +23,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information about an airpot.
          */
-        class CAirport : public CValueObjectStdTuple<CAirport>, public Geo::ICoordinateWithRelativePosition
+        class CAirport : public CValueObject<CAirport>, public Geo::ICoordinateWithRelativePosition
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/avairporticao.h b/src/blackmisc/avairporticao.h
index 0a63533e7..8663dabc5 100644
--- a/src/blackmisc/avairporticao.h
+++ b/src/blackmisc/avairporticao.h
@@ -20,7 +20,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object encapsulating information of a callsign.
-        class CAirportIcao : public CValueObjectStdTuple<CAirportIcao>
+        class CAirportIcao : public CValueObject<CAirportIcao>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/avaltitude.cpp b/src/blackmisc/avaltitude.cpp
index ad49c7224..827d3e8eb 100644
--- a/src/blackmisc/avaltitude.cpp
+++ b/src/blackmisc/avaltitude.cpp
@@ -22,7 +22,7 @@ namespace BlackMisc
         /*
          * Constructor
          */
-        CAltitude::CAltitude(const QString &altitudeAsString, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) : CValueObjectStdTuple(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel)
+        CAltitude::CAltitude(const QString &altitudeAsString, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode) : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel)
         {
             this->parseFromString(altitudeAsString, mode);
         }
diff --git a/src/blackmisc/avaltitude.h b/src/blackmisc/avaltitude.h
index a4b173108..3e9ea5a3c 100644
--- a/src/blackmisc/avaltitude.h
+++ b/src/blackmisc/avaltitude.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation { class CAltitude; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CAltitude> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CAltitude> : public CValueObjectPolicy<>
     {
         using Equals = Policy::Equals::MetaTuple;
         using Compare = Policy::Compare::MetaTuple;
@@ -34,7 +34,7 @@ namespace BlackMisc
          * Altitude as used in aviation, can be AGL or MSL altitude
          * \remarks Intentionally allowing +/- CLength , and >= / <= CLength.
          */
-        class CAltitude : public CValueObjectStdTuple<CAltitude, PhysicalQuantities::CLength>
+        class CAltitude : public CValueObject<CAltitude, PhysicalQuantities::CLength>
         {
         public:
             /*!
@@ -53,16 +53,16 @@ namespace BlackMisc
 
         public:
             //! Default constructor: 0 Altitude true
-            CAltitude() : CValueObjectStdTuple(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {}
+            CAltitude() : CValueObject(0, BlackMisc::PhysicalQuantities::CLengthUnit::m()), m_datum(MeanSeaLevel) {}
 
             //! Constructor
-            CAltitude(double value, ReferenceDatum datum, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CValueObjectStdTuple(value, unit), m_datum(datum) {}
+            CAltitude(double value, ReferenceDatum datum, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CValueObject(value, unit), m_datum(datum) {}
 
             //! Altitude as string
             CAltitude(const QString &altitudeAsString, BlackMisc::PhysicalQuantities::CPqString::SeparatorMode mode = BlackMisc::PhysicalQuantities::CPqString::SeparatorsLocale);
 
             //! Constructor by CLength
-            CAltitude(BlackMisc::PhysicalQuantities::CLength altitude, ReferenceDatum datum) : CValueObjectStdTuple(altitude), m_datum(datum) {}
+            CAltitude(BlackMisc::PhysicalQuantities::CLength altitude, ReferenceDatum datum) : CValueObject(altitude), m_datum(datum) {}
 
             //! AGL Above ground level?
             bool isAboveGroundLevel() const { return AboveGround == this->m_datum; }
diff --git a/src/blackmisc/avatcstation.cpp b/src/blackmisc/avatcstation.cpp
index 46e875b08..942689276 100644
--- a/src/blackmisc/avatcstation.cpp
+++ b/src/blackmisc/avatcstation.cpp
@@ -306,7 +306,7 @@ namespace BlackMisc
                 return this->m_voiceRoom.propertyByIndex(index.copyFrontRemoved());
             default:
                 if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::propertyByIndex(index); }
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -356,7 +356,7 @@ namespace BlackMisc
                 this->m_voiceRoom.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/avatcstation.h b/src/blackmisc/avatcstation.h
index 16dc46219..cee127067 100644
--- a/src/blackmisc/avatcstation.h
+++ b/src/blackmisc/avatcstation.h
@@ -32,7 +32,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information about an ATC station.
          */
-        class CAtcStation : public CValueObjectStdTuple<CAtcStation>, public Geo::ICoordinateWithRelativePosition
+        class CAtcStation : public CValueObject<CAtcStation>, public Geo::ICoordinateWithRelativePosition
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp
index 314c98864..249e79476 100644
--- a/src/blackmisc/avcallsign.cpp
+++ b/src/blackmisc/avcallsign.cpp
@@ -162,7 +162,7 @@ namespace BlackMisc
             case IndexSuffix:
                 return CVariant(this->getSuffix());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -189,7 +189,7 @@ namespace BlackMisc
                 this->m_telephonyDesignator = variant.toQString();
                 break;
             default:
-                return CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                return CValueObject::setPropertyByIndex(variant, index);
             }
         }
 
diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h
index 55a6dee33..572a58965 100644
--- a/src/blackmisc/avcallsign.h
+++ b/src/blackmisc/avcallsign.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object encapsulating information of a callsign.
-        class CCallsign : public CValueObjectStdTuple<CCallsign>
+        class CCallsign : public CValueObject<CCallsign>
         {
         public:
             //! Indexes
diff --git a/src/blackmisc/avflightplan.h b/src/blackmisc/avflightplan.h
index 40d29745e..34ef2c972 100644
--- a/src/blackmisc/avflightplan.h
+++ b/src/blackmisc/avflightplan.h
@@ -26,7 +26,7 @@ namespace BlackMisc
         /*!
          * Value object for a flight plan
          */
-        class CFlightPlan : public CValueObjectStdTuple<CFlightPlan>
+        class CFlightPlan : public CValueObject<CFlightPlan>
         {
         public:
             /*!
diff --git a/src/blackmisc/avheading.h b/src/blackmisc/avheading.h
index 7e355b38f..daa15ee03 100644
--- a/src/blackmisc/avheading.h
+++ b/src/blackmisc/avheading.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation { class CHeading; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CHeading> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CHeading> : public CValueObjectPolicy<>
     {
         using Equals = Policy::Equals::MetaTuple;
         using Compare = Policy::Compare::MetaTuple;
@@ -34,7 +34,7 @@ namespace BlackMisc
          * \brief Heading as used in aviation, can be true or magnetic heading
          * \remarks Intentionally allowing +/- CAngle , and >= / <= CAngle.
          */
-        class CHeading : public CValueObjectStdTuple<CHeading, PhysicalQuantities::CAngle>
+        class CHeading : public CValueObject<CHeading, PhysicalQuantities::CAngle>
         {
         public:
             /*!
@@ -52,13 +52,13 @@ namespace BlackMisc
 
         public:
             //! \brief Default constructor: 0 heading true
-            CHeading() : CValueObjectStdTuple(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
+            CHeading() : CValueObject(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
 
             //! \brief Constructor
-            CHeading(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObjectStdTuple(value, unit), m_north(north) {}
+            CHeading(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObject(value, unit), m_north(north) {}
 
             //! \brief Constructor by CAngle
-            CHeading(CAngle heading, ReferenceNorth north) : CValueObjectStdTuple(heading), m_north(north) {}
+            CHeading(CAngle heading, ReferenceNorth north) : CValueObject(heading), m_north(north) {}
 
             //! \brief Magnetic heading?
             bool isMagneticHeading() const { return Magnetic == this->m_north; }
diff --git a/src/blackmisc/aviation/aircraftengine.h b/src/blackmisc/aviation/aircraftengine.h
index f4c233359..7cf2464db 100644
--- a/src/blackmisc/aviation/aircraftengine.h
+++ b/src/blackmisc/aviation/aircraftengine.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object encapsulating information about aircraft's engines
-        class CAircraftEngine : public CValueObjectStdTuple<CAircraftEngine>
+        class CAircraftEngine : public CValueObject<CAircraftEngine>
         {
         public:
 
diff --git a/src/blackmisc/aviation/aircraftlights.cpp b/src/blackmisc/aviation/aircraftlights.cpp
index c43c4126f..f0c57e414 100644
--- a/src/blackmisc/aviation/aircraftlights.cpp
+++ b/src/blackmisc/aviation/aircraftlights.cpp
@@ -68,7 +68,7 @@ namespace BlackMisc
             case IndexTaxi:
                 return CVariant::from(m_taxiOn);
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -102,7 +102,7 @@ namespace BlackMisc
                 this->m_taxiOn = variant.toBool();
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/aviation/aircraftlights.h b/src/blackmisc/aviation/aircraftlights.h
index fb56ae6cd..c6bea6114 100644
--- a/src/blackmisc/aviation/aircraftlights.h
+++ b/src/blackmisc/aviation/aircraftlights.h
@@ -20,7 +20,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! Value object encapsulating information about aircraft's lights
-        class CAircraftLights : public CValueObjectStdTuple<CAircraftLights>
+        class CAircraftLights : public CValueObject<CAircraftLights>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp
index d0a68dcff..395f1b197 100644
--- a/src/blackmisc/aviation/aircraftparts.cpp
+++ b/src/blackmisc/aviation/aircraftparts.cpp
@@ -54,7 +54,7 @@ namespace BlackMisc
             case IndexSpoilersOut:
                 return CVariant::fromValue(this->m_spoilersOut);
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -93,7 +93,7 @@ namespace BlackMisc
                 this->m_correspondingCallsign.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/aviation/aircraftparts.h b/src/blackmisc/aviation/aircraftparts.h
index 5ad63fe22..28994217f 100644
--- a/src/blackmisc/aviation/aircraftparts.h
+++ b/src/blackmisc/aviation/aircraftparts.h
@@ -25,7 +25,7 @@ namespace BlackMisc
     {
         //! Value object encapsulating information of aircraft's parts
         class CAircraftParts :
-            public CValueObjectStdTuple<CAircraftParts>,
+            public CValueObject<CAircraftParts>,
             public BlackMisc::ITimestampBased
         {
         public:
diff --git a/src/blackmisc/avinformationmessage.h b/src/blackmisc/avinformationmessage.h
index 1270b6378..463645bf5 100644
--- a/src/blackmisc/avinformationmessage.h
+++ b/src/blackmisc/avinformationmessage.h
@@ -25,7 +25,7 @@ namespace BlackMisc
          * Value object encapsulating information message.
          * ATIS, METAR, TAF
          */
-        class CInformationMessage : public CValueObjectStdTuple<CInformationMessage>
+        class CInformationMessage : public CValueObject<CInformationMessage>
         {
         public:
             /*!
diff --git a/src/blackmisc/avioadfsystem.h b/src/blackmisc/avioadfsystem.h
index 848378428..43de40c5f 100644
--- a/src/blackmisc/avioadfsystem.h
+++ b/src/blackmisc/avioadfsystem.h
@@ -20,7 +20,7 @@ namespace BlackMisc
     namespace Aviation { class CAdfSystem; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CAdfSystem> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CAdfSystem> : public CValueObjectPolicy<>
     {
         using MetaType = Policy::MetaType::Default;
         using Equals = Policy::Equals::None;
@@ -37,7 +37,7 @@ namespace BlackMisc
         /*!
          * ADF system ("for NDBs")
          */
-        class CAdfSystem : public CValueObjectStdTuple<CAdfSystem, CModulator<CAdfSystem>>
+        class CAdfSystem : public CValueObject<CAdfSystem, CModulator<CAdfSystem>>
         {
         public:
             //! Default constructor
@@ -45,7 +45,7 @@ namespace BlackMisc
 
             //! Constructor
             CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
-                CValueObjectStdTuple(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
+                CValueObject(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
             { }
 
             //! Valid aviation frequency?
diff --git a/src/blackmisc/aviobase.h b/src/blackmisc/aviobase.h
index b59c49a93..df534af3b 100644
--- a/src/blackmisc/aviobase.h
+++ b/src/blackmisc/aviobase.h
@@ -18,7 +18,7 @@ namespace BlackMisc
     {
 
         //! \brief Base class for avionics
-        class CAvionicsBase : public CValueObjectStdTuple<CAvionicsBase>
+        class CAvionicsBase : public CValueObject<CAvionicsBase>
         {
         protected:
             QString m_name; //!< name of the unit
diff --git a/src/blackmisc/aviocomsystem.h b/src/blackmisc/aviocomsystem.h
index 44451b840..b98b701d8 100644
--- a/src/blackmisc/aviocomsystem.h
+++ b/src/blackmisc/aviocomsystem.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation { class CComSystem; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CComSystem> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CComSystem> : public CValueObjectPolicy<>
     {
         using LessThan = Policy::LessThan::None;
         using Compare = Policy::Compare::None;
@@ -31,7 +31,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! COM system (aka "radio")
-        class CComSystem : public CValueObjectStdTuple<CComSystem, CModulator<CComSystem>>
+        class CComSystem : public CValueObject<CComSystem, CModulator<CComSystem>>
         {
         public:
             //! Channel spacing frequency
@@ -54,7 +54,7 @@ namespace BlackMisc
 
             //! Constructor
             CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
-                CValueObjectStdTuple(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
+                CValueObject(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
             { }
 
             //! Set active frequency
diff --git a/src/blackmisc/aviomodulator.cpp b/src/blackmisc/aviomodulator.cpp
index 4e1e2c58f..86189662e 100644
--- a/src/blackmisc/aviomodulator.cpp
+++ b/src/blackmisc/aviomodulator.cpp
@@ -52,7 +52,7 @@ namespace BlackMisc
             case IndexOutputVolume:
                 return CVariant::from(this->getVolumeOutput());
             default:
-                return CValueObjectStdTuple<CModulator<AVIO>, CAvionicsBase>::propertyByIndex(index);
+                return CValueObject<CModulator<AVIO>, CAvionicsBase>::propertyByIndex(index);
             }
         }
 
@@ -85,7 +85,7 @@ namespace BlackMisc
                 this->setVolumeOutput(variant.toInt());
                 break;
             default:
-                CValueObjectStdTuple<CModulator<AVIO>, CAvionicsBase>::setPropertyByIndex(variant, index);
+                CValueObject<CModulator<AVIO>, CAvionicsBase>::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/aviomodulator.h b/src/blackmisc/aviomodulator.h
index 3ba12817b..f4909c553 100644
--- a/src/blackmisc/aviomodulator.h
+++ b/src/blackmisc/aviomodulator.h
@@ -25,7 +25,7 @@ namespace BlackMisc
         /*!
          * Base class for COM, NAV, Squawk units.
          */
-        template <class AVIO> class CModulator : public CValueObjectStdTuple<CModulator<AVIO>, CAvionicsBase>
+        template <class AVIO> class CModulator : public CValueObject<CModulator<AVIO>, CAvionicsBase>
         {
         public:
             //! Column indexes
@@ -98,11 +98,11 @@ namespace BlackMisc
         protected:
             //! Default constructor
             CModulator() :
-                CModulator::CValueObjectStdTuple("default") {}
+                CModulator::CValueObject("default") {}
 
             //! Constructor
             CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
-                CModulator::CValueObjectStdTuple(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
+                CModulator::CValueObject(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
 
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override
diff --git a/src/blackmisc/avionavsystem.h b/src/blackmisc/avionavsystem.h
index 71c1df4f6..785da31d0 100644
--- a/src/blackmisc/avionavsystem.h
+++ b/src/blackmisc/avionavsystem.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation { class CNavSystem; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CNavSystem> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CNavSystem> : public CValueObjectPolicy<>
     {
         using MetaType = Policy::MetaType::Default;
         using Equals = Policy::Equals::None;
@@ -33,7 +33,7 @@ namespace BlackMisc
     namespace Aviation
     {
         //! NAV system (radio navigation)
-        class CNavSystem : public CValueObjectStdTuple<CNavSystem, CModulator<CNavSystem>>
+        class CNavSystem : public CValueObject<CNavSystem, CModulator<CNavSystem>>
         {
         public:
             //! Default constructor
@@ -41,7 +41,7 @@ namespace BlackMisc
 
             //! Constructor
             CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency):
-                CValueObjectStdTuple(name, activeFrequency, standbyFrequency)
+                CValueObject(name, activeFrequency, standbyFrequency)
             { }
 
             //! Set active frequency
diff --git a/src/blackmisc/aviotransponder.h b/src/blackmisc/aviotransponder.h
index 2f5c49177..ffb814a70 100644
--- a/src/blackmisc/aviotransponder.h
+++ b/src/blackmisc/aviotransponder.h
@@ -21,7 +21,7 @@ namespace BlackMisc
         /*!
          * Transponder
          */
-        class CTransponder : public CValueObjectStdTuple<CTransponder, CAvionicsBase>
+        class CTransponder : public CValueObject<CTransponder, CAvionicsBase>
         {
         public:
             //! Transponder codes
@@ -46,23 +46,23 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CTransponder() : CValueObjectStdTuple("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
+            CTransponder() : CValueObject("transponder"), m_transponderCode(0), m_transponderMode(StateStandby) {}
 
             //! Constructor
             CTransponder(const QString &name, int transponderCode, TransponderMode transponderMode) :
-                CValueObjectStdTuple(name), m_transponderCode(transponderCode), m_transponderMode(transponderMode)
+                CValueObject(name), m_transponderCode(transponderCode), m_transponderMode(transponderMode)
             {  }
 
             //! Constructor with transponder mode as string
             CTransponder(const QString &name, int transponderCode, QString transponderMode) :
-                CValueObjectStdTuple(name), m_transponderCode(transponderCode), m_transponderMode(StateStandby)
+                CValueObject(name), m_transponderCode(transponderCode), m_transponderMode(StateStandby)
             {
                 this->setModeAsString(transponderMode);
             }
 
             //! Constructor, code as string
             CTransponder(const QString &name, QString transponderCode, TransponderMode transponderMode) :
-                CValueObjectStdTuple(name), m_transponderCode(0), m_transponderMode(transponderMode)
+                CValueObject(name), m_transponderCode(0), m_transponderMode(transponderMode)
             {
                 bool ok = false;
                 this->m_transponderCode = transponderCode.toUInt(&ok);
@@ -71,7 +71,7 @@ namespace BlackMisc
 
             //! Constructor
             CTransponder(const QString &name, QString transponderCode, QString transponderMode) :
-                CValueObjectStdTuple(name), m_transponderCode(0), m_transponderMode(StateStandby)
+                CValueObject(name), m_transponderCode(0), m_transponderMode(StateStandby)
             {
                 bool ok = false;
                 this->m_transponderCode = transponderCode.toUInt(&ok);
diff --git a/src/blackmisc/avselcal.h b/src/blackmisc/avselcal.h
index 111f53589..bcab391cb 100644
--- a/src/blackmisc/avselcal.h
+++ b/src/blackmisc/avselcal.h
@@ -24,7 +24,7 @@ namespace BlackMisc
          * \see http://en.wikipedia.org/wiki/SELCAL
          * \see http://www.asri.aero/our-services/selcal/ User Guide
          */
-        class CSelcal : public CValueObjectStdTuple<CSelcal>
+        class CSelcal : public CValueObject<CSelcal>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/avtrack.h b/src/blackmisc/avtrack.h
index ba59aa547..16c42b2f2 100644
--- a/src/blackmisc/avtrack.h
+++ b/src/blackmisc/avtrack.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Aviation { class CTrack; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Aviation::CTrack> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Aviation::CTrack> : public CValueObjectPolicy<>
     {
         using Equals = Policy::Equals::MetaTuple;
         using Compare = Policy::Compare::MetaTuple;
@@ -35,7 +35,7 @@ namespace BlackMisc
          * \remarks Intentionally allowing +/- BlackMisc::PhysicalQuantities::CAngle ,
          *          and >= / <= CAngle.
          */
-        class CTrack : public CValueObjectStdTuple<CTrack, PhysicalQuantities::CAngle>
+        class CTrack : public CValueObject<CTrack, PhysicalQuantities::CAngle>
         {
         public:
             /*!
@@ -48,13 +48,13 @@ namespace BlackMisc
             };
 
             //! \brief Default constructor: 0 Track magnetic
-            CTrack() : CValueObjectStdTuple(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
+            CTrack() : CValueObject(0, BlackMisc::PhysicalQuantities::CAngleUnit::rad()), m_north(Magnetic) {}
 
             //! \brief Constructor
-            CTrack(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObjectStdTuple(value, unit), m_north(north) {}
+            CTrack(double value, ReferenceNorth north, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObject(value, unit), m_north(north) {}
 
             //! \brief Constructor by CAngle
-            CTrack(BlackMisc::PhysicalQuantities::CAngle track, ReferenceNorth north) : CValueObjectStdTuple(track), m_north(north) {}
+            CTrack(BlackMisc::PhysicalQuantities::CAngle track, ReferenceNorth north) : CValueObject(track), m_north(north) {}
 
             //! \brief Magnetic Track?
             bool isMagneticTrack() const
diff --git a/src/blackmisc/blackmisc.h b/src/blackmisc/blackmisc.h
index 14b77016c..abbd04388 100644
--- a/src/blackmisc/blackmisc.h
+++ b/src/blackmisc/blackmisc.h
@@ -70,7 +70,7 @@
 
 /*!
  * \namespace BlackMisc::Policy
- * \brief Policy classes for CValueObjectStdTuple.
+ * \brief Policy classes for CValueObject.
  */
 
 /*!
diff --git a/src/blackmisc/containerbase.h b/src/blackmisc/containerbase.h
index cfda5e915..23bba90e2 100644
--- a/src/blackmisc/containerbase.h
+++ b/src/blackmisc/containerbase.h
@@ -48,14 +48,14 @@ namespace BlackMisc
 
     //! \private
     template <template <class> class C, class T, class CIt>
-    struct CValueObjectStdTuplePolicy<CContainerBase<C, T, CIt>> : public CValueObjectLegacy
+    struct CValueObjectPolicy<CContainerBase<C, T, CIt>> : public CValueObjectLegacy
     {};
 
     /*!
      * \brief Base class for CCollection and CSequence adding mutating operations and CValueObject facility on top of CRangeBase.
      */
     template <template <class> class C, class T, class CIt>
-    class CContainerBase : public CValueObjectStdTuple<CContainerBase<C, T, CIt>>, public CRangeBase<C<T>, CIt>
+    class CContainerBase : public CValueObject<CContainerBase<C, T, CIt>>, public CRangeBase<C<T>, CIt>
     {
         //! \copydoc BlackMisc::CValueObject::compare
         friend int compare(const C<T> &a, const C<T> &b)
@@ -144,7 +144,7 @@ namespace BlackMisc
             }
         }
 
-    protected: // CValueObjectStdTuple overrides
+    protected: // CValueObject overrides
         //! \copydoc BlackMisc::CValueObject::convertToQString
         virtual QString convertToQString(bool i18n = false) const override
         {
diff --git a/src/blackmisc/coordinateecef.h b/src/blackmisc/coordinateecef.h
index a75700ca0..37b88ef4a 100644
--- a/src/blackmisc/coordinateecef.h
+++ b/src/blackmisc/coordinateecef.h
@@ -15,7 +15,7 @@ namespace BlackMisc
     namespace Geo { class CCoordinateEcef; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Geo::CCoordinateEcef> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Geo::CCoordinateEcef> : public CValueObjectPolicy<>
     {
         using Compare = Policy::Compare::None;
         using Hash = Policy::Hash::Own;
@@ -29,7 +29,7 @@ namespace BlackMisc
         /*!
          * \brief Earth centered, earth fixed position
          */
-        class CCoordinateEcef : public CValueObjectStdTuple<CCoordinateEcef, Math::CVector3DBase<CCoordinateEcef>>
+        class CCoordinateEcef : public CValueObject<CCoordinateEcef, Math::CVector3DBase<CCoordinateEcef>>
         {
         public:
             /*!
@@ -40,12 +40,12 @@ namespace BlackMisc
             /*!
              * \brief Constructor by values
              */
-            CCoordinateEcef(double x, double y, double z) : CValueObjectStdTuple(x, y, z) {}
+            CCoordinateEcef(double x, double y, double z) : CValueObject(x, y, z) {}
 
             /*!
              * \brief Constructor by math vector
              */
-            explicit CCoordinateEcef(const BlackMisc::Math::CVector3D vector) : CValueObjectStdTuple(vector.i(), vector.j(), vector.k()) {}
+            explicit CCoordinateEcef(const BlackMisc::Math::CVector3D vector) : CValueObject(vector.i(), vector.j(), vector.k()) {}
 
             //! \brief x
             double x() const
diff --git a/src/blackmisc/coordinategeodetic.cpp b/src/blackmisc/coordinategeodetic.cpp
index 0c25e88f4..b34df997a 100644
--- a/src/blackmisc/coordinategeodetic.cpp
+++ b/src/blackmisc/coordinategeodetic.cpp
@@ -132,7 +132,7 @@ namespace BlackMisc
             }
             else
             {
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -165,7 +165,7 @@ namespace BlackMisc
                 this->m_geodeticHeight.parseFromString(variant.toQString());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/coordinategeodetic.h b/src/blackmisc/coordinategeodetic.h
index 49b2342f9..81b6a73a9 100644
--- a/src/blackmisc/coordinategeodetic.h
+++ b/src/blackmisc/coordinategeodetic.h
@@ -127,7 +127,7 @@ namespace BlackMisc
 
 
         //! Geodetic coordinate
-        class CCoordinateGeodetic : public CValueObjectStdTuple<CCoordinateGeodetic>, public ICoordinateGeodetic
+        class CCoordinateGeodetic : public CValueObject<CCoordinateGeodetic>, public ICoordinateGeodetic
         {
 
         public:
diff --git a/src/blackmisc/coordinatened.h b/src/blackmisc/coordinatened.h
index 99ea25e53..846f8232e 100644
--- a/src/blackmisc/coordinatened.h
+++ b/src/blackmisc/coordinatened.h
@@ -20,7 +20,7 @@ namespace BlackMisc
         /*!
          * \brief North, East, Down
          */
-        class CCoordinateNed : public CValueObjectStdTuple<CCoordinateNed, Math::CVector3DBase<CCoordinateNed>>
+        class CCoordinateNed : public CValueObject<CCoordinateNed, Math::CVector3DBase<CCoordinateNed>>
         {
         protected:
             //! \copydoc CValueObject::convertToQString
@@ -48,22 +48,22 @@ namespace BlackMisc
             /*!
              * \brief Constructor by values
              */
-            CCoordinateNed(const CCoordinateGeodetic &referencePosition, double north, double east, double down) : CValueObjectStdTuple(north, east, down), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
+            CCoordinateNed(const CCoordinateGeodetic &referencePosition, double north, double east, double down) : CValueObject(north, east, down), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
             /*!
              * \brief Constructor by values
              */
-            CCoordinateNed(double north, double east, double down) : CValueObjectStdTuple(north, east, down), m_referencePosition(), m_hasReferencePosition(false) {}
+            CCoordinateNed(double north, double east, double down) : CValueObject(north, east, down), m_referencePosition(), m_hasReferencePosition(false) {}
 
             /*!
              * \brief Constructor by math vector
              */
-            explicit CCoordinateNed(const BlackMisc::Math::CVector3D &vector) : CValueObjectStdTuple(vector.i(), vector.j(), vector.k()), m_referencePosition(), m_hasReferencePosition(false) {}
+            explicit CCoordinateNed(const BlackMisc::Math::CVector3D &vector) : CValueObject(vector.i(), vector.j(), vector.k()), m_referencePosition(), m_hasReferencePosition(false) {}
 
             /*!
              * \brief Constructor by math vector and reference position
              */
-            CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D &vector) : CValueObjectStdTuple(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
+            CCoordinateNed(const CCoordinateGeodetic &referencePosition, const BlackMisc::Math::CVector3D &vector) : CValueObject(vector.i(), vector.j(), vector.k()), m_referencePosition(referencePosition), m_hasReferencePosition(true) {}
 
             /*!
              * \brief Corresponding reference position
diff --git a/src/blackmisc/dictionary.h b/src/blackmisc/dictionary.h
index f6fd130b8..8c0ece4ca 100644
--- a/src/blackmisc/dictionary.h
+++ b/src/blackmisc/dictionary.h
@@ -80,12 +80,12 @@ namespace BlackMisc
 
     //! \private
     template <class Key, class Value, template <class...> class Impl>
-    struct CValueObjectStdTuplePolicy<CDictionary<Key, Value, Impl>> : public CValueObjectLegacy
+    struct CValueObjectPolicy<CDictionary<Key, Value, Impl>> : public CValueObjectLegacy
     {};
 
     //! Associative container with value semantics, chooses a sensible default implementation container type
     template<class Key, class Value, template <class...> class Impl /*= AssociativityTraits<Key>::template DefaultType*/>
-    class CDictionary : public CValueObjectStdTuple<CDictionary<Key, Value, Impl>>
+    class CDictionary : public CValueObject<CDictionary<Key, Value, Impl>>
     {
         //! \copydoc BlackMisc::CValueObject::compare
         friend int compare(const CDictionary &a, const CDictionary &b)
diff --git a/src/blackmisc/eveventhotkeyfunction.h b/src/blackmisc/eveventhotkeyfunction.h
index b4c1e32be..e6d61d55b 100644
--- a/src/blackmisc/eveventhotkeyfunction.h
+++ b/src/blackmisc/eveventhotkeyfunction.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     namespace Event
     {
         //! Value object encapsulating a hotkey function for distribution
-        class CEventHotkeyFunction : public CValueObjectStdTuple<CEventHotkeyFunction>
+        class CEventHotkeyFunction : public CValueObject<CEventHotkeyFunction>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/evoriginator.h b/src/blackmisc/evoriginator.h
index 82107db65..a49b066c8 100644
--- a/src/blackmisc/evoriginator.h
+++ b/src/blackmisc/evoriginator.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     namespace Event { class COriginator; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Event::COriginator> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Event::COriginator> : public CValueObjectPolicy<>
     {
         using Json = Policy::Json::None;
     };
@@ -31,7 +31,7 @@ namespace BlackMisc
     {
 
         //! Value object encapsulating information about the originiator
-        class COriginator : public CValueObjectStdTuple<COriginator>
+        class COriginator : public CValueObject<COriginator>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/geoearthangle.h b/src/blackmisc/geoearthangle.h
index e60870d3a..fc9fab653 100644
--- a/src/blackmisc/geoearthangle.h
+++ b/src/blackmisc/geoearthangle.h
@@ -21,7 +21,7 @@ namespace BlackMisc
         /*!
          * Base class for latitude / longitude
          */
-        template <class LATorLON> class CEarthAngle : public CValueObjectStdTuple<CEarthAngle<LATorLON>, PhysicalQuantities::CAngle>
+        template <class LATorLON> class CEarthAngle : public CValueObject<CEarthAngle<LATorLON>, PhysicalQuantities::CAngle>
         {
         public:
             //! Plus operator +=
@@ -105,13 +105,13 @@ namespace BlackMisc
 
         protected:
             //! Default constructor
-            CEarthAngle() : CEarthAngle::CValueObjectStdTuple(0.0, BlackMisc::PhysicalQuantities::CAngleUnit::deg()) {}
+            CEarthAngle() : CEarthAngle::CValueObject(0.0, BlackMisc::PhysicalQuantities::CAngleUnit::deg()) {}
 
             //! Init by double value
-            CEarthAngle(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle::CValueObjectStdTuple(value, unit) {}
+            CEarthAngle(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CEarthAngle::CValueObject(value, unit) {}
 
             //! Init by CAngle value
-            CEarthAngle(const BlackMisc::PhysicalQuantities::CAngle &angle) : CEarthAngle::CValueObjectStdTuple(angle) {}
+            CEarthAngle(const BlackMisc::PhysicalQuantities::CAngle &angle) : CEarthAngle::CValueObject(angle) {}
 
             //! \copydoc CValueObject::convertToQString
             virtual QString convertToQString(bool i18n = false) const override
diff --git a/src/blackmisc/geolatitude.h b/src/blackmisc/geolatitude.h
index 07586d256..6dd283083 100644
--- a/src/blackmisc/geolatitude.h
+++ b/src/blackmisc/geolatitude.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     {
 
         //! Latitude
-        class CLatitude : public CValueObjectStdTuple<CLatitude, CEarthAngle<CLatitude>>
+        class CLatitude : public CValueObject<CLatitude, CEarthAngle<CLatitude>>
         {
         protected:
             //! \copydoc CValueObject::convertToQString
@@ -40,10 +40,10 @@ namespace BlackMisc
             CLatitude() = default;
 
             //! Constructor
-            explicit CLatitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CValueObjectStdTuple(angle) {}
+            explicit CLatitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CValueObject(angle) {}
 
             //! Init by double value
-            CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CLatitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObject(value, unit) {}
         };
 
     }
diff --git a/src/blackmisc/geolongitude.h b/src/blackmisc/geolongitude.h
index 5bddafa83..f197826ba 100644
--- a/src/blackmisc/geolongitude.h
+++ b/src/blackmisc/geolongitude.h
@@ -20,7 +20,7 @@ namespace BlackMisc
     {
 
         //! Longitude
-        class CLongitude : public CValueObjectStdTuple<CLongitude, CEarthAngle<CLongitude>>
+        class CLongitude : public CValueObject<CLongitude, CEarthAngle<CLongitude>>
         {
         protected:
             //! \copydoc CValueObject::convertToQString
@@ -37,10 +37,10 @@ namespace BlackMisc
             CLongitude() = default;
 
             //! Constructor
-            explicit CLongitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CValueObjectStdTuple(angle) {}
+            explicit CLongitude(const BlackMisc::PhysicalQuantities::CAngle &angle) : CValueObject(angle) {}
 
             //! Init by double value
-            CLongitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CLongitude(double value, const BlackMisc::PhysicalQuantities::CAngleUnit &unit) : CValueObject(value, unit) {}
         };
 
     }
diff --git a/src/blackmisc/hotkeyfunction.h b/src/blackmisc/hotkeyfunction.h
index 002dbe9e0..e781b4702 100644
--- a/src/blackmisc/hotkeyfunction.h
+++ b/src/blackmisc/hotkeyfunction.h
@@ -18,7 +18,7 @@
 namespace BlackMisc
 {
     //! Value object representing a hotkey function.
-    class CHotkeyFunction : public CValueObjectStdTuple<CHotkeyFunction>
+    class CHotkeyFunction : public CValueObject<CHotkeyFunction>
     {
     public:
         //! Function type
diff --git a/src/blackmisc/hwjoystickbutton.h b/src/blackmisc/hwjoystickbutton.h
index 6029c6d71..d964e4e3c 100644
--- a/src/blackmisc/hwjoystickbutton.h
+++ b/src/blackmisc/hwjoystickbutton.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     namespace Hardware
     {
         //! Value object representing a joystick button
-        class CJoystickButton : public CValueObjectStdTuple<CJoystickButton>
+        class CJoystickButton : public CValueObject<CJoystickButton>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h
index 9196257db..eb4550aaa 100644
--- a/src/blackmisc/hwkeyboardkey.h
+++ b/src/blackmisc/hwkeyboardkey.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     namespace Hardware
     {
         //! Value object representing a keyboard key.
-        class CKeyboardKey : public CValueObjectStdTuple<CKeyboardKey>
+        class CKeyboardKey : public CValueObject<CKeyboardKey>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/icon.h b/src/blackmisc/icon.h
index 7b01c49fd..d9a4dd05c 100644
--- a/src/blackmisc/icon.h
+++ b/src/blackmisc/icon.h
@@ -25,7 +25,7 @@ namespace BlackMisc
 
     //! Value object for icons. An icon is stored in the global icon repository and
     //! identified by its index. It contains no(!) pyhsical data for the icon itself.
-    class CIcon : public CValueObjectStdTuple<CIcon>
+    class CIcon : public CValueObject<CIcon>
     {
     public:
         //! Default constructor.
diff --git a/src/blackmisc/logcategory.h b/src/blackmisc/logcategory.h
index 2365c441c..cd10ec85d 100644
--- a/src/blackmisc/logcategory.h
+++ b/src/blackmisc/logcategory.h
@@ -21,7 +21,7 @@ namespace BlackMisc
      *
      * A log handler can filter messages based on their categories.
      */
-    class CLogCategory : public CValueObjectStdTuple<CLogCategory>
+    class CLogCategory : public CValueObject<CLogCategory>
     {
     public:
         //! \name Predefined special categories (public static methods)
diff --git a/src/blackmisc/logpattern.h b/src/blackmisc/logpattern.h
index 147a7779d..a83dc73f3 100644
--- a/src/blackmisc/logpattern.h
+++ b/src/blackmisc/logpattern.h
@@ -23,7 +23,7 @@ namespace BlackMisc
     class CLogPattern;
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<CLogPattern> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<CLogPattern> : public CValueObjectPolicy<>
     {
         using LessThan = Policy::LessThan::None;
         using Compare = Policy::Compare::None;
@@ -35,7 +35,7 @@ namespace BlackMisc
     /*!
      * Value class for matching log messages based on their categories.
      */
-    class CLogPattern : public CValueObjectStdTuple<CLogPattern>
+    class CLogPattern : public CValueObject<CLogPattern>
     {
     public:
         //! Default constructed CLogPattern will match any message.
diff --git a/src/blackmisc/mathmatrix1x3.h b/src/blackmisc/mathmatrix1x3.h
index 9e6015203..3432227e5 100644
--- a/src/blackmisc/mathmatrix1x3.h
+++ b/src/blackmisc/mathmatrix1x3.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     {
 
         //! Matrix 1x3
-        class CMatrix1x3 : public CValueObjectStdTuple<CMatrix1x3, CMatrixBase<CMatrix1x3, 1, 3>>
+        class CMatrix1x3 : public CValueObject<CMatrix1x3, CMatrixBase<CMatrix1x3, 1, 3>>
         {
         public:
 
@@ -29,7 +29,7 @@ namespace BlackMisc
             CMatrix1x3() = default;
 
             //! Init by fill value
-            explicit CMatrix1x3(double fillValue) : CValueObjectStdTuple(fillValue) {}
+            explicit CMatrix1x3(double fillValue) : CValueObject(fillValue) {}
 
             //! Constructor
             CMatrix1x3(double c1, double c2, double c3)
diff --git a/src/blackmisc/mathmatrix3x1.h b/src/blackmisc/mathmatrix3x1.h
index c3dabfe49..b002b986f 100644
--- a/src/blackmisc/mathmatrix3x1.h
+++ b/src/blackmisc/mathmatrix3x1.h
@@ -23,7 +23,7 @@ namespace BlackMisc
         class CMatrix3x3;
 
         //! Matrix 3x1
-        class CMatrix3x1 : public CValueObjectStdTuple<CMatrix3x1, CMatrixBase<CMatrix3x1, 3, 1>>
+        class CMatrix3x1 : public CValueObject<CMatrix3x1, CMatrixBase<CMatrix3x1, 3, 1>>
         {
             friend class CMatrix3x3;
 
@@ -40,7 +40,7 @@ namespace BlackMisc
             }
 
             //! Init by fill value
-            explicit CMatrix3x1(double fillValue) : CValueObjectStdTuple(fillValue) {}
+            explicit CMatrix3x1(double fillValue) : CValueObject(fillValue) {}
 
             //! Convert to vector
             CVector3D toVector3D() const
diff --git a/src/blackmisc/mathmatrix3x3.h b/src/blackmisc/mathmatrix3x3.h
index 256ba2740..1e71e553e 100644
--- a/src/blackmisc/mathmatrix3x3.h
+++ b/src/blackmisc/mathmatrix3x3.h
@@ -22,14 +22,14 @@ namespace BlackMisc
     {
 
         //! 3x3 matrix
-        class CMatrix3x3 : public CValueObjectStdTuple<CMatrix3x3, CMatrixBase<CMatrix3x3, 3, 3>>
+        class CMatrix3x3 : public CValueObject<CMatrix3x3, CMatrixBase<CMatrix3x3, 3, 3>>
         {
         public:
             //! Constructor
             CMatrix3x3() = default;
 
             //! Init by fill value
-            explicit CMatrix3x3(double fillValue) : CValueObjectStdTuple(fillValue) {}
+            explicit CMatrix3x3(double fillValue) : CValueObject(fillValue) {}
 
             //! Stupid, but handy constructor by single row column values
             explicit CMatrix3x3(double r1c1, double r1c2, double r1c3,
diff --git a/src/blackmisc/mathmatrixbase.h b/src/blackmisc/mathmatrixbase.h
index b9ff5a431..c13d0d449 100644
--- a/src/blackmisc/mathmatrixbase.h
+++ b/src/blackmisc/mathmatrixbase.h
@@ -18,7 +18,7 @@ namespace BlackMisc
     namespace Math { template <class, int, int> class CMatrixBase; }
 
     //! \private
-    template <class ImplMatrix, int Rows, int Columns> struct CValueObjectStdTuplePolicy<Math::CMatrixBase<ImplMatrix, Rows, Columns>> : public CValueObjectStdTuplePolicy<>
+    template <class ImplMatrix, int Rows, int Columns> struct CValueObjectPolicy<Math::CMatrixBase<ImplMatrix, Rows, Columns>> : public CValueObjectPolicy<>
     {
         using Equals = Policy::Equals::None;
         using LessThan = Policy::LessThan::None;
@@ -34,7 +34,7 @@ namespace BlackMisc
         /*!
          * \brief Base functionality of a matrix
          */
-        template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public CValueObjectStdTuple<CMatrixBase<ImplMatrix, Rows, Columns>>
+        template<class ImplMatrix, int Rows, int Columns> class CMatrixBase : public CValueObject<CMatrixBase<ImplMatrix, Rows, Columns>>
         {
             //! \copydoc CValueObject::compare
             friend int compare(const ImplMatrix &a, const ImplMatrix &b) { return compareImpl(a, b); }
diff --git a/src/blackmisc/mathvector3d.h b/src/blackmisc/mathvector3d.h
index 2caa7f357..b52eac867 100644
--- a/src/blackmisc/mathvector3d.h
+++ b/src/blackmisc/mathvector3d.h
@@ -19,7 +19,7 @@ namespace BlackMisc
     namespace Math { class CVector3D; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<Math::CVector3D> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<Math::CVector3D> : public CValueObjectPolicy<>
     {
         using Compare = Policy::Compare::None;
         using Hash = Policy::Hash::Own;
@@ -33,7 +33,7 @@ namespace BlackMisc
         /*!
          * \brief Concrete vector implementation
          */
-        class CVector3D : public CValueObjectStdTuple<CVector3D, CVector3DBase<CVector3D>>
+        class CVector3D : public CValueObject<CVector3D, CVector3DBase<CVector3D>>
         {
         public:
             /*!
@@ -44,12 +44,12 @@ namespace BlackMisc
             /*!
              * \brief Constructor by value
              */
-            CVector3D(double i, double j, double k) : CValueObjectStdTuple(i, j, k) {}
+            CVector3D(double i, double j, double k) : CValueObject(i, j, k) {}
 
             /*!
              * \brief Constructor by value
              */
-            explicit CVector3D(double value) : CValueObjectStdTuple(value) {}
+            explicit CVector3D(double value) : CValueObject(value) {}
 
             /*!
              * \brief i
diff --git a/src/blackmisc/mathvector3dbase.h b/src/blackmisc/mathvector3dbase.h
index 7744f37ff..77e6e8dc6 100644
--- a/src/blackmisc/mathvector3dbase.h
+++ b/src/blackmisc/mathvector3dbase.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     namespace Math { template <class> class CVector3DBase; }
 
     //! \private
-    template <class ImplVector> struct CValueObjectStdTuplePolicy<Math::CVector3DBase<ImplVector>> : public CValueObjectStdTuplePolicy<>
+    template <class ImplVector> struct CValueObjectPolicy<Math::CVector3DBase<ImplVector>> : public CValueObjectPolicy<>
     {
         using Equals = Policy::Equals::None;
         using LessThan = Policy::LessThan::None;
@@ -34,7 +34,7 @@ namespace BlackMisc
         class CMatrix3x1;
 
         //! 3D vector base (x, y, z)
-        template <class ImplVector> class CVector3DBase : public CValueObjectStdTuple<CVector3DBase<ImplVector>>
+        template <class ImplVector> class CVector3DBase : public CValueObject<CVector3DBase<ImplVector>>
         {
         public:
             // getter and setters are implemented in the derived classes
diff --git a/src/blackmisc/namevariantpair.cpp b/src/blackmisc/namevariantpair.cpp
index 62bc385f5..665b37e05 100644
--- a/src/blackmisc/namevariantpair.cpp
+++ b/src/blackmisc/namevariantpair.cpp
@@ -65,7 +65,7 @@ namespace BlackMisc
         case IndexPixmap:
             return CVariant(this->m_icon.toPixmap());
         default:
-            return CValueObjectStdTuple::propertyByIndex(index);
+            return CValueObject::propertyByIndex(index);
         }
     }
 
@@ -100,7 +100,7 @@ namespace BlackMisc
             }
             break;
         default:
-            CValueObjectStdTuple::setPropertyByIndex(variant, index);
+            CValueObject::setPropertyByIndex(variant, index);
             break;
         }
     }
diff --git a/src/blackmisc/namevariantpair.h b/src/blackmisc/namevariantpair.h
index 72cf7af00..6ae8cb7dc 100644
--- a/src/blackmisc/namevariantpair.h
+++ b/src/blackmisc/namevariantpair.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     /*!
      * Value / variant pair
      */
-    class CNameVariantPair : public CValueObjectStdTuple<CNameVariantPair>
+    class CNameVariantPair : public CValueObject<CNameVariantPair>
     {
     public:
         //! Properties by index
diff --git a/src/blackmisc/nwaircraftmapping.cpp b/src/blackmisc/nwaircraftmapping.cpp
index 0fd91577f..d38575f5f 100644
--- a/src/blackmisc/nwaircraftmapping.cpp
+++ b/src/blackmisc/nwaircraftmapping.cpp
@@ -61,7 +61,7 @@ namespace BlackMisc
             case IndexSource:
                 return QVariant::fromValue(this->m_source);
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -91,7 +91,7 @@ namespace BlackMisc
                 this->m_source = variant.toQString();
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/nwaircraftmapping.h b/src/blackmisc/nwaircraftmapping.h
index 7a6892722..e13f0ffc0 100644
--- a/src/blackmisc/nwaircraftmapping.h
+++ b/src/blackmisc/nwaircraftmapping.h
@@ -21,7 +21,7 @@ namespace BlackMisc
     namespace Network
     {
         //! Mapping
-        class CAircraftMapping : public CValueObjectStdTuple<CAircraftMapping>
+        class CAircraftMapping : public CValueObject<CAircraftMapping>
         {
 
         protected:
diff --git a/src/blackmisc/nwclient.cpp b/src/blackmisc/nwclient.cpp
index c51546f8c..d8e3ebe4a 100644
--- a/src/blackmisc/nwclient.cpp
+++ b/src/blackmisc/nwclient.cpp
@@ -112,7 +112,7 @@ namespace BlackMisc
             case IndexVoiceCapabilitiesString:
                 return CVariant(this->m_voiceCapabilities.toQString(true));
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -148,7 +148,7 @@ namespace BlackMisc
                 this->m_voiceCapabilities.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/nwclient.h b/src/blackmisc/nwclient.h
index e5c661dc1..f10271a84 100644
--- a/src/blackmisc/nwclient.h
+++ b/src/blackmisc/nwclient.h
@@ -25,7 +25,7 @@ namespace BlackMisc
         /*!
          * Another client software.
          */
-        class CClient : public CValueObjectStdTuple<CClient>
+        class CClient : public CValueObject<CClient>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/nwserver.h b/src/blackmisc/nwserver.h
index 0786ed796..c64638bff 100644
--- a/src/blackmisc/nwserver.h
+++ b/src/blackmisc/nwserver.h
@@ -23,7 +23,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information of a server
          */
-        class CServer : public CValueObjectStdTuple<CServer>
+        class CServer : public CValueObject<CServer>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/nwtextmessage.cpp b/src/blackmisc/nwtextmessage.cpp
index b83341a6d..c325cdaf1 100644
--- a/src/blackmisc/nwtextmessage.cpp
+++ b/src/blackmisc/nwtextmessage.cpp
@@ -203,7 +203,7 @@ namespace BlackMisc
             case IndexMessage:
                 return CVariant::fromValue(this->m_message);
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -229,7 +229,7 @@ namespace BlackMisc
                 this->m_message = variant.value<QString>();
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/nwtextmessage.h b/src/blackmisc/nwtextmessage.h
index 4666e0634..962e24dbf 100644
--- a/src/blackmisc/nwtextmessage.h
+++ b/src/blackmisc/nwtextmessage.h
@@ -27,7 +27,7 @@ namespace BlackMisc
          * Value object encapsulating information of a text message
          */
         class CTextMessage :
-            public CValueObjectStdTuple<CTextMessage>,
+            public CValueObject<CTextMessage>,
             public BlackMisc::ITimestampBased
         {
         public:
diff --git a/src/blackmisc/nwuser.cpp b/src/blackmisc/nwuser.cpp
index 07ba0a778..d3249a20a 100644
--- a/src/blackmisc/nwuser.cpp
+++ b/src/blackmisc/nwuser.cpp
@@ -191,7 +191,7 @@ namespace BlackMisc
             case IndexCallsign:
                 return this->m_callsign.propertyByIndex(index.copyFrontRemoved());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -224,7 +224,7 @@ namespace BlackMisc
                 this->m_callsign.setPropertyByIndex(variant, index.copyFrontRemoved());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/nwuser.h b/src/blackmisc/nwuser.h
index 1e217e6d1..81d3ae147 100644
--- a/src/blackmisc/nwuser.h
+++ b/src/blackmisc/nwuser.h
@@ -26,7 +26,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information of a user.
          */
-        class CUser : public CValueObjectStdTuple<CUser>
+        class CUser : public CValueObject<CUser>
         {
         public:
             /*!
diff --git a/src/blackmisc/nwvoicecapabilities.h b/src/blackmisc/nwvoicecapabilities.h
index ad095bb13..6d37190e8 100644
--- a/src/blackmisc/nwvoicecapabilities.h
+++ b/src/blackmisc/nwvoicecapabilities.h
@@ -22,7 +22,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information for voice capabilities.
          */
-        class CVoiceCapabilities : public CValueObjectStdTuple<CVoiceCapabilities>
+        class CVoiceCapabilities : public CValueObject<CVoiceCapabilities>
         {
         public:
             //! Voice capabilities
diff --git a/src/blackmisc/pixmap.cpp b/src/blackmisc/pixmap.cpp
index 6d462ca5e..f4a6c6ffa 100644
--- a/src/blackmisc/pixmap.cpp
+++ b/src/blackmisc/pixmap.cpp
@@ -19,7 +19,7 @@ namespace BlackMisc
         this->fillByteArray();
     }
 
-    CPixmap::CPixmap(const CPixmap &other) : CValueObjectStdTuple(), m_pixmap(other.m_pixmap), m_hasCachedPixmap(other.m_hasCachedPixmap), m_array(other.m_array)
+    CPixmap::CPixmap(const CPixmap &other) : CValueObject(), m_pixmap(other.m_pixmap), m_hasCachedPixmap(other.m_hasCachedPixmap), m_array(other.m_array)
     {}
 
     CPixmap &CPixmap::operator =(const CPixmap &other)
diff --git a/src/blackmisc/pixmap.h b/src/blackmisc/pixmap.h
index cd8918406..daa99d9e9 100644
--- a/src/blackmisc/pixmap.h
+++ b/src/blackmisc/pixmap.h
@@ -20,7 +20,7 @@ namespace BlackMisc
 {
     //! Value object for icons. An icon is stored in the global icon repository and
     //! identified by its index. It contains no(!) pyhsical data for the icon itself.
-    class CPixmap : public CValueObjectStdTuple<CPixmap>
+    class CPixmap : public CValueObject<CPixmap>
     {
     public:
         //! Default constructor.
diff --git a/src/blackmisc/pqacceleration.h b/src/blackmisc/pqacceleration.h
index 75d9e589e..5c2f9b14d 100644
--- a/src/blackmisc/pqacceleration.h
+++ b/src/blackmisc/pqacceleration.h
@@ -20,17 +20,17 @@ namespace BlackMisc
     {
 
         //! Acceleration
-        class CAcceleration : public CValueObjectStdTuple<CAcceleration, CPhysicalQuantity<CAccelerationUnit, CAcceleration>>
+        class CAcceleration : public CValueObject<CAcceleration, CPhysicalQuantity<CAccelerationUnit, CAcceleration>>
         {
         public:
             //! Default constructor
-            CAcceleration() : CValueObjectStdTuple(0, CAccelerationUnit::defaultUnit()) {}
+            CAcceleration() : CValueObject(0, CAccelerationUnit::defaultUnit()) {}
 
             //! Init by double value
-            CAcceleration(double value, const CAccelerationUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CAcceleration(double value, const CAccelerationUnit &unit) : CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CAcceleration(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CAcceleration(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqangle.h b/src/blackmisc/pqangle.h
index 782407e27..7a8a3cbd0 100644
--- a/src/blackmisc/pqangle.h
+++ b/src/blackmisc/pqangle.h
@@ -20,24 +20,24 @@ namespace BlackMisc
     namespace PhysicalQuantities
     {
         //! Physical unit angle (radians, degrees)
-        class CAngle : public CValueObjectStdTuple<CAngle, CPhysicalQuantity<CAngleUnit, CAngle>>
+        class CAngle : public CValueObject<CAngle, CPhysicalQuantity<CAngleUnit, CAngle>>
         {
         public:
             //! Default constructor
-            CAngle() : CValueObjectStdTuple(0, CAngleUnit::defaultUnit()) {}
+            CAngle() : CValueObject(0, CAngleUnit::defaultUnit()) {}
 
             //! Init by double value
-            CAngle(double value, const CAngleUnit &unit): CValueObjectStdTuple(value, unit) {}
+            CAngle(double value, const CAngleUnit &unit): CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CAngle(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CAngle(const QString &unitString) : CValueObject(unitString) {}
 
             /*!
              * \brief Init as sexagesimal degrees, minutes, seconds
              * The sign of all parameters must be the same, either all positive or all negative.
              */
             CAngle(int degrees, int minutes, double seconds) :
-                CValueObjectStdTuple(
+                CValueObject(
                     degrees + minutes / 100.0 + seconds / 10000.0,
                     CAngleUnit::sexagesimalDeg()) {}
 
@@ -46,7 +46,7 @@ namespace BlackMisc
              * The sign of both parameters must be the same, either both positive or both negative.
              */
             CAngle(int degrees, double minutes) :
-                CValueObjectStdTuple(
+                CValueObject(
                     degrees + minutes / 100.0,
                     CAngleUnit::sexagesimalDegMin()) {}
 
diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pqbase.h
index 3db599f75..3f148af2a 100644
--- a/src/blackmisc/pqbase.h
+++ b/src/blackmisc/pqbase.h
@@ -30,7 +30,7 @@ namespace BlackMisc
     namespace PhysicalQuantities { class CMeasurementUnit; }
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<PhysicalQuantities::CMeasurementUnit> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<PhysicalQuantities::CMeasurementUnit> : public CValueObjectPolicy<>
     {
         using MetaType = Policy::MetaType::DefaultAndQList;
         using Equals = Policy::Equals::None;
@@ -46,7 +46,7 @@ namespace BlackMisc
         /*!
          * Base class for all units, such as meter, hertz.
          */
-        class CMeasurementUnit : public CValueObjectStdTuple<CMeasurementUnit>
+        class CMeasurementUnit : public CValueObject<CMeasurementUnit>
         {
         protected:
             /*!
diff --git a/src/blackmisc/pqfrequency.h b/src/blackmisc/pqfrequency.h
index 11d0c2209..9a3de4fcd 100644
--- a/src/blackmisc/pqfrequency.h
+++ b/src/blackmisc/pqfrequency.h
@@ -21,20 +21,20 @@ namespace BlackMisc
         /*!
          * Physical unit frequency
          */
-        class CFrequency : public CValueObjectStdTuple<CFrequency, CPhysicalQuantity<CFrequencyUnit, CFrequency>>
+        class CFrequency : public CValueObject<CFrequency, CPhysicalQuantity<CFrequencyUnit, CFrequency>>
         {
         public:
             //! Default constructor
-            CFrequency() : CValueObjectStdTuple(0, CFrequencyUnit::defaultUnit()) {}
+            CFrequency() : CValueObject(0, CFrequencyUnit::defaultUnit()) {}
 
             //! Init by double value
-            CFrequency(double value, const CFrequencyUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CFrequency(double value, const CFrequencyUnit &unit) : CValueObject(value, unit) {}
 
             //! Init by int value converted to double
             CFrequency(int value, const CFrequencyUnit &unit) : CFrequency(double(value), unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CFrequency(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CFrequency(const QString &unitString) : CValueObject(unitString) {}
         };
     }
 }
diff --git a/src/blackmisc/pqlength.h b/src/blackmisc/pqlength.h
index f4f103341..34de9e2e2 100644
--- a/src/blackmisc/pqlength.h
+++ b/src/blackmisc/pqlength.h
@@ -20,17 +20,17 @@ namespace BlackMisc
     {
 
         //! Physical unit length (length)
-        class CLength : public CValueObjectStdTuple<CLength, CPhysicalQuantity<CLengthUnit, CLength>>
+        class CLength : public CValueObject<CLength, CPhysicalQuantity<CLengthUnit, CLength>>
         {
         public:
             //! Default constructor
-            CLength() : CValueObjectStdTuple(0, CLengthUnit::defaultUnit()) {}
+            CLength() : CValueObject(0, CLengthUnit::defaultUnit()) {}
 
             //! Init by double value
-            CLength(double value, const CLengthUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CLength(double value, const CLengthUnit &unit) : CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CLength(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CLength(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqmass.h b/src/blackmisc/pqmass.h
index 28446ae62..7f2712d93 100644
--- a/src/blackmisc/pqmass.h
+++ b/src/blackmisc/pqmass.h
@@ -22,17 +22,17 @@ namespace BlackMisc
         /*!
          * Mass
          */
-        class CMass : public CValueObjectStdTuple<CMass, CPhysicalQuantity<CMassUnit, CMass>>
+        class CMass : public CValueObject<CMass, CPhysicalQuantity<CMassUnit, CMass>>
         {
         public:
             //! Default constructor
-            CMass() : CValueObjectStdTuple(0, CMassUnit::defaultUnit()) {}
+            CMass() : CValueObject(0, CMassUnit::defaultUnit()) {}
 
             //! Init by double value
-            CMass(double value, const CMassUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CMass(double value, const CMassUnit &unit) : CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CMass(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CMass(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp
index a8df96080..341728b7b 100644
--- a/src/blackmisc/pqphysicalquantity.cpp
+++ b/src/blackmisc/pqphysicalquantity.cpp
@@ -311,7 +311,7 @@ namespace BlackMisc
             case IndexValueRounded6DigitsWithUnit:
                 return CVariant::from(this->valueRoundedWithUnit(6));
             default:
-                return CValueObjectStdTuple<CPhysicalQuantity<MU, PQ>>::propertyByIndex(index);
+                return CValueObject<CPhysicalQuantity<MU, PQ>>::propertyByIndex(index);
             }
         }
 
@@ -342,7 +342,7 @@ namespace BlackMisc
                 this->parseFromString(variant.toQString());
                 break;
             default:
-                CValueObjectStdTuple<CPhysicalQuantity<MU, PQ>>::setPropertyByIndex(variant, index);
+                CValueObject<CPhysicalQuantity<MU, PQ>>::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h
index 90d40ccb0..280380038 100644
--- a/src/blackmisc/pqphysicalquantity.h
+++ b/src/blackmisc/pqphysicalquantity.h
@@ -29,7 +29,7 @@ namespace BlackMisc
     namespace PhysicalQuantities { template <class, class> class CPhysicalQuantity; }
 
     //! \private
-    template <class MU, class PQ> struct CValueObjectStdTuplePolicy<PhysicalQuantities::CPhysicalQuantity<MU, PQ>> : public CValueObjectStdTuplePolicy<>
+    template <class MU, class PQ> struct CValueObjectPolicy<PhysicalQuantities::CPhysicalQuantity<MU, PQ>> : public CValueObjectPolicy<>
     {
         using MetaType = Policy::MetaType::DefaultAndQList;
         using Equals = Policy::Equals::None;
@@ -45,7 +45,7 @@ namespace BlackMisc
         /*!
          * A physical quantity such as "5m", "20s", "1500ft/s"
          */
-        template <class MU, class PQ> class CPhysicalQuantity : public CValueObjectStdTuple<CPhysicalQuantity<MU, PQ>>
+        template <class MU, class PQ> class CPhysicalQuantity : public CValueObject<CPhysicalQuantity<MU, PQ>>
         {
             //! \copydoc CValueObject::compare
             friend int compare(const PQ &a, const PQ &b) { return compareImpl(a, b); }
diff --git a/src/blackmisc/pqpressure.h b/src/blackmisc/pqpressure.h
index 3617ccb5f..ff8dfcf91 100644
--- a/src/blackmisc/pqpressure.h
+++ b/src/blackmisc/pqpressure.h
@@ -22,17 +22,17 @@ namespace BlackMisc
         /*!
          * Physical unit distance
          */
-        class CPressure : public CValueObjectStdTuple<CPressure, CPhysicalQuantity<CPressureUnit, CPressure>>
+        class CPressure : public CValueObject<CPressure, CPhysicalQuantity<CPressureUnit, CPressure>>
         {
         public:
             //! Default constructor
-            CPressure() : CValueObjectStdTuple(0, CPressureUnit::defaultUnit()) {}
+            CPressure() : CValueObject(0, CPressureUnit::defaultUnit()) {}
 
             //! Init by double value
-            CPressure(double value, const CPressureUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CPressure(double value, const CPressureUnit &unit) : CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CPressure(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CPressure(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqspeed.h b/src/blackmisc/pqspeed.h
index 780e4c65e..f31a050fc 100644
--- a/src/blackmisc/pqspeed.h
+++ b/src/blackmisc/pqspeed.h
@@ -22,17 +22,17 @@ namespace BlackMisc
         /*!
          * Speed class, e.g. "m/s", "NM/h", "km/h", "ft/s"
          */
-        class CSpeed : public CValueObjectStdTuple<CSpeed, CPhysicalQuantity<CSpeedUnit, CSpeed>>
+        class CSpeed : public CValueObject<CSpeed, CPhysicalQuantity<CSpeedUnit, CSpeed>>
         {
         public:
             //! Default constructor
-            CSpeed() : CValueObjectStdTuple(0, CSpeedUnit::defaultUnit()) {}
+            CSpeed() : CValueObject(0, CSpeedUnit::defaultUnit()) {}
 
             //! Init by double value
-            CSpeed(double value, const CSpeedUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CSpeed(double value, const CSpeedUnit &unit) : CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CSpeed(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CSpeed(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqstring.h b/src/blackmisc/pqstring.h
index 1eae1707f..b5be98c39 100644
--- a/src/blackmisc/pqstring.h
+++ b/src/blackmisc/pqstring.h
@@ -26,7 +26,7 @@ namespace BlackMisc
          * \details Used to parse strings into physical quantities, validate strings
          * \sa BlackMisc::PhysicalQuantity
          */
-        class CPqString : public CValueObjectStdTuple<CPqString>
+        class CPqString : public CValueObject<CPqString>
         {
         protected:
             //! \copydoc CValueObject::convertToQString
diff --git a/src/blackmisc/pqtemperature.h b/src/blackmisc/pqtemperature.h
index c726d7014..9c16dd8a0 100644
--- a/src/blackmisc/pqtemperature.h
+++ b/src/blackmisc/pqtemperature.h
@@ -22,17 +22,17 @@ namespace BlackMisc
         /*!
          * Physical unit temperature
          */
-        class CTemperature : public CValueObjectStdTuple<CTemperature, CPhysicalQuantity<CTemperatureUnit, CTemperature>>
+        class CTemperature : public CValueObject<CTemperature, CPhysicalQuantity<CTemperatureUnit, CTemperature>>
         {
         public:
             //! Default constructor
-            CTemperature() : CValueObjectStdTuple(0, CTemperatureUnit::defaultUnit()) {}
+            CTemperature() : CValueObject(0, CTemperatureUnit::defaultUnit()) {}
 
             //! Init by double value
-            CTemperature(double value, const CTemperatureUnit &unit): CValueObjectStdTuple(value, unit) {}
+            CTemperature(double value, const CTemperatureUnit &unit): CValueObject(value, unit) {}
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CTemperature(const QString &unitString) : CValueObjectStdTuple(unitString) {}
+            CTemperature(const QString &unitString) : CValueObject(unitString) {}
         };
 
     }
diff --git a/src/blackmisc/pqtime.cpp b/src/blackmisc/pqtime.cpp
index 19be77823..12a65ec87 100644
--- a/src/blackmisc/pqtime.cpp
+++ b/src/blackmisc/pqtime.cpp
@@ -13,7 +13,7 @@ namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
-        CTime::CTime(int hours, int minutes, int seconds) : CValueObjectStdTuple(0, CTimeUnit::nullUnit())
+        CTime::CTime(int hours, int minutes, int seconds) : CValueObject(0, CTimeUnit::nullUnit())
         {
             bool negative = (hours < 0);
             double value = qAbs(hours) + minutes / 100.0 + seconds / 10000.0;
@@ -34,7 +34,7 @@ namespace BlackMisc
             }
         }
 
-        CTime::CTime(const QTime &time, bool negative) : CValueObjectStdTuple(0, CTimeUnit::nullUnit())
+        CTime::CTime(const QTime &time, bool negative) : CValueObject(0, CTimeUnit::nullUnit())
         {
             CTime converted(time.hour(), time.minute(), time.second());
             (*this) = converted;
diff --git a/src/blackmisc/pqtime.h b/src/blackmisc/pqtime.h
index 1110d68b1..e3f176919 100644
--- a/src/blackmisc/pqtime.h
+++ b/src/blackmisc/pqtime.h
@@ -22,7 +22,7 @@ namespace BlackMisc
         /*!
          * Time class, e.g. "ms", "hour", "s", "day"
          */
-        class CTime : public CValueObjectStdTuple<CTime, CPhysicalQuantity<CTimeUnit, CTime>>
+        class CTime : public CValueObject<CTime, CPhysicalQuantity<CTimeUnit, CTime>>
         {
         public:
             //! Parts
@@ -34,10 +34,10 @@ namespace BlackMisc
             };
 
             //! Default constructor
-            CTime() : CValueObjectStdTuple(0, CTimeUnit::defaultUnit()) {}
+            CTime() : CValueObject(0, CTimeUnit::defaultUnit()) {}
 
             //! Init by double value
-            CTime(double value, const CTimeUnit &unit) : CValueObjectStdTuple(value, unit) {}
+            CTime(double value, const CTimeUnit &unit) : CValueObject(value, unit) {}
 
             //! By hours, minutes, seconds
             CTime(int hours, int minutes, int seconds = 0);
@@ -46,7 +46,7 @@ namespace BlackMisc
             CTime(const QTime &time, bool negative = false);
 
             //! \copydoc CPhysicalQuantity(const QString &unitString)
-            CTime(const QString &unitString) : CValueObjectStdTuple(0, CTimeUnit::nullUnit()) { this->parseFromString(unitString); }
+            CTime(const QString &unitString) : CValueObject(0, CTimeUnit::nullUnit()) { this->parseFromString(unitString); }
 
             //! From string hh:mm, or hh:mm:ss, or time units such as s, min
             virtual void parseFromString(const QString &time) override;
diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pqunits.h
index 218bdf8de..574b643fd 100644
--- a/src/blackmisc/pqunits.h
+++ b/src/blackmisc/pqunits.h
@@ -34,17 +34,17 @@ namespace BlackMisc
     {
 
         //! Specialized class for distance units (meter, foot, nautical miles).
-        class CLengthUnit : public CValueObjectStdTuple<CLengthUnit, CMeasurementUnit>
+        class CLengthUnit : public CValueObject<CLengthUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CLengthUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             //! null constructor
             CLengthUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             struct NauticalMilesToMeters    { static double factor() { return 1852.0;    } };
@@ -55,7 +55,7 @@ namespace BlackMisc
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CLengthUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CLengthUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CLengthUnit &defaultUnit() { return m(); }
@@ -145,16 +145,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for angles (degrees, radian).
-        class CAngleUnit : public CValueObjectStdTuple<CAngleUnit, CMeasurementUnit>
+        class CAngleUnit : public CValueObject<CAngleUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CAngleUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CAngleUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             struct RadiansToDegrees { static double factor() { return 180.0 / M_PI; } };
@@ -162,7 +162,7 @@ namespace BlackMisc
 
         public:
             //!  Default constructor, required for Qt Metasystem
-            CAngleUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CAngleUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CAngleUnit &defaultUnit() { return deg(); }
@@ -236,23 +236,23 @@ namespace BlackMisc
         };
 
         //! Specialized class for frequency (hertz, mega hertz, kilo hertz).
-        class CFrequencyUnit : public CValueObjectStdTuple<CFrequencyUnit, CMeasurementUnit>
+        class CFrequencyUnit : public CValueObject<CFrequencyUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CFrequencyUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CFrequencyUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             typedef One HertzToHertz;
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CFrequencyUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CFrequencyUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CFrequencyUnit &defaultUnit() { return Hz(); }
@@ -318,16 +318,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for mass units (kg, lbs).
-        class CMassUnit : public CValueObjectStdTuple<CMassUnit, CMeasurementUnit>
+        class CMassUnit : public CValueObject<CMassUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CMassUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CMassUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             typedef Milli<One> GramsToKilograms;
@@ -335,7 +335,7 @@ namespace BlackMisc
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CMassUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CMassUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CMassUnit &defaultUnit() { return kg(); }
@@ -409,16 +409,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for pressure (psi, hPa, bar).
-        class CPressureUnit : public CValueObjectStdTuple<CPressureUnit, CMeasurementUnit>
+        class CPressureUnit : public CValueObject<CPressureUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CPressureUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CPressureUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             typedef Centi<One> PascalsToHectopascals;
@@ -428,7 +428,7 @@ namespace BlackMisc
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CPressureUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CPressureUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CPressureUnit &defaultUnit() { return hPa(); }
@@ -517,16 +517,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for temperatur units (kelvin, centidegree).
-        class CTemperatureUnit : public CValueObjectStdTuple<CTemperatureUnit, CMeasurementUnit>
+        class CTemperatureUnit : public CValueObject<CTemperatureUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CTemperatureUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CTemperatureUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             struct KelvinToCentigrade
@@ -542,7 +542,7 @@ namespace BlackMisc
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CTemperatureUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CTemperatureUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CTemperatureUnit &defaultUnit() { return C(); }
@@ -600,16 +600,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for speed units (m/s, ft/s, NM/h).
-        class CSpeedUnit : public CValueObjectStdTuple<CSpeedUnit, CMeasurementUnit>
+        class CSpeedUnit : public CValueObject<CSpeedUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CSpeedUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CSpeedUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             struct KnotsToMps       { static double factor() { return 1852.0    / 3600.0; } };
@@ -620,7 +620,7 @@ namespace BlackMisc
         public:
 
             //! Default constructor, required for Qt Metasystem
-            CSpeedUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CSpeedUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CSpeedUnit &defaultUnit() { return m_s(); }
@@ -702,16 +702,16 @@ namespace BlackMisc
         };
 
         //! Specialized class for time units (ms, hour, min).
-        class CTimeUnit : public CValueObjectStdTuple<CTimeUnit, CMeasurementUnit>
+        class CTimeUnit : public CValueObject<CTimeUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CTimeUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CTimeUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             typedef One SecondsToSeconds;
@@ -722,7 +722,7 @@ namespace BlackMisc
         public:
 
             //! Default constructor, required for Qt Metasystem
-            CTimeUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CTimeUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CTimeUnit &defaultUnit() { return s(); }
@@ -828,23 +828,23 @@ namespace BlackMisc
         };
 
         //! Specialized class for acceleration units (m/s2, ft/s2).
-        class CAccelerationUnit : public CValueObjectStdTuple<CAccelerationUnit, CMeasurementUnit>
+        class CAccelerationUnit : public CValueObject<CAccelerationUnit, CMeasurementUnit>
         {
         private:
             template <class Converter>
             CAccelerationUnit(const QString &name, const QString &symbol, const Converter &converter, int displayDigits = 2, double epsilon = 1E-9) :
-                CValueObjectStdTuple(name, symbol, converter, displayDigits, epsilon)
+                CValueObject(name, symbol, converter, displayDigits, epsilon)
             {}
 
             CAccelerationUnit(const QString &name, const QString &symbol, std::nullptr_t) :
-                CValueObjectStdTuple(name, symbol, nullptr)
+                CValueObject(name, symbol, nullptr)
             {}
 
             struct FeetToMeters { static double factor() { return 0.3048; } };
 
         public:
             //! Default constructor, required for Qt Metasystem
-            CAccelerationUnit() : CValueObjectStdTuple(defaultUnit()) {}
+            CAccelerationUnit() : CValueObject(defaultUnit()) {}
 
             //! Default unit
             static const CAccelerationUnit &defaultUnit() { return m_s2(); }
diff --git a/src/blackmisc/propertyindex.h b/src/blackmisc/propertyindex.h
index 69645e31c..f3de8fef2 100644
--- a/src/blackmisc/propertyindex.h
+++ b/src/blackmisc/propertyindex.h
@@ -24,7 +24,7 @@ namespace BlackMisc
      * Property index. The index can be nested, that's why it is a sequence
      * (e.g. PropertyIndexPilot, PropertyIndexRealname).
      */
-    class CPropertyIndex : public CValueObjectStdTuple<CPropertyIndex>
+    class CPropertyIndex : public CValueObject<CPropertyIndex>
     {
         // In the first trial I have used CSequence<int> as base class
         // This has created too much circular dependencies of the headers
diff --git a/src/blackmisc/propertyindexvariantmap.h b/src/blackmisc/propertyindexvariantmap.h
index 6e89138df..81ea39f09 100644
--- a/src/blackmisc/propertyindexvariantmap.h
+++ b/src/blackmisc/propertyindexvariantmap.h
@@ -30,13 +30,13 @@ namespace BlackMisc
     class CPropertyIndexVariantMap;
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<CPropertyIndexVariantMap> : public CValueObjectLegacy {};
+    template <> struct CValueObjectPolicy<CPropertyIndexVariantMap> : public CValueObjectLegacy {};
 
     /*!
      * Specialized value object compliant map for variants,
      * based on indexes
      */
-    class CPropertyIndexVariantMap : public CValueObjectStdTuple<CPropertyIndexVariantMap>
+    class CPropertyIndexVariantMap : public CValueObject<CPropertyIndexVariantMap>
     {
 
     public:
diff --git a/src/blackmisc/setaudio.h b/src/blackmisc/setaudio.h
index 7879ea261..d4722aa03 100644
--- a/src/blackmisc/setaudio.h
+++ b/src/blackmisc/setaudio.h
@@ -23,7 +23,7 @@ namespace BlackMisc
     namespace Settings
     {
         //! Value object encapsulating information of audio related settings.
-        class CSettingsAudio : public CValueObjectStdTuple<CSettingsAudio>
+        class CSettingsAudio : public CValueObject<CSettingsAudio>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/setkeyboardhotkey.cpp b/src/blackmisc/setkeyboardhotkey.cpp
index 4345137bf..9952eeacb 100644
--- a/src/blackmisc/setkeyboardhotkey.cpp
+++ b/src/blackmisc/setkeyboardhotkey.cpp
@@ -65,7 +65,7 @@ namespace BlackMisc
             case IndexKeyAsStringRepresentation:
                 return CVariant::from(m_key.getKeyAsStringRepresentation());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -106,7 +106,7 @@ namespace BlackMisc
                 this->setObject(variant.value<BlackMisc::Settings::CSettingKeyboardHotkey>());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/setkeyboardhotkey.h b/src/blackmisc/setkeyboardhotkey.h
index caf9b7a0a..32d3bfe9d 100644
--- a/src/blackmisc/setkeyboardhotkey.h
+++ b/src/blackmisc/setkeyboardhotkey.h
@@ -24,7 +24,7 @@ namespace BlackMisc
     namespace Settings
     {
         //! Value object encapsulating the keyboard hotkey assignment
-        class CSettingKeyboardHotkey : public CValueObjectStdTuple<CSettingKeyboardHotkey>
+        class CSettingKeyboardHotkey : public CValueObject<CSettingKeyboardHotkey>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h
index 419372067..ca4ca24e1 100644
--- a/src/blackmisc/setnetwork.h
+++ b/src/blackmisc/setnetwork.h
@@ -26,7 +26,7 @@ namespace BlackMisc
     {
         //! Value object encapsulating information of network related settings.
         //! \remarks Not only traffic network settings, but also URLs, DBus address, ...
-        class CSettingsNetwork : public CValueObjectStdTuple<CSettingsNetwork>
+        class CSettingsNetwork : public CValueObject<CSettingsNetwork>
         {
         public:
             //! Default constructor.
diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp
index 2e45281f8..dd60e8724 100644
--- a/src/blackmisc/simulation/aircraftmodel.cpp
+++ b/src/blackmisc/simulation/aircraftmodel.cpp
@@ -56,7 +56,7 @@ namespace BlackMisc
             case IndexCallsign:
                 return m_callsign.propertyByIndex(index.copyFrontRemoved());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -89,7 +89,7 @@ namespace BlackMisc
                 this->m_modelType = variant.toInt();
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/simulation/aircraftmodel.h b/src/blackmisc/simulation/aircraftmodel.h
index 9e2b05e0e..65551122d 100644
--- a/src/blackmisc/simulation/aircraftmodel.h
+++ b/src/blackmisc/simulation/aircraftmodel.h
@@ -23,7 +23,7 @@ namespace BlackMisc
     {
         //! Aircraft model (other pilot, my models on disk)
         //! \remarks Simulator independent class, supposed to be common denominator
-        class CAircraftModel : public CValueObjectStdTuple<CAircraftModel>
+        class CAircraftModel : public CValueObject<CAircraftModel>
         {
         public:
             //! Model type
diff --git a/src/blackmisc/simulation/simulatedaircraft.cpp b/src/blackmisc/simulation/simulatedaircraft.cpp
index d4f753793..c68f81333 100644
--- a/src/blackmisc/simulation/simulatedaircraft.cpp
+++ b/src/blackmisc/simulation/simulatedaircraft.cpp
@@ -25,7 +25,7 @@ namespace BlackMisc
         }
 
         CSimulatedAircraft::CSimulatedAircraft(const CAircraft &aircraft, const CAircraftModel &model, const CClient &client) :
-            CValueObjectStdTuple(aircraft), m_model(model), m_client(client)
+            CValueObject(aircraft), m_model(model), m_client(client)
         {
             init();
         }
diff --git a/src/blackmisc/simulation/simulatedaircraft.h b/src/blackmisc/simulation/simulatedaircraft.h
index e636d2c77..9050b93fd 100644
--- a/src/blackmisc/simulation/simulatedaircraft.h
+++ b/src/blackmisc/simulation/simulatedaircraft.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     {
         //! Comprehensive information of an aircraft
         //! \sa CAircraft
-        class CSimulatedAircraft : public CValueObjectStdTuple<CSimulatedAircraft, BlackMisc::Aviation::CAircraft>
+        class CSimulatedAircraft : public CValueObject<CSimulatedAircraft, BlackMisc::Aviation::CAircraft>
         {
         public:
             //! Properties by index
diff --git a/src/blackmisc/statusmessage.cpp b/src/blackmisc/statusmessage.cpp
index 823451477..4ac24beb5 100644
--- a/src/blackmisc/statusmessage.cpp
+++ b/src/blackmisc/statusmessage.cpp
@@ -262,7 +262,7 @@ namespace BlackMisc
         case IndexCategoryHumanReadable:
             return CVariant::from(this->getHumanReadableCategory());
         default:
-            return CValueObjectStdTuple::propertyByIndex(index);
+            return CValueObject::propertyByIndex(index);
         }
     }
 
@@ -286,7 +286,7 @@ namespace BlackMisc
             this->m_categories = variant.value<CLogCategoryList>();
             break;
         default:
-            CValueObjectStdTuple::setPropertyByIndex(variant, index);
+            CValueObject::setPropertyByIndex(variant, index);
             break;
         }
     }
diff --git a/src/blackmisc/statusmessage.h b/src/blackmisc/statusmessage.h
index 723fea43c..f4b4b9e56 100644
--- a/src/blackmisc/statusmessage.h
+++ b/src/blackmisc/statusmessage.h
@@ -24,7 +24,7 @@ namespace BlackMisc
      * Streamable status message, e.g. from Core -> GUI
      */
     class CStatusMessage :
-        public CValueObjectStdTuple<CStatusMessage>,
+        public CValueObject<CStatusMessage>,
         public ITimestampBased
     {
     public:
diff --git a/src/blackmisc/tuple.h b/src/blackmisc/tuple.h
index 63cc4692d..f6c826390 100644
--- a/src/blackmisc/tuple.h
+++ b/src/blackmisc/tuple.h
@@ -69,7 +69,7 @@ namespace BlackMisc
         template <> class TupleConverter<T> : TupleConverterBase                \
         {                                                                       \
             friend class T;                                                     \
-            template <class, class> friend class BlackMisc::CValueObjectStdTuple; \
+            template <class, class> friend class BlackMisc::CValueObject;       \
             friend class BlackMisc::Private::EncapsulationBreaker;              \
             static_assert(Private::HasEnabledTupleConversion<T>::value,         \
                           "Missing BLACK_ENABLE_TUPLE_CONVERSION macro in " #T); \
@@ -121,7 +121,7 @@ namespace BlackMisc
         template <class... U> class TupleConverter<T<U...>> : TupleConverterBase \
         {                                                                       \
             friend class T<U...>;                                               \
-            template <class, class> friend class BlackMisc::CValueObjectStdTuple; \
+            template <class, class> friend class BlackMisc::CValueObject;       \
             friend class BlackMisc::Private::EncapsulationBreaker;              \
             static_assert(Private::HasEnabledTupleConversion<T<U...>>::value,   \
                           "Missing BLACK_ENABLE_TUPLE_CONVERSION macro in " #T); \
diff --git a/src/blackmisc/tuple_private.h b/src/blackmisc/tuple_private.h
index 4d8cc3be4..bb515a75d 100644
--- a/src/blackmisc/tuple_private.h
+++ b/src/blackmisc/tuple_private.h
@@ -27,7 +27,7 @@ namespace BlackMisc
 {
     class CEmpty;
     template <class> class TupleConverter;
-    template <class Derived, class Base = CEmpty> class CValueObjectStdTuple;
+    template <class Derived, class Base = CEmpty> class CValueObject;
 
     //! Traits class to test whether a class template specialization is a base class of another class.
     template <template <class...> class Base, class Derived>
@@ -52,7 +52,7 @@ namespace BlackMisc
         // Inhibit doxygen warnings about missing documentation
         //! \cond PRIVATE
 
-        // To allow CValueObjectStdTuple policy classes to use the tuple system
+        // To allow CValueObject policy classes to use the tuple system
         class EncapsulationBreaker
         {
         protected:
diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h
index 0239229b7..229e36fa2 100644
--- a/src/blackmisc/valueobject.h
+++ b/src/blackmisc/valueobject.h
@@ -39,8 +39,8 @@ namespace BlackMisc
     class CVariant;
     class CEmpty;
 
-    //! Traits class to test whether a class is derived from CValueObjectStdTuple.
-    //! \todo TemplateIsBaseOf gives incorrect result due to ambiguity if there is more than one specialization of CValueObjectStdTuple which is a base of T.
+    //! Traits class to test whether a class is derived from CValueObject.
+    //! \todo TemplateIsBaseOf gives incorrect result due to ambiguity if there is more than one specialization of CValueObject which is a base of T.
     template <class T>
     using IsValueObject = typename std::is_base_of<CEmpty, T>::type;
 
@@ -63,7 +63,7 @@ namespace BlackMisc
     }
 
     /*!
-     * Default base class for CValueObjectStdTuple.
+     * Default base class for CValueObject.
      */
     class CEmpty
     {
@@ -85,7 +85,7 @@ namespace BlackMisc
 
     protected:
         //! String for QString conversion
-        //! \todo Here because pure virtual. Move to CValueObjectStdTuple when all dynamic polymorphism is removed.
+        //! \todo Here because pure virtual. Move to CValueObject when all dynamic polymorphism is removed.
         virtual QString convertToQString(bool i18n = false) const = 0;
 
         //! Protected default constructor
@@ -105,7 +105,7 @@ namespace BlackMisc
     inline int compare(const CEmpty &, const CEmpty &) { return 0; }
 
     /*!
-     * Terminating base cases for the recursive methods of CValueObjectStdTuple.
+     * Terminating base cases for the recursive methods of CValueObject.
      */
     struct CValueObjectDummyBase
     {
@@ -129,17 +129,17 @@ namespace BlackMisc
     };
 
     /*!
-     * Default policy classes for use by CValueObjectStdTuple.
+     * Default policy classes for use by CValueObject.
      *
      * The default policies are inherited from the policies of the base class. There is a specialization
      * for the terminating case in which the base class is CEmpty.
      *
      * Specialize this template to use non-default policies for a particular derived class.
-     * Due to the void default template parameter, specializations can inherit from CValueObjectStdTuplePolicy<>
+     * Due to the void default template parameter, specializations can inherit from CValueObjectPolicy<>
      * so that only the policies which differ from the default need be specified.
      * Policy classes which can be used are defined in namespace BlackMisc::Policy.
      */
-    template <class Derived = void> struct CValueObjectStdTuplePolicy
+    template <class Derived = void> struct CValueObjectPolicy
     {
         using MetaType = Policy::MetaType::Inherit; //!< Metatype policy
         using Equals = Policy::Equals::Inherit;     //!< Equals policy
@@ -152,11 +152,11 @@ namespace BlackMisc
     };
 
     /*!
-     * Default policy classes for use by CValueObjectStdTuple.
+     * Default policy classes for use by CValueObject.
      *
      * Specialization for the terminating case in which the base class is CEmpty.
      */
-    template <> struct CValueObjectStdTuplePolicy<CEmpty>
+    template <> struct CValueObjectPolicy<CEmpty>
     {
         using MetaType = Policy::MetaType::Default;     //!< Metatype policy
         using Equals = Policy::Equals::MetaTuple;       //!< Equals policy
@@ -169,12 +169,12 @@ namespace BlackMisc
     };
 
     /*!
-     * Policy classes for use by classes with incomplete migration to CValueObjectStdTuple.
+     * Policy classes for use by classes with incomplete migration to new CValueObject.
      *
      * This is to make it easier to apply the necessary changes to these classes for #356.
      * \todo Remove this and finish migrating classes that use it.
      */
-    struct CValueObjectLegacy : public CValueObjectStdTuplePolicy<CEmpty>
+    struct CValueObjectLegacy : public CValueObjectPolicy<CEmpty>
     {
         using Equals = Policy::Equals::None;        //!< Equals policy
         using LessThan = Policy::LessThan::None;    //!< Less than policy
@@ -187,26 +187,26 @@ namespace BlackMisc
     /*!
      * Standard implementation of CValueObject using meta tuple system.
      *
-     * This uses policy-based design. Specialize the class template CValueObjectStdTuplePolicy
+     * This uses policy-based design. Specialize the class template CValueObjectPolicy
      * to specify different policy classes.
      *
      * \tparam Derived  The class which is inheriting from this one (CRTP).
      * \tparam Base     The class which this one shall inherit from (default is CEmpty,
      *                  but this can be changed to create a deeper inheritance hierarchy).
      */
-    template <class Derived, class Base /*= CEmpty*/> class CValueObjectStdTuple :
+    template <class Derived, class Base /*= CEmpty*/> class CValueObject :
         public Base,
-        private CValueObjectStdTuplePolicy<Derived>::Equals::template Ops<Derived, Base>,
-        private CValueObjectStdTuplePolicy<Derived>::LessThan::template Ops<Derived, Base>,
-        private CValueObjectStdTuplePolicy<Derived>::Compare::template Ops<Derived, Base>
+        private CValueObjectPolicy<Derived>::Equals::template Ops<Derived, Base>,
+        private CValueObjectPolicy<Derived>::LessThan::template Ops<Derived, Base>,
+        private CValueObjectPolicy<Derived>::Compare::template Ops<Derived, Base>
     {
-        static_assert(std::is_same<CEmpty, Base>::value || IsValueObject<Base>::value, "Base must be either CEmpty or derived from CValueObjectStdTuple");
+        static_assert(std::is_same<CEmpty, Base>::value || IsValueObject<Base>::value, "Base must be either CEmpty or derived from CValueObject");
 
-        using MetaTypePolicy = typename CValueObjectStdTuplePolicy<Derived>::MetaType;
-        using HashPolicy = typename CValueObjectStdTuplePolicy<Derived>::Hash;
-        using DBusPolicy = typename CValueObjectStdTuplePolicy<Derived>::DBus;
-        using JsonPolicy = typename CValueObjectStdTuplePolicy<Derived>::Json;
-        using PropertyIndexPolicy = typename CValueObjectStdTuplePolicy<Derived>::PropertyIndex;
+        using MetaTypePolicy = typename CValueObjectPolicy<Derived>::MetaType;
+        using HashPolicy = typename CValueObjectPolicy<Derived>::Hash;
+        using DBusPolicy = typename CValueObjectPolicy<Derived>::DBus;
+        using JsonPolicy = typename CValueObjectPolicy<Derived>::Json;
+        using PropertyIndexPolicy = typename CValueObjectPolicy<Derived>::PropertyIndex;
 
         using BaseOrDummy = typename std::conditional<std::is_same<Base, CEmpty>::value, CValueObjectDummyBase, Base>::type;
 
@@ -249,7 +249,7 @@ namespace BlackMisc
         friend const QDBusArgument &operator>>(const QDBusArgument &arg, Derived &obj)
         {
             arg.beginStructure();
-            static_cast<CValueObjectStdTuple &>(obj).unmarshallFromDbus(arg); // virtual method is protected in Derived
+            static_cast<CValueObject &>(obj).unmarshallFromDbus(arg); // virtual method is protected in Derived
             arg.endStructure();
             return arg;
         }
@@ -258,7 +258,7 @@ namespace BlackMisc
         friend QDBusArgument &operator<<(QDBusArgument &arg, const Derived &obj)
         {
             arg.beginStructure();
-            static_cast<const CValueObjectStdTuple &>(obj).marshallToDbus(arg); // virtual method is protected in Derived
+            static_cast<const CValueObject &>(obj).marshallToDbus(arg); // virtual method is protected in Derived
             arg.endStructure();
             return arg;
         }
@@ -309,7 +309,7 @@ namespace BlackMisc
         using base_type = Base;
 
         //! Destructor
-        virtual ~CValueObjectStdTuple() {}
+        virtual ~CValueObject() {}
 
         //! Base class enums
         enum ColumnIndex
@@ -393,18 +393,18 @@ namespace BlackMisc
         friend struct Private::CValueObjectMetaInfo;
 
         //! Default constructor.
-        CValueObjectStdTuple() = default;
+        CValueObject() = default;
 
         //! Template constructor, forwards all arguments to base class constructor.
         //! \todo When our compilers support C++11 inheriting constructors, use those instead.
-        template <typename T, typename... Ts, typename = typename std::enable_if<! std::is_same<CValueObjectStdTuple, typename std::decay<T>::type>::value>::type>
-        CValueObjectStdTuple(T &&first, Ts &&... args) : Base(std::forward<T>(first), std::forward<Ts>(args)...) {}
+        template <typename T, typename... Ts, typename = typename std::enable_if<! std::is_same<CValueObject, typename std::decay<T>::type>::value>::type>
+        CValueObject(T &&first, Ts &&... args) : Base(std::forward<T>(first), std::forward<Ts>(args)...) {}
 
         //! Copy constructor.
-        CValueObjectStdTuple(const CValueObjectStdTuple &) = default;
+        CValueObject(const CValueObject &) = default;
 
         //! Copy assignment operator.
-        CValueObjectStdTuple &operator =(const CValueObjectStdTuple &) = default;
+        CValueObject &operator =(const CValueObject &) = default;
 
         //! String for streaming operators
         virtual QString stringForStreaming() const { return this->convertToQString(); }
@@ -456,7 +456,7 @@ namespace BlackMisc
 
 } // namespace
 
-// TODO Includes due to cyclic dependencies can be removed when CValueObjectStdTuple is split into parts along policy boundaries.
+// TODO Includes due to cyclic dependencies can be removed when CValueObject is split into parts along policy boundaries.
 #include "variant.h"
 #include "propertyindex.h"
 #include "propertyindexlist.h"
@@ -466,24 +466,24 @@ namespace BlackMisc
 namespace BlackMisc
 {
     template <class Derived, class Base>
-    CVariant CValueObjectStdTuple<Derived, Base>::toCVariant() const
+    CVariant CValueObject<Derived, Base>::toCVariant() const
     {
         return CVariant(this->toQVariant());
     }
     template <class Derived, class Base>
-    void CValueObjectStdTuple<Derived, Base>::convertFromCVariant(const CVariant &variant)
+    void CValueObject<Derived, Base>::convertFromCVariant(const CVariant &variant)
     {
         this->convertFromQVariant(variant.getQVariant());
     }
     template <class Derived, class Base>
-    CPropertyIndexList CValueObjectStdTuple<Derived, Base>::apply(const BlackMisc::CPropertyIndexVariantMap &indexMap, bool skipEqualValues)
+    CPropertyIndexList CValueObject<Derived, Base>::apply(const BlackMisc::CPropertyIndexVariantMap &indexMap, bool skipEqualValues)
     {
         CPropertyIndexList result;
         PropertyIndexPolicy::apply(*derived(), indexMap, result, skipEqualValues);
         return result;
     }
     template <class Derived, class Base>
-    CVariant CValueObjectStdTuple<Derived, Base>::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
+    CVariant CValueObject<Derived, Base>::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
     {
         CVariant result;
         PropertyIndexPolicy::propertyByIndex(*derived(), index, result);
@@ -533,7 +533,7 @@ namespace BlackMisc
                     o_property = obj.toCVariant();
                     return;
                 }
-                using Base = CValueObjectStdTuple<T, typename T::base_type>;
+                using Base = CValueObject<T, typename T::base_type>;
                 auto i = index.frontCasted<typename Base::ColumnIndex>();
                 switch (i)
                 {
diff --git a/src/blackmisc/valueobject_policy.h b/src/blackmisc/valueobject_policy.h
index 954a076dd..3f2953990 100644
--- a/src/blackmisc/valueobject_policy.h
+++ b/src/blackmisc/valueobject_policy.h
@@ -23,7 +23,7 @@ namespace BlackMisc
     class CPropertyIndexVariantMap;
 
     template <class>
-    struct CValueObjectStdTuplePolicy;
+    struct CValueObjectPolicy;
 
     template <typename T>
     void registerMetaValueType();
@@ -34,7 +34,7 @@ namespace BlackMisc
         {
             //! \private Alias for the policy of the base class of T
             template <class T>
-            using Inherit = CValueObjectStdTuplePolicy<typename T::base_type>;
+            using Inherit = CValueObjectPolicy<typename T::base_type>;
 
             //! \private
             using BlackMisc::Private::EncapsulationBreaker;
@@ -42,7 +42,7 @@ namespace BlackMisc
 
         namespace MetaType
         {
-            //! CValueObjectStdTuple registerMetadata policy which only registers with QMetaType and QtDBus
+            //! CValueObject registerMetadata policy which only registers with QMetaType and QtDBus
             struct QMetaTypeAndDBusOnly
             {
                 //! Register with QMetaType
@@ -50,7 +50,7 @@ namespace BlackMisc
                 static void registerImpl() { qRegisterMetaType<T>(); qDBusRegisterMetaType<T>(); }
             };
 
-            //! CValueObjectStdTuple default registerMetadata policy
+            //! CValueObject default registerMetadata policy
             struct Default
             {
                 //! Register with QMetaType
@@ -66,7 +66,7 @@ namespace BlackMisc
                 static void maybeRegisterMetaValueType(std::false_type) {}
             };
 
-            //! CValueObjectStdTuple registerMetadata policy which inherits the policy of the base class
+            //! CValueObject registerMetadata policy which inherits the policy of the base class
             struct Inherit
             {
                 //! Register with QMetaType
@@ -74,7 +74,7 @@ namespace BlackMisc
                 static void registerImpl() { Private::Inherit<Base>::MetaType::template registerImpl<T, typename Base::base_type>(); }
             };
 
-            //! CValueObjectStdTuple registerMetadata policy which also registers QList<T>
+            //! CValueObject registerMetadata policy which also registers QList<T>
             struct DefaultAndQList
             {
                 //! Register with QMetaType
@@ -85,7 +85,7 @@ namespace BlackMisc
 
         namespace Equals
         {
-            //! CValueObjectStdTuple policy for a class which should not have an equals operator
+            //! CValueObject policy for a class which should not have an equals operator
             struct None
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -93,15 +93,15 @@ namespace BlackMisc
                 struct Ops {};
             };
 
-            //! CValueObjectStdTuple equals operator policy which inherits the policy of the base class
+            //! CValueObject equals operator policy which inherits the policy of the base class
             struct Inherit
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
                 template <class T, class Base>
-                struct Ops : public CValueObjectStdTuplePolicy<Base>::Equals::template Ops<T, typename Base::base_type> {};
+                struct Ops : public CValueObjectPolicy<Base>::Equals::template Ops<T, typename Base::base_type> {};
             };
 
-            //! CValueObjectStdTuple policy for a class whose meta tuple members can be compared by the equals operator
+            //! CValueObject policy for a class whose meta tuple members can be compared by the equals operator
             struct MetaTuple
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -135,7 +135,7 @@ namespace BlackMisc
 
         namespace LessThan
         {
-            //! CValueObjectStdTuple policy for a class which should not have a less than operator
+            //! CValueObject policy for a class which should not have a less than operator
             struct None
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -143,15 +143,15 @@ namespace BlackMisc
                 struct Ops {};
             };
 
-            //! CValueObjectStdTuple less than operator policy which inherits the policy of the base class
+            //! CValueObject less than operator policy which inherits the policy of the base class
             struct Inherit
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
                 template <class T, class Base>
-                struct Ops : public CValueObjectStdTuplePolicy<Base>::LessThan::template Ops<T, typename Base::base_type> {};
+                struct Ops : public CValueObjectPolicy<Base>::LessThan::template Ops<T, typename Base::base_type> {};
             };
 
-            //! CValueObjectStdTuple policy for a class whose meta tuple members can be compared by the less than operator
+            //! CValueObject policy for a class whose meta tuple members can be compared by the less than operator
             struct MetaTuple
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -193,7 +193,7 @@ namespace BlackMisc
 
         namespace Compare
         {
-            //! CValueObjectStdTuple policy for a class without compare() support
+            //! CValueObject policy for a class without compare() support
             struct None
             {
                 //! Inner class template which actually bestows the friend function via the Barton-Nackman trick
@@ -201,15 +201,15 @@ namespace BlackMisc
                 struct Ops {};
             };
 
-            //! CValueObjectStdTuple compare() policy which inherits the policy of the base class
+            //! CValueObject compare() policy which inherits the policy of the base class
             struct Inherit
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
                 template <class T, class Base>
-                struct Ops : public CValueObjectStdTuplePolicy<Base>::Compare::template Ops<T, typename Base::base_type> {};
+                struct Ops : public CValueObjectPolicy<Base>::Compare::template Ops<T, typename Base::base_type> {};
             };
 
-            //! CValueObjectStdTuple policy for a class with default metatuple-based compare() support
+            //! CValueObject policy for a class with default metatuple-based compare() support
             struct MetaTuple
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -225,7 +225,7 @@ namespace BlackMisc
                 };
             };
 
-            //! CValueObjectStdTuple policy for a class which implements compare() in terms of the less than operator
+            //! CValueObject policy for a class which implements compare() in terms of the less than operator
             struct LessThan
             {
                 //! Inner class template which actually bestows the operators via the Barton-Nackman trick
@@ -245,7 +245,7 @@ namespace BlackMisc
 
         namespace Hash
         {
-            //! CValueObjectStdTuple policy for a class without hashing support
+            //! CValueObject policy for a class without hashing support
             struct None
             {
                 //! \copydoc BlackMisc::CValueObject::getHashValue
@@ -253,7 +253,7 @@ namespace BlackMisc
                 static uint hashImpl(const T &) { qFatal("Not implemented"); return 0; }
             };
 
-            //! CValueObjectStdTuple hashing policy which inherits the policy of the base class
+            //! CValueObject hashing policy which inherits the policy of the base class
             struct Inherit
             {
                 //! \copydoc BlackMisc::CValueObject::getHashValue
@@ -261,7 +261,7 @@ namespace BlackMisc
                 static uint hashImpl(const T &obj) { return Private::Inherit<Base>::Hash::template hashImpl<T, typename Base::base_type>(obj); }
             };
 
-            //! CValueObjectStdTuple policy for a class with default metatuple-based hashing support
+            //! CValueObject policy for a class with default metatuple-based hashing support
             struct MetaTuple : private Private::EncapsulationBreaker
             {
                 //! \copydoc BlackMisc::CValueObject::getHashValue
@@ -269,7 +269,7 @@ namespace BlackMisc
                 static uint hashImpl(const T &obj) { return qHash(Private::EncapsulationBreaker::toMetaTuple(obj)); }
             };
 
-            //! CValueObjectStdTuple policy for a class which implements its own custom hashing support
+            //! CValueObject policy for a class which implements its own custom hashing support
             struct Own
             {
                 //! \copydoc BlackMisc::CValueObject::getHashValue
@@ -280,7 +280,7 @@ namespace BlackMisc
 
         namespace DBus
         {
-            //! CValueObjectStdTuple policy for a class without DBus marshalling support
+            //! CValueObject policy for a class without DBus marshalling support
             struct None
             {
                 //! \copydoc BlackMisc::CValueObject::marshallToDbus
@@ -292,7 +292,7 @@ namespace BlackMisc
                 static void unmarshallImpl(const QDBusArgument &, T &) { qFatal("Not implemented"); }
             };
 
-            //! CValueObjectStdTuple marshalling policy which inherits the policy of the base class
+            //! CValueObject marshalling policy which inherits the policy of the base class
             struct Inherit
             {
                 //! \copydoc BlackMisc::CValueObject::marshallToDbus
@@ -304,7 +304,7 @@ namespace BlackMisc
                 static void unmarshallImpl(const QDBusArgument &arg, T &obj) { return Private::Inherit<Base>::DBus::template unmarshallImpl<T, typename Base::base_type>(arg, obj); }
             };
 
-            //! CValueObjectStdTuple policy for a class with default metatuple-based DBus marshalling support
+            //! CValueObject policy for a class with default metatuple-based DBus marshalling support
             struct MetaTuple : private Private::EncapsulationBreaker
             {
                 //! \copydoc BlackMisc::CValueObject::marshallToDbus
@@ -316,7 +316,7 @@ namespace BlackMisc
                 static void unmarshallImpl(const QDBusArgument &arg, T &obj) { arg >> Private::EncapsulationBreaker::toMetaTuple(obj); }
             };
 
-            //! CValueObjectStdTuple policy for a class which implements its own custom DBus marshalling support
+            //! CValueObject policy for a class which implements its own custom DBus marshalling support
             struct Own
             {
                 //! \copydoc BlackMisc::CValueObject::marshallToDbus
@@ -331,7 +331,7 @@ namespace BlackMisc
 
         namespace Json
         {
-            //! CValueObjectStdTuple policy for a class without JSON support
+            //! CValueObject policy for a class without JSON support
             struct None
             {
                 //! \copydoc BlackMisc::serializeJson
@@ -343,7 +343,7 @@ namespace BlackMisc
                 static void deserializeImpl(const QJsonObject &, T &) { qFatal("Not implemented"); }
             };
 
-            //! CValueObjectStdTuple JSON policy which inherits the policy of the base class
+            //! CValueObject JSON policy which inherits the policy of the base class
             struct Inherit
             {
                 //! \copydoc BlackMisc::serializeJson
@@ -355,7 +355,7 @@ namespace BlackMisc
                 static void deserializeImpl(const QJsonObject &json, T &obj) { Private::Inherit<Base>::Json::template deserializeImpl<T, typename Base::base_type>(json, obj); }
             };
 
-            //! CValueObjectStdTuple policy for a class with default metatuple-based JSON support
+            //! CValueObject policy for a class with default metatuple-based JSON support
             struct MetaTuple : private Private::EncapsulationBreaker
             {
                 //! \copydoc BlackMisc::serializeJson
@@ -367,7 +367,7 @@ namespace BlackMisc
                 static void deserializeImpl(const QJsonObject &json, T &obj) { BlackMisc::deserializeJson(json, Private::EncapsulationBreaker::toMetaTuple(obj)); }
             };
 
-            //! CValueObjectStdTuple policy for a class which implements its own custom JSON support
+            //! CValueObject policy for a class which implements its own custom JSON support
             struct Own
             {
                 //! \copydoc BlackMisc::serializeJson
@@ -382,7 +382,7 @@ namespace BlackMisc
 
         namespace PropertyIndex
         {
-            //! CValueObjectStdTuple policy for PropertyIndex related methods
+            //! CValueObject policy for PropertyIndex related methods
             struct Default
             {
                 //! \private
@@ -393,7 +393,7 @@ namespace BlackMisc
                 template <class T>
                 using DisableIfEmptyBase = typename std::enable_if<! std::is_same<typename T::base_type, CEmpty>::value>::type *;
 
-                //! \copydoc CValueObjectStdTuple::apply
+                //! \copydoc CValueObject::apply
                 //! @{
                 template <class T, class...>
                 static void apply(T &obj, const CPropertyIndexVariantMap &indexMap, CPropertyIndexList &o_changed, bool skipEqualValues, DisableIfEmptyBase<T> = nullptr) { o_changed = obj.T::base_type::apply(indexMap, skipEqualValues); }
@@ -401,7 +401,7 @@ namespace BlackMisc
                 static void apply(T &obj, const CPropertyIndexVariantMap &indexMap, CPropertyIndexList &o_changed, bool skipEqualValues, EnableIfEmptyBase<T> = nullptr); // implemented in valueobject.h due to cyclic include dependency
                 //! @}
 
-                //! \copydoc CValueObjectStdTuple::setPropertyByIndex
+                //! \copydoc CValueObject::setPropertyByIndex
                 //! @{
                 template <class T, class...>
                 static void setPropertyByIndex(T &obj, const CVariant &variant, const CPropertyIndex &index, DisableIfEmptyBase<T> = nullptr) { return obj.T::base_type::setPropertyByIndex(variant, index); }
@@ -409,7 +409,7 @@ namespace BlackMisc
                 static void setPropertyByIndex(T &obj, const CVariant &variant, const CPropertyIndex &index, EnableIfEmptyBase<T> = nullptr); // implemented in valueobject.h due to cyclic include dependency
                 //! @}
 
-                //! \copydoc CValueObjectStdTuple::propertyByIndex
+                //! \copydoc CValueObject::propertyByIndex
                 //! @{
                 template <class T, class...>
                 static void propertyByIndex(const T &obj, const CPropertyIndex &index, CVariant &o_property, DisableIfEmptyBase<T> = nullptr) { o_property = obj.T::base_type::propertyByIndex(index); }
@@ -417,7 +417,7 @@ namespace BlackMisc
                 static void propertyByIndex(const T &obj, const CPropertyIndex &index, CVariant &o_property, EnableIfEmptyBase<T> = nullptr); // implemented in valueobject.h due to cyclic include dependency
                 //! @}
 
-                //! \copydoc CValueObjectStdTuple::propertyByIndexAsString
+                //! \copydoc CValueObject::propertyByIndexAsString
                 //! @{
                 template <class T, class...>
                 static QString propertyByIndexAsString(const T &obj, const CPropertyIndex &index, bool i18n, DisableIfEmptyBase<T> = nullptr) { return obj.T::base_type::propertyByIndexAsString(index, i18n); }
@@ -425,7 +425,7 @@ namespace BlackMisc
                 static QString propertyByIndexAsString(const T &obj, const CPropertyIndex &index, bool i18n, EnableIfEmptyBase<T> = nullptr); // implemented in valueobject.h due to cyclic include dependency
                 //! @}
 
-                //! \copydoc CValueObjectStdTuple::equalsPropertyByIndex
+                //! \copydoc CValueObject::equalsPropertyByIndex
                 //! @{
                 template <class T, class...>
                 static bool equalsPropertyByIndex(const T &obj, const CVariant &compareValue, const CPropertyIndex &index, DisableIfEmptyBase<T> = nullptr) { return obj.T::base_type::equalsPropertyByIndex(compareValue, index); }
diff --git a/src/blackmisc/variant.h b/src/blackmisc/variant.h
index b9a86c58d..0da1251d0 100644
--- a/src/blackmisc/variant.h
+++ b/src/blackmisc/variant.h
@@ -28,7 +28,7 @@ namespace BlackMisc
     class CVariant;
 
     //! \private
-    template <> struct CValueObjectStdTuplePolicy<CVariant> : public CValueObjectStdTuplePolicy<>
+    template <> struct CValueObjectPolicy<CVariant> : public CValueObjectPolicy<>
     {
         using MetaType = Policy::MetaType::QMetaTypeAndDBusOnly;
         using Equals = Policy::Equals::OwnEquals;
@@ -43,17 +43,17 @@ namespace BlackMisc
      * Wrapper around QVariant which provides transparent access to CValueObject methods
      * of the contained object if it is registered with BlackMisc::registerMetaValueType.
      */
-    class CVariant : public CValueObjectStdTuple<CVariant>
+    class CVariant : public CValueObject<CVariant>
     {
     public:
         //! Default constructor.
         CVariant() {}
 
         //! Copy constructor.
-        CVariant(const CVariant &other) : CValueObjectStdTuple(other), m_v(other.m_v) {}
+        CVariant(const CVariant &other) : CValueObject(other), m_v(other.m_v) {}
 
         //! Move constructor.
-        CVariant(CVariant &&other) : CValueObjectStdTuple(std::move(other)), m_v(std::move(other.m_v)) {}
+        CVariant(CVariant &&other) : CValueObject(std::move(other)), m_v(std::move(other.m_v)) {}
 
         //! Construct from a QVariant.
         CVariant(const QVariant &var) : m_v(var) {}
diff --git a/src/blackmisc/voiceroom.cpp b/src/blackmisc/voiceroom.cpp
index 72ecde7f3..2b8847367 100644
--- a/src/blackmisc/voiceroom.cpp
+++ b/src/blackmisc/voiceroom.cpp
@@ -48,7 +48,7 @@ namespace BlackMisc
             case IndexUrl:
                 return CVariant::from(this->getVoiceRoomUrl());
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -82,7 +82,7 @@ namespace BlackMisc
                 this->setVoiceRoomUrl(variant.value<QString>());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blackmisc/voiceroom.h b/src/blackmisc/voiceroom.h
index 65ae0eda1..62b8b9115 100644
--- a/src/blackmisc/voiceroom.h
+++ b/src/blackmisc/voiceroom.h
@@ -23,7 +23,7 @@ namespace BlackMisc
         /*!
          * Value object encapsulating information of a voice room
          */
-        class CVoiceRoom : public CValueObjectStdTuple<CVoiceRoom>
+        class CVoiceRoom : public CValueObject<CVoiceRoom>
         {
         public:
             //! Properties by index
diff --git a/src/blacksim/fscommon/aircraftcfgentries.cpp b/src/blacksim/fscommon/aircraftcfgentries.cpp
index c4d84d9f2..38e4cf8d5 100644
--- a/src/blacksim/fscommon/aircraftcfgentries.cpp
+++ b/src/blacksim/fscommon/aircraftcfgentries.cpp
@@ -106,7 +106,7 @@ namespace BlackSim
             case IndexDescription:
                 return CVariant::from(this->m_description);
             default:
-                return CValueObjectStdTuple::propertyByIndex(index);
+                return CValueObject::propertyByIndex(index);
             }
         }
 
@@ -144,7 +144,7 @@ namespace BlackSim
                 this->setTexture(variant.toQString());
                 break;
             default:
-                CValueObjectStdTuple::setPropertyByIndex(variant, index);
+                CValueObject::setPropertyByIndex(variant, index);
                 break;
             }
         }
diff --git a/src/blacksim/fscommon/aircraftcfgentries.h b/src/blacksim/fscommon/aircraftcfgentries.h
index c2ddde866..256520fc0 100644
--- a/src/blacksim/fscommon/aircraftcfgentries.h
+++ b/src/blacksim/fscommon/aircraftcfgentries.h
@@ -25,7 +25,7 @@ namespace BlackSim
          * \remarks an entry in the aircraft.cfg is title, atc type, ... This class already bundles
          *          relevant entries, hence the class is named Entries (plural)
          */
-        class CAircraftCfgEntries: public BlackMisc::CValueObjectStdTuple<CAircraftCfgEntries>
+        class CAircraftCfgEntries: public BlackMisc::CValueObject<CAircraftCfgEntries>
         {
         public:
             //! Properties by index
diff --git a/src/blacksim/setsimulator.h b/src/blacksim/setsimulator.h
index 933702215..3d2cc8deb 100644
--- a/src/blacksim/setsimulator.h
+++ b/src/blacksim/setsimulator.h
@@ -23,7 +23,7 @@ namespace BlackSim
     namespace Settings
     {
         //! Value object encapsulating information of simulator related settings.
-        class CSettingsSimulator : public BlackMisc::CValueObjectStdTuple<CSettingsSimulator>
+        class CSettingsSimulator : public BlackMisc::CValueObject<CSettingsSimulator>
         {
         public:
             //! Default constructor.
diff --git a/src/blacksim/simulatorinfo.h b/src/blacksim/simulatorinfo.h
index 973654594..a8a4dd7a7 100644
--- a/src/blacksim/simulatorinfo.h
+++ b/src/blacksim/simulatorinfo.h
@@ -18,7 +18,7 @@
 namespace BlackSim
 {
     //! Describing a simulator
-    class CSimulatorInfo : public BlackMisc::CValueObjectStdTuple<CSimulatorInfo>
+    class CSimulatorInfo : public BlackMisc::CValueObject<CSimulatorInfo>
     {
     public:
         //! Default constructor
diff --git a/tests/blackmisc/testvalueobject.cpp b/tests/blackmisc/testvalueobject.cpp
index bdae3ad12..5e2c3d242 100644
--- a/tests/blackmisc/testvalueobject.cpp
+++ b/tests/blackmisc/testvalueobject.cpp
@@ -37,7 +37,7 @@ namespace BlackMisc
         case IndexName:
             return CVariant::fromValue(this->m_name);
         default:
-            return CValueObjectStdTuple::propertyByIndex(index);
+            return CValueObject::propertyByIndex(index);
         }
     }
 
@@ -61,7 +61,7 @@ namespace BlackMisc
             this->setName(variant.value<QString>());
             break;
         default:
-            CValueObjectStdTuple::setPropertyByIndex(variant, index);
+            CValueObject::setPropertyByIndex(variant, index);
             break;
         }
     }
diff --git a/tests/blackmisc/testvalueobject.h b/tests/blackmisc/testvalueobject.h
index 7c9f372c7..173931a13 100644
--- a/tests/blackmisc/testvalueobject.h
+++ b/tests/blackmisc/testvalueobject.h
@@ -22,7 +22,7 @@ namespace BlackMisc
     /*!
      * Value object encapsulating information of a server
      */
-    class CTestValueObject : public BlackMisc::CValueObjectStdTuple<CTestValueObject>
+    class CTestValueObject : public BlackMisc::CValueObject<CTestValueObject>
     {
     public:
         //! Properties by index