From b70b8c9ad0ef50c10d635b5d0b392d0360f156b4 Mon Sep 17 00:00:00 2001
From: Nicolas F Rouquette <nicolas.f.rouquette@jpl.nasa.gov>
Date: Sat, 28 Nov 2020 11:31:47 -0800
Subject: [PATCH 1/2] Taxonomies of mass quantities and magnitudes

---
 .../imce.jpl.nasa.gov/discipline/fse/fse.oml  |  76 ++++----
 .../projects/firesat/systems/pld/masses.oml   |   6 +-
 .../projects/firesat/systems/spc/masses.oml   |   6 +-
 .../workpackages/05/systems/pld/masses.oml    |  12 +-
 .../06/04/subsystems/sam/masses.oml           |  24 +--
 .../06/05/subsystems/thc/masses.oml           |   6 +-
 .../06/06/subsystems/eps/masses.oml           |  18 +-
 .../06/07/subsystems/ang/masses.oml           |  78 ++++----
 .../06/08/subsystems/prp/masses.oml           |  90 +++++-----
 .../06/09/subsystems/cmn/masses.oml           |  30 ++--
 .../06/10/subsystems/cdh/masses.oml           | 168 +++++++++---------
 .../workpackages/06/systems/spc/masses.oml    |  18 +-
 .../06/systems/spc/subsystems/ang/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/cdh/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/cmn/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/eps/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/prp/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/sam/masses.oml  |   6 +-
 .../06/systems/spc/subsystems/thc/masses.oml  |   6 +-
 19 files changed, 283 insertions(+), 291 deletions(-)

diff --git a/src/oml/imce.jpl.nasa.gov/discipline/fse/fse.oml b/src/oml/imce.jpl.nasa.gov/discipline/fse/fse.oml
index 922e0410..0c10c22a 100644
--- a/src/oml/imce.jpl.nasa.gov/discipline/fse/fse.oml
+++ b/src/oml/imce.jpl.nasa.gov/discipline/fse/fse.oml
@@ -14,6 +14,8 @@ vocabulary <http://imce.jpl.nasa.gov/discipline/fse/fse> with # as fse {
 
 	extends <http://iso.org/80000-6-magnitudes1>
 
+	uses <http://iso.org/80000-4-instances>
+
 	@rdfs:label "Reference Designated Element"
 	aspect ReferenceDesignatedElement :> base:IdentifiedElement
 
@@ -61,62 +63,52 @@ vocabulary <http://imce.jpl.nasa.gov/discipline/fse/fse> with # as fse {
 
 	ref concept project:WorkPackage :> MassAllocatedElement, MassEstimatedElement
 
-	@rdfs:label "Is Mass Of"
-	relation entity IsMassOf :> metrology:IsQuantityOf [
-		from 80000-4-quantities:mass
-		to MassConstrainedElement
-		forward isMassOf
-		reverse hasMass
+	@rdfs:label "Mass Estimate"
+	concept MassEstimate :> 80000-4-quantities:mass [
+		restricts all relation metrology:hasMagnitude to MassEstimateMagnitude
 	]
 
-	@rdfs:label "Is Mass Estimation Of"
-	relation entity IsMassEstimationOf :> IsMassOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMassEstimationOf
-		reverse hasMassEstimation
+	concept MassEstimateMagnitude :> 80000-4-units:MassMagnitude [
+		restricts relation metrology:hasReference to 80000-4-instances:kilogram
 	]
 
-	@rdfs:label "Is MEV Mass Of"
-	relation entity IsMEVMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMEVMassOf
-		reverse hasMEVMass
+	@rdfs:label "MEV Mass"
+	concept MEVMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to MEVMagnitue
 	]
 
-	@rdfs:label "Is MGA Mass Of"
-	relation entity IsMGAMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isMGAMassOf
-		reverse hasMGAMass
+	concept MEVMagnitue :> MassEstimateMagnitude
+
+	@rdfs:label "MGA Mass"
+	concept MGAMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to MGAMagnitude
 	]
 
-	@rdfs:label "Is CBE Mass Of"
-	relation entity IsCBEMassOf :> IsMassEstimationOf [
-		from 80000-4-quantities:mass
-		to MassEstimatedElement
-		forward isCBEMassOf
-		reverse hasCBEMassOf
+	concept MGAMagnitude :> MassEstimateMagnitude
+
+	@rdfs:label "CBE Mass"
+	concept CBEMass :> MassEstimate [
+		restricts all relation metrology:hasMagnitude to CBEMagnitude
 	]
 
-	@rdfs:label "Is Mass Allocation Of"
-	relation entity IsMassAllocationOf :> IsMassOf [
-		from 80000-4-quantities:mass
-		to MassAllocatedElement
-		forward isMassAllocationOf
-		reverse hasMassAllocation
+	concept CBEMagnitude :> MassEstimateMagnitude
+
+	@rdfs:label "Mass Allocation"
+	concept MassAllocation :> 80000-4-quantities:mass [
+		restricts all relation metrology:hasMagnitude to MassAllocationMagnitude
 	]
 
-	@rdfs:label "Is Mass Limit Of"
-	relation entity IsMassLimitOf :> IsMassAllocationOf [
-		from 80000-4-quantities:mass
-		to MassAllocatedElement
-		forward isMassLimitOf
-		reverse hasMassLimit
+	concept MassAllocationMagnitude :> 80000-4-units:MassMagnitude [
+		restricts relation metrology:hasReference to 80000-4-instances:kilogram
 	]
 
+	@rdfs:label "Mass Limit"
+	concept MassLimit :> MassAllocation [
+		restricts all relation metrology:hasMagnitude to MassLimitMagnitude
+	]
+
+	concept MassLimitMagnitude :> MassAllocationMagnitude
+
 	@rdfs:label "Connects Assembly"
 	relation entity ConnectsAssembly :> analysis:AnalyzedElement, analysis:CharacterizedElement [
 		from Function
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/pld/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/pld/masses.oml
index cd3270ca..f5652c80 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/pld/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/pld/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Payload Mass
 
 	@rdfs:label "Payload Mass Limit"
-	ci PayloadMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf pld:Payload
+	ci PayloadMassLimit : fse:MassLimit [
+		metrology:isQuantityOf pld:Payload
 	]
 	
 	@rdfs:label "Payload Mass Limit Magnitude"
-	ci PayloadMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PayloadMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "28.1"^^xsd:double
 		metrology:isMagnitudeOf PayloadMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/spc/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/spc/masses.oml
index e434c0d9..d293f666 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/spc/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/systems/spc/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Spacecraft Mass
 
 	@rdfs:label "Spacecraft Mass Limit"
-	ci SpacecraftMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf spc:Spacecraft
+	ci SpacecraftMassLimit : fse:MassLimit [
+		metrology:isQuantityOf spc:Spacecraft
 	]
 	
 	@rdfs:label "Spacecraft Mass Limit Magnitude"
-	ci SpacecraftMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SpacecraftMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "235.1"^^xsd:double
 		metrology:isMagnitudeOf SpacecraftMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/05/systems/pld/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/05/systems/pld/masses.oml
index 4e791066..dbc252bf 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/05/systems/pld/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/05/systems/pld/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Payload Module Mass
 
 	@rdfs:label "Payload Module CBE Mass"
-	ci PayloadModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf pld-assemblies:PayloadModule
+	ci PayloadModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf pld-assemblies:PayloadModule
 	]
 
 	@rdfs:label "Payload Module CBE Mass Magnitude"
-	ci PayloadModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PayloadModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PayloadModuleCBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Sensor Mass
 
 	@rdfs:label "Sensor CBE Mass"
-	ci SensorCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf pld-assemblies:Sensor
+	ci SensorCBEMass : fse:CBEMass [
+		metrology:isQuantityOf pld-assemblies:Sensor
 	]
 
 	@rdfs:label "Sensor CBE Mass Magnitude"
-	ci SensorCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SensorCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "28.1"^^xsd:double
 		metrology:isMagnitudeOf PayloadModuleCBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/04/subsystems/sam/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/04/subsystems/sam/masses.oml
index 6c461565..25012933 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/04/subsystems/sam/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/04/subsystems/sam/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Power Control Unit Mass
 
 	@rdfs:label "Power Control Unit CBE Mass"
-	ci PowerControlUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:PowerControlUnit
+	ci PowerControlUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:PowerControlUnit
 	]
 
 	@rdfs:label "Power Control Unit CBE Mass Magnitude"
-	ci PowerControlUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PowerControlUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "5.96"^^xsd:double
 		metrology:isMagnitudeOf PowerControlUnitCBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// EPS Regulators And Converters Unit Mass
 
 	@rdfs:label "EPS Regulators and Converters Unit CBE Mass"
-	ci EPSRegulatorsAndConvertersUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:EPSRegulatorsAndConvertersUnit
+	ci EPSRegulatorsAndConvertersUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:EPSRegulatorsAndConvertersUnit
 	]
 
 	@rdfs:label "EPS Regulators and Converters Unit CBE Mass Magnitude"
-	ci EPSRegulatorsAndConvertersUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci EPSRegulatorsAndConvertersUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "14.48"^^xsd:double
 		metrology:isMagnitudeOf EPSRegulatorsAndConvertersUnitCBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Solar Array With SADA 1 Mass
 
 	@rdfs:label "Solar Array With SADA 1 CBE Mass"
-	ci SolarArrayWithSADA1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:SolarArrayWithSADA1
+	ci SolarArrayWithSADA1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:SolarArrayWithSADA1
 	]
 
 	@rdfs:label "Solar Array With SADA 1 CBE Mass Magnitude"
-	ci SolarArrayWithSADA1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SolarArrayWithSADA1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "7.965"^^xsd:double
 		metrology:isMagnitudeOf SolarArrayWithSADA1CBEMass
 	]
@@ -47,12 +47,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Solar Array With SADA 2 Mass
 
 	@rdfs:label "Solar Array With SADA 2 CBE Mass"
-	ci SolarArrayWithSADA2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf sam-assemblies:SolarArrayWithSADA2
+	ci SolarArrayWithSADA2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf sam-assemblies:SolarArrayWithSADA2
 	]
 
 	@rdfs:label "Solar Array With SADA 2 CBE Mass Magnitude"
-	ci SolarArrayWithSADA2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SolarArrayWithSADA2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "7.965"^^xsd:double
 		metrology:isMagnitudeOf SolarArrayWithSADA2CBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/05/subsystems/thc/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/05/subsystems/thc/masses.oml
index eb8d9e02..1dc2f343 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/05/subsystems/thc/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/05/subsystems/thc/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Thermal Blankets Mass
 
 	@rdfs:label "Thermal Blankets CBE Mass"
-	ci ThermalBlanketsCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf thc-assemblies:ThermalBlankets
+	ci ThermalBlanketsCBEMass : fse:CBEMass [
+		metrology:isQuantityOf thc-assemblies:ThermalBlankets
 	]
 
 	@rdfs:label "Thermal Blankets CBE Mass Magnitude"
-	ci ThermalBlanketsCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ThermalBlanketsCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.9"^^xsd:double
 		metrology:isMagnitudeOf ThermalBlanketsCBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/06/subsystems/eps/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/06/subsystems/eps/masses.oml
index b584bed3..0e9f64d5 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/06/subsystems/eps/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/06/subsystems/eps/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Battery Pack 1 Mass
 
 	@rdfs:label "Battery Pack 1 CBE Mass"
-	ci BatteryPack1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack1
+	ci BatteryPack1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack1
 	]
 
 	@rdfs:label "Battery Pack 1 CBE Mass Magnitude"
-	ci BatteryPack1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack1CBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Battery Pack 2 Mass
 
 	@rdfs:label "Battery Pack 2 CBE Mass"
-	ci BatteryPack2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack2
+	ci BatteryPack2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack2
 	]
 
 	@rdfs:label "Battery Pack 2 CBE Mass Magnitude"
-	ci BatteryPack2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack2CBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Battery Pack 3 Mass
 
 	@rdfs:label "Battery Pack 3 CBE Mass"
-	ci BatteryPack3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf eps-assemblies:BatteryPack3
+	ci BatteryPack3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf eps-assemblies:BatteryPack3
 	]
 
 	@rdfs:label "Battery Pack 3 CBE Mass Magnitude"
-	ci BatteryPack3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BatteryPack3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.103"^^xsd:double
 		metrology:isMagnitudeOf BatteryPack3CBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/07/subsystems/ang/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/07/subsystems/ang/masses.oml
index 16b3c24b..920ed10c 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/07/subsystems/ang/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/07/subsystems/ang/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Magnetometer Mass
 
 	@rdfs:label "Magnetometer CBE Mass"
-	ci MagnetometerCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:Magnetometer
+	ci MagnetometerCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:Magnetometer
 	]
 
 	@rdfs:label "Magnetometer CBE Mass Magnitude"
-	ci MagnetometerCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci MagnetometerCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.85"^^xsd:double
 		metrology:isMagnitudeOf MagnetometerCBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// GPS Antenna Mass
 
 	@rdfs:label "GPS Antenna CBE Mass"
-	ci GPSAntennaCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:GPSAntenna
+	ci GPSAntennaCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:GPSAntenna
 	]
 
 	@rdfs:label "GPS Antenna CBE Mass Magnitude"
-	ci GPSAntennaCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci GPSAntennaCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.25"^^xsd:double
 		metrology:isMagnitudeOf GPSAntennaCBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// GPS Receiver Unit Mass
 
 	@rdfs:label "GPS Receiver Unit CBE Mass"
-	ci GPSReceiverUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:GPSReceiverUnit
+	ci GPSReceiverUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:GPSReceiverUnit
 	]
 
 	@rdfs:label "GPS Receiver Unit CBE Mass Magnitude"
-	ci GPSReceiverUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci GPSReceiverUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "1.0"^^xsd:double
 		metrology:isMagnitudeOf GPSReceiverUnitCBEMass
 	]
@@ -47,12 +47,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ADCS Electronics Unit Mass
 
 	@rdfs:label "ADCS Electronics Unit CBE Mass"
-	ci ADCSElectronicsUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:ADCSElectronicsUnit
+	ci ADCSElectronicsUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:ADCSElectronicsUnit
 	]
 
 	@rdfs:label "ADCS Electronics Unit CBE Mass Magnitude"
-	ci ADCSElectronicsUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ADCSElectronicsUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.0"^^xsd:double
 		metrology:isMagnitudeOf ADCSElectronicsUnitCBEMass
 	]
@@ -60,12 +60,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Sun Sensor Mass
 
 	@rdfs:label "Sun Sensor CBE Mass"
-	ci SunSensorCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:SunSensor
+	ci SunSensorCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:SunSensor
 	]
 
 	@rdfs:label "Sun Sensor CBE Mass Magnitude"
-	ci SunSensorCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SunSensorCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf SunSensorCBEMass
 	]
@@ -73,12 +73,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Earth Sensor Mass
 
 	@rdfs:label "Earth Sensor CBE Mass"
-	ci EarthSensorCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:EarthSensor
+	ci EarthSensorCBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:EarthSensor
 	]
 
 	@rdfs:label "Earth Sensor CBE Mass Magnitude"
-	ci EarthSensorCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci EarthSensorCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.75"^^xsd:double
 		metrology:isMagnitudeOf EarthSensorCBEMass
 	]
@@ -86,12 +86,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Reaction Wheel 1 Mass
 
 	@rdfs:label "Reaction Wheel 1 CBE Mass"
-	ci ReactionWheel1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:ReactionWheel1
+	ci ReactionWheel1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:ReactionWheel1
 	]
 
 	@rdfs:label "Reaction Wheel 1 CBE Mass Magnitude"
-	ci ReactionWheel1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReactionWheel1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.1975"^^xsd:double
 		metrology:isMagnitudeOf ReactionWheel1CBEMass
 	]
@@ -99,12 +99,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Reaction Wheel 2 Mass
 
 	@rdfs:label "Reaction Wheel 2 CBE Mass"
-	ci ReactionWheel2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:ReactionWheel2
+	ci ReactionWheel2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:ReactionWheel2
 	]
 
 	@rdfs:label "Reaction Wheel 2 CBE Mass Magnitude"
-	ci ReactionWheel2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReactionWheel2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.1975"^^xsd:double
 		metrology:isMagnitudeOf ReactionWheel2CBEMass
 	]
@@ -112,12 +112,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Reaction Wheel 3 Mass
 
 	@rdfs:label "Reaction Wheel 3 CBE Mass"
-	ci ReactionWheel3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:ReactionWheel3
+	ci ReactionWheel3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:ReactionWheel3
 	]
 
 	@rdfs:label "Reaction Wheel 3 CBE Mass"
-	ci ReactionWheel3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReactionWheel3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.1975"^^xsd:double
 		metrology:isMagnitudeOf ReactionWheel3CBEMass
 	]
@@ -125,12 +125,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Reaction Wheel 4 Mass
 
 	@rdfs:label "Reaction Wheel 4 CBE Mass"
-	ci ReactionWheel4CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:ReactionWheel4
+	ci ReactionWheel4CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:ReactionWheel4
 	]
 
 	@rdfs:label "Reaction Wheel 4 CBE Mass Magnitude"
-	ci ReactionWheel4CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReactionWheel4CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.1975"^^xsd:double
 		metrology:isMagnitudeOf ReactionWheel4CBEMass
 	]
@@ -138,12 +138,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Magnetorquer 1 Mass
 
 	@rdfs:label "Magnetorquer 1 CBE Mass"
-	ci Magnetorquer1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:Magnetorquer1
+	ci Magnetorquer1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:Magnetorquer1
 	]
 
 	@rdfs:label "Magnetorquer 1 CBE Mass Magnitude"
-	ci Magnetorquer1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci Magnetorquer1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf Magnetorquer1CBEMass
 	]
@@ -151,12 +151,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Magnetorquer 2 Mass
 
 	@rdfs:label "Magnetorquer 2 CBE Mass"
-	ci Magnetorquer2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:Magnetorquer2
+	ci Magnetorquer2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:Magnetorquer2
 	]
 
 	@rdfs:label "Magnetorquer 2 CBE Mass Magnitude"
-	ci Magnetorquer2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci Magnetorquer2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf Magnetorquer2CBEMass
 	]
@@ -164,12 +164,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Magnetorquer 3 Mass
 
 	@rdfs:label "Magnetorquer 3 CBE Mass"
-	ci Magnetorquer3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf ang-assemblies:Magnetorquer3
+	ci Magnetorquer3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf ang-assemblies:Magnetorquer3
 	]
 
 	@rdfs:label "Magnetorquer 3 CBE Mass Magnitude"
-	ci Magnetorquer3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci Magnetorquer3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf Magnetorquer3CBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/08/subsystems/prp/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/08/subsystems/prp/masses.oml
index 0672a134..0951dd22 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/08/subsystems/prp/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/08/subsystems/prp/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion System Control Unit Mass
 
 	@rdfs:label "Propulsion System Control Unit CBE Mass"
-	ci PropulsionSystemControlUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PropulsionSystemControlUnit
+	ci PropulsionSystemControlUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PropulsionSystemControlUnit
 	]
 
 	@rdfs:label "Propulsion System Control Unit CBE Mass Magnitude"
-	ci PropulsionSystemControlUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionSystemControlUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "1.0"^^xsd:double
 		metrology:isMagnitudeOf PropulsionSystemControlUnitCBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Primary Thruster Mass
 
 	@rdfs:label "Primary Thruster CBE Mass"
-	ci PrimaryThrusterCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PrimaryThruster
+	ci PrimaryThrusterCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PrimaryThruster
 	]
 
 	@rdfs:label "Primary Thruster CBE Mass Magnitude"
-	ci PrimaryThrusterCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PrimaryThrusterCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "1.0"^^xsd:double
 		metrology:isMagnitudeOf PrimaryThrusterCBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 1 Mass
 
 	@rdfs:label "A CS Thruster 1 CBE Mass"
-	ci ACSThruster1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster1
+	ci ACSThruster1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster1
 	]
 
 	@rdfs:label "A CS Thruster 1 CBE Mass Magnitude"
-	ci ACSThruster1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster1CBEMass
 	]
@@ -47,12 +47,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 2 Mass
 
 	@rdfs:label "A CS Thruster 2 CBE Mass"
-	ci ACSThruster2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster2
+	ci ACSThruster2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster2
 	]
 
 	@rdfs:label "A CS Thruster 2 CBE Mass Magnitude"
-	ci ACSThruster2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster2CBEMass
 	]
@@ -60,12 +60,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 3 Mass
 
 	@rdfs:label "A CS Thruster 3 CBE Mass"
-	ci ACSThruster3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster3
+	ci ACSThruster3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster3
 	]
 
 	@rdfs:label "A CS Thruster 3 CBE Mass Magnitude"
-	ci ACSThruster3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster3CBEMass
 	]
@@ -73,12 +73,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 4 Mass
 
 	@rdfs:label "A CS Thruster 4 CBE Mass"
-	ci ACSThruster4CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster4
+	ci ACSThruster4CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster4
 	]
 
 	@rdfs:label "A CS Thruster 4 CBE Mass Magnitude"
-	ci ACSThruster4CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster4CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster4CBEMass
 	]
@@ -86,12 +86,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 5 Mass
 
 	@rdfs:label "A CS Thruster 5 CBE Mass"
-	ci ACSThruster5CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster5
+	ci ACSThruster5CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster5
 	]
 
 	@rdfs:label "A CS Thruster 5 CBE Mass Magnitude"
-	ci ACSThruster5CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster5CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster5CBEMass
 	]
@@ -99,12 +99,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ACS Thruster 6 Mass
 
 	@rdfs:label "A CS Thruster 6 CBE Mass"
-	ci ACSThruster6CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:ACSThruster6
+	ci ACSThruster6CBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:ACSThruster6
 	]
 
 	@rdfs:label "A CS Thruster 6 CBE Mass Magnitude"
-	ci ACSThruster6CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ACSThruster6CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.5"^^xsd:double
 		metrology:isMagnitudeOf ACSThruster6CBEMass
 	]
@@ -112,12 +112,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propellant Handling Section Mass
 
 	@rdfs:label "Propellant Handling Section CBE Mass"
-	ci PropellantHandlingSectionCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PropellantHandlingSection
+	ci PropellantHandlingSectionCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PropellantHandlingSection
 	]
 
 	@rdfs:label "Propellant Handling Section CBE Mass Magnitude"
-	ci PropellantHandlingSectionCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropellantHandlingSectionCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropellantHandlingSectionCBEMass
 	]
@@ -125,12 +125,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Fill Drain Valve Unit Mass
 
 	@rdfs:label "Fill Drain Valve Unit CBE Mass"
-	ci FillDrainValveUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:FillDrainValveUnit
+	ci FillDrainValveUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:FillDrainValveUnit
 	]
 
 	@rdfs:label "Fill Drain Valve Unit CBE Mass Magnitude"
-	ci FillDrainValveUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci FillDrainValveUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.75"^^xsd:double
 		metrology:isMagnitudeOf FillDrainValveUnitCBEMass
 	]
@@ -138,12 +138,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// BP Propellant Line Unit Mass
 
 	@rdfs:label "BP Propellant Line Unit CBE Mass"
-	ci BPPropellantLineUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:BPPropellantLineUnit
+	ci BPPropellantLineUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:BPPropellantLineUnit
 	]
 
 	@rdfs:label "BP Propellant Line Unit CBE Mass Magnitude"
-	ci BPPropellantLineUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BPPropellantLineUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.695"^^xsd:double
 		metrology:isMagnitudeOf BPPropellantLineUnitCBEMass
 	]
@@ -151,12 +151,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Module Mass
 
 	@rdfs:label "Propulsion Module CBE Mass"
-	ci PropulsionModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PropulsionModule
+	ci PropulsionModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PropulsionModule
 	]
 
 	@rdfs:label "Propulsion Module CBE Mass Magnitude"
-	ci PropulsionModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropulsionModuleCBEMass
 	]
@@ -164,12 +164,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propellant Tank Mass
 
 	@rdfs:label "Propellant Tank CBE Mass"
-	ci PropellantTankCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PropellantTank
+	ci PropellantTankCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PropellantTank
 	]
 
 	@rdfs:label "Propellant Tank CBE Mass Magnitude"
-	ci PropellantTankCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropellantTankCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "20.0"^^xsd:double
 		metrology:isMagnitudeOf PropellantTankCBEMass
 	]
@@ -177,12 +177,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Pressurant Tank Mass
 
 	@rdfs:label "Pressurant Tank CBE Mass"
-	ci PressurantTankCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PressurantTank
+	ci PressurantTankCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PressurantTank
 	]
 
 	@rdfs:label "Pressurant Tank CBE Mass Magnitude"
-	ci PressurantTankCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PressurantTankCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "10.0"^^xsd:double
 		metrology:isMagnitudeOf PressurantTankCBEMass
 	]
@@ -190,12 +190,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// PM Propellant Line Unit Mass
 
 	@rdfs:label "PM Propellant Line Unit CBE Mass"
-	ci PMPropellantLineUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf prp-assemblies:PMPropellantLineUnit
+	ci PMPropellantLineUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf prp-assemblies:PMPropellantLineUnit
 	]
 
 	@rdfs:label "PM Propellant Line Unit CBE Mass Magnitude"
-	ci PMPropellantLineUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PMPropellantLineUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.695"^^xsd:double
 		metrology:isMagnitudeOf PMPropellantLineUnitCBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/09/subsystems/cmn/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/09/subsystems/cmn/masses.oml
index 260f97af..00f3fe62 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/09/subsystems/cmn/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/09/subsystems/cmn/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Transmitter Unit Mass
 
 	@rdfs:label "Transmitter Unit CBE Mass"
-	ci TransmitterUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cmn-assemblies:TransmitterUnit
+	ci TransmitterUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cmn-assemblies:TransmitterUnit
 	]
 
 	@rdfs:label "Transmitter Unit CBE Mass Magnitude"
-	ci TransmitterUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci TransmitterUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.1"^^xsd:double
 		metrology:isMagnitudeOf TransmitterUnitCBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Receiver Unit Mass
 
 	@rdfs:label "Receiver Unit CBE Mass"
-	ci ReceiverUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cmn-assemblies:ReceiverUnit
+	ci ReceiverUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cmn-assemblies:ReceiverUnit
 	]
 
 	@rdfs:label "Receiver Unit CBE Mass Magnitude"
-	ci ReceiverUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReceiverUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "1.0"^^xsd:double
 		metrology:isMagnitudeOf ReceiverUnitCBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Transmit Whip Antenna Mass
 
 	@rdfs:label "Transmit Whip Antenna CBE Mass"
-	ci TransmitWhipAntennaCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cmn-assemblies:TransmitWhipAntenna
+	ci TransmitWhipAntennaCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cmn-assemblies:TransmitWhipAntenna
 	]
 
 	@rdfs:label "Transmit Whip Antenna CBE Mass Magnitude"
-	ci TransmitWhipAntennaCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci TransmitWhipAntennaCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.04"^^xsd:double
 		metrology:isMagnitudeOf TransmitWhipAntennaCBEMass
 	]
@@ -47,12 +47,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Transmit Hi-Gain Antenna Mass
 
 	@rdfs:label "Transmit Hi-Gain Antenna CBE Mass"
-	ci TransmitHiGainAntennaCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cmn-assemblies:TransmitHiGainAntenna
+	ci TransmitHiGainAntennaCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cmn-assemblies:TransmitHiGainAntenna
 	]
 
 	@rdfs:label "Transmit Hi-Gain Antenna CBE Mass Magnitude"
-	ci TransmitHiGainAntennaCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci TransmitHiGainAntennaCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.04"^^xsd:double
 		metrology:isMagnitudeOf TransmitHiGainAntennaCBEMass
 	]
@@ -60,12 +60,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Receive Whip Antenna Mass
 
 	@rdfs:label "Receive Whip Antenna CBE Mass"
-	ci ReceiveWhipAntennaCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cmn-assemblies:ReceiveWhipAntenna
+	ci ReceiveWhipAntennaCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cmn-assemblies:ReceiveWhipAntenna
 	]
 
 	@rdfs:label "Receive Whip Antenna CBE Mass Magnitude"
-	ci ReceiveWhipAntennaCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ReceiveWhipAntennaCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.08"^^xsd:double
 		metrology:isMagnitudeOf ReceiveWhipAntennaCBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/10/subsystems/cdh/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/10/subsystems/cdh/masses.oml
index b44593b1..595b695c 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/10/subsystems/cdh/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/10/subsystems/cdh/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Structure Post 1 Mass
 
 	@rdfs:label "Propulsion Structure Post 1 CBE Mass"
-	ci PropulsionStructurePost1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PropulsionStructurePost1
+	ci PropulsionStructurePost1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PropulsionStructurePost1
 	]
 
 	@rdfs:label "Propulsion Structure Post 1 CBE Mass Magnitude"
-	ci PropulsionStructurePost1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionStructurePost1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropulsionStructurePost1CBEMass
 	]
@@ -21,12 +21,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Structure Post 2 Mass
 
 	@rdfs:label "Propulsion Structure Post 2 CBE Mass"
-	ci PropulsionStructurePost2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PropulsionStructurePost2
+	ci PropulsionStructurePost2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PropulsionStructurePost2
 	]
 
 	@rdfs:label "Propulsion Structure Post 2 CBE Mass Magnitude"
-	ci PropulsionStructurePost2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionStructurePost2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropulsionStructurePost2CBEMass
 	]
@@ -34,12 +34,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Structure Post 3 Mass
 
 	@rdfs:label "Propulsion Structure Post 3 CBE Mass"
-	ci PropulsionStructurePost3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PropulsionStructurePost3
+	ci PropulsionStructurePost3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PropulsionStructurePost3
 	]
 
 	@rdfs:label "Propulsion Structure Post 3 CBE Mass Magnitude"
-	ci PropulsionStructurePost3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionStructurePost3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropulsionStructurePost3CBEMass
 	]
@@ -47,12 +47,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Structure Post 4 Mass
 
 	@rdfs:label "Propulsion Structure Post 4 CBE Mass"
-	ci PropulsionStructurePost4CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PropulsionStructurePost4
+	ci PropulsionStructurePost4CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PropulsionStructurePost4
 	]
 
 	@rdfs:label "Propulsion Structure Post 4 CBE Mass Magnitude"
-	ci PropulsionStructurePost4CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionStructurePost4CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf PropulsionStructurePost4CBEMass
 	]
@@ -60,12 +60,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 1 Mass
 
 	@rdfs:label "Structure Post 1 CBE Mass"
-	ci StructurePost1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost1
+	ci StructurePost1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost1
 	]
 
 	@rdfs:label "Structure Post 1 CBE Mass Magnitude"
-	ci StructurePost1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost1CBEMass
 	]
@@ -73,12 +73,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 2 Mass
 
 	@rdfs:label "Structure Post 2 CBE Mass"
-	ci StructurePost2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost2
+	ci StructurePost2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost2
 	]
 
 	@rdfs:label "Structure Post 2 CBE Mass Magnitude"
-	ci StructurePost2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost2CBEMass
 	]
@@ -86,12 +86,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 3 Mass
 
 	@rdfs:label "Structure Post 3 CBE Mass"
-	ci StructurePost3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost3
+	ci StructurePost3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost3
 	]
 
 	@rdfs:label "Structure Post 3 CBE Mass Magnitude"
-	ci StructurePost3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost3CBEMass
 	]
@@ -99,12 +99,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 4 Mass
 
 	@rdfs:label "Structure Post 4 CBE Mass"
-	ci StructurePost4CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost4
+	ci StructurePost4CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost4
 	]
 
 	@rdfs:label "Structure Post 4 CBE Mass Magnitude"
-	ci StructurePost4CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost4CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost4CBEMass
 	]
@@ -112,12 +112,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 5 Mass
 
 	@rdfs:label "Structure Post 5 CBE Mass"
-	ci StructurePost5CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost5
+	ci StructurePost5CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost5
 	]
 
 	@rdfs:label "Structure Post 5 CBE Mass Magnitude"
-	ci StructurePost5CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost5CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost5CBEMass
 	]
@@ -125,12 +125,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structure Post 6 Mass
 
 	@rdfs:label "Structure Post 6 CBE Mass"
-	ci StructurePost6CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:StructurePost6
+	ci StructurePost6CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:StructurePost6
 	]
 
 	@rdfs:label "Structure Post 6 CBE Mass Magnitude"
-	ci StructurePost6CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructurePost6CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf StructurePost6CBEMass
 	]
@@ -138,12 +138,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 1 Mass
 
 	@rdfs:label "Side Panel 1 CBE Mass"
-	ci SidePanel1CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel1
+	ci SidePanel1CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel1
 	]
 
 	@rdfs:label "Side Panel 1 CBE Mass Magnitude"
-	ci SidePanel1CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel1CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel1CBEMass
 	]
@@ -151,12 +151,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 2 Mass
 
 	@rdfs:label "Side Panel 2 CBE Mass"
-	ci SidePanel2CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel2
+	ci SidePanel2CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel2
 	]
 
 	@rdfs:label "Side Panel 2 CBE Mass Magnitude"
-	ci SidePanel2CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel2CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel2CBEMass
 	]
@@ -164,12 +164,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 3 Mass
 
 	@rdfs:label "Side Panel 3 CBE Mass"
-	ci SidePanel3CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel3
+	ci SidePanel3CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel3
 	]
 
 	@rdfs:label "Side Panel 3 CBE Mass Magnitude"
-	ci SidePanel3CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel3CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel3CBEMass
 	]
@@ -177,12 +177,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 4 Mass
 
 	@rdfs:label "Side Panel 4 CBE Mass"
-	ci SidePanel4CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel4
+	ci SidePanel4CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel4
 	]
 
 	@rdfs:label "Side Panel 4 CBE Mass Magnitude"
-	ci SidePanel4CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel4CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel4CBEMass
 	]
@@ -190,12 +190,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 5 Mass
 
 	@rdfs:label "Side Panel 5 CBE Mass"
-	ci SidePanel5CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel5
+	ci SidePanel5CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel5
 	]
 
 	@rdfs:label "Side Panel 5 CBE Mass Magnitude"
-	ci SidePanel5CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel5CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel5CBEMass
 	]
@@ -203,12 +203,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Side Panel 6 Mass
 
 	@rdfs:label "Side Panel 6 CBE Mass"
-	ci SidePanel6CBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SidePanel6
+	ci SidePanel6CBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SidePanel6
 	]
 
 	@rdfs:label "Side Panel 6 CBE Mass Magnitude"
-	ci SidePanel6CBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SidePanel6CBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.8"^^xsd:double
 		metrology:isMagnitudeOf SidePanel6CBEMass
 	]
@@ -216,12 +216,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Base Plate Module Mass
 
 	@rdfs:label "Base Plate Module CBE Mass"
-	ci BasePlateModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:BasePlateModule
+	ci BasePlateModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:BasePlateModule
 	]
 
 	@rdfs:label "Base Plate Module CBE Mass Magnitude"
-	ci BasePlateModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BasePlateModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf BasePlateModuleCBEMass
 	]
@@ -229,12 +229,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Base Plate Mass
 
 	@rdfs:label "Base Plate CBE Mass"
-	ci BasePlateCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:BasePlate
+	ci BasePlateCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:BasePlate
 	]
 
 	@rdfs:label "Base Plate CBE Mass Magnitude"
-	ci BasePlateCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci BasePlateCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "1.32"^^xsd:double
 		metrology:isMagnitudeOf BasePlateCBEMass
 	]
@@ -242,12 +242,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Avionics Stack Section Mass
 
 	@rdfs:label "Avionics Stack Section CBE Mass"
-	ci AvionicsStackSectionCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:AvionicsStackSection
+	ci AvionicsStackSectionCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:AvionicsStackSection
 	]
 
 	@rdfs:label "Avionics Stack Section CBE Mass Magnitude"
-	ci AvionicsStackSectionCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci AvionicsStackSectionCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf AvionicsStackSectionCBEMass
 	]
@@ -255,12 +255,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Primary Flight Computer Unit Mass
 
 	@rdfs:label "Primary Flight Computer Unit CBE Mass"
-	ci PrimaryFlightComputerUnitCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PrimaryFlightComputerUnit
+	ci PrimaryFlightComputerUnitCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PrimaryFlightComputerUnit
 	]
 
 	@rdfs:label "Primary Flight Computer Unit CBE Mass Magnitude"
-	ci PrimaryFlightComputerUnitCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PrimaryFlightComputerUnitCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.35"^^xsd:double
 		metrology:isMagnitudeOf PrimaryFlightComputerUnitCBEMass
 	]
@@ -268,12 +268,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Launch Vehicle Interface Module Mass
 
 	@rdfs:label "Launch Vehicle Interface Module CBE Mass"
-	ci LaunchVehicleInterfaceModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:LaunchVehicleInterfaceModule
+	ci LaunchVehicleInterfaceModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:LaunchVehicleInterfaceModule
 	]
 
 	@rdfs:label "Launch Vehicle Interface Module CBE Mass Magnitude"
-	ci LaunchVehicleInterfaceModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci LaunchVehicleInterfaceModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf LaunchVehicleInterfaceModuleCBEMass
 	]
@@ -281,12 +281,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Launch Vehicle Adapter Mass
 
 	@rdfs:label "Launch Vehicle Adapter CBE Mass"
-	ci LaunchVehicleAdapterCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:LaunchVehicleAdapter
+	ci LaunchVehicleAdapterCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:LaunchVehicleAdapter
 	]
 
 	@rdfs:label "Launch Vehicle Adapter CBE Magnitude"
-	ci LaunchVehicleAdapterCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci LaunchVehicleAdapterCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "5.0"^^xsd:double
 		metrology:isMagnitudeOf LaunchVehicleAdapterCBEMass
 	]
@@ -294,12 +294,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Separation System Mass
 
 	@rdfs:label "Separation System CBE Mass"
-	ci SeparationSystemCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:SeparationSystem
+	ci SeparationSystemCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:SeparationSystem
 	]
 
 	@rdfs:label "Separation System CBE Mass Magnitude"
-	ci SeparationSystemCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SeparationSystemCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.0"^^xsd:double
 		metrology:isMagnitudeOf SeparationSystemCBEMass
 	]
@@ -307,12 +307,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propellant Tank Mounting Panel Mass
 
 	@rdfs:label "Propellant Tank Mounting Panel CBE Mass"
-	ci PropellantTankMountingPanelCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PropellantTankMountingPanel
+	ci PropellantTankMountingPanelCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PropellantTankMountingPanel
 	]
 
 	@rdfs:label "Propellant Tank Mounting Panel CBE Mass Magnitude"
-	ci PropellantTankMountingPanelCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropellantTankMountingPanelCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.7"^^xsd:double
 		metrology:isMagnitudeOf PropellantTankMountingPanelCBEMass
 	]
@@ -320,12 +320,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Pressurant Tank Mounting Panel Mass
 
 	@rdfs:label "Pressurant Tank Mounting Panel CBE Mass"
-	ci PressurantTankMountingPanelCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PressurantTankMountingPanel
+	ci PressurantTankMountingPanelCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PressurantTankMountingPanel
 	]
 
 	@rdfs:label "Pressurant Tank Mounting Panel CBE Mass Magnitude"
-	ci PressurantTankMountingPanelCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PressurantTankMountingPanelCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.7"^^xsd:double
 		metrology:isMagnitudeOf PressurantTankMountingPanelCBEMass
 	]
@@ -333,12 +333,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Payload Structural Interface Mass
 
 	@rdfs:label "Payload Structural Interface CBE Mass"
-	ci PayloadStructuralInterfaceCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:PayloadStructuralInterface
+	ci PayloadStructuralInterfaceCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:PayloadStructuralInterface
 	]
 
 	@rdfs:label "Payload Structural Interface CBE Mass Magnitude"
-	ci PayloadStructuralInterfaceCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PayloadStructuralInterfaceCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "3.5"^^xsd:double
 		metrology:isMagnitudeOf PayloadStructuralInterfaceCBEMass
 	]
@@ -346,12 +346,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Top Panel Module Mass
 
 	@rdfs:label "Top Panel Module CBE Mass"
-	ci TopPanelModuleCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:TopPanelModule
+	ci TopPanelModuleCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:TopPanelModule
 	]
 
 	@rdfs:label "Top Panel Module CBE Mass Magnitude"
-	ci TopPanelModuleCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci TopPanelModuleCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf TopPanelModuleCBEMass
 	]
@@ -359,12 +359,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Top Panel Mass
 
 	@rdfs:label "Top Panel CBE Mass"
-	ci TopPanelCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf cdh-assemblies:TopPanel
+	ci TopPanelCBEMass : fse:CBEMass [
+		metrology:isQuantityOf cdh-assemblies:TopPanel
 	]
 	
 	@rdfs:label "Top Panel CBE Mass Magnitude"
-	ci TopPanelCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci TopPanelCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "2.7"^^xsd:double
 		metrology:isMagnitudeOf TopPanelCBEMass
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/masses.oml
index c5ae092d..d58b695f 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Spacecraft System Segment Mass
 
 	@rdfs:label "Spacecraft System Segment CBE Mass"
-	ci SpacecraftSystemSegmentCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf spc-assemblies:SpacecraftSystemSegment
+	ci SpacecraftSystemSegmentCBEMass : fse:CBEMass [
+		metrology:isQuantityOf spc-assemblies:SpacecraftSystemSegment
 	]
 
 	@rdfs:label "Spacecraft System Segment CBE Mass Magnitude"
-	ci SpacecraftSystemSegmentCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci SpacecraftSystemSegmentCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "0.6"^^xsd:double
 		metrology:isMagnitudeOf SpacecraftSystemSegmentCBEMass
 	]
@@ -21,23 +21,23 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propellant Mass
 
 	@rdfs:label "Propellant CBE Mass"
-	ci PropellantCBEMass : 80000-4-quantities:mass [
-		fse:isCBEMassOf spc-assemblies:Propellant
+	ci PropellantCBEMass : fse:CBEMass [
+		metrology:isQuantityOf spc-assemblies:Propellant
 	]
 
 	@rdfs:label "Propellant CBE Mass Magnitude"
-	ci PropellantCBEMassMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropellantCBEMassMagnitude : fse:CBEMagnitude [
 		metrology:hasDoubleNumber "66.21"^^xsd:double
 		metrology:isMagnitudeOf PropellantCBEMass
 	]
 
 	@rdfs:label "Propellant Mass Limit"
-	ci PropellantMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf spc-assemblies:Propellant
+	ci PropellantMassLimit : fse:MassLimit [
+		metrology:isQuantityOf spc-assemblies:Propellant
 	]
 
 	@rdfs:label "Propellant Mass Limit Magnitude"
-	ci PropellantMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropellantMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "66.21"^^xsd:double
 		metrology:isMagnitudeOf PropellantMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/ang/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/ang/masses.oml
index 281d5525..856e2f9d 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/ang/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/ang/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// ADCS And GNC Mass
 
 	@rdfs:label "ADCS and GNC Mass Limit"
-	ci ADCSAndGNCMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf ang:ADCSAndGNC
+	ci ADCSAndGNCMassLimit : fse:MassLimit [
+		metrology:isQuantityOf ang:ADCSAndGNC
 	]
 
 	@rdfs:label "ADCS and GNC Mass Limit Magnitude"
-	ci ADCSAndGNCMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ADCSAndGNCMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "9.74"^^xsd:double
 		metrology:isMagnitudeOf ADCSAndGNCMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cdh/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cdh/masses.oml
index 357977a9..06e786bc 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cdh/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cdh/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Command And Data Handling Mass
 
 	@rdfs:label "Command and Data Handling Mass Limit"
-	ci CommandAndDataHandlingMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf cdh:CommandAndDataHandling
+	ci CommandAndDataHandlingMassLimit : fse:MassLimit [
+		metrology:isQuantityOf cdh:CommandAndDataHandling
 	]
 
 	@rdfs:label "Command and Data Handling Mass Limit Magnitude"
-	ci CommandAndDataHandlingMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci CommandAndDataHandlingMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "38.07"^^xsd:double
 		metrology:isMagnitudeOf CommandAndDataHandlingMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cmn/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cmn/masses.oml
index e295ff35..9b36c5c3 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cmn/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/cmn/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Communications Mass
 
 	@rdfs:label "Communications Mass Limit"
-	ci CommunicationsMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf cmn:Communications
+	ci CommunicationsMassLimit : fse:MassLimit [
+		metrology:isQuantityOf cmn:Communications
 	]
 
 	@rdfs:label "Communications Mass Limit Magnitude"
-	ci CommunicationsMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci CommunicationsMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "3.26"^^xsd:double
 		metrology:isMagnitudeOf CommunicationsMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/eps/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/eps/masses.oml
index df1f9a28..e17bdcd1 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/eps/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/eps/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Electric Power System Mass
 
 	@rdfs:label "Electric Power System Mass Limit"
-	ci EPSMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf eps:ElectricPowerSystem
+	ci EPSMassLimit : fse:MassLimit [
+		metrology:isQuantityOf eps:ElectricPowerSystem
 	]
 
 	@rdfs:label "Electric Power System Mass Limit Magnitude"
-	ci EPSMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci EPSMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "9.31"^^xsd:double
 		metrology:isMagnitudeOf EPSMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/prp/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/prp/masses.oml
index 4fc51d51..14c9ac20 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/prp/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/prp/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Propulsion Mass
 
 	@rdfs:label "Propulsion Mass Limit"
-	ci PropulsionMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf prp:Propulsion
+	ci PropulsionMassLimit : fse:MassLimit [
+		metrology:isQuantityOf prp:Propulsion
 	]
 
 	@rdfs:label "Propulsion Mass Limit Magnitude"
-	ci PropulsionMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci PropulsionMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "44.14"^^xsd:double
 		metrology:isMagnitudeOf PropulsionMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/sam/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/sam/masses.oml
index c346f085..8f3f2248 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/sam/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/sam/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Structures and Mechanisms Mass
 
 	@rdfs:label "Structures and Mechanisms Mass Limit"
-	ci StructuresAndMechanismsMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf sam:StructuresAndMechanisms
+	ci StructuresAndMechanismsMassLimit : fse:MassLimit [
+		metrology:isQuantityOf sam:StructuresAndMechanisms
 	]
 
 	@rdfs:label "Structures and Mechanisms Mass Limit Magnitude"
-	ci StructuresAndMechanismsMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci StructuresAndMechanismsMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "5.0"^^xsd:double
 		metrology:isMagnitudeOf StructuresAndMechanismsMassLimit
 	]
diff --git a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/thc/masses.oml b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/thc/masses.oml
index ba50ca06..4a06279d 100644
--- a/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/thc/masses.oml
+++ b/src/oml/opencaesar.io/examples/firesat/programs/earth-science/projects/firesat/workpackages/06/systems/spc/subsystems/thc/masses.oml
@@ -8,12 +8,12 @@ description <http://opencaesar.io/examples/firesat/programs/earth-science/projec
 	// Thermal Control Mass
 
 	@rdfs:label "Thermal Control Mass Limit"
-	ci ThermalControlMassLimit : 80000-4-quantities:mass [
-		fse:isMassLimitOf thc:ThermalControl
+	ci ThermalControlMassLimit : fse:MassLimit [
+		metrology:isQuantityOf thc:ThermalControl
 	]
 
 	@rdfs:label "Thermal Control Mass Limit Magnitude"
-	ci ThermalControlMassLimitMagnitude : 80000-4-magnitudes1:kilogram-magnitude [
+	ci ThermalControlMassLimitMagnitude : fse:MassLimitMagnitude [
 		metrology:hasDoubleNumber "3.9"^^xsd:double
 		metrology:isMagnitudeOf ThermalControlMassLimit
 	]

From 746d48cdebb8f3b5cbddf32f4ba27dbcaf9210e1 Mon Sep 17 00:00:00 2001
From: Nicolas F Rouquette <nicolas.f.rouquette@jpl.nasa.gov>
Date: Sat, 28 Nov 2020 11:33:06 -0800
Subject: [PATCH 2/2] Version bump

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 379ba5b6..f67b76c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
  */
 description='The FireSat example project'
 group = 'io.opencaesar.ontologies'
-version = '2.1.0'
+version = '2.2.0'
 
 /* 
  * The Gradle task dependencies