diff --git a/Gu.Units.Generator.Tests/MockSettings.cs b/Gu.Units.Generator.Tests/MockSettings.cs
index daa75529..29740610 100644
--- a/Gu.Units.Generator.Tests/MockSettings.cs
+++ b/Gu.Units.Generator.Tests/MockSettings.cs
@@ -2,7 +2,6 @@
 {
     public class MockSettings : Settings
     {
-        public readonly string Namespace = "Gu.Units";
         public readonly SiUnit Metres;
         public readonly Quantity Length;
 
@@ -32,7 +31,7 @@ public class MockSettings : Settings
 
         public readonly DerivedUnit Watts;
         public readonly Quantity Power;
-        
+
         public readonly DerivedUnit Volts;
         public readonly Quantity Voltage;
 
@@ -41,23 +40,23 @@ public class MockSettings : Settings
 
         public MockSettings()
         {
-            Metres = new SiUnit(Namespace, "Metres", "m") { QuantityName = "Length" };
+            Metres = new SiUnit("Metres", "m") { QuantityName = "Length" };
             SiUnits.Add(Metres);
             Length = Metres.Quantity;
 
-            Seconds = new SiUnit(Namespace, "Seconds", "s") { QuantityName = "Time" };
+            Seconds = new SiUnit("Seconds", "s") { QuantityName = "Time" };
             SiUnits.Add(Seconds);
             Time = Seconds.Quantity;
 
-            Kilograms = new SiUnit("", "Kilograms", "kg") { QuantityName = "Mass" };
+            Kilograms = new SiUnit("Kilograms", "kg") { QuantityName = "Mass" };
             SiUnits.Add(Kilograms);
             Mass = Kilograms.Quantity;
 
-            Amperes = new SiUnit("", "Amperes", "A") { QuantityName = "ElectricalCurrent" };
+            Amperes = new SiUnit("Amperes", "A") { QuantityName = "ElectricalCurrent" };
             SiUnits.Add(Amperes);
             Current = Amperes.Quantity;
 
-            MetresPerSecond = new DerivedUnit(Namespace,
+            MetresPerSecond = new DerivedUnit(
                 "MetresPerSecond",
                 "m/s",
                 new UnitAndPower(Metres, 1),
@@ -65,7 +64,7 @@ public MockSettings()
             DerivedUnits.Add(MetresPerSecond);
             Speed = MetresPerSecond.Quantity;
 
-            Newtons = new DerivedUnit(Namespace,
+            Newtons = new DerivedUnit(
                 "Newtons",
                 "N",
                 new UnitAndPower(Kilograms, 1),
@@ -74,7 +73,7 @@ public MockSettings()
             DerivedUnits.Add(Newtons);
             Force = Newtons.Quantity;
 
-            Joules = new DerivedUnit(Namespace,
+            Joules = new DerivedUnit(
                 "Joules",
                 "J",
                 new UnitAndPower(Newtons, 1),
@@ -82,7 +81,7 @@ public MockSettings()
             DerivedUnits.Add(Joules);
             Energy = Joules.Quantity;
 
-            Watts = new DerivedUnit(Namespace,
+            Watts = new DerivedUnit(
                 "Watts",
                 "W",
                 new UnitAndPower(Joules, 1),
@@ -90,7 +89,7 @@ public MockSettings()
             DerivedUnits.Add(Watts);
             Power = Watts.Quantity;
 
-            Volts = new DerivedUnit(Namespace,
+            Volts = new DerivedUnit(
                 "Volts",
                 "V",
                 new UnitAndPower(Watts, 1),
@@ -98,7 +97,7 @@ public MockSettings()
             DerivedUnits.Add(Volts);
             Voltage = Volts.Quantity;
 
-            Coloumbs = new DerivedUnit(Namespace,
+            Coloumbs = new DerivedUnit(
                 "Coloumbs",
                 "C",
                 new UnitAndPower(Seconds, 1),
@@ -106,14 +105,14 @@ public MockSettings()
             DerivedUnits.Add(Coloumbs);
             ElectricCharge = Coloumbs.Quantity;
 
-            SquareMetres = new DerivedUnit(Namespace, "SquareMetres", "m^2", new UnitAndPower(Metres, 2))
+            SquareMetres = new DerivedUnit("SquareMetres", "m^2", new UnitAndPower(Metres, 2))
             {
                 QuantityName = "Area"
             };
             DerivedUnits.Add(SquareMetres);
             Area = SquareMetres.Quantity;
 
-            CubicMetres = new DerivedUnit(Namespace, "CubicMetres", "m^3", new UnitAndPower(Metres, 3))
+            CubicMetres = new DerivedUnit("CubicMetres", "m^3", new UnitAndPower(Metres, 3))
             {
                 QuantityName = "Volume"
             };
diff --git a/Gu.Units.Generator.Tests/QuantityTests.cs b/Gu.Units.Generator.Tests/QuantityTests.cs
index 78efa315..13398643 100644
--- a/Gu.Units.Generator.Tests/QuantityTests.cs
+++ b/Gu.Units.Generator.Tests/QuantityTests.cs
@@ -7,7 +7,6 @@
     public class QuantityTests
     {
         private IUnit _metres;
-        private string Namespace;
         private IUnit _seconds;
         private MockSettings _settings;
         [SetUp]
@@ -16,7 +15,6 @@ public void SetUp()
             _settings = new MockSettings();
             _metres = _settings.Metres;
             _seconds = _settings.Seconds;
-            Namespace = _settings.Namespace;
         }
 
         [TestCase("Length", "IQuantity<LengthUnit, I1>")]
@@ -33,7 +31,7 @@ public void BaseQuantityInterface(string quantityName, string expected)
         public void PowerQuantityInterface(int power, string expected)
         {
             var unitAndPower = new UnitAndPower(_metres, power);
-            var derivedUnit = new DerivedUnit(Namespace, "sdf", "ssf", unitAndPower) { QuantityName = "Qty" };
+            var derivedUnit = new DerivedUnit("sdf", "ssf", unitAndPower) { QuantityName = "Qty" };
             var quantity = new Quantity(derivedUnit);
             var @interface = quantity.Interface;
             Assert.AreEqual(expected, @interface);
@@ -46,8 +44,8 @@ public void ComposedQuantityInterface(int p1, int p2, string expected)
             var unitAndPower2 = new UnitAndPower(_seconds, p2);
             var quantities = new[]
             {
-                new Quantity(new DerivedUnit("", "", "", unitAndPower1, unitAndPower2)),
-                new Quantity(new DerivedUnit("", "", "", unitAndPower2, unitAndPower1))
+                new Quantity(new DerivedUnit("", "", unitAndPower1, unitAndPower2)),
+                new Quantity(new DerivedUnit("", "", unitAndPower2, unitAndPower1))
             };
             foreach (var quantity in quantities)
             {
diff --git a/Gu.Units.Generator/Descriptors/Conversion.cs b/Gu.Units.Generator/Descriptors/Conversion.cs
index 8a656962..fe9cc65f 100644
--- a/Gu.Units.Generator/Descriptors/Conversion.cs
+++ b/Gu.Units.Generator/Descriptors/Conversion.cs
@@ -22,8 +22,8 @@ public Conversion()
             _formula = new ConversionFormula(this);
         }
 
-        public Conversion(string @namespace, string className, string symbol)
-            : base(@namespace, className)
+        public Conversion(string className, string symbol)
+            : base(className)
         {
             _symbol = symbol;
             _formula = new ConversionFormula(this);
@@ -46,23 +46,6 @@ public string Symbol
             }
         }
 
-        public double ConversionFactor
-        {
-            get
-            {
-                return _formula.ConversionFactor;
-            }
-            set
-            {
-                if (value == _formula.ConversionFactor)
-                {
-                    return;
-                }
-                _formula.ConversionFactor = value;
-                this.OnPropertyChanged();
-            }
-        }
-
         public ConversionFormula Formula
         {
             get { return _formula; }
@@ -150,6 +133,7 @@ public ObservableCollection<Conversion> Conversions
         {
             get { return _conversions; }
         }
+
         public bool AnyOffsetConversion
         {
             get { return Conversions.Any(x => x.Formula.Offset != 0); }
@@ -172,7 +156,7 @@ private void SyncWithPrefix()
             {
                 return;
             }
-            ConversionFactor = Math.Pow(10, _prefix.Power);
+            Formula.ConversionFactor = Math.Pow(10, _prefix.Power);
             if (string.IsNullOrEmpty(Symbol))
             {
                 Symbol = Prefix.Symbol + BaseUnit.Symbol;
@@ -195,10 +179,10 @@ public void SetParts(IEnumerable<Conversion> subunits)
             foreach (var part in subunits)
             {
                 var up = unitParts.Single(x => x.UnitName == part.BaseUnit.ClassName);
-                cf = cf * Math.Pow(part.ConversionFactor, up.Power);
+                cf = cf * Math.Pow(part.Formula.ConversionFactor, up.Power);
                 unitParts.Replace(up, new UnitAndPower(part, up.Power));
             }
-            ConversionFactor = cf;
+            Formula.ConversionFactor = cf;
             ClassName = unitParts.UnitName;
             Symbol = unitParts.Expression;
         }
diff --git a/Gu.Units.Generator/Descriptors/DerivedUnit.cs b/Gu.Units.Generator/Descriptors/DerivedUnit.cs
index a103035d..4391c42f 100644
--- a/Gu.Units.Generator/Descriptors/DerivedUnit.cs
+++ b/Gu.Units.Generator/Descriptors/DerivedUnit.cs
@@ -15,13 +15,13 @@ public class DerivedUnit : UnitBase
         private readonly UnitParts _parts;
 
         public DerivedUnit()
-            : base(null, null, null)
+            : base(null, null)
         {
             _parts = new UnitParts(this);
         }
 
-        public DerivedUnit(string @namespace, string name, string symbol, params UnitAndPower[] parts)
-            : base(@namespace, name, symbol)
+        public DerivedUnit(string name, string symbol, params UnitAndPower[] parts)
+            : base(name, symbol)
         {
             _parts = new UnitParts(this);
             if (parts.Length == 0)
diff --git a/Gu.Units.Generator/Descriptors/IUnit.cs b/Gu.Units.Generator/Descriptors/IUnit.cs
index e26d639b..ed503b6b 100644
--- a/Gu.Units.Generator/Descriptors/IUnit.cs
+++ b/Gu.Units.Generator/Descriptors/IUnit.cs
@@ -7,7 +7,6 @@ public interface IUnit : INotifyPropertyChanged
     {
         string Symbol { get; set; }
         string ClassName { get; set; }
-        string Namespace { get; set; }
         string ParameterName { get; }
         string QuantityName { get; set; }
         Quantity Quantity { get; set; }
diff --git a/Gu.Units.Generator/Descriptors/Quantity.cs b/Gu.Units.Generator/Descriptors/Quantity.cs
index a0a83169..38317a0d 100644
--- a/Gu.Units.Generator/Descriptors/Quantity.cs
+++ b/Gu.Units.Generator/Descriptors/Quantity.cs
@@ -14,7 +14,7 @@ public class Quantity : TypeMetaData
         private string _unitName;
 
         public Quantity(IUnit unit)
-            : base(unit.Namespace, null)
+            : base(null)
         {
             _unit = unit;
             _unit.Quantity = this;
diff --git a/Gu.Units.Generator/Descriptors/SiUnit.cs b/Gu.Units.Generator/Descriptors/SiUnit.cs
index 8ed68851..43933c10 100644
--- a/Gu.Units.Generator/Descriptors/SiUnit.cs
+++ b/Gu.Units.Generator/Descriptors/SiUnit.cs
@@ -16,12 +16,12 @@
     public class SiUnit : UnitBase
     {
         public SiUnit()
-            : base(null, null, null)
+            : base(null, null)
         {
         }
 
-        public SiUnit(string @namespace, string name, string symbol)
-            : base(@namespace, name, symbol)
+        public SiUnit(string name, string symbol)
+            : base(name, symbol)
         {
         }
 
diff --git a/Gu.Units.Generator/Descriptors/TypeMetaData.cs b/Gu.Units.Generator/Descriptors/TypeMetaData.cs
index f1276166..0256a0ff 100644
--- a/Gu.Units.Generator/Descriptors/TypeMetaData.cs
+++ b/Gu.Units.Generator/Descriptors/TypeMetaData.cs
@@ -12,36 +12,18 @@
     public class TypeMetaData : MarshalByRefObject, INotifyPropertyChanged
     {
         private string _className;
-        private string _ns;
 
         protected TypeMetaData()
         {
         }
         
-        public TypeMetaData(string @namespace,string className)
+        public TypeMetaData(string className)
         {
-            _ns = @namespace;
             _className = className;
         }
 
         public event PropertyChangedEventHandler PropertyChanged;
 
-        public virtual string Namespace
-        {
-            get { return _ns; }
-            set
-            {
-                if (value == _ns)
-                {
-                    return;
-                }
-                _ns = value;
-                OnPropertyChanged();
-            }
-        }
-
-        public string Ns { get; set; }
-
         public string ClassName
         {
             get { return _className; }
diff --git a/Gu.Units.Generator/Descriptors/UnitBase.cs b/Gu.Units.Generator/Descriptors/UnitBase.cs
index 380a82a9..f8142496 100644
--- a/Gu.Units.Generator/Descriptors/UnitBase.cs
+++ b/Gu.Units.Generator/Descriptors/UnitBase.cs
@@ -21,8 +21,8 @@ protected UnitBase()
             Quantity = new Quantity(this);
         }
 
-        protected UnitBase(string @namespace, string className, string symbol)
-            : base(@namespace, className)
+        protected UnitBase(string className, string symbol)
+            : base(className)
         {
             _conversions = new ParentCollection<UnitBase, Conversion>(this, (unit, parent) => unit.BaseUnit = parent);
             Quantity = new Quantity(this);
diff --git a/Gu.Units.Generator/GeneratorSettings.xml b/Gu.Units.Generator/GeneratorSettings.xml
index f28db2c3..3f2432ee 100644
--- a/Gu.Units.Generator/GeneratorSettings.xml
+++ b/Gu.Units.Generator/GeneratorSettings.xml
@@ -2,7 +2,6 @@
 <Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <DerivedUnits>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>SquareMetres</ClassName>
       <Symbol>m²</Symbol>
       <QuantityName>Area</QuantityName>
@@ -10,7 +9,6 @@
         <Conversion>
           <ClassName>SquareMillimetres</ClassName>
           <Symbol>mm²</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -20,7 +18,6 @@
         <Conversion>
           <ClassName>SquareCentimetres</ClassName>
           <Symbol>cm²</Symbol>
-          <ConversionFactor>0.0001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.0001</ConversionFactor>
             <Offset>0</Offset>
@@ -30,7 +27,6 @@
         <Conversion>
           <ClassName>SquareDecimetres</ClassName>
           <Symbol>dm²</Symbol>
-          <ConversionFactor>0.010000000000000002</ConversionFactor>
           <Formula>
             <ConversionFactor>0.010000000000000002</ConversionFactor>
             <Offset>0</Offset>
@@ -40,7 +36,6 @@
         <Conversion>
           <ClassName>SquareKilometres</ClassName>
           <Symbol>km²</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -50,7 +45,6 @@
         <Conversion>
           <ClassName>SquareInches</ClassName>
           <Symbol>in²</Symbol>
-          <ConversionFactor>0.00064516</ConversionFactor>
           <Formula>
             <ConversionFactor>0.00064516</ConversionFactor>
             <Offset>0</Offset>
@@ -60,7 +54,6 @@
         <Conversion>
           <ClassName>Hectare</ClassName>
           <Symbol>ha</Symbol>
-          <ConversionFactor>10000</ConversionFactor>
           <Formula>
             <ConversionFactor>10000</ConversionFactor>
             <Offset>0</Offset>
@@ -70,7 +63,6 @@
         <Conversion>
           <ClassName>SquareMile</ClassName>
           <Symbol>mi²</Symbol>
-          <ConversionFactor>2589988.110336</ConversionFactor>
           <Formula>
             <ConversionFactor>2589988.110336</ConversionFactor>
             <Offset>0</Offset>
@@ -80,7 +72,6 @@
         <Conversion>
           <ClassName>SquareYard</ClassName>
           <Symbol>yd²</Symbol>
-          <ConversionFactor>0.83612736</ConversionFactor>
           <Formula>
             <ConversionFactor>0.83612736</ConversionFactor>
             <Offset>0</Offset>
@@ -96,7 +87,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>CubicMetres</ClassName>
       <Symbol>m³</Symbol>
       <QuantityName>Volume</QuantityName>
@@ -104,7 +94,6 @@
         <Conversion>
           <ClassName>Litres</ClassName>
           <Symbol>L</Symbol>
-          <ConversionFactor>0.0010000000000000002</ConversionFactor>
           <Formula>
             <ConversionFactor>0.0010000000000000002</ConversionFactor>
             <Offset>0</Offset>
@@ -114,7 +103,6 @@
         <Conversion>
           <ClassName>CubicCentimetres</ClassName>
           <Symbol>cm³</Symbol>
-          <ConversionFactor>1.0000000000000002E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1.0000000000000002E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -124,7 +112,6 @@
         <Conversion>
           <ClassName>CubicMillimetres</ClassName>
           <Symbol>mm³</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -134,7 +121,6 @@
         <Conversion>
           <ClassName>CubicInches</ClassName>
           <Symbol>in³</Symbol>
-          <ConversionFactor>1.6387064E-05</ConversionFactor>
           <Formula>
             <ConversionFactor>1.6387064E-05</ConversionFactor>
             <Offset>0</Offset>
@@ -150,7 +136,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Newtons</ClassName>
       <Symbol>N</Symbol>
       <QuantityName>Force</QuantityName>
@@ -158,7 +143,6 @@
         <Conversion>
           <ClassName>Nanonewtons</ClassName>
           <Symbol>nN</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -168,7 +152,6 @@
         <Conversion>
           <ClassName>Micronewtons</ClassName>
           <Symbol>µN</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -178,7 +161,6 @@
         <Conversion>
           <ClassName>Millinewtons</ClassName>
           <Symbol>mN</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -188,7 +170,6 @@
         <Conversion>
           <ClassName>Kilonewtons</ClassName>
           <Symbol>kN</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -198,7 +179,6 @@
         <Conversion>
           <ClassName>Meganewtons</ClassName>
           <Symbol>MN</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -208,7 +188,6 @@
         <Conversion>
           <ClassName>Giganewtons</ClassName>
           <Symbol>GN</Symbol>
-          <ConversionFactor>1000000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000000</ConversionFactor>
             <Offset>0</Offset>
@@ -232,7 +211,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Pascals</ClassName>
       <Symbol>Pa</Symbol>
       <QuantityName>Pressure</QuantityName>
@@ -240,7 +218,6 @@
         <Conversion>
           <ClassName>Nanopascals</ClassName>
           <Symbol>nPa</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -250,7 +227,6 @@
         <Conversion>
           <ClassName>Micropascals</ClassName>
           <Symbol>µPa</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -260,7 +236,6 @@
         <Conversion>
           <ClassName>Millipascals</ClassName>
           <Symbol>mPa</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -270,7 +245,6 @@
         <Conversion>
           <ClassName>Kilopascals</ClassName>
           <Symbol>kPa</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -280,7 +254,6 @@
         <Conversion>
           <ClassName>Megapascals</ClassName>
           <Symbol>MPa</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -290,7 +263,6 @@
         <Conversion>
           <ClassName>Gigapascals</ClassName>
           <Symbol>GPa</Symbol>
-          <ConversionFactor>1000000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000000</ConversionFactor>
             <Offset>0</Offset>
@@ -310,7 +282,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>KilogramsPerCubicMetre</ClassName>
       <Symbol>kg/m³</Symbol>
       <QuantityName>Density</QuantityName>
@@ -318,7 +289,6 @@
         <Conversion>
           <ClassName>GramsPerCubicMillimetre</ClassName>
           <Symbol>g / mm³</Symbol>
-          <ConversionFactor>999999.99999999988</ConversionFactor>
           <Formula>
             <ConversionFactor>999999.99999999988</ConversionFactor>
             <Offset>0</Offset>
@@ -328,7 +298,6 @@
         <Conversion>
           <ClassName>GramsPerCubicCentimetre</ClassName>
           <Symbol>g / cm³</Symbol>
-          <ConversionFactor>999.99999999999989</ConversionFactor>
           <Formula>
             <ConversionFactor>999.99999999999989</ConversionFactor>
             <Offset>0</Offset>
@@ -348,7 +317,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Joules</ClassName>
       <Symbol>J</Symbol>
       <QuantityName>Energy</QuantityName>
@@ -356,7 +324,6 @@
         <Conversion>
           <ClassName>Nanojoules</ClassName>
           <Symbol>nJ</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -366,7 +333,6 @@
         <Conversion>
           <ClassName>Microjoules</ClassName>
           <Symbol>µJ</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -376,7 +342,6 @@
         <Conversion>
           <ClassName>Millijoules</ClassName>
           <Symbol>mJ</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -386,7 +351,6 @@
         <Conversion>
           <ClassName>Kilojoules</ClassName>
           <Symbol>kJ</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -396,7 +360,6 @@
         <Conversion>
           <ClassName>Megajoules</ClassName>
           <Symbol>MJ</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -406,7 +369,6 @@
         <Conversion>
           <ClassName>Gigajoules</ClassName>
           <Symbol>GJ</Symbol>
-          <ConversionFactor>1000000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000000</ConversionFactor>
             <Offset>0</Offset>
@@ -416,7 +378,6 @@
         <Conversion>
           <ClassName>KilowattHours</ClassName>
           <Symbol>kWh</Symbol>
-          <ConversionFactor>3600000</ConversionFactor>
           <Formula>
             <ConversionFactor>3600000</ConversionFactor>
             <Offset>0</Offset>
@@ -440,7 +401,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Watts</ClassName>
       <Symbol>W</Symbol>
       <QuantityName>Power</QuantityName>
@@ -448,7 +408,6 @@
         <Conversion>
           <ClassName>Nanowatts</ClassName>
           <Symbol>nW</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -458,7 +417,6 @@
         <Conversion>
           <ClassName>Microwatts</ClassName>
           <Symbol>µW</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -468,7 +426,6 @@
         <Conversion>
           <ClassName>Milliwatts</ClassName>
           <Symbol>mW</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -478,7 +435,6 @@
         <Conversion>
           <ClassName>Kilowatts</ClassName>
           <Symbol>kW</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -488,7 +444,6 @@
         <Conversion>
           <ClassName>Megawatts</ClassName>
           <Symbol>MW</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -498,7 +453,6 @@
         <Conversion>
           <ClassName>Gigawatts</ClassName>
           <Symbol>GW</Symbol>
-          <ConversionFactor>1000000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000000</ConversionFactor>
             <Offset>0</Offset>
@@ -518,7 +472,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>MetresPerSecond</ClassName>
       <Symbol>m/s</Symbol>
       <QuantityName>Speed</QuantityName>
@@ -526,7 +479,6 @@
         <Conversion>
           <ClassName>MillimetresPerSecond</ClassName>
           <Symbol>mm / s</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -536,7 +488,6 @@
         <Conversion>
           <ClassName>CentimetresPerSecond</ClassName>
           <Symbol>cm / s</Symbol>
-          <ConversionFactor>0.01</ConversionFactor>
           <Formula>
             <ConversionFactor>0.01</ConversionFactor>
             <Offset>0</Offset>
@@ -546,7 +497,6 @@
         <Conversion>
           <ClassName>KilometresPerHour</ClassName>
           <Symbol>km / h</Symbol>
-          <ConversionFactor>0.27777777777777779</ConversionFactor>
           <Formula>
             <ConversionFactor>0.27777777777777779</ConversionFactor>
             <Offset>0</Offset>
@@ -556,7 +506,6 @@
         <Conversion>
           <ClassName>CentimetresPerMinute</ClassName>
           <Symbol>cm / min</Symbol>
-          <ConversionFactor>0.00016666666666666666</ConversionFactor>
           <Formula>
             <ConversionFactor>0.00016666666666666666</ConversionFactor>
             <Offset>0</Offset>
@@ -566,7 +515,6 @@
         <Conversion>
           <ClassName>MetresPerMinute</ClassName>
           <Symbol>m / min</Symbol>
-          <ConversionFactor>0.016666666666666666</ConversionFactor>
           <Formula>
             <ConversionFactor>0.016666666666666666</ConversionFactor>
             <Offset>0</Offset>
@@ -576,7 +524,6 @@
         <Conversion>
           <ClassName>MetresPerHour</ClassName>
           <Symbol>m / h</Symbol>
-          <ConversionFactor>0.00027777777777777778</ConversionFactor>
           <Formula>
             <ConversionFactor>0.00027777777777777778</ConversionFactor>
             <Offset>0</Offset>
@@ -586,7 +533,6 @@
         <Conversion>
           <ClassName>MillimetresPerHour</ClassName>
           <Symbol>mm / h</Symbol>
-          <ConversionFactor>2.7777777777777776E-07</ConversionFactor>
           <Formula>
             <ConversionFactor>2.7777777777777776E-07</ConversionFactor>
             <Offset>0</Offset>
@@ -596,7 +542,6 @@
         <Conversion>
           <ClassName>CentimetresPerHour</ClassName>
           <Symbol>cm / h</Symbol>
-          <ConversionFactor>2.7777777777777779E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>2.7777777777777779E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -606,7 +551,6 @@
         <Conversion>
           <ClassName>MillimetresPerMinute</ClassName>
           <Symbol>mm / min</Symbol>
-          <ConversionFactor>1.6666666666666667E-05</ConversionFactor>
           <Formula>
             <ConversionFactor>1.6666666666666667E-05</ConversionFactor>
             <Offset>0</Offset>
@@ -626,7 +570,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>RadiansPerSecond</ClassName>
       <Symbol>rad/s</Symbol>
       <QuantityName>AngularSpeed</QuantityName>
@@ -634,7 +577,6 @@
         <Conversion>
           <ClassName>RevolutionsPerMinute</ClassName>
           <Symbol>rpm</Symbol>
-          <ConversionFactor>0.10471975511966</ConversionFactor>
           <Formula>
             <ConversionFactor>0.10471975511966</ConversionFactor>
             <Offset>0</Offset>
@@ -654,7 +596,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Hertz</ClassName>
       <Symbol>Hz</Symbol>
       <QuantityName>Frequency</QuantityName>
@@ -662,7 +603,6 @@
         <Conversion>
           <ClassName>Millihertz</ClassName>
           <Symbol>mHz</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -672,7 +612,6 @@
         <Conversion>
           <ClassName>Kilohertz</ClassName>
           <Symbol>kHz</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -682,7 +621,6 @@
         <Conversion>
           <ClassName>Megahertz</ClassName>
           <Symbol>MHz</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -692,7 +630,6 @@
         <Conversion>
           <ClassName>Gigahertz</ClassName>
           <Symbol>GHz</Symbol>
-          <ConversionFactor>1000000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000000</ConversionFactor>
             <Offset>0</Offset>
@@ -708,7 +645,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>MetresPerSecondSquared</ClassName>
       <Symbol>m/s²</Symbol>
       <QuantityName>Acceleration</QuantityName>
@@ -716,7 +652,6 @@
         <Conversion>
           <ClassName>MillimetresPerSecondSquared</ClassName>
           <Symbol>mm / s^2</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -726,7 +661,6 @@
         <Conversion>
           <ClassName>CentimetresPerSecondSquared</ClassName>
           <Symbol>cm / s^2</Symbol>
-          <ConversionFactor>0.0001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.0001</ConversionFactor>
             <Offset>0</Offset>
@@ -746,7 +680,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>NewtonMetres</ClassName>
       <Symbol>N⋅m</Symbol>
       <QuantityName>Torque</QuantityName>
@@ -767,7 +700,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>NewtonsPerMetre</ClassName>
       <Symbol>N/m</Symbol>
       <QuantityName>Stiffness</QuantityName>
@@ -784,7 +716,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>CubicMetresPerSecond</ClassName>
       <Symbol>m³ / s</Symbol>
       <QuantityName>VolumetricFlow</QuantityName>
@@ -801,7 +732,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Volts</ClassName>
       <Symbol>V</Symbol>
       <QuantityName>Voltage</QuantityName>
@@ -809,7 +739,6 @@
         <Conversion>
           <ClassName>Millivolts</ClassName>
           <Symbol>mV</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -819,7 +748,6 @@
         <Conversion>
           <ClassName>Kilovolts</ClassName>
           <Symbol>kV</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -829,7 +757,6 @@
         <Conversion>
           <ClassName>Megavolts</ClassName>
           <Symbol>MV</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -839,7 +766,6 @@
         <Conversion>
           <ClassName>Microvolts</ClassName>
           <Symbol>µV</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -859,7 +785,6 @@
       </Parts>
     </DerivedUnit>
     <DerivedUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Ohm</ClassName>
       <Symbol>Ω</Symbol>
       <QuantityName>Resistance</QuantityName>
@@ -867,7 +792,6 @@
         <Conversion>
           <ClassName>Microohm</ClassName>
           <Symbol>µΩ</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -877,7 +801,6 @@
         <Conversion>
           <ClassName>Milliohm</ClassName>
           <Symbol>mΩ</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -887,7 +810,6 @@
         <Conversion>
           <ClassName>Kiloohm</ClassName>
           <Symbol>kΩ</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -897,7 +819,6 @@
         <Conversion>
           <ClassName>Megaohm</ClassName>
           <Symbol>MΩ</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -987,7 +908,6 @@
   </DerivedUnits>
   <SiUnits>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Kilograms</ClassName>
       <Symbol>kg</Symbol>
       <QuantityName>Mass</QuantityName>
@@ -995,7 +915,6 @@
         <Conversion>
           <ClassName>Grams</ClassName>
           <Symbol>g</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -1005,7 +924,6 @@
         <Conversion>
           <ClassName>Milligrams</ClassName>
           <Symbol>mg</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -1015,7 +933,6 @@
         <Conversion>
           <ClassName>Micrograms</ClassName>
           <Symbol>µg</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -1025,7 +942,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Metres</ClassName>
       <Symbol>m</Symbol>
       <QuantityName>Length</QuantityName>
@@ -1033,7 +949,6 @@
         <Conversion>
           <ClassName>Nanometres</ClassName>
           <Symbol>nm</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -1043,7 +958,6 @@
         <Conversion>
           <ClassName>Micrometres</ClassName>
           <Symbol>µm</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -1053,7 +967,6 @@
         <Conversion>
           <ClassName>Millimetres</ClassName>
           <Symbol>mm</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -1063,7 +976,6 @@
         <Conversion>
           <ClassName>Centimetres</ClassName>
           <Symbol>cm</Symbol>
-          <ConversionFactor>0.01</ConversionFactor>
           <Formula>
             <ConversionFactor>0.01</ConversionFactor>
             <Offset>0</Offset>
@@ -1073,7 +985,6 @@
         <Conversion>
           <ClassName>Decimetres</ClassName>
           <Symbol>dm</Symbol>
-          <ConversionFactor>0.1</ConversionFactor>
           <Formula>
             <ConversionFactor>0.1</ConversionFactor>
             <Offset>0</Offset>
@@ -1083,7 +994,6 @@
         <Conversion>
           <ClassName>Kilometres</ClassName>
           <Symbol>km</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -1093,7 +1003,6 @@
         <Conversion>
           <ClassName>Inches</ClassName>
           <Symbol>in</Symbol>
-          <ConversionFactor>0.0254</ConversionFactor>
           <Formula>
             <ConversionFactor>0.0254</ConversionFactor>
             <Offset>0</Offset>
@@ -1103,7 +1012,6 @@
         <Conversion>
           <ClassName>Mile</ClassName>
           <Symbol>mi</Symbol>
-          <ConversionFactor>1609.344</ConversionFactor>
           <Formula>
             <ConversionFactor>1609.344</ConversionFactor>
             <Offset>0</Offset>
@@ -1113,7 +1021,6 @@
         <Conversion>
           <ClassName>Yard</ClassName>
           <Symbol>yd</Symbol>
-          <ConversionFactor>0.9144</ConversionFactor>
           <Formula>
             <ConversionFactor>0.9144</ConversionFactor>
             <Offset>0</Offset>
@@ -1123,7 +1030,6 @@
         <Conversion>
           <ClassName>NauticalMile</ClassName>
           <Symbol>nmi</Symbol>
-          <ConversionFactor>1852</ConversionFactor>
           <Formula>
             <ConversionFactor>1852</ConversionFactor>
             <Offset>0</Offset>
@@ -1133,7 +1039,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Seconds</ClassName>
       <Symbol>s</Symbol>
       <QuantityName>Time</QuantityName>
@@ -1141,7 +1046,6 @@
         <Conversion>
           <ClassName>Nanoseconds</ClassName>
           <Symbol>ns</Symbol>
-          <ConversionFactor>1E-09</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-09</ConversionFactor>
             <Offset>0</Offset>
@@ -1151,7 +1055,6 @@
         <Conversion>
           <ClassName>Microseconds</ClassName>
           <Symbol>µs</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -1161,7 +1064,6 @@
         <Conversion>
           <ClassName>Milliseconds</ClassName>
           <Symbol>ms</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -1171,7 +1073,6 @@
         <Conversion>
           <ClassName>Hours</ClassName>
           <Symbol>h</Symbol>
-          <ConversionFactor>3600</ConversionFactor>
           <Formula>
             <ConversionFactor>3600</ConversionFactor>
             <Offset>0</Offset>
@@ -1181,7 +1082,6 @@
         <Conversion>
           <ClassName>Minutes</ClassName>
           <Symbol>min</Symbol>
-          <ConversionFactor>60</ConversionFactor>
           <Formula>
             <ConversionFactor>60</ConversionFactor>
             <Offset>0</Offset>
@@ -1191,7 +1091,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Kelvin</ClassName>
       <Symbol>K</Symbol>
       <QuantityName>Temperature</QuantityName>
@@ -1199,7 +1098,6 @@
         <Conversion>
           <ClassName>Celsius</ClassName>
           <Symbol>°C</Symbol>
-          <ConversionFactor>1</ConversionFactor>
           <Formula>
             <ConversionFactor>1</ConversionFactor>
             <Offset>-273.15</Offset>
@@ -1209,7 +1107,6 @@
         <Conversion>
           <ClassName>Fahrenheit</ClassName>
           <Symbol>°F</Symbol>
-          <ConversionFactor>1.8</ConversionFactor>
           <Formula>
             <ConversionFactor>1.8</ConversionFactor>
             <Offset>-459.67</Offset>
@@ -1219,7 +1116,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Radians</ClassName>
       <Symbol>rad</Symbol>
       <QuantityName>Angle</QuantityName>
@@ -1227,7 +1123,6 @@
         <Conversion>
           <ClassName>Degrees</ClassName>
           <Symbol>°</Symbol>
-          <ConversionFactor>57.295779513082323</ConversionFactor>
           <Formula>
             <ConversionFactor>57.295779513082323</ConversionFactor>
             <Offset>0</Offset>
@@ -1237,7 +1132,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Fractions</ClassName>
       <Symbol>/x</Symbol>
       <QuantityName>Fraction</QuantityName>
@@ -1245,7 +1139,6 @@
         <Conversion>
           <ClassName>PartsPerMillion</ClassName>
           <Symbol>ppm</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
@@ -1255,7 +1148,6 @@
         <Conversion>
           <ClassName>Promilles</ClassName>
           <Symbol>‰</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -1265,7 +1157,6 @@
         <Conversion>
           <ClassName>Percents</ClassName>
           <Symbol>%</Symbol>
-          <ConversionFactor>0.01</ConversionFactor>
           <Formula>
             <ConversionFactor>0.01</ConversionFactor>
             <Offset>0</Offset>
@@ -1275,7 +1166,6 @@
       </Conversions>
     </SiUnit>
     <SiUnit>
-      <Namespace>Gu.Units</Namespace>
       <ClassName>Amperes</ClassName>
       <Symbol>A</Symbol>
       <QuantityName>Current</QuantityName>
@@ -1283,7 +1173,6 @@
         <Conversion>
           <ClassName>Milliamperes</ClassName>
           <Symbol>mA</Symbol>
-          <ConversionFactor>0.001</ConversionFactor>
           <Formula>
             <ConversionFactor>0.001</ConversionFactor>
             <Offset>0</Offset>
@@ -1293,7 +1182,6 @@
         <Conversion>
           <ClassName>Kiloamperes</ClassName>
           <Symbol>kA</Symbol>
-          <ConversionFactor>1000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000</ConversionFactor>
             <Offset>0</Offset>
@@ -1303,7 +1191,6 @@
         <Conversion>
           <ClassName>Megaamperes</ClassName>
           <Symbol>MA</Symbol>
-          <ConversionFactor>1000000</ConversionFactor>
           <Formula>
             <ConversionFactor>1000000</ConversionFactor>
             <Offset>0</Offset>
@@ -1313,7 +1200,6 @@
         <Conversion>
           <ClassName>Microamperes</ClassName>
           <Symbol>µA</Symbol>
-          <ConversionFactor>1E-06</ConversionFactor>
           <Formula>
             <ConversionFactor>1E-06</ConversionFactor>
             <Offset>0</Offset>
diff --git a/Gu.Units.Generator/MainWindow.xaml b/Gu.Units.Generator/MainWindow.xaml
index da75ddb4..42058c56 100644
--- a/Gu.Units.Generator/MainWindow.xaml
+++ b/Gu.Units.Generator/MainWindow.xaml
@@ -150,7 +150,6 @@
                                     <DataGridTextColumn Binding="{Binding Quantity.ClassName}" Header="Quantity" />
                                     <DataGridTextColumn Binding="{Binding ClassName}" Header="Unit" />
                                     <DataGridTextColumn Binding="{Binding Symbol}" Header="Symbol" />
-                                    <DataGridTextColumn Binding="{Binding ConversionFactor}" Header="Factor" />
                                     <DataGridTextColumn Binding="{Binding Formula}" Header="Formula" />
                                 </DataGrid.Columns>
                             </DataGrid>
diff --git a/Gu.Units.Generator/PartConversionVm.cs b/Gu.Units.Generator/PartConversionVm.cs
index 88f47f8a..dfc1c0ec 100644
--- a/Gu.Units.Generator/PartConversionVm.cs
+++ b/Gu.Units.Generator/PartConversionVm.cs
@@ -26,7 +26,7 @@ public bool IsUsed
         {
             get
             {
-                return _unit.Conversions.Any(x => x.ConversionFactor == Temp.ConversionFactor);
+                return _unit.Conversions.Any(x => x.Formula.ConversionFactor == Temp.Formula.ConversionFactor);
             }
             set
             {
@@ -42,7 +42,7 @@ public bool IsUsed
                 }
                 else
                 {
-                    _unit.Conversions.InvokeRemove(x => x.ConversionFactor == Temp.ConversionFactor);
+                    _unit.Conversions.InvokeRemove(x => x.Formula.ConversionFactor == Temp.Formula.ConversionFactor);
                 }
                 OnPropertyChanged();
             }
diff --git a/Gu.Units.Generator/PrefixConversionVm.cs b/Gu.Units.Generator/PrefixConversionVm.cs
index 66959356..e13d3d7b 100644
--- a/Gu.Units.Generator/PrefixConversionVm.cs
+++ b/Gu.Units.Generator/PrefixConversionVm.cs
@@ -34,7 +34,7 @@ public bool IsUsed
                 {
                     return false;
                 }
-                return _unit.Conversions.Any(x => x.ConversionFactor == _temp.ConversionFactor && x.Symbol == _temp.Symbol);
+                return _unit.Conversions.Any(x => x.Formula.ConversionFactor == _temp.Formula.ConversionFactor && x.Symbol == _temp.Symbol);
             }
             set
             {
diff --git a/Gu.Units.Generator/Templates/Quantity.tt b/Gu.Units.Generator/Templates/Quantity.tt
index e43e7f07..e543ad2e 100644
--- a/Gu.Units.Generator/Templates/Quantity.tt
+++ b/Gu.Units.Generator/Templates/Quantity.tt
@@ -12,12 +12,12 @@ if(QuantityMetaData != null)
 }
 else
 {
-    var unit = new SiUnit("Gu.Units", "Metres", "m")
+    var unit = new SiUnit("Metres", "m")
                     {
                         QuantityName = "Length"
                     };
-    unit.Conversions.Add(new Conversion("Gu.Units", "Centimetres", "cm"));
-    unit.Conversions.Add(new Conversion("Gu.Units", "Millimetres", "mm"));
+    unit.Conversions.Add(new Conversion("Centimetres", "cm"));
+    unit.Conversions.Add(new Conversion("Millimetres", "mm"));
     quantity = unit.Quantity;
 }
 #>
diff --git a/Gu.Units.Generator/Templates/Unit.tt b/Gu.Units.Generator/Templates/Unit.tt
index 3f6ec7c6..fd320ac6 100644
--- a/Gu.Units.Generator/Templates/Unit.tt
+++ b/Gu.Units.Generator/Templates/Unit.tt
@@ -12,12 +12,12 @@ if(UnitMetaData != null)
 }
 else
 {
-    unit = new SiUnit("Gu.Units", "Metres", "m")
+    unit = new SiUnit("Metres", "m")
                     {
                         QuantityName =  "Length"
                     };
-    unit.Conversions.Add(new Conversion("Gu.Units", "Centimetres", "cm"));
-    unit.Conversions.Add(new Conversion("Gu.Units", "Millimetres", "mm"));
+    unit.Conversions.Add(new Conversion("Centimetres", "cm"));
+    unit.Conversions.Add(new Conversion("Millimetres", "mm"));
 }
 #>
 namespace <#= Settings.Namespace #>
@@ -72,13 +72,13 @@ namespace <#= Settings.Namespace #>
 	if (unit.AnyOffsetConversion)
 	{
 	    #>
-		public static readonly <#= unit.QuantityName #>Unit <#= su.ClassName #> = new <#= unit.QuantityName #>Unit(<#= su.ConversionFactor #>, <#= su.Formula.Offset #>, "<#= su.Symbol #>");
+		public static readonly <#= unit.QuantityName #>Unit <#= su.ClassName #> = new <#= unit.QuantityName #>Unit(<#= su.Formula.ConversionFactor #>, <#= su.Formula.Offset #>, "<#= su.Symbol #>");
 <#
 	}
 	else
 	{
 	    #>
-		public static readonly <#= unit.QuantityName #>Unit <#= su.ClassName #> = new <#= unit.QuantityName #>Unit(<#= su.ConversionFactor #>, "<#= su.Symbol #>");
+		public static readonly <#= unit.QuantityName #>Unit <#= su.ClassName #> = new <#= unit.QuantityName #>Unit(<#= su.Formula.ConversionFactor #>, "<#= su.Symbol #>");
 <#
 	}
         #><#
diff --git a/Gu.Units.Generator/WpfStuff/TypeMetaDataConverter.cs b/Gu.Units.Generator/WpfStuff/TypeMetaDataConverter.cs
index 6cf2a77a..a20bd25c 100644
--- a/Gu.Units.Generator/WpfStuff/TypeMetaDataConverter.cs
+++ b/Gu.Units.Generator/WpfStuff/TypeMetaDataConverter.cs
@@ -18,7 +18,7 @@ public override bool CanConvertTo(ITypeDescriptorContext context, Type destinati
         
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            return value == null ? null : new TypeMetaData("", (string)value);
+            return value == null ? null : new TypeMetaData((string)value);
         }
         
         public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)