diff --git a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
index 77ef517896..6feff58a75 100644
--- a/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
+++ b/CodeGen/Generators/UnitsNetGen/QuantityGenerator.cs
@@ -249,7 +249,7 @@ private void GenerateStaticProperties()
         /// <summary>
         ///     The <see cref=""QuantityType"" /> of this quantity.
         /// </summary>
-        [Obsolete(""QuantityType will be removed in the future. Use Info property instead."")]
+        [Obsolete(""QuantityType will be removed in the future. Use the Info property instead."")]
         public static QuantityType QuantityType {{ get; }} = QuantityType.{_quantity.Name};
 
         /// <summary>
@@ -303,7 +303,8 @@ private void GenerateProperties()
         /// <summary>
         ///     The <see cref=""QuantityType"" /> of this quantity.
         /// </summary>
-        public QuantityType Type => {_quantity.Name}.QuantityType;
+        [Obsolete(""QuantityType will be removed in the future. Use the Info property instead."")]
+        public QuantityType Type => QuantityType.{_quantity.Name};
 
         /// <summary>
         ///     The <see cref=""BaseDimensions"" /> of this quantity.
diff --git a/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs b/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs
index 72c1bbccef..624f319486 100644
--- a/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs
+++ b/CodeGen/Generators/UnitsNetGen/QuantityTypeGenerator.cs
@@ -16,6 +16,9 @@ public override string Generate()
             Writer.WL(GeneratedFileHeader);
             Writer.WL(@"
 // ReSharper disable once CheckNamespace
+
+using System;
+
 namespace UnitsNet
 {
     /// <summary>
@@ -24,6 +27,7 @@ namespace UnitsNet
     ///     This is useful for populating options in the UI, such as creating a generic conversion
     ///     tool with inputValue, quantityName, fromUnit and toUnit selectors.
     /// </summary>
+    [Obsolete(""QuantityType will be removed in the future. Use the QuantityInfo class instead."")]
     public enum QuantityType
     {
 // Missing XML comment for public type or member
diff --git a/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs b/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs
index 5e646a0605..99bc982b13 100644
--- a/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs
+++ b/CodeGen/Generators/UnitsNetGen/StaticQuantityGenerator.cs
@@ -43,16 +43,6 @@ public static partial class Quantity
             Writer.WL(@"
         };
 
-        // Used by the QuantityInfo .ctor to map a name to a QuantityType. Will be removed when QuantityType
-        // will be removed.
-        internal static readonly IDictionary<string, QuantityType> QuantityTypeByName = new Dictionary<string, QuantityType>
-        {");
-            foreach (var quantity in _quantities)
-                Writer.WL($@"
-            {{ ""{quantity.Name}"", QuantityType.{quantity.Name} }},");
-            Writer.WL(@"
-        };
-
         /// <summary>
         /// Dynamically constructs a quantity of the given <see cref=""QuantityType""/> with the value in the quantity's base units.
         /// </summary>
diff --git a/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs b/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs
index 337b14719c..6b4471253a 100644
--- a/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs
+++ b/CodeGen/Generators/UnitsNetWrcGen/QuantityGenerator.cs
@@ -1,4 +1,4 @@
-// Licensed under MIT No Attribution, see LICENSE file at the root.
+// Licensed under MIT No Attribution, see LICENSE file at the root.
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
 using System;
@@ -194,6 +194,7 @@ private void GenerateStaticProperties()
         /// <summary>
         ///     The <see cref=""QuantityType"" /> of this quantity.
         /// </summary>
+        [Obsolete(""QuantityType will be removed in the future. Use the Info property instead."")]
         public static QuantityType QuantityType {{ get; }} = QuantityType.{_quantity.Name};
 
         /// <summary>
@@ -235,6 +236,7 @@ private void GenerateProperties()
         /// <summary>
         ///     The <see cref=""QuantityType"" /> of this quantity.
         /// </summary>
+        [Obsolete(""QuantityType will be removed in the future. Use the Info property instead."")]
         public QuantityType Type => {_quantity.Name}.QuantityType;
 
         /// <summary>
@@ -585,7 +587,7 @@ public bool Equals({_quantity.Name} other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current {_quantity.Name}.</returns>
         public override int GetHashCode()
         {{
-            return new {{ QuantityType, Value, Unit }}.GetHashCode();
+            return new {{ Info.Name, Value, Unit }}.GetHashCode();
         }}
 
         #endregion
diff --git a/CodeGen/Generators/UnitsNetWrcGen/QuantityTypeGenerator.cs b/CodeGen/Generators/UnitsNetWrcGen/QuantityTypeGenerator.cs
index 582b299d6a..e498d2d2d7 100644
--- a/CodeGen/Generators/UnitsNetWrcGen/QuantityTypeGenerator.cs
+++ b/CodeGen/Generators/UnitsNetWrcGen/QuantityTypeGenerator.cs
@@ -1,4 +1,4 @@
-using CodeGen.JsonTypes;
+using CodeGen.JsonTypes;
 
 namespace CodeGen.Generators.UnitsNetWrcGen
 {
@@ -16,6 +16,9 @@ public override string Generate()
             Writer.WL(GeneratedFileHeader);
             Writer.WL(@"
 // ReSharper disable once CheckNamespace
+
+using System;
+
 namespace UnitsNet
 {
     /// <summary>
@@ -24,6 +27,7 @@ namespace UnitsNet
     ///     This is useful for populating options in the UI, such as creating a generic conversion
     ///     tool with inputValue, quantityName, fromUnit and toUnit selectors.
     /// </summary>
+    [Obsolete(""QuantityType will be removed in the future. Use the QuantityInfo class instead."")]
     public enum QuantityType
     {
         Undefined = 0,");
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Acceleration.g.cs
index 85cab970be..887de0cca9 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Acceleration.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Acceleration.g.cs
@@ -110,6 +110,7 @@ private Acceleration(double value, AccelerationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Acceleration;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Acceleration(double value, AccelerationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Acceleration.QuantityType;
 
         /// <summary>
@@ -645,7 +647,7 @@ public bool Equals(Acceleration other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current Acceleration.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmountOfSubstance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmountOfSubstance.g.cs
index 5ad5fa29f4..f50690a9f3 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmountOfSubstance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmountOfSubstance.g.cs
@@ -110,6 +110,7 @@ private AmountOfSubstance(double value, AmountOfSubstanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AmountOfSubstance;
 
         /// <summary>
@@ -144,6 +145,7 @@ private AmountOfSubstance(double value, AmountOfSubstanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => AmountOfSubstance.QuantityType;
 
         /// <summary>
@@ -660,7 +662,7 @@ public bool Equals(AmountOfSubstance other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current AmountOfSubstance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmplitudeRatio.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmplitudeRatio.g.cs
index 32343032b5..96f5f5536b 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmplitudeRatio.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AmplitudeRatio.g.cs
@@ -110,6 +110,7 @@ private AmplitudeRatio(double value, AmplitudeRatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AmplitudeRatio;
 
         /// <summary>
@@ -144,6 +145,7 @@ private AmplitudeRatio(double value, AmplitudeRatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => AmplitudeRatio.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(AmplitudeRatio other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current AmplitudeRatio.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Angle.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Angle.g.cs
index c43fedfd87..5f9a81fb71 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Angle.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Angle.g.cs
@@ -110,6 +110,7 @@ private Angle(double value, AngleUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Angle;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Angle(double value, AngleUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Angle.QuantityType;
 
         /// <summary>
@@ -675,7 +677,7 @@ public bool Equals(Angle other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Angle.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentEnergy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentEnergy.g.cs
index 3ddcbd6a6e..ed3a7470ba 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentEnergy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentEnergy.g.cs
@@ -110,6 +110,7 @@ private ApparentEnergy(double value, ApparentEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ApparentEnergy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ApparentEnergy(double value, ApparentEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ApparentEnergy.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(ApparentEnergy other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current ApparentEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentPower.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentPower.g.cs
index 0781f3b56a..6ed5dbb714 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentPower.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ApparentPower.g.cs
@@ -110,6 +110,7 @@ private ApparentPower(double value, ApparentPowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ApparentPower;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ApparentPower(double value, ApparentPowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ApparentPower.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(ApparentPower other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current ApparentPower.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Area.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Area.g.cs
index 2e8dfb7f71..2c4e1c24b0 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Area.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Area.g.cs
@@ -110,6 +110,7 @@ private Area(double value, AreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Area;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Area(double value, AreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Area.QuantityType;
 
         /// <summary>
@@ -645,7 +647,7 @@ public bool Equals(Area other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Area.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaDensity.g.cs
index 0a351eab96..01fedc8752 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaDensity.g.cs
@@ -110,6 +110,7 @@ private AreaDensity(double value, AreaDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AreaDensity;
 
         /// <summary>
@@ -144,6 +145,7 @@ private AreaDensity(double value, AreaDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => AreaDensity.QuantityType;
 
         /// <summary>
@@ -450,7 +452,7 @@ public bool Equals(AreaDensity other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current AreaDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
index 6b9b75cc31..3695672534 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
@@ -110,6 +110,7 @@ private AreaMomentOfInertia(double value, AreaMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AreaMomentOfInertia;
 
         /// <summary>
@@ -144,6 +145,7 @@ private AreaMomentOfInertia(double value, AreaMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => AreaMomentOfInertia.QuantityType;
 
         /// <summary>
@@ -525,7 +527,7 @@ public bool Equals(AreaMomentOfInertia other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current AreaMomentOfInertia.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BitRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BitRate.g.cs
index 8f5502bd4e..e1e13abe37 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BitRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BitRate.g.cs
@@ -113,6 +113,7 @@ private BitRate(decimal value, BitRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.BitRate;
 
         /// <summary>
@@ -147,6 +148,7 @@ private BitRate(decimal value, BitRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => BitRate.QuantityType;
 
         /// <summary>
@@ -828,7 +830,7 @@ public bool Equals(BitRate other, double tolerance, ComparisonType comparisonTyp
         /// <returns>A hash code for the current BitRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
index 81d4e9c4d7..c025f0df11 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
@@ -110,6 +110,7 @@ private BrakeSpecificFuelConsumption(double value, BrakeSpecificFuelConsumptionU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.BrakeSpecificFuelConsumption;
 
         /// <summary>
@@ -144,6 +145,7 @@ private BrakeSpecificFuelConsumption(double value, BrakeSpecificFuelConsumptionU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => BrakeSpecificFuelConsumption.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(BrakeSpecificFuelConsumption other, double tolerance, Compari
         /// <returns>A hash code for the current BrakeSpecificFuelConsumption.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Capacitance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Capacitance.g.cs
index 211e9d682b..17f1e2ec22 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Capacitance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Capacitance.g.cs
@@ -113,6 +113,7 @@ private Capacitance(double value, CapacitanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Capacitance;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Capacitance(double value, CapacitanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Capacitance.QuantityType;
 
         /// <summary>
@@ -543,7 +545,7 @@ public bool Equals(Capacitance other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Capacitance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
index a491a33eb4..0818c312ad 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
@@ -110,6 +110,7 @@ private CoefficientOfThermalExpansion(double value, CoefficientOfThermalExpansio
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.CoefficientOfThermalExpansion;
 
         /// <summary>
@@ -144,6 +145,7 @@ private CoefficientOfThermalExpansion(double value, CoefficientOfThermalExpansio
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => CoefficientOfThermalExpansion.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(CoefficientOfThermalExpansion other, double tolerance, Compar
         /// <returns>A hash code for the current CoefficientOfThermalExpansion.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Density.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Density.g.cs
index 4322085fa7..7b9c754664 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Density.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Density.g.cs
@@ -113,6 +113,7 @@ private Density(double value, DensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Density;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Density(double value, DensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Density.QuantityType;
 
         /// <summary>
@@ -1038,7 +1040,7 @@ public bool Equals(Density other, double tolerance, ComparisonType comparisonTyp
         /// <returns>A hash code for the current Density.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Duration.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Duration.g.cs
index 111414c734..066217baaa 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Duration.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Duration.g.cs
@@ -110,6 +110,7 @@ private Duration(double value, DurationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Duration;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Duration(double value, DurationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Duration.QuantityType;
 
         /// <summary>
@@ -600,7 +602,7 @@ public bool Equals(Duration other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current Duration.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/DynamicViscosity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/DynamicViscosity.g.cs
index 2975d76bd9..e11f51e684 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/DynamicViscosity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/DynamicViscosity.g.cs
@@ -113,6 +113,7 @@ private DynamicViscosity(double value, DynamicViscosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.DynamicViscosity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private DynamicViscosity(double value, DynamicViscosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => DynamicViscosity.QuantityType;
 
         /// <summary>
@@ -588,7 +590,7 @@ public bool Equals(DynamicViscosity other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current DynamicViscosity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricAdmittance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricAdmittance.g.cs
index 519872df8f..a3b99b4304 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricAdmittance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricAdmittance.g.cs
@@ -110,6 +110,7 @@ private ElectricAdmittance(double value, ElectricAdmittanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricAdmittance;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricAdmittance(double value, ElectricAdmittanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricAdmittance.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(ElectricAdmittance other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current ElectricAdmittance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCharge.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCharge.g.cs
index abb5480f7c..0bb0693c43 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCharge.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCharge.g.cs
@@ -113,6 +113,7 @@ private ElectricCharge(double value, ElectricChargeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCharge;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricCharge(double value, ElectricChargeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricCharge.QuantityType;
 
         /// <summary>
@@ -513,7 +515,7 @@ public bool Equals(ElectricCharge other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current ElectricCharge.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricChargeDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
index c56a49e549..401bceae95 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
@@ -113,6 +113,7 @@ private ElectricChargeDensity(double value, ElectricChargeDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricChargeDensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricChargeDensity(double value, ElectricChargeDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricChargeDensity.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(ElectricChargeDensity other, double tolerance, ComparisonType
         /// <returns>A hash code for the current ElectricChargeDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductance.g.cs
index 89fe68bac9..9b1fe27bd1 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductance.g.cs
@@ -113,6 +113,7 @@ private ElectricConductance(double value, ElectricConductanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricConductance;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricConductance(double value, ElectricConductanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricConductance.QuantityType;
 
         /// <summary>
@@ -483,7 +485,7 @@ public bool Equals(ElectricConductance other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current ElectricConductance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductivity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductivity.g.cs
index 1af5cf33cf..915f576883 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductivity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricConductivity.g.cs
@@ -113,6 +113,7 @@ private ElectricConductivity(double value, ElectricConductivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricConductivity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricConductivity(double value, ElectricConductivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricConductivity.QuantityType;
 
         /// <summary>
@@ -483,7 +485,7 @@ public bool Equals(ElectricConductivity other, double tolerance, ComparisonType
         /// <returns>A hash code for the current ElectricConductivity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrent.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrent.g.cs
index 2842e7852c..c240538c93 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrent.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrent.g.cs
@@ -110,6 +110,7 @@ private ElectricCurrent(double value, ElectricCurrentUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrent;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricCurrent(double value, ElectricCurrentUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricCurrent.QuantityType;
 
         /// <summary>
@@ -555,7 +557,7 @@ public bool Equals(ElectricCurrent other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current ElectricCurrent.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
index 80778d222b..ef624633b7 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
@@ -113,6 +113,7 @@ private ElectricCurrentDensity(double value, ElectricCurrentDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentDensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricCurrentDensity(double value, ElectricCurrentDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricCurrentDensity.QuantityType;
 
         /// <summary>
@@ -483,7 +485,7 @@ public bool Equals(ElectricCurrentDensity other, double tolerance, ComparisonTyp
         /// <returns>A hash code for the current ElectricCurrentDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
index 937a762793..c93b623420 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
@@ -110,6 +110,7 @@ private ElectricCurrentGradient(double value, ElectricCurrentGradientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentGradient;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricCurrentGradient(double value, ElectricCurrentGradientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricCurrentGradient.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(ElectricCurrentGradient other, double tolerance, ComparisonTy
         /// <returns>A hash code for the current ElectricCurrentGradient.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricField.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricField.g.cs
index 22ef18d5f6..e17b8dc2c8 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricField.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricField.g.cs
@@ -113,6 +113,7 @@ private ElectricField(double value, ElectricFieldUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricField;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricField(double value, ElectricFieldUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricField.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(ElectricField other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current ElectricField.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricInductance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricInductance.g.cs
index 5109849aec..62516d9068 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricInductance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricInductance.g.cs
@@ -113,6 +113,7 @@ private ElectricInductance(double value, ElectricInductanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricInductance;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricInductance(double value, ElectricInductanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricInductance.QuantityType;
 
         /// <summary>
@@ -498,7 +500,7 @@ public bool Equals(ElectricInductance other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current ElectricInductance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotential.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotential.g.cs
index 7aa0e72cfb..55aa4bf478 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotential.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotential.g.cs
@@ -110,6 +110,7 @@ private ElectricPotential(double value, ElectricPotentialUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotential;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricPotential(double value, ElectricPotentialUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricPotential.QuantityType;
 
         /// <summary>
@@ -510,7 +512,7 @@ public bool Equals(ElectricPotential other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current ElectricPotential.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialAc.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
index e9df870b18..4d091ac68e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
@@ -110,6 +110,7 @@ private ElectricPotentialAc(double value, ElectricPotentialAcUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialAc;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricPotentialAc(double value, ElectricPotentialAcUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricPotentialAc.QuantityType;
 
         /// <summary>
@@ -510,7 +512,7 @@ public bool Equals(ElectricPotentialAc other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current ElectricPotentialAc.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
index f01bc555f9..87cf3651a8 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
@@ -110,6 +110,7 @@ private ElectricPotentialChangeRate(double value, ElectricPotentialChangeRateUni
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialChangeRate;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricPotentialChangeRate(double value, ElectricPotentialChangeRateUni
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricPotentialChangeRate.QuantityType;
 
         /// <summary>
@@ -735,7 +737,7 @@ public bool Equals(ElectricPotentialChangeRate other, double tolerance, Comparis
         /// <returns>A hash code for the current ElectricPotentialChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialDc.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
index 9b7dacb193..6bfb3ccb8f 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
@@ -110,6 +110,7 @@ private ElectricPotentialDc(double value, ElectricPotentialDcUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialDc;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricPotentialDc(double value, ElectricPotentialDcUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricPotentialDc.QuantityType;
 
         /// <summary>
@@ -510,7 +512,7 @@ public bool Equals(ElectricPotentialDc other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current ElectricPotentialDc.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistance.g.cs
index 62c594e09e..e78a5b9fda 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistance.g.cs
@@ -110,6 +110,7 @@ private ElectricResistance(double value, ElectricResistanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricResistance;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ElectricResistance(double value, ElectricResistanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricResistance.QuantityType;
 
         /// <summary>
@@ -525,7 +527,7 @@ public bool Equals(ElectricResistance other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current ElectricResistance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistivity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistivity.g.cs
index c47de6271c..92d7edc144 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistivity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricResistivity.g.cs
@@ -113,6 +113,7 @@ private ElectricResistivity(double value, ElectricResistivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricResistivity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricResistivity(double value, ElectricResistivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricResistivity.QuantityType;
 
         /// <summary>
@@ -648,7 +650,7 @@ public bool Equals(ElectricResistivity other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current ElectricResistivity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
index f56800c357..091df26ea9 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
@@ -113,6 +113,7 @@ private ElectricSurfaceChargeDensity(double value, ElectricSurfaceChargeDensityU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricSurfaceChargeDensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ElectricSurfaceChargeDensity(double value, ElectricSurfaceChargeDensityU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ElectricSurfaceChargeDensity.QuantityType;
 
         /// <summary>
@@ -483,7 +485,7 @@ public bool Equals(ElectricSurfaceChargeDensity other, double tolerance, Compari
         /// <returns>A hash code for the current ElectricSurfaceChargeDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs
index c1bbd532f8..ba1328da08 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Energy.g.cs
@@ -110,6 +110,7 @@ private Energy(double value, EnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Energy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Energy(double value, EnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Energy.QuantityType;
 
         /// <summary>
@@ -975,7 +977,7 @@ public bool Equals(Energy other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Energy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Entropy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Entropy.g.cs
index 724b9a22d6..68b168e3c9 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Entropy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Entropy.g.cs
@@ -110,6 +110,7 @@ private Entropy(double value, EntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Entropy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Entropy(double value, EntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Entropy.QuantityType;
 
         /// <summary>
@@ -540,7 +542,7 @@ public bool Equals(Entropy other, double tolerance, ComparisonType comparisonTyp
         /// <returns>A hash code for the current Entropy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Force.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Force.g.cs
index dbc95e816f..204a9058f9 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Force.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Force.g.cs
@@ -110,6 +110,7 @@ private Force(double value, ForceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Force;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Force(double value, ForceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Force.QuantityType;
 
         /// <summary>
@@ -660,7 +662,7 @@ public bool Equals(Force other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Force.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForceChangeRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForceChangeRate.g.cs
index f6e0d5bd50..4fc5c100a0 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForceChangeRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForceChangeRate.g.cs
@@ -110,6 +110,7 @@ private ForceChangeRate(double value, ForceChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ForceChangeRate;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ForceChangeRate(double value, ForceChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ForceChangeRate.QuantityType;
 
         /// <summary>
@@ -660,7 +662,7 @@ public bool Equals(ForceChangeRate other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current ForceChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForcePerLength.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForcePerLength.g.cs
index 9ba947a00e..aab038dde8 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForcePerLength.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ForcePerLength.g.cs
@@ -110,6 +110,7 @@ private ForcePerLength(double value, ForcePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ForcePerLength;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ForcePerLength(double value, ForcePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ForcePerLength.QuantityType;
 
         /// <summary>
@@ -1005,7 +1007,7 @@ public bool Equals(ForcePerLength other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current ForcePerLength.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Frequency.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Frequency.g.cs
index a0f99c7cb5..5a25e5620c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Frequency.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Frequency.g.cs
@@ -110,6 +110,7 @@ private Frequency(double value, FrequencyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Frequency;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Frequency(double value, FrequencyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Frequency.QuantityType;
 
         /// <summary>
@@ -600,7 +602,7 @@ public bool Equals(Frequency other, double tolerance, ComparisonType comparisonT
         /// <returns>A hash code for the current Frequency.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/FuelEfficiency.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/FuelEfficiency.g.cs
index 1a17cc3fc7..80126fdf13 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/FuelEfficiency.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/FuelEfficiency.g.cs
@@ -113,6 +113,7 @@ private FuelEfficiency(double value, FuelEfficiencyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.FuelEfficiency;
 
         /// <summary>
@@ -147,6 +148,7 @@ private FuelEfficiency(double value, FuelEfficiencyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => FuelEfficiency.QuantityType;
 
         /// <summary>
@@ -498,7 +500,7 @@ public bool Equals(FuelEfficiency other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current FuelEfficiency.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatFlux.g.cs
index b0899f7903..98bd20151e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatFlux.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatFlux.g.cs
@@ -110,6 +110,7 @@ private HeatFlux(double value, HeatFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.HeatFlux;
 
         /// <summary>
@@ -144,6 +145,7 @@ private HeatFlux(double value, HeatFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => HeatFlux.QuantityType;
 
         /// <summary>
@@ -705,7 +707,7 @@ public bool Equals(HeatFlux other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current HeatFlux.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
index eb4cdc4691..6a61d7e687 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
@@ -110,6 +110,7 @@ private HeatTransferCoefficient(double value, HeatTransferCoefficientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.HeatTransferCoefficient;
 
         /// <summary>
@@ -144,6 +145,7 @@ private HeatTransferCoefficient(double value, HeatTransferCoefficientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => HeatTransferCoefficient.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(HeatTransferCoefficient other, double tolerance, ComparisonTy
         /// <returns>A hash code for the current HeatTransferCoefficient.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Illuminance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Illuminance.g.cs
index 543b303667..959824140f 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Illuminance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Illuminance.g.cs
@@ -113,6 +113,7 @@ private Illuminance(double value, IlluminanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Illuminance;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Illuminance(double value, IlluminanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Illuminance.QuantityType;
 
         /// <summary>
@@ -498,7 +500,7 @@ public bool Equals(Illuminance other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Illuminance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.g.cs
index 493d68e580..f8826f1290 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Information.g.cs
@@ -110,6 +110,7 @@ private Information(decimal value, InformationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Information;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Information(decimal value, InformationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Information.QuantityType;
 
         /// <summary>
@@ -825,7 +827,7 @@ public bool Equals(Information other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Information.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiance.g.cs
index c144fc7db5..1b539fc840 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiance.g.cs
@@ -110,6 +110,7 @@ private Irradiance(double value, IrradianceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Irradiance;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Irradiance(double value, IrradianceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Irradiance.QuantityType;
 
         /// <summary>
@@ -645,7 +647,7 @@ public bool Equals(Irradiance other, double tolerance, ComparisonType comparison
         /// <returns>A hash code for the current Irradiance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiation.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiation.g.cs
index cc5a256723..4f7dccf0b1 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiation.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Irradiation.g.cs
@@ -113,6 +113,7 @@ private Irradiation(double value, IrradiationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Irradiation;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Irradiation(double value, IrradiationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Irradiation.QuantityType;
 
         /// <summary>
@@ -543,7 +545,7 @@ public bool Equals(Irradiation other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Irradiation.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/KinematicViscosity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/KinematicViscosity.g.cs
index c8783a04c9..13d7fcfa1d 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/KinematicViscosity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/KinematicViscosity.g.cs
@@ -113,6 +113,7 @@ private KinematicViscosity(double value, KinematicViscosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.KinematicViscosity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private KinematicViscosity(double value, KinematicViscosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => KinematicViscosity.QuantityType;
 
         /// <summary>
@@ -573,7 +575,7 @@ public bool Equals(KinematicViscosity other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current KinematicViscosity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LapseRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LapseRate.g.cs
index cf49b9649f..9dcbda5522 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LapseRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LapseRate.g.cs
@@ -111,6 +111,7 @@ private LapseRate(double value, LapseRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LapseRate;
 
         /// <summary>
@@ -145,6 +146,7 @@ private LapseRate(double value, LapseRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => LapseRate.QuantityType;
 
         /// <summary>
@@ -451,7 +453,7 @@ public bool Equals(LapseRate other, double tolerance, ComparisonType comparisonT
         /// <returns>A hash code for the current LapseRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.g.cs
index f901c4999c..1102917948 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Length.g.cs
@@ -110,6 +110,7 @@ private Length(double value, LengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Length;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Length(double value, LengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Length.QuantityType;
 
         /// <summary>
@@ -930,7 +932,7 @@ public bool Equals(Length other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Length.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.g.cs
index 498a843642..37c39ad953 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Level.g.cs
@@ -110,6 +110,7 @@ private Level(double value, LevelUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Level;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Level(double value, LevelUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Level.QuantityType;
 
         /// <summary>
@@ -465,7 +467,7 @@ public bool Equals(Level other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Level.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearDensity.g.cs
index da30246f8b..71447472e7 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearDensity.g.cs
@@ -113,6 +113,7 @@ private LinearDensity(double value, LinearDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LinearDensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private LinearDensity(double value, LinearDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => LinearDensity.QuantityType;
 
         /// <summary>
@@ -648,7 +650,7 @@ public bool Equals(LinearDensity other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current LinearDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearPowerDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearPowerDensity.g.cs
index 3bfbb20af2..0f0ca739f7 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearPowerDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LinearPowerDensity.g.cs
@@ -113,6 +113,7 @@ private LinearPowerDensity(double value, LinearPowerDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LinearPowerDensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private LinearPowerDensity(double value, LinearPowerDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => LinearPowerDensity.QuantityType;
 
         /// <summary>
@@ -813,7 +815,7 @@ public bool Equals(LinearPowerDensity other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current LinearPowerDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Luminosity.g.cs
index 7ee56e2f39..68484d8b1a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Luminosity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Luminosity.g.cs
@@ -113,6 +113,7 @@ private Luminosity(double value, LuminosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Luminosity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Luminosity(double value, LuminosityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Luminosity.QuantityType;
 
         /// <summary>
@@ -648,7 +650,7 @@ public bool Equals(Luminosity other, double tolerance, ComparisonType comparison
         /// <returns>A hash code for the current Luminosity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousFlux.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousFlux.g.cs
index c197dc10fd..a3b500804a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousFlux.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousFlux.g.cs
@@ -113,6 +113,7 @@ private LuminousFlux(double value, LuminousFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LuminousFlux;
 
         /// <summary>
@@ -147,6 +148,7 @@ private LuminousFlux(double value, LuminousFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => LuminousFlux.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(LuminousFlux other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current LuminousFlux.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousIntensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousIntensity.g.cs
index 143e64a04a..0ac8f4b56a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousIntensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/LuminousIntensity.g.cs
@@ -113,6 +113,7 @@ private LuminousIntensity(double value, LuminousIntensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LuminousIntensity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private LuminousIntensity(double value, LuminousIntensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => LuminousIntensity.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(LuminousIntensity other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current LuminousIntensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticField.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticField.g.cs
index a7777d5c1a..d5011eda6c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticField.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticField.g.cs
@@ -113,6 +113,7 @@ private MagneticField(double value, MagneticFieldUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MagneticField;
 
         /// <summary>
@@ -147,6 +148,7 @@ private MagneticField(double value, MagneticFieldUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MagneticField.QuantityType;
 
         /// <summary>
@@ -528,7 +530,7 @@ public bool Equals(MagneticField other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current MagneticField.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticFlux.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticFlux.g.cs
index ebce2331a4..c4ea1de71a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticFlux.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MagneticFlux.g.cs
@@ -113,6 +113,7 @@ private MagneticFlux(double value, MagneticFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MagneticFlux;
 
         /// <summary>
@@ -147,6 +148,7 @@ private MagneticFlux(double value, MagneticFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MagneticFlux.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(MagneticFlux other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current MagneticFlux.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Magnetization.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Magnetization.g.cs
index b0b66874e3..60286b3c5e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Magnetization.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Magnetization.g.cs
@@ -113,6 +113,7 @@ private Magnetization(double value, MagnetizationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Magnetization;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Magnetization(double value, MagnetizationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Magnetization.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(Magnetization other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current Magnetization.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Mass.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Mass.g.cs
index 5e49ff77b0..fa86a2ae2f 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Mass.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Mass.g.cs
@@ -110,6 +110,7 @@ private Mass(double value, MassUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Mass;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Mass(double value, MassUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Mass.QuantityType;
 
         /// <summary>
@@ -810,7 +812,7 @@ public bool Equals(Mass other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Mass.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassConcentration.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassConcentration.g.cs
index 3dee8e60c8..016bb8ab13 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassConcentration.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassConcentration.g.cs
@@ -113,6 +113,7 @@ private MassConcentration(double value, MassConcentrationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassConcentration;
 
         /// <summary>
@@ -147,6 +148,7 @@ private MassConcentration(double value, MassConcentrationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MassConcentration.QuantityType;
 
         /// <summary>
@@ -1173,7 +1175,7 @@ public bool Equals(MassConcentration other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current MassConcentration.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlow.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlow.g.cs
index 690395d14f..8d24eab0b7 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlow.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlow.g.cs
@@ -110,6 +110,7 @@ private MassFlow(double value, MassFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFlow;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MassFlow(double value, MassFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MassFlow.QuantityType;
 
         /// <summary>
@@ -930,7 +932,7 @@ public bool Equals(MassFlow other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current MassFlow.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlux.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlux.g.cs
index 6c9c1c2519..6ec9900b17 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlux.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFlux.g.cs
@@ -110,6 +110,7 @@ private MassFlux(double value, MassFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFlux;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MassFlux(double value, MassFluxUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MassFlux.QuantityType;
 
         /// <summary>
@@ -615,7 +617,7 @@ public bool Equals(MassFlux other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current MassFlux.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFraction.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFraction.g.cs
index 45d38ca472..0f430ba797 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFraction.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassFraction.g.cs
@@ -113,6 +113,7 @@ private MassFraction(double value, MassFractionUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFraction;
 
         /// <summary>
@@ -147,6 +148,7 @@ private MassFraction(double value, MassFractionUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MassFraction.QuantityType;
 
         /// <summary>
@@ -798,7 +800,7 @@ public bool Equals(MassFraction other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current MassFraction.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassMomentOfInertia.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
index c0632713dc..666f93f42c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
@@ -110,6 +110,7 @@ private MassMomentOfInertia(double value, MassMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassMomentOfInertia;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MassMomentOfInertia(double value, MassMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MassMomentOfInertia.QuantityType;
 
         /// <summary>
@@ -855,7 +857,7 @@ public bool Equals(MassMomentOfInertia other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current MassMomentOfInertia.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEnergy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEnergy.g.cs
index f1bb8ab9b1..35458435a2 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEnergy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEnergy.g.cs
@@ -110,6 +110,7 @@ private MolarEnergy(double value, MolarEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarEnergy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MolarEnergy(double value, MolarEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MolarEnergy.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(MolarEnergy other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current MolarEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEntropy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEntropy.g.cs
index 055bcd576b..f603398b6e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEntropy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarEntropy.g.cs
@@ -110,6 +110,7 @@ private MolarEntropy(double value, MolarEntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarEntropy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MolarEntropy(double value, MolarEntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MolarEntropy.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(MolarEntropy other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current MolarEntropy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarMass.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarMass.g.cs
index e00565a7fd..6707296dfc 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarMass.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/MolarMass.g.cs
@@ -110,6 +110,7 @@ private MolarMass(double value, MolarMassUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarMass;
 
         /// <summary>
@@ -144,6 +145,7 @@ private MolarMass(double value, MolarMassUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => MolarMass.QuantityType;
 
         /// <summary>
@@ -615,7 +617,7 @@ public bool Equals(MolarMass other, double tolerance, ComparisonType comparisonT
         /// <returns>A hash code for the current MolarMass.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Molarity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Molarity.g.cs
index 008ec84178..cc42941db9 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Molarity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Molarity.g.cs
@@ -113,6 +113,7 @@ private Molarity(double value, MolarityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Molarity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Molarity(double value, MolarityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Molarity.QuantityType;
 
         /// <summary>
@@ -558,7 +560,7 @@ public bool Equals(Molarity other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current Molarity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permeability.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permeability.g.cs
index 398cf90dae..c396b61f45 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permeability.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permeability.g.cs
@@ -113,6 +113,7 @@ private Permeability(double value, PermeabilityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Permeability;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Permeability(double value, PermeabilityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Permeability.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(Permeability other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current Permeability.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permittivity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permittivity.g.cs
index 21a5a1eda3..837a585b87 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permittivity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Permittivity.g.cs
@@ -113,6 +113,7 @@ private Permittivity(double value, PermittivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Permittivity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Permittivity(double value, PermittivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Permittivity.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(Permittivity other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current Permittivity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Power.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Power.g.cs
index fb8c263383..5e31da8b9c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Power.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Power.g.cs
@@ -110,6 +110,7 @@ private Power(decimal value, PowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Power;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Power(decimal value, PowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Power.QuantityType;
 
         /// <summary>
@@ -810,7 +812,7 @@ public bool Equals(Power other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Power.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerDensity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerDensity.g.cs
index e374a600e1..43e52f7479 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerDensity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerDensity.g.cs
@@ -110,6 +110,7 @@ private PowerDensity(double value, PowerDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PowerDensity;
 
         /// <summary>
@@ -144,6 +145,7 @@ private PowerDensity(double value, PowerDensityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => PowerDensity.QuantityType;
 
         /// <summary>
@@ -1095,7 +1097,7 @@ public bool Equals(PowerDensity other, double tolerance, ComparisonType comparis
         /// <returns>A hash code for the current PowerDensity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerRatio.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerRatio.g.cs
index 56e646575b..60aa905e75 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerRatio.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PowerRatio.g.cs
@@ -110,6 +110,7 @@ private PowerRatio(double value, PowerRatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PowerRatio;
 
         /// <summary>
@@ -144,6 +145,7 @@ private PowerRatio(double value, PowerRatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => PowerRatio.QuantityType;
 
         /// <summary>
@@ -465,7 +467,7 @@ public bool Equals(PowerRatio other, double tolerance, ComparisonType comparison
         /// <returns>A hash code for the current PowerRatio.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Pressure.g.cs
index bc4bbeea0a..5818154d5b 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Pressure.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Pressure.g.cs
@@ -110,6 +110,7 @@ private Pressure(double value, PressureUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Pressure;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Pressure(double value, PressureUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Pressure.QuantityType;
 
         /// <summary>
@@ -1110,7 +1112,7 @@ public bool Equals(Pressure other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current Pressure.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PressureChangeRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PressureChangeRate.g.cs
index 7a06c5139f..f6b5661741 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PressureChangeRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/PressureChangeRate.g.cs
@@ -110,6 +110,7 @@ private PressureChangeRate(double value, PressureChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PressureChangeRate;
 
         /// <summary>
@@ -144,6 +145,7 @@ private PressureChangeRate(double value, PressureChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => PressureChangeRate.QuantityType;
 
         /// <summary>
@@ -645,7 +647,7 @@ public bool Equals(PressureChangeRate other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current PressureChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Ratio.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Ratio.g.cs
index bcfd882a71..67ae6a267b 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Ratio.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Ratio.g.cs
@@ -110,6 +110,7 @@ private Ratio(double value, RatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Ratio;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Ratio(double value, RatioUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Ratio.QuantityType;
 
         /// <summary>
@@ -525,7 +527,7 @@ public bool Equals(Ratio other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Ratio.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RatioChangeRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RatioChangeRate.g.cs
index f81a5299e9..1b9ef3a9fa 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RatioChangeRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RatioChangeRate.g.cs
@@ -110,6 +110,7 @@ private RatioChangeRate(double value, RatioChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RatioChangeRate;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RatioChangeRate(double value, RatioChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RatioChangeRate.QuantityType;
 
         /// <summary>
@@ -465,7 +467,7 @@ public bool Equals(RatioChangeRate other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current RatioChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactiveEnergy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactiveEnergy.g.cs
index 851d24d687..cf5d7228a6 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactiveEnergy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactiveEnergy.g.cs
@@ -110,6 +110,7 @@ private ReactiveEnergy(double value, ReactiveEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReactiveEnergy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ReactiveEnergy(double value, ReactiveEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ReactiveEnergy.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(ReactiveEnergy other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current ReactiveEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactivePower.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactivePower.g.cs
index 47e1add8ac..3539899831 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactivePower.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReactivePower.g.cs
@@ -110,6 +110,7 @@ private ReactivePower(double value, ReactivePowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReactivePower;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ReactivePower(double value, ReactivePowerUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ReactivePower.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(ReactivePower other, double tolerance, ComparisonType compari
         /// <returns>A hash code for the current ReactivePower.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalArea.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalArea.g.cs
index ff9fa40dce..09ad6fa501 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalArea.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalArea.g.cs
@@ -113,6 +113,7 @@ private ReciprocalArea(double value, ReciprocalAreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReciprocalArea;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ReciprocalArea(double value, ReciprocalAreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ReciprocalArea.QuantityType;
 
         /// <summary>
@@ -603,7 +605,7 @@ public bool Equals(ReciprocalArea other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current ReciprocalArea.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalLength.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalLength.g.cs
index 8a0d4d8d1d..30a64fb2ac 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalLength.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ReciprocalLength.g.cs
@@ -113,6 +113,7 @@ private ReciprocalLength(double value, ReciprocalLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReciprocalLength;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ReciprocalLength(double value, ReciprocalLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ReciprocalLength.QuantityType;
 
         /// <summary>
@@ -588,7 +590,7 @@ public bool Equals(ReciprocalLength other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current ReciprocalLength.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RelativeHumidity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RelativeHumidity.g.cs
index 4eab60e0a5..3fed1eab0d 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RelativeHumidity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RelativeHumidity.g.cs
@@ -110,6 +110,7 @@ private RelativeHumidity(double value, RelativeHumidityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RelativeHumidity;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RelativeHumidity(double value, RelativeHumidityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RelativeHumidity.QuantityType;
 
         /// <summary>
@@ -450,7 +452,7 @@ public bool Equals(RelativeHumidity other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current RelativeHumidity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalAcceleration.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalAcceleration.g.cs
index 5a0de083e2..fca85a060a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalAcceleration.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalAcceleration.g.cs
@@ -110,6 +110,7 @@ private RotationalAcceleration(double value, RotationalAccelerationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalAcceleration;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RotationalAcceleration(double value, RotationalAccelerationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RotationalAcceleration.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(RotationalAcceleration other, double tolerance, ComparisonTyp
         /// <returns>A hash code for the current RotationalAcceleration.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalSpeed.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalSpeed.g.cs
index 99b6922094..81dcd594d1 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalSpeed.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalSpeed.g.cs
@@ -110,6 +110,7 @@ private RotationalSpeed(double value, RotationalSpeedUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalSpeed;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RotationalSpeed(double value, RotationalSpeedUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RotationalSpeed.QuantityType;
 
         /// <summary>
@@ -630,7 +632,7 @@ public bool Equals(RotationalSpeed other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current RotationalSpeed.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffness.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffness.g.cs
index b7879af272..60416bca89 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffness.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffness.g.cs
@@ -110,6 +110,7 @@ private RotationalStiffness(double value, RotationalStiffnessUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffness;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RotationalStiffness(double value, RotationalStiffnessUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RotationalStiffness.QuantityType;
 
         /// <summary>
@@ -930,7 +932,7 @@ public bool Equals(RotationalStiffness other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current RotationalStiffness.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
index cec23a5888..6335f74665 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
@@ -110,6 +110,7 @@ private RotationalStiffnessPerLength(double value, RotationalStiffnessPerLengthU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffnessPerLength;
 
         /// <summary>
@@ -144,6 +145,7 @@ private RotationalStiffnessPerLength(double value, RotationalStiffnessPerLengthU
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => RotationalStiffnessPerLength.QuantityType;
 
         /// <summary>
@@ -510,7 +512,7 @@ public bool Equals(RotationalStiffnessPerLength other, double tolerance, Compari
         /// <returns>A hash code for the current RotationalStiffnessPerLength.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Scalar.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Scalar.g.cs
index 39d68ea3b5..7922956357 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Scalar.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Scalar.g.cs
@@ -110,6 +110,7 @@ private Scalar(double value, ScalarUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Scalar;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Scalar(double value, ScalarUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Scalar.QuantityType;
 
         /// <summary>
@@ -450,7 +452,7 @@ public bool Equals(Scalar other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Scalar.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SolidAngle.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SolidAngle.g.cs
index b7163491e9..5e98f42d3e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SolidAngle.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SolidAngle.g.cs
@@ -113,6 +113,7 @@ private SolidAngle(double value, SolidAngleUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SolidAngle;
 
         /// <summary>
@@ -147,6 +148,7 @@ private SolidAngle(double value, SolidAngleUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SolidAngle.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(SolidAngle other, double tolerance, ComparisonType comparison
         /// <returns>A hash code for the current SolidAngle.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEnergy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEnergy.g.cs
index 87c65ba238..391033fd59 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEnergy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEnergy.g.cs
@@ -113,6 +113,7 @@ private SpecificEnergy(double value, SpecificEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificEnergy;
 
         /// <summary>
@@ -147,6 +148,7 @@ private SpecificEnergy(double value, SpecificEnergyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SpecificEnergy.QuantityType;
 
         /// <summary>
@@ -813,7 +815,7 @@ public bool Equals(SpecificEnergy other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current SpecificEnergy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEntropy.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEntropy.g.cs
index a24c093d9e..3bd5e2557c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEntropy.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificEntropy.g.cs
@@ -110,6 +110,7 @@ private SpecificEntropy(double value, SpecificEntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificEntropy;
 
         /// <summary>
@@ -144,6 +145,7 @@ private SpecificEntropy(double value, SpecificEntropyUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SpecificEntropy.QuantityType;
 
         /// <summary>
@@ -570,7 +572,7 @@ public bool Equals(SpecificEntropy other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current SpecificEntropy.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
index 26129abb06..936059eda6 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
@@ -113,6 +113,7 @@ private SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificFuelConsumption;
 
         /// <summary>
@@ -147,6 +148,7 @@ private SpecificFuelConsumption(double value, SpecificFuelConsumptionUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SpecificFuelConsumption.QuantityType;
 
         /// <summary>
@@ -498,7 +500,7 @@ public bool Equals(SpecificFuelConsumption other, double tolerance, ComparisonTy
         /// <returns>A hash code for the current SpecificFuelConsumption.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificVolume.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificVolume.g.cs
index b0fbec3944..b7f0440a44 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificVolume.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificVolume.g.cs
@@ -110,6 +110,7 @@ private SpecificVolume(double value, SpecificVolumeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificVolume;
 
         /// <summary>
@@ -144,6 +145,7 @@ private SpecificVolume(double value, SpecificVolumeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SpecificVolume.QuantityType;
 
         /// <summary>
@@ -480,7 +482,7 @@ public bool Equals(SpecificVolume other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current SpecificVolume.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificWeight.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificWeight.g.cs
index 129be9de76..4ec25f4b8a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificWeight.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/SpecificWeight.g.cs
@@ -113,6 +113,7 @@ private SpecificWeight(double value, SpecificWeightUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificWeight;
 
         /// <summary>
@@ -147,6 +148,7 @@ private SpecificWeight(double value, SpecificWeightUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => SpecificWeight.QuantityType;
 
         /// <summary>
@@ -693,7 +695,7 @@ public bool Equals(SpecificWeight other, double tolerance, ComparisonType compar
         /// <returns>A hash code for the current SpecificWeight.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Speed.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Speed.g.cs
index 563c5ac20c..843178da8d 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Speed.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Speed.g.cs
@@ -110,6 +110,7 @@ private Speed(double value, SpeedUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Speed;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Speed(double value, SpeedUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Speed.QuantityType;
 
         /// <summary>
@@ -915,7 +917,7 @@ public bool Equals(Speed other, double tolerance, ComparisonType comparisonType)
         /// <returns>A hash code for the current Speed.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/StandardVolumeFlow.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
index 38b7664b58..bb82514f8a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
@@ -110,6 +110,7 @@ private StandardVolumeFlow(double value, StandardVolumeFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.StandardVolumeFlow;
 
         /// <summary>
@@ -144,6 +145,7 @@ private StandardVolumeFlow(double value, StandardVolumeFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => StandardVolumeFlow.QuantityType;
 
         /// <summary>
@@ -570,7 +572,7 @@ public bool Equals(StandardVolumeFlow other, double tolerance, ComparisonType co
         /// <returns>A hash code for the current StandardVolumeFlow.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Temperature.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Temperature.g.cs
index 7060f1fdd0..c27836ab8e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Temperature.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Temperature.g.cs
@@ -110,6 +110,7 @@ private Temperature(double value, TemperatureUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Temperature;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Temperature(double value, TemperatureUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Temperature.QuantityType;
 
         /// <summary>
@@ -585,7 +587,7 @@ public bool Equals(Temperature other, double tolerance, ComparisonType compariso
         /// <returns>A hash code for the current Temperature.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureChangeRate.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
index 8cf1566aa2..45d87d636f 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
@@ -110,6 +110,7 @@ private TemperatureChangeRate(double value, TemperatureChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureChangeRate;
 
         /// <summary>
@@ -144,6 +145,7 @@ private TemperatureChangeRate(double value, TemperatureChangeRateUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => TemperatureChangeRate.QuantityType;
 
         /// <summary>
@@ -585,7 +587,7 @@ public bool Equals(TemperatureChangeRate other, double tolerance, ComparisonType
         /// <returns>A hash code for the current TemperatureChangeRate.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureDelta.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureDelta.g.cs
index 90c7179d75..bfb5563d7f 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureDelta.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureDelta.g.cs
@@ -110,6 +110,7 @@ private TemperatureDelta(double value, TemperatureDeltaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureDelta;
 
         /// <summary>
@@ -144,6 +145,7 @@ private TemperatureDelta(double value, TemperatureDeltaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => TemperatureDelta.QuantityType;
 
         /// <summary>
@@ -570,7 +572,7 @@ public bool Equals(TemperatureDelta other, double tolerance, ComparisonType comp
         /// <returns>A hash code for the current TemperatureDelta.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureGradient.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureGradient.g.cs
index 00c2b50ddc..9c17567458 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureGradient.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TemperatureGradient.g.cs
@@ -110,6 +110,7 @@ private TemperatureGradient(double value, TemperatureGradientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureGradient;
 
         /// <summary>
@@ -144,6 +145,7 @@ private TemperatureGradient(double value, TemperatureGradientUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => TemperatureGradient.QuantityType;
 
         /// <summary>
@@ -495,7 +497,7 @@ public bool Equals(TemperatureGradient other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current TemperatureGradient.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalConductivity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalConductivity.g.cs
index d1dca98373..b874a5d25a 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalConductivity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalConductivity.g.cs
@@ -113,6 +113,7 @@ private ThermalConductivity(double value, ThermalConductivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ThermalConductivity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private ThermalConductivity(double value, ThermalConductivityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ThermalConductivity.QuantityType;
 
         /// <summary>
@@ -468,7 +470,7 @@ public bool Equals(ThermalConductivity other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current ThermalConductivity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalResistance.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalResistance.g.cs
index 249f4ad104..94cfe1d0c4 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalResistance.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/ThermalResistance.g.cs
@@ -110,6 +110,7 @@ private ThermalResistance(double value, ThermalResistanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ThermalResistance;
 
         /// <summary>
@@ -144,6 +145,7 @@ private ThermalResistance(double value, ThermalResistanceUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => ThermalResistance.QuantityType;
 
         /// <summary>
@@ -525,7 +527,7 @@ public bool Equals(ThermalResistance other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current ThermalResistance.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Torque.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Torque.g.cs
index 91f2fc3a98..4aa7f2f088 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Torque.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Torque.g.cs
@@ -110,6 +110,7 @@ private Torque(double value, TorqueUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Torque;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Torque(double value, TorqueUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Torque.QuantityType;
 
         /// <summary>
@@ -810,7 +812,7 @@ public bool Equals(Torque other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Torque.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TorquePerLength.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TorquePerLength.g.cs
index 66e8eb26b3..ee11ec0f6e 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TorquePerLength.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/TorquePerLength.g.cs
@@ -110,6 +110,7 @@ private TorquePerLength(double value, TorquePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TorquePerLength;
 
         /// <summary>
@@ -144,6 +145,7 @@ private TorquePerLength(double value, TorquePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => TorquePerLength.QuantityType;
 
         /// <summary>
@@ -750,7 +752,7 @@ public bool Equals(TorquePerLength other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current TorquePerLength.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Turbidity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Turbidity.g.cs
index 7ce077db8c..5e6bb5b668 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Turbidity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Turbidity.g.cs
@@ -113,6 +113,7 @@ private Turbidity(double value, TurbidityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Turbidity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private Turbidity(double value, TurbidityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Turbidity.QuantityType;
 
         /// <summary>
@@ -453,7 +455,7 @@ public bool Equals(Turbidity other, double tolerance, ComparisonType comparisonT
         /// <returns>A hash code for the current Turbidity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VitaminA.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VitaminA.g.cs
index 08118cc8ff..6fdf4481b4 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VitaminA.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VitaminA.g.cs
@@ -110,6 +110,7 @@ private VitaminA(double value, VitaminAUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VitaminA;
 
         /// <summary>
@@ -144,6 +145,7 @@ private VitaminA(double value, VitaminAUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VitaminA.QuantityType;
 
         /// <summary>
@@ -450,7 +452,7 @@ public bool Equals(VitaminA other, double tolerance, ComparisonType comparisonTy
         /// <returns>A hash code for the current VitaminA.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Volume.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Volume.g.cs
index f81ce7cd6f..fc73bec294 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Volume.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/Volume.g.cs
@@ -110,6 +110,7 @@ private Volume(double value, VolumeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Volume;
 
         /// <summary>
@@ -144,6 +145,7 @@ private Volume(double value, VolumeUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => Volume.QuantityType;
 
         /// <summary>
@@ -1200,7 +1202,7 @@ public bool Equals(Volume other, double tolerance, ComparisonType comparisonType
         /// <returns>A hash code for the current Volume.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeConcentration.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeConcentration.g.cs
index de9d7c8e36..21894872b1 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeConcentration.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeConcentration.g.cs
@@ -113,6 +113,7 @@ private VolumeConcentration(double value, VolumeConcentrationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeConcentration;
 
         /// <summary>
@@ -147,6 +148,7 @@ private VolumeConcentration(double value, VolumeConcentrationUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VolumeConcentration.QuantityType;
 
         /// <summary>
@@ -738,7 +740,7 @@ public bool Equals(VolumeConcentration other, double tolerance, ComparisonType c
         /// <returns>A hash code for the current VolumeConcentration.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlow.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlow.g.cs
index c80d0f8f1f..5937363259 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlow.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlow.g.cs
@@ -110,6 +110,7 @@ private VolumeFlow(double value, VolumeFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeFlow;
 
         /// <summary>
@@ -144,6 +145,7 @@ private VolumeFlow(double value, VolumeFlowUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VolumeFlow.QuantityType;
 
         /// <summary>
@@ -1365,7 +1367,7 @@ public bool Equals(VolumeFlow other, double tolerance, ComparisonType comparison
         /// <returns>A hash code for the current VolumeFlow.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
index 040f11a161..8f158a1c1c 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
@@ -110,6 +110,7 @@ private VolumeFlowPerArea(double value, VolumeFlowPerAreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeFlowPerArea;
 
         /// <summary>
@@ -144,6 +145,7 @@ private VolumeFlowPerArea(double value, VolumeFlowPerAreaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VolumeFlowPerArea.QuantityType;
 
         /// <summary>
@@ -465,7 +467,7 @@ public bool Equals(VolumeFlowPerArea other, double tolerance, ComparisonType com
         /// <returns>A hash code for the current VolumeFlowPerArea.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumePerLength.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumePerLength.g.cs
index 81ab899959..2ba154e219 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumePerLength.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumePerLength.g.cs
@@ -110,6 +110,7 @@ private VolumePerLength(double value, VolumePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumePerLength;
 
         /// <summary>
@@ -144,6 +145,7 @@ private VolumePerLength(double value, VolumePerLengthUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VolumePerLength.QuantityType;
 
         /// <summary>
@@ -540,7 +542,7 @@ public bool Equals(VolumePerLength other, double tolerance, ComparisonType compa
         /// <returns>A hash code for the current VolumePerLength.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
index a836761c8a..1d9cb42105 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
@@ -113,6 +113,7 @@ private VolumetricHeatCapacity(double value, VolumetricHeatCapacityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumetricHeatCapacity;
 
         /// <summary>
@@ -147,6 +148,7 @@ private VolumetricHeatCapacity(double value, VolumetricHeatCapacityUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => VolumetricHeatCapacity.QuantityType;
 
         /// <summary>
@@ -573,7 +575,7 @@ public bool Equals(VolumetricHeatCapacity other, double tolerance, ComparisonTyp
         /// <returns>A hash code for the current VolumetricHeatCapacity.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
index 74bc407b4d..414a897345 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
@@ -110,6 +110,7 @@ private WarpingMomentOfInertia(double value, WarpingMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.WarpingMomentOfInertia;
 
         /// <summary>
@@ -144,6 +145,7 @@ private WarpingMomentOfInertia(double value, WarpingMomentOfInertiaUnit unit)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public QuantityType Type => WarpingMomentOfInertia.QuantityType;
 
         /// <summary>
@@ -525,7 +527,7 @@ public bool Equals(WarpingMomentOfInertia other, double tolerance, ComparisonTyp
         /// <returns>A hash code for the current WarpingMomentOfInertia.</returns>
         public override int GetHashCode()
         {
-            return new { QuantityType, Value, Unit }.GetHashCode();
+            return new { Info.Name, Value, Unit }.GetHashCode();
         }
 
         #endregion
diff --git a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/QuantityType.g.cs b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/QuantityType.g.cs
index f59d4eb444..0da8ff7922 100644
--- a/UnitsNet.WindowsRuntimeComponent/GeneratedCode/QuantityType.g.cs
+++ b/UnitsNet.WindowsRuntimeComponent/GeneratedCode/QuantityType.g.cs
@@ -18,6 +18,9 @@
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
 // ReSharper disable once CheckNamespace
+
+using System;
+
 namespace UnitsNet
 {
     /// <summary>
@@ -26,6 +29,7 @@ namespace UnitsNet
     ///     This is useful for populating options in the UI, such as creating a generic conversion
     ///     tool with inputValue, quantityName, fromUnit and toUnit selectors.
     /// </summary>
+    [Obsolete("QuantityType will be removed in the future. Use the QuantityInfo class instead.")]
     public enum QuantityType
     {
         Undefined = 0,
diff --git a/UnitsNet.WindowsRuntimeComponent/IQuantity.cs b/UnitsNet.WindowsRuntimeComponent/IQuantity.cs
index 34286b6c49..51326eed47 100644
--- a/UnitsNet.WindowsRuntimeComponent/IQuantity.cs
+++ b/UnitsNet.WindowsRuntimeComponent/IQuantity.cs
@@ -15,6 +15,7 @@ public interface IQuantity
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         QuantityType Type { get; }
 
         /// <summary>
diff --git a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
index 129787880a..cc93a0d920 100644
--- a/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Acceleration.g.cs
@@ -138,7 +138,7 @@ public Acceleration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Acceleration;
 
         /// <summary>
@@ -174,7 +174,8 @@ public Acceleration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Acceleration.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Acceleration;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
index a4c975d355..b4d0984d35 100644
--- a/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AmountOfSubstance.g.cs
@@ -139,7 +139,7 @@ public AmountOfSubstance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AmountOfSubstance;
 
         /// <summary>
@@ -175,7 +175,8 @@ public AmountOfSubstance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => AmountOfSubstance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.AmountOfSubstance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
index f4478bfd0d..fcb27efe30 100644
--- a/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AmplitudeRatio.g.cs
@@ -128,7 +128,7 @@ public AmplitudeRatio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AmplitudeRatio;
 
         /// <summary>
@@ -164,7 +164,8 @@ public AmplitudeRatio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => AmplitudeRatio.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.AmplitudeRatio;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
index 7025d49b06..6c209d73ad 100644
--- a/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Angle.g.cs
@@ -140,7 +140,7 @@ public Angle(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Angle;
 
         /// <summary>
@@ -176,7 +176,8 @@ public Angle(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Angle.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Angle;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs
index 5c8f074761..80aef1e282 100644
--- a/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ApparentEnergy.g.cs
@@ -127,7 +127,7 @@ public ApparentEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ApparentEnergy;
 
         /// <summary>
@@ -163,7 +163,8 @@ public ApparentEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ApparentEnergy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ApparentEnergy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs b/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs
index 69009aed33..1fc40a404f 100644
--- a/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ApparentPower.g.cs
@@ -128,7 +128,7 @@ public ApparentPower(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ApparentPower;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ApparentPower(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ApparentPower.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ApparentPower;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Area.g.cs b/UnitsNet/GeneratedCode/Quantities/Area.g.cs
index 0e03c9a519..aa37a081f0 100644
--- a/UnitsNet/GeneratedCode/Quantities/Area.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Area.g.cs
@@ -138,7 +138,7 @@ public Area(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Area;
 
         /// <summary>
@@ -174,7 +174,8 @@ public Area(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Area.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Area;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
index e52b05bf88..293b45d731 100644
--- a/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AreaDensity.g.cs
@@ -125,7 +125,7 @@ public AreaDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AreaDensity;
 
         /// <summary>
@@ -161,7 +161,8 @@ public AreaDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => AreaDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.AreaDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
index 35752e8a18..3a8c025943 100644
--- a/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/AreaMomentOfInertia.g.cs
@@ -130,7 +130,7 @@ public AreaMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.AreaMomentOfInertia;
 
         /// <summary>
@@ -166,7 +166,8 @@ public AreaMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => AreaMomentOfInertia.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.AreaMomentOfInertia;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
index 8215bf3120..2a02c6949e 100644
--- a/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/BitRate.g.cs
@@ -153,7 +153,7 @@ public BitRate(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.BitRate;
 
         /// <summary>
@@ -194,7 +194,8 @@ public BitRate(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => BitRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.BitRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
index 1db65ccd26..6ad6ac491e 100644
--- a/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/BrakeSpecificFuelConsumption.g.cs
@@ -127,7 +127,7 @@ public BrakeSpecificFuelConsumption(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.BrakeSpecificFuelConsumption;
 
         /// <summary>
@@ -163,7 +163,8 @@ public BrakeSpecificFuelConsumption(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => BrakeSpecificFuelConsumption.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.BrakeSpecificFuelConsumption;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs b/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs
index cc2bf58663..d57502aad3 100644
--- a/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Capacitance.g.cs
@@ -134,7 +134,7 @@ public Capacitance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Capacitance;
 
         /// <summary>
@@ -170,7 +170,8 @@ public Capacitance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Capacitance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Capacitance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
index cae873cd13..8e8890f6b0 100644
--- a/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/CoefficientOfThermalExpansion.g.cs
@@ -127,7 +127,7 @@ public CoefficientOfThermalExpansion(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.CoefficientOfThermalExpansion;
 
         /// <summary>
@@ -163,7 +163,8 @@ public CoefficientOfThermalExpansion(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => CoefficientOfThermalExpansion.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.CoefficientOfThermalExpansion;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Density.g.cs b/UnitsNet/GeneratedCode/Quantities/Density.g.cs
index 11b60bd3d2..78a1bab7e7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Density.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Density.g.cs
@@ -167,7 +167,7 @@ public Density(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Density;
 
         /// <summary>
@@ -203,7 +203,8 @@ public Density(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Density.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Density;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
index 6ce341eccb..173ca1685b 100644
--- a/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Duration.g.cs
@@ -135,7 +135,7 @@ public Duration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Duration;
 
         /// <summary>
@@ -171,7 +171,8 @@ public Duration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Duration.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Duration;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
index 54c0078e3b..b8200bb9c3 100644
--- a/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/DynamicViscosity.g.cs
@@ -137,7 +137,7 @@ public DynamicViscosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.DynamicViscosity;
 
         /// <summary>
@@ -173,7 +173,8 @@ public DynamicViscosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => DynamicViscosity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.DynamicViscosity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
index 24a5702c8c..ff3b3c22e6 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricAdmittance.g.cs
@@ -128,7 +128,7 @@ public ElectricAdmittance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricAdmittance;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ElectricAdmittance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricAdmittance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricAdmittance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
index ab9d21afbb..08b7ccfd24 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCharge.g.cs
@@ -132,7 +132,7 @@ public ElectricCharge(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCharge;
 
         /// <summary>
@@ -168,7 +168,8 @@ public ElectricCharge(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricCharge.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricCharge;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
index 5be23b40c2..702bc97a30 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricChargeDensity.g.cs
@@ -128,7 +128,7 @@ public ElectricChargeDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricChargeDensity;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ElectricChargeDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricChargeDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricChargeDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
index 2e3908e2bb..3015ee9d88 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductance.g.cs
@@ -130,7 +130,7 @@ public ElectricConductance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricConductance;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ElectricConductance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricConductance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricConductance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
index 510d8cf461..5e2aa85718 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricConductivity.g.cs
@@ -130,7 +130,7 @@ public ElectricConductivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricConductivity;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ElectricConductivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricConductivity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricConductivity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
index b799cadf1d..89b779aeea 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrent.g.cs
@@ -132,7 +132,7 @@ public ElectricCurrent(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrent;
 
         /// <summary>
@@ -168,7 +168,8 @@ public ElectricCurrent(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricCurrent.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricCurrent;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
index 04728cb1e4..1a10575979 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentDensity.g.cs
@@ -130,7 +130,7 @@ public ElectricCurrentDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentDensity;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ElectricCurrentDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricCurrentDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricCurrentDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
index 4fec12a674..568f6267ee 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricCurrentGradient.g.cs
@@ -128,7 +128,7 @@ public ElectricCurrentGradient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricCurrentGradient;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ElectricCurrentGradient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricCurrentGradient.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricCurrentGradient;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
index 8f1dc443e9..1c3d3920b1 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricField.g.cs
@@ -128,7 +128,7 @@ public ElectricField(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricField;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ElectricField(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricField.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricField;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
index c033bd06d4..37aa5512f2 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricInductance.g.cs
@@ -131,7 +131,7 @@ public ElectricInductance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricInductance;
 
         /// <summary>
@@ -167,7 +167,8 @@ public ElectricInductance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricInductance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricInductance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
index 3afcdacee7..e5b2f0f314 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotential.g.cs
@@ -129,7 +129,7 @@ public ElectricPotential(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotential;
 
         /// <summary>
@@ -165,7 +165,8 @@ public ElectricPotential(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricPotential.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricPotential;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
index 312b9f4968..c81afcfd37 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialAc.g.cs
@@ -129,7 +129,7 @@ public ElectricPotentialAc(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialAc;
 
         /// <summary>
@@ -165,7 +165,8 @@ public ElectricPotentialAc(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricPotentialAc.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricPotentialAc;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
index 703973f8d7..1bd52ca314 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialChangeRate.g.cs
@@ -144,7 +144,7 @@ public ElectricPotentialChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialChangeRate;
 
         /// <summary>
@@ -180,7 +180,8 @@ public ElectricPotentialChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricPotentialChangeRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricPotentialChangeRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
index f46630a1ec..1f4c01bbb6 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricPotentialDc.g.cs
@@ -129,7 +129,7 @@ public ElectricPotentialDc(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricPotentialDc;
 
         /// <summary>
@@ -165,7 +165,8 @@ public ElectricPotentialDc(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricPotentialDc.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricPotentialDc;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
index 07f4137d6a..efa02f04ae 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistance.g.cs
@@ -130,7 +130,7 @@ public ElectricResistance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricResistance;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ElectricResistance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricResistance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricResistance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
index bb3c7e0ea5..4a7874197b 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricResistivity.g.cs
@@ -141,7 +141,7 @@ public ElectricResistivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricResistivity;
 
         /// <summary>
@@ -177,7 +177,8 @@ public ElectricResistivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricResistivity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricResistivity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
index 418979c96b..e2de9d6793 100644
--- a/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ElectricSurfaceChargeDensity.g.cs
@@ -130,7 +130,7 @@ public ElectricSurfaceChargeDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ElectricSurfaceChargeDensity;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ElectricSurfaceChargeDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ElectricSurfaceChargeDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ElectricSurfaceChargeDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
index b19927be1e..56f6411967 100644
--- a/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Energy.g.cs
@@ -160,7 +160,7 @@ public Energy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Energy;
 
         /// <summary>
@@ -196,7 +196,8 @@ public Energy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Energy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Energy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
index f1a32e356d..22d2695d4c 100644
--- a/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Entropy.g.cs
@@ -131,7 +131,7 @@ public Entropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Entropy;
 
         /// <summary>
@@ -167,7 +167,8 @@ public Entropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Entropy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Entropy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Force.g.cs b/UnitsNet/GeneratedCode/Quantities/Force.g.cs
index 54d04e2e3c..f943a8fcc2 100644
--- a/UnitsNet/GeneratedCode/Quantities/Force.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Force.g.cs
@@ -139,7 +139,7 @@ public Force(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Force;
 
         /// <summary>
@@ -175,7 +175,8 @@ public Force(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Force.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Force;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
index 86d4c8bbc4..069bf7b09c 100644
--- a/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ForceChangeRate.g.cs
@@ -139,7 +139,7 @@ public ForceChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ForceChangeRate;
 
         /// <summary>
@@ -175,7 +175,8 @@ public ForceChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ForceChangeRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ForceChangeRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
index 8160031d62..693725b6db 100644
--- a/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ForcePerLength.g.cs
@@ -162,7 +162,7 @@ public ForcePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ForcePerLength;
 
         /// <summary>
@@ -198,7 +198,8 @@ public ForcePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ForcePerLength.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ForcePerLength;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
index b82b7682f2..0e738bcf80 100644
--- a/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Frequency.g.cs
@@ -135,7 +135,7 @@ public Frequency(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Frequency;
 
         /// <summary>
@@ -171,7 +171,8 @@ public Frequency(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Frequency.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Frequency;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
index f00c7c8f37..7e51669461 100644
--- a/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/FuelEfficiency.g.cs
@@ -131,7 +131,7 @@ public FuelEfficiency(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.FuelEfficiency;
 
         /// <summary>
@@ -167,7 +167,8 @@ public FuelEfficiency(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => FuelEfficiency.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.FuelEfficiency;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
index 2139a34317..059a013734 100644
--- a/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/HeatFlux.g.cs
@@ -142,7 +142,7 @@ public HeatFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.HeatFlux;
 
         /// <summary>
@@ -178,7 +178,8 @@ public HeatFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => HeatFlux.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.HeatFlux;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
index a16bc127cb..30101ab889 100644
--- a/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/HeatTransferCoefficient.g.cs
@@ -127,7 +127,7 @@ public HeatTransferCoefficient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.HeatTransferCoefficient;
 
         /// <summary>
@@ -163,7 +163,8 @@ public HeatTransferCoefficient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => HeatTransferCoefficient.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.HeatTransferCoefficient;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
index c3b01e15e0..1fe25f7d2e 100644
--- a/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Illuminance.g.cs
@@ -131,7 +131,7 @@ public Illuminance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Illuminance;
 
         /// <summary>
@@ -167,7 +167,8 @@ public Illuminance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Illuminance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Illuminance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Information.g.cs b/UnitsNet/GeneratedCode/Quantities/Information.g.cs
index cf438f74c5..52806a6e9d 100644
--- a/UnitsNet/GeneratedCode/Quantities/Information.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Information.g.cs
@@ -150,7 +150,7 @@ public Information(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Information;
 
         /// <summary>
@@ -191,7 +191,8 @@ public Information(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Information.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Information;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
index ef2e4fae9a..3d68d8baa9 100644
--- a/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Irradiance.g.cs
@@ -138,7 +138,7 @@ public Irradiance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Irradiance;
 
         /// <summary>
@@ -174,7 +174,8 @@ public Irradiance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Irradiance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Irradiance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
index a7a5eb6ad7..5623ccc289 100644
--- a/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Irradiation.g.cs
@@ -134,7 +134,7 @@ public Irradiation(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Irradiation;
 
         /// <summary>
@@ -170,7 +170,8 @@ public Irradiation(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Irradiation.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Irradiation;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
index e49c80cf31..49608faf3c 100644
--- a/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/KinematicViscosity.g.cs
@@ -136,7 +136,7 @@ public KinematicViscosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.KinematicViscosity;
 
         /// <summary>
@@ -172,7 +172,8 @@ public KinematicViscosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => KinematicViscosity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.KinematicViscosity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs b/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs
index 259f53fa1e..44227ffadb 100644
--- a/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LapseRate.g.cs
@@ -126,7 +126,7 @@ public LapseRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LapseRate;
 
         /// <summary>
@@ -162,7 +162,8 @@ public LapseRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => LapseRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.LapseRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Length.g.cs b/UnitsNet/GeneratedCode/Quantities/Length.g.cs
index 1f624cab7c..901639ab30 100644
--- a/UnitsNet/GeneratedCode/Quantities/Length.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Length.g.cs
@@ -157,7 +157,7 @@ public Length(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Length;
 
         /// <summary>
@@ -193,7 +193,8 @@ public Length(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Length.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Length;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Level.g.cs b/UnitsNet/GeneratedCode/Quantities/Level.g.cs
index 41e28629dc..ac17cc5823 100644
--- a/UnitsNet/GeneratedCode/Quantities/Level.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Level.g.cs
@@ -126,7 +126,7 @@ public Level(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Level;
 
         /// <summary>
@@ -162,7 +162,8 @@ public Level(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Level.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Level;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
index 832fa889ee..85890eb857 100644
--- a/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LinearDensity.g.cs
@@ -141,7 +141,7 @@ public LinearDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LinearDensity;
 
         /// <summary>
@@ -177,7 +177,8 @@ public LinearDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => LinearDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.LinearDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
index 913b09383b..9d3a56fadb 100644
--- a/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LinearPowerDensity.g.cs
@@ -152,7 +152,7 @@ public LinearPowerDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LinearPowerDensity;
 
         /// <summary>
@@ -188,7 +188,8 @@ public LinearPowerDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => LinearPowerDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.LinearPowerDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
index 7448398ec7..c68aaa9208 100644
--- a/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Luminosity.g.cs
@@ -141,7 +141,7 @@ public Luminosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Luminosity;
 
         /// <summary>
@@ -177,7 +177,8 @@ public Luminosity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Luminosity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Luminosity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
index c728d71999..75fc8f255e 100644
--- a/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LuminousFlux.g.cs
@@ -128,7 +128,7 @@ public LuminousFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LuminousFlux;
 
         /// <summary>
@@ -164,7 +164,8 @@ public LuminousFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => LuminousFlux.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.LuminousFlux;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
index cf848bc96c..d4851d96ab 100644
--- a/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/LuminousIntensity.g.cs
@@ -128,7 +128,7 @@ public LuminousIntensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.LuminousIntensity;
 
         /// <summary>
@@ -164,7 +164,8 @@ public LuminousIntensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => LuminousIntensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.LuminousIntensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
index a5ee7c2a80..930286cb76 100644
--- a/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MagneticField.g.cs
@@ -133,7 +133,7 @@ public MagneticField(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MagneticField;
 
         /// <summary>
@@ -169,7 +169,8 @@ public MagneticField(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MagneticField.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MagneticField;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
index 8787207610..c959f281f9 100644
--- a/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MagneticFlux.g.cs
@@ -128,7 +128,7 @@ public MagneticFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MagneticFlux;
 
         /// <summary>
@@ -164,7 +164,8 @@ public MagneticFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MagneticFlux.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MagneticFlux;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
index b5771cbab6..f224d7e9ca 100644
--- a/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Magnetization.g.cs
@@ -128,7 +128,7 @@ public Magnetization(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Magnetization;
 
         /// <summary>
@@ -164,7 +164,8 @@ public Magnetization(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Magnetization.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Magnetization;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
index a6928331a4..fb4dd13192 100644
--- a/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Mass.g.cs
@@ -149,7 +149,7 @@ public Mass(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Mass;
 
         /// <summary>
@@ -185,7 +185,8 @@ public Mass(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Mass.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Mass;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
index 7f4d40bcca..e647a6bd20 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassConcentration.g.cs
@@ -176,7 +176,7 @@ public MassConcentration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassConcentration;
 
         /// <summary>
@@ -212,7 +212,8 @@ public MassConcentration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MassConcentration.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MassConcentration;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
index 374bbfc3ea..4814dc8e4e 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFlow.g.cs
@@ -157,7 +157,7 @@ public MassFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFlow;
 
         /// <summary>
@@ -193,7 +193,8 @@ public MassFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MassFlow.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MassFlow;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
index 2751d6a4d8..8b6d76b6a4 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFlux.g.cs
@@ -136,7 +136,7 @@ public MassFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFlux;
 
         /// <summary>
@@ -172,7 +172,8 @@ public MassFlux(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MassFlux.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MassFlux;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
index 559f282e08..c3a67cf4ee 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassFraction.g.cs
@@ -151,7 +151,7 @@ public MassFraction(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassFraction;
 
         /// <summary>
@@ -187,7 +187,8 @@ public MassFraction(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MassFraction.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MassFraction;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
index 7332ab643b..aa53e53980 100644
--- a/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MassMomentOfInertia.g.cs
@@ -152,7 +152,7 @@ public MassMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MassMomentOfInertia;
 
         /// <summary>
@@ -188,7 +188,8 @@ public MassMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MassMomentOfInertia.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MassMomentOfInertia;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
index fb0076783f..71957bcb6e 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarEnergy.g.cs
@@ -127,7 +127,7 @@ public MolarEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarEnergy;
 
         /// <summary>
@@ -163,7 +163,8 @@ public MolarEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MolarEnergy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MolarEnergy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
index fd570688ef..43f84bd6f5 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarEntropy.g.cs
@@ -127,7 +127,7 @@ public MolarEntropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarEntropy;
 
         /// <summary>
@@ -163,7 +163,8 @@ public MolarEntropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MolarEntropy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MolarEntropy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
index 6b2f8efea1..b3bfc9628d 100644
--- a/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/MolarMass.g.cs
@@ -136,7 +136,7 @@ public MolarMass(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.MolarMass;
 
         /// <summary>
@@ -172,7 +172,8 @@ public MolarMass(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => MolarMass.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.MolarMass;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
index b6d2a4ceee..1313d29efe 100644
--- a/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Molarity.g.cs
@@ -135,7 +135,7 @@ public Molarity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Molarity;
 
         /// <summary>
@@ -171,7 +171,8 @@ public Molarity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Molarity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Molarity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
index 7e286f2ce0..622198249f 100644
--- a/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Permeability.g.cs
@@ -128,7 +128,7 @@ public Permeability(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Permeability;
 
         /// <summary>
@@ -164,7 +164,8 @@ public Permeability(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Permeability.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Permeability;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
index a3bbbd52d7..4e5427b3e7 100644
--- a/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Permittivity.g.cs
@@ -128,7 +128,7 @@ public Permittivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Permittivity;
 
         /// <summary>
@@ -164,7 +164,8 @@ public Permittivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Permittivity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Permittivity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Power.g.cs b/UnitsNet/GeneratedCode/Quantities/Power.g.cs
index 4469dc22cf..e9dd6dd3dd 100644
--- a/UnitsNet/GeneratedCode/Quantities/Power.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Power.g.cs
@@ -149,7 +149,7 @@ public Power(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Power;
 
         /// <summary>
@@ -190,7 +190,8 @@ public Power(decimal value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Power.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Power;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
index f8e40805da..79844c3b86 100644
--- a/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PowerDensity.g.cs
@@ -168,7 +168,7 @@ public PowerDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PowerDensity;
 
         /// <summary>
@@ -204,7 +204,8 @@ public PowerDensity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => PowerDensity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.PowerDensity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
index 5fc6c4963e..07e326bf7f 100644
--- a/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PowerRatio.g.cs
@@ -126,7 +126,7 @@ public PowerRatio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PowerRatio;
 
         /// <summary>
@@ -162,7 +162,8 @@ public PowerRatio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => PowerRatio.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.PowerRatio;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
index ac69896765..a1fe074981 100644
--- a/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Pressure.g.cs
@@ -169,7 +169,7 @@ public Pressure(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Pressure;
 
         /// <summary>
@@ -205,7 +205,8 @@ public Pressure(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Pressure.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Pressure;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
index 0d75bde65b..c807dd2d37 100644
--- a/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/PressureChangeRate.g.cs
@@ -138,7 +138,7 @@ public PressureChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.PressureChangeRate;
 
         /// <summary>
@@ -174,7 +174,8 @@ public PressureChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => PressureChangeRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.PressureChangeRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
index 5c1504d069..637f3acc51 100644
--- a/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Ratio.g.cs
@@ -130,7 +130,7 @@ public Ratio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Ratio;
 
         /// <summary>
@@ -166,7 +166,8 @@ public Ratio(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Ratio.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Ratio;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
index 816dac5c6c..d8bf68d5f3 100644
--- a/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RatioChangeRate.g.cs
@@ -126,7 +126,7 @@ public RatioChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RatioChangeRate;
 
         /// <summary>
@@ -162,7 +162,8 @@ public RatioChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RatioChangeRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RatioChangeRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs
index 75b498f348..0d6201a6d3 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReactiveEnergy.g.cs
@@ -127,7 +127,7 @@ public ReactiveEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReactiveEnergy;
 
         /// <summary>
@@ -163,7 +163,8 @@ public ReactiveEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ReactiveEnergy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ReactiveEnergy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs b/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs
index 3f04f97883..186f17f065 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReactivePower.g.cs
@@ -128,7 +128,7 @@ public ReactivePower(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReactivePower;
 
         /// <summary>
@@ -164,7 +164,8 @@ public ReactivePower(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ReactivePower.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ReactivePower;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs b/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
index 08965698c2..0a17d02128 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReciprocalArea.g.cs
@@ -138,7 +138,7 @@ public ReciprocalArea(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReciprocalArea;
 
         /// <summary>
@@ -174,7 +174,8 @@ public ReciprocalArea(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ReciprocalArea.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ReciprocalArea;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs b/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
index af768a8ef2..250436f0e2 100644
--- a/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ReciprocalLength.g.cs
@@ -137,7 +137,7 @@ public ReciprocalLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ReciprocalLength;
 
         /// <summary>
@@ -173,7 +173,8 @@ public ReciprocalLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ReciprocalLength.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ReciprocalLength;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
index 0b62365c85..a17baa39b5 100644
--- a/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RelativeHumidity.g.cs
@@ -125,7 +125,7 @@ public RelativeHumidity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RelativeHumidity;
 
         /// <summary>
@@ -161,7 +161,8 @@ public RelativeHumidity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RelativeHumidity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RelativeHumidity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
index de5d3df498..2298b76f90 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalAcceleration.g.cs
@@ -128,7 +128,7 @@ public RotationalAcceleration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalAcceleration;
 
         /// <summary>
@@ -164,7 +164,8 @@ public RotationalAcceleration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RotationalAcceleration.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RotationalAcceleration;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
index a34bd384df..2b1c18486d 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalSpeed.g.cs
@@ -137,7 +137,7 @@ public RotationalSpeed(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalSpeed;
 
         /// <summary>
@@ -173,7 +173,8 @@ public RotationalSpeed(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RotationalSpeed.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RotationalSpeed;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
index 2cb9ddb73b..8026cd1720 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffness.g.cs
@@ -157,7 +157,7 @@ public RotationalStiffness(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffness;
 
         /// <summary>
@@ -193,7 +193,8 @@ public RotationalStiffness(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RotationalStiffness.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RotationalStiffness;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
index 698c7c06b8..4a0d67b119 100644
--- a/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/RotationalStiffnessPerLength.g.cs
@@ -129,7 +129,7 @@ public RotationalStiffnessPerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.RotationalStiffnessPerLength;
 
         /// <summary>
@@ -165,7 +165,8 @@ public RotationalStiffnessPerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => RotationalStiffnessPerLength.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.RotationalStiffnessPerLength;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs b/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
index 7e8c3dddd0..1d2aaea2f0 100644
--- a/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Scalar.g.cs
@@ -125,7 +125,7 @@ public Scalar(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Scalar;
 
         /// <summary>
@@ -161,7 +161,8 @@ public Scalar(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Scalar.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Scalar;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
index bab23997a2..9367f83fbc 100644
--- a/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SolidAngle.g.cs
@@ -128,7 +128,7 @@ public SolidAngle(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SolidAngle;
 
         /// <summary>
@@ -164,7 +164,8 @@ public SolidAngle(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SolidAngle.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SolidAngle;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
index d812bc6db0..1caa64d230 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificEnergy.g.cs
@@ -152,7 +152,7 @@ public SpecificEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificEnergy;
 
         /// <summary>
@@ -188,7 +188,8 @@ public SpecificEnergy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SpecificEnergy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SpecificEnergy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
index 94896490b8..8c2bf678b9 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificEntropy.g.cs
@@ -133,7 +133,7 @@ public SpecificEntropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificEntropy;
 
         /// <summary>
@@ -169,7 +169,8 @@ public SpecificEntropy(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SpecificEntropy.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SpecificEntropy;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
index 861ac827c1..8fe34113d6 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificFuelConsumption.g.cs
@@ -131,7 +131,7 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificFuelConsumption;
 
         /// <summary>
@@ -167,7 +167,8 @@ public SpecificFuelConsumption(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SpecificFuelConsumption.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SpecificFuelConsumption;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
index a3ccc3ffa3..12e085ac13 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificVolume.g.cs
@@ -127,7 +127,7 @@ public SpecificVolume(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificVolume;
 
         /// <summary>
@@ -163,7 +163,8 @@ public SpecificVolume(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SpecificVolume.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SpecificVolume;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
index 26b6f3908d..14f3d90791 100644
--- a/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/SpecificWeight.g.cs
@@ -144,7 +144,7 @@ public SpecificWeight(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.SpecificWeight;
 
         /// <summary>
@@ -180,7 +180,8 @@ public SpecificWeight(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => SpecificWeight.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.SpecificWeight;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
index 908ae57e51..eb2082102b 100644
--- a/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Speed.g.cs
@@ -156,7 +156,7 @@ public Speed(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Speed;
 
         /// <summary>
@@ -192,7 +192,8 @@ public Speed(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Speed.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Speed;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
index e824e47951..6fb4815a65 100644
--- a/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/StandardVolumeFlow.g.cs
@@ -133,7 +133,7 @@ public StandardVolumeFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.StandardVolumeFlow;
 
         /// <summary>
@@ -169,7 +169,8 @@ public StandardVolumeFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => StandardVolumeFlow.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.StandardVolumeFlow;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
index 0535351faa..5ba103367d 100644
--- a/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Temperature.g.cs
@@ -134,7 +134,7 @@ public Temperature(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Temperature;
 
         /// <summary>
@@ -170,7 +170,8 @@ public Temperature(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Temperature.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Temperature;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
index 3386e70e79..1f0688902c 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureChangeRate.g.cs
@@ -134,7 +134,7 @@ public TemperatureChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureChangeRate;
 
         /// <summary>
@@ -170,7 +170,8 @@ public TemperatureChangeRate(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => TemperatureChangeRate.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.TemperatureChangeRate;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
index 2da799ff92..a42e58ea1f 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureDelta.g.cs
@@ -133,7 +133,7 @@ public TemperatureDelta(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureDelta;
 
         /// <summary>
@@ -169,7 +169,8 @@ public TemperatureDelta(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => TemperatureDelta.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.TemperatureDelta;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs b/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
index e5a03e343e..c0be4d47c4 100644
--- a/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TemperatureGradient.g.cs
@@ -128,7 +128,7 @@ public TemperatureGradient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TemperatureGradient;
 
         /// <summary>
@@ -164,7 +164,8 @@ public TemperatureGradient(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => TemperatureGradient.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.TemperatureGradient;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
index a50d788c87..fae67c6c18 100644
--- a/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ThermalConductivity.g.cs
@@ -129,7 +129,7 @@ public ThermalConductivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ThermalConductivity;
 
         /// <summary>
@@ -165,7 +165,8 @@ public ThermalConductivity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ThermalConductivity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ThermalConductivity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
index aeb4aa9edc..c0c7427c37 100644
--- a/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/ThermalResistance.g.cs
@@ -130,7 +130,7 @@ public ThermalResistance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.ThermalResistance;
 
         /// <summary>
@@ -166,7 +166,8 @@ public ThermalResistance(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => ThermalResistance.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.ThermalResistance;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
index 9bc552774f..12ba5193f8 100644
--- a/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Torque.g.cs
@@ -149,7 +149,7 @@ public Torque(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Torque;
 
         /// <summary>
@@ -185,7 +185,8 @@ public Torque(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Torque.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Torque;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs
index 5fa9737c3d..c2e0d6c091 100644
--- a/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/TorquePerLength.g.cs
@@ -145,7 +145,7 @@ public TorquePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.TorquePerLength;
 
         /// <summary>
@@ -181,7 +181,8 @@ public TorquePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => TorquePerLength.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.TorquePerLength;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
index 588fb8c5ed..a41106f0eb 100644
--- a/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Turbidity.g.cs
@@ -128,7 +128,7 @@ public Turbidity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Turbidity;
 
         /// <summary>
@@ -164,7 +164,8 @@ public Turbidity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Turbidity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Turbidity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
index fac84258d0..6c632ef3af 100644
--- a/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VitaminA.g.cs
@@ -125,7 +125,7 @@ public VitaminA(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VitaminA;
 
         /// <summary>
@@ -161,7 +161,8 @@ public VitaminA(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VitaminA.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VitaminA;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
index dac8c7c81f..cc9d39d4b3 100644
--- a/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/Volume.g.cs
@@ -175,7 +175,7 @@ public Volume(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.Volume;
 
         /// <summary>
@@ -211,7 +211,8 @@ public Volume(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => Volume.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.Volume;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
index 76d63b69a1..011f693c8f 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeConcentration.g.cs
@@ -147,7 +147,7 @@ public VolumeConcentration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeConcentration;
 
         /// <summary>
@@ -183,7 +183,8 @@ public VolumeConcentration(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VolumeConcentration.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VolumeConcentration;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
index 4e80c298fb..3e2633c963 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeFlow.g.cs
@@ -186,7 +186,7 @@ public VolumeFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeFlow;
 
         /// <summary>
@@ -222,7 +222,8 @@ public VolumeFlow(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VolumeFlow.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VolumeFlow;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
index d4cf539c68..d5d2e6b09a 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumeFlowPerArea.g.cs
@@ -126,7 +126,7 @@ public VolumeFlowPerArea(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumeFlowPerArea;
 
         /// <summary>
@@ -162,7 +162,8 @@ public VolumeFlowPerArea(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VolumeFlowPerArea.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VolumeFlowPerArea;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
index 741f79165e..a0ea195172 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumePerLength.g.cs
@@ -131,7 +131,7 @@ public VolumePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumePerLength;
 
         /// <summary>
@@ -167,7 +167,8 @@ public VolumePerLength(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VolumePerLength.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VolumePerLength;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
index ca83ca00da..05634674b1 100644
--- a/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/VolumetricHeatCapacity.g.cs
@@ -136,7 +136,7 @@ public VolumetricHeatCapacity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.VolumetricHeatCapacity;
 
         /// <summary>
@@ -172,7 +172,8 @@ public VolumetricHeatCapacity(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => VolumetricHeatCapacity.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.VolumetricHeatCapacity;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
index 6ae795df69..fc43e52613 100644
--- a/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
+++ b/UnitsNet/GeneratedCode/Quantities/WarpingMomentOfInertia.g.cs
@@ -130,7 +130,7 @@ public WarpingMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        [Obsolete("QuantityType will be removed in the future. Use Info property instead.")]
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
         public static QuantityType QuantityType { get; } = QuantityType.WarpingMomentOfInertia;
 
         /// <summary>
@@ -166,7 +166,8 @@ public WarpingMomentOfInertia(double value, UnitSystem unitSystem)
         /// <summary>
         ///     The <see cref="QuantityType" /> of this quantity.
         /// </summary>
-        public QuantityType Type => WarpingMomentOfInertia.QuantityType;
+        [Obsolete("QuantityType will be removed in the future. Use the Info property instead.")]
+        public QuantityType Type => QuantityType.WarpingMomentOfInertia;
 
         /// <summary>
         ///     The <see cref="BaseDimensions" /> of this quantity.
diff --git a/UnitsNet/GeneratedCode/Quantity.g.cs b/UnitsNet/GeneratedCode/Quantity.g.cs
index 86c9377a32..2a033a2d36 100644
--- a/UnitsNet/GeneratedCode/Quantity.g.cs
+++ b/UnitsNet/GeneratedCode/Quantity.g.cs
@@ -152,124 +152,6 @@ public static partial class Quantity
             { "WarpingMomentOfInertia", WarpingMomentOfInertia.Info },
         };
 
-        // Used by the QuantityInfo .ctor to map a name to a QuantityType. Will be removed when QuantityType
-        // will be removed.
-        internal static readonly IDictionary<string, QuantityType> QuantityTypeByName = new Dictionary<string, QuantityType>
-        {
-            { "Acceleration", QuantityType.Acceleration },
-            { "AmountOfSubstance", QuantityType.AmountOfSubstance },
-            { "AmplitudeRatio", QuantityType.AmplitudeRatio },
-            { "Angle", QuantityType.Angle },
-            { "ApparentEnergy", QuantityType.ApparentEnergy },
-            { "ApparentPower", QuantityType.ApparentPower },
-            { "Area", QuantityType.Area },
-            { "AreaDensity", QuantityType.AreaDensity },
-            { "AreaMomentOfInertia", QuantityType.AreaMomentOfInertia },
-            { "BitRate", QuantityType.BitRate },
-            { "BrakeSpecificFuelConsumption", QuantityType.BrakeSpecificFuelConsumption },
-            { "Capacitance", QuantityType.Capacitance },
-            { "CoefficientOfThermalExpansion", QuantityType.CoefficientOfThermalExpansion },
-            { "Density", QuantityType.Density },
-            { "Duration", QuantityType.Duration },
-            { "DynamicViscosity", QuantityType.DynamicViscosity },
-            { "ElectricAdmittance", QuantityType.ElectricAdmittance },
-            { "ElectricCharge", QuantityType.ElectricCharge },
-            { "ElectricChargeDensity", QuantityType.ElectricChargeDensity },
-            { "ElectricConductance", QuantityType.ElectricConductance },
-            { "ElectricConductivity", QuantityType.ElectricConductivity },
-            { "ElectricCurrent", QuantityType.ElectricCurrent },
-            { "ElectricCurrentDensity", QuantityType.ElectricCurrentDensity },
-            { "ElectricCurrentGradient", QuantityType.ElectricCurrentGradient },
-            { "ElectricField", QuantityType.ElectricField },
-            { "ElectricInductance", QuantityType.ElectricInductance },
-            { "ElectricPotential", QuantityType.ElectricPotential },
-            { "ElectricPotentialAc", QuantityType.ElectricPotentialAc },
-            { "ElectricPotentialChangeRate", QuantityType.ElectricPotentialChangeRate },
-            { "ElectricPotentialDc", QuantityType.ElectricPotentialDc },
-            { "ElectricResistance", QuantityType.ElectricResistance },
-            { "ElectricResistivity", QuantityType.ElectricResistivity },
-            { "ElectricSurfaceChargeDensity", QuantityType.ElectricSurfaceChargeDensity },
-            { "Energy", QuantityType.Energy },
-            { "Entropy", QuantityType.Entropy },
-            { "Force", QuantityType.Force },
-            { "ForceChangeRate", QuantityType.ForceChangeRate },
-            { "ForcePerLength", QuantityType.ForcePerLength },
-            { "Frequency", QuantityType.Frequency },
-            { "FuelEfficiency", QuantityType.FuelEfficiency },
-            { "HeatFlux", QuantityType.HeatFlux },
-            { "HeatTransferCoefficient", QuantityType.HeatTransferCoefficient },
-            { "Illuminance", QuantityType.Illuminance },
-            { "Information", QuantityType.Information },
-            { "Irradiance", QuantityType.Irradiance },
-            { "Irradiation", QuantityType.Irradiation },
-            { "KinematicViscosity", QuantityType.KinematicViscosity },
-            { "LapseRate", QuantityType.LapseRate },
-            { "Length", QuantityType.Length },
-            { "Level", QuantityType.Level },
-            { "LinearDensity", QuantityType.LinearDensity },
-            { "LinearPowerDensity", QuantityType.LinearPowerDensity },
-            { "Luminosity", QuantityType.Luminosity },
-            { "LuminousFlux", QuantityType.LuminousFlux },
-            { "LuminousIntensity", QuantityType.LuminousIntensity },
-            { "MagneticField", QuantityType.MagneticField },
-            { "MagneticFlux", QuantityType.MagneticFlux },
-            { "Magnetization", QuantityType.Magnetization },
-            { "Mass", QuantityType.Mass },
-            { "MassConcentration", QuantityType.MassConcentration },
-            { "MassFlow", QuantityType.MassFlow },
-            { "MassFlux", QuantityType.MassFlux },
-            { "MassFraction", QuantityType.MassFraction },
-            { "MassMomentOfInertia", QuantityType.MassMomentOfInertia },
-            { "MolarEnergy", QuantityType.MolarEnergy },
-            { "MolarEntropy", QuantityType.MolarEntropy },
-            { "Molarity", QuantityType.Molarity },
-            { "MolarMass", QuantityType.MolarMass },
-            { "Permeability", QuantityType.Permeability },
-            { "Permittivity", QuantityType.Permittivity },
-            { "Power", QuantityType.Power },
-            { "PowerDensity", QuantityType.PowerDensity },
-            { "PowerRatio", QuantityType.PowerRatio },
-            { "Pressure", QuantityType.Pressure },
-            { "PressureChangeRate", QuantityType.PressureChangeRate },
-            { "Ratio", QuantityType.Ratio },
-            { "RatioChangeRate", QuantityType.RatioChangeRate },
-            { "ReactiveEnergy", QuantityType.ReactiveEnergy },
-            { "ReactivePower", QuantityType.ReactivePower },
-            { "ReciprocalArea", QuantityType.ReciprocalArea },
-            { "ReciprocalLength", QuantityType.ReciprocalLength },
-            { "RelativeHumidity", QuantityType.RelativeHumidity },
-            { "RotationalAcceleration", QuantityType.RotationalAcceleration },
-            { "RotationalSpeed", QuantityType.RotationalSpeed },
-            { "RotationalStiffness", QuantityType.RotationalStiffness },
-            { "RotationalStiffnessPerLength", QuantityType.RotationalStiffnessPerLength },
-            { "Scalar", QuantityType.Scalar },
-            { "SolidAngle", QuantityType.SolidAngle },
-            { "SpecificEnergy", QuantityType.SpecificEnergy },
-            { "SpecificEntropy", QuantityType.SpecificEntropy },
-            { "SpecificFuelConsumption", QuantityType.SpecificFuelConsumption },
-            { "SpecificVolume", QuantityType.SpecificVolume },
-            { "SpecificWeight", QuantityType.SpecificWeight },
-            { "Speed", QuantityType.Speed },
-            { "StandardVolumeFlow", QuantityType.StandardVolumeFlow },
-            { "Temperature", QuantityType.Temperature },
-            { "TemperatureChangeRate", QuantityType.TemperatureChangeRate },
-            { "TemperatureDelta", QuantityType.TemperatureDelta },
-            { "TemperatureGradient", QuantityType.TemperatureGradient },
-            { "ThermalConductivity", QuantityType.ThermalConductivity },
-            { "ThermalResistance", QuantityType.ThermalResistance },
-            { "Torque", QuantityType.Torque },
-            { "TorquePerLength", QuantityType.TorquePerLength },
-            { "Turbidity", QuantityType.Turbidity },
-            { "VitaminA", QuantityType.VitaminA },
-            { "Volume", QuantityType.Volume },
-            { "VolumeConcentration", QuantityType.VolumeConcentration },
-            { "VolumeFlow", QuantityType.VolumeFlow },
-            { "VolumeFlowPerArea", QuantityType.VolumeFlowPerArea },
-            { "VolumePerLength", QuantityType.VolumePerLength },
-            { "VolumetricHeatCapacity", QuantityType.VolumetricHeatCapacity },
-            { "WarpingMomentOfInertia", QuantityType.WarpingMomentOfInertia },
-        };
-
         /// <summary>
         /// Dynamically constructs a quantity of the given <see cref="QuantityType"/> with the value in the quantity's base units.
         /// </summary>
diff --git a/UnitsNet/GeneratedCode/QuantityType.g.cs b/UnitsNet/GeneratedCode/QuantityType.g.cs
index dbf108961d..522fe664ca 100644
--- a/UnitsNet/GeneratedCode/QuantityType.g.cs
+++ b/UnitsNet/GeneratedCode/QuantityType.g.cs
@@ -18,6 +18,9 @@
 // Copyright 2013 Andreas Gullberg Larsen (andreas.larsen84@gmail.com). Maintained at https://github.com/angularsen/UnitsNet.
 
 // ReSharper disable once CheckNamespace
+
+using System;
+
 namespace UnitsNet
 {
     /// <summary>
@@ -26,6 +29,7 @@ namespace UnitsNet
     ///     This is useful for populating options in the UI, such as creating a generic conversion
     ///     tool with inputValue, quantityName, fromUnit and toUnit selectors.
     /// </summary>
+    [Obsolete("QuantityType will be removed in the future. Use the QuantityInfo class instead.")]
     public enum QuantityType
     {
 // Missing XML comment for public type or member
diff --git a/UnitsNet/UnitConverter.cs b/UnitsNet/UnitConverter.cs
index 09f55f3255..f314a71b6f 100644
--- a/UnitsNet/UnitConverter.cs
+++ b/UnitsNet/UnitConverter.cs
@@ -280,8 +280,8 @@ public static bool TryConvert(QuantityValue fromValue, Enum fromUnitValue, Enum
         ///     convert from.
         /// </param>
         /// <param name="quantityName">
-        ///     Name of quantity, such as "Length" and "Mass". <see cref="QuantityType" /> for all
-        ///     values.
+        ///     The name of the quantity, such as "Length" or "Mass". See <see cref="Quantity.Infos" /> for all
+        ///     types generated by UnitsNet and use <see cref="UnitInfo.Name"/>.
         /// </param>
         /// <param name="fromUnit">
         ///     Name of unit, such as "Meter" or "Centimeter" if "Length" was passed as
@@ -330,8 +330,8 @@ public static double ConvertByName(QuantityValue fromValue, string quantityName,
         ///     convert from.
         /// </param>
         /// <param name="quantityName">
-        ///     Name of quantity, such as "Length" and "Mass". <see cref="QuantityType" /> for all
-        ///     values.
+        ///     The name of the quantity, such as "Length" or "Mass". See <see cref="Quantity.Infos" /> for all
+        ///     types generated by UnitsNet and use <see cref="UnitInfo.Name"/>.
         /// </param>
         /// <param name="fromUnit">
         ///     Name of unit, such as "Meter" or "Centimeter" if "Length" was passed as
@@ -405,8 +405,8 @@ public static double ConvertByAbbreviation(QuantityValue fromValue, string quant
         ///     convert from.
         /// </param>
         /// <param name="quantityName">
-        ///     Name of quantity, such as "Length" and "Mass". <see cref="QuantityType" /> for all
-        ///     values.
+        ///     The name of the quantity, such as "Length" or "Mass". See <see cref="Quantity.Infos" /> for all
+        ///     types generated by UnitsNet and use <see cref="UnitInfo.Name"/>.
         /// </param>
         /// <param name="fromUnitAbbrev">
         ///     Name of unit, such as "Meter" or "Centimeter" if "Length" was passed as
@@ -451,8 +451,8 @@ public static double ConvertByAbbreviation(QuantityValue fromValue, string quant
         ///     convert from.
         /// </param>
         /// <param name="quantityName">
-        ///     Name of quantity, such as "Length" and "Mass". <see cref="QuantityType" /> for all
-        ///     values.
+        ///     The name of the quantity, such as "Length" or "Mass". See <see cref="Quantity.Infos" /> for all
+        ///     types generated by UnitsNet and use <see cref="UnitInfo.Name"/>.
         /// </param>
         /// <param name="fromUnitAbbrev">
         ///     Name of unit, such as "Meter" or "Centimeter" if "Length" was passed as
@@ -483,8 +483,8 @@ public static bool TryConvertByAbbreviation(QuantityValue fromValue, string quan
         ///     convert from.
         /// </param>
         /// <param name="quantityName">
-        ///     Name of quantity, such as "Length" and "Mass". <see cref="QuantityType" /> for all
-        ///     values.
+        ///     The name of the quantity, such as "Length" or "Mass". See <see cref="Quantity.Infos" /> for all
+        ///     types generated by UnitsNet and use <see cref="UnitInfo.Name"/>.
         /// </param>
         /// <param name="fromUnitAbbrev">
         ///     Name of unit, such as "Meter" or "Centimeter" if "Length" was passed as