diff --git a/models/nist-bdg1-1.ttl b/models/nist-bdg1-1.ttl
index 299b5c25..a2e1fc83 100644
--- a/models/nist-bdg1-1.ttl
+++ b/models/nist-bdg1-1.ttl
@@ -40,7 +40,7 @@ psm:AHUElectricityInlet
 psm:AHUExhaustOutlet
   a s223:OutletConnectionPoint ;
   s223:connectsThrough psm:i00060 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "AHUExhaust outlet" ;
 .
 psm:AHUHotWaterInlet
@@ -58,18 +58,18 @@ psm:AHUHotWaterOutlet
 psm:AHUOAInlet
   a s223:InletConnectionPoint ;
   s223:connectsThrough psm:i00006 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "AHUOAInlet" ;
 .
 psm:AHUReturnInlet
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "AHUReturn inlet" ;
 .
 psm:AHUSupplyOutlet
   a s223:OutletConnectionPoint ;
   s223:cnx psm:VAVSupply ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "AHUSupply outlet" ;
 .
 psm:BR1InletConnectionPoint
@@ -139,7 +139,7 @@ psm:Bathroom
 psm:BathroomExhaustDuct
   a s223:Connection ;
   s223:cnx psm:BathroomOutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Bathroom exhaust duct" ;
 .
 psm:BathroomExhaustFan
@@ -152,18 +152,18 @@ psm:BathroomExhaustFan
 .
 psm:BathroomExhaustToExteriorAir
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Bathroom exhaust to exterior air" ;
 .
 psm:BathroomFanExhaustDuct
   a s223:Duct ;
   s223:cnx psm:BathroomExhaustToExteriorAir ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Bathroom fan exhaust duct" ;
 .
 psm:BathroomInletConnectionPoint
   a s223:BidirectionalConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Bathroom inlet connection point" ;
 .
 psm:BathroomLight1
@@ -181,7 +181,7 @@ psm:BathroomLightInletCP
 .
 psm:BathroomOutletConnectionPoint
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Bathroom outlet connection point" ;
 .
 psm:BreakerCP1Phase
@@ -245,7 +245,7 @@ psm:CoolingCoilOutletTemperature
 .
 psm:CoolingCoilValveActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:CoolingCoilValvePosition ;
+  s223:actuatedByProperty psm:CoolingCoilValvePosition ;
   rdfs:label "A5" ;
 .
 psm:CoolingCoilValvePosition
@@ -265,12 +265,12 @@ psm:Corridor
 .
 psm:CorridorInletConnectionPointK
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Corridor inlet connection point k" ;
 .
 psm:CorridorInletConnectionPointPO
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Corridor inlet connection point po" ;
 .
 psm:CorridorLight1
@@ -286,12 +286,12 @@ psm:CorridorLightInletCP
 .
 psm:CorridorOutletConnectionPointB
   a s223:BidirectionalConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Corridor outlet connection point b" ;
 .
 psm:CorridorOutletConnectionPointOO
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Corridor outlet connection point OO" ;
 .
 psm:DLightPath1
@@ -308,12 +308,12 @@ psm:DaylightSensor1
 .
 psm:Driver1
   a s223:Actuator ;
+  s223:actuatedByProperty psm:Luminaire1CCT ;
+  s223:actuatedByProperty psm:Luminaire1Intensity ;
+  s223:actuatedByProperty psm:Luminaire1OnOff ;
   s223:actuates psm:LightEngine1 ;
   s223:cnx psm:Driver1Inlet ;
   s223:cnx psm:Driver1Outlet ;
-  s223:commandedByProperty psm:Luminaire1CCT ;
-  s223:commandedByProperty psm:Luminaire1Intensity ;
-  s223:commandedByProperty psm:Luminaire1OnOff ;
   rdfs:label "Driver1" ;
 .
 psm:Driver1Inlet
@@ -325,7 +325,7 @@ psm:Driver1Inlet
 psm:Driver1Outlet
   a s223:OutletConnectionPoint ;
   s223:cnx psm:Luminaire1InternalWire ;
-  s223:hasMedium s223:Medium-Electricity ;
+  s223:hasMedium s223:Constituent-Electricity ;
   rdfs:label "Driver1Outlet" ;
 .
 psm:ELightPath1
@@ -387,7 +387,7 @@ psm:ElectricCircuit3
 .
 psm:ExhaustAirDamperActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:ExhaustAirDamperPosition ;
+  s223:actuatedByProperty psm:ExhaustAirDamperPosition ;
   rdfs:label "A1" ;
 .
 psm:ExhaustAirDamperPosition
@@ -405,7 +405,7 @@ psm:ExhaustFanStatus
 .
 psm:ExhaustToExteriorAir
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Exhaust to exterior air" ;
 .
 psm:ExteriorAir
@@ -434,7 +434,7 @@ psm:ExteriorAmbientLightPath
   rdfs:label "Exterior ambient light path" ;
 .
 psm:ExteriorPhysicalSpace
-  a s223:OutsidePhysicalSpace ;
+  a s223:OutdoorPhysicalSpace ;
   s223:encloses psm:ExteriorAir ;
   s223:encloses psm:ExteriorAmbientLight ;
   rdfs:label "Exterior physical space" ;
@@ -448,7 +448,7 @@ psm:ExternalBoiler
 psm:ExternalBoilerInletCP
   a s223:InletConnectionPoint ;
   s223:connectsThrough psm:PipeToBoiler ;
-  s223:hasMedium s223:Medium-Water ;
+  s223:hasMedium s223:Fluid-Water ;
   rdfs:label "External boiler inlet CP" ;
 .
 psm:ExternalBoilerOutletCP
@@ -466,7 +466,7 @@ psm:ExternalChiller
 psm:ExternalChillerInletCP
   a s223:InletConnectionPoint ;
   s223:cnx psm:PipeToChiller ;
-  s223:hasMedium s223:Medium-Water ;
+  s223:hasMedium s223:Fluid-Water ;
   rdfs:label "External chiller inlet CP" ;
 .
 psm:ExternalChillerOutletCP
@@ -478,13 +478,13 @@ psm:ExternalChillerOutletCP
 psm:FanInletConnectionPoint
   a s223:InletConnectionPoint ;
   s223:cnx psm:BathroomExhaustDuct ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Fan inlet connection point" ;
 .
 psm:FanOutletConnectionPoint
   a s223:OutletConnectionPoint ;
   s223:cnx psm:BathroomFanExhaustDuct ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Fan outlet connection point" ;
 .
 psm:Floor1
@@ -510,7 +510,7 @@ psm:GridConnection
 psm:HVAC4-5Connection
   a s223:Connection ;
   s223:cnx psm:InletIntraCorridor4CP ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "HVAC4-5Connection" ;
 .
 psm:HVACSpace1
@@ -579,6 +579,7 @@ psm:HVACZone1
 .
 psm:HVACZone1Temperature
   a s223:QuantifiableObservableProperty ;
+  s223:hasSetpoint psm:HVACZone1TemperatureSetpoint ;
   s223:hasValue 69.7 ;
   qudt:hasQuantityKind qudtqk:Temperature ;
   qudt:hasUnit unit:DEG_F ;
@@ -602,7 +603,9 @@ psm:HVACZone1TemperatureSetpoint
 psm:HVACZone1Thermostat
   a s223:Thermostat ;
   s223:contains psm:HVACZone1TemperatureSensor ;
+  s223:executes psm:TerminalUnit1Function ;
   s223:hasProperty psm:HVACZone1TemperatureSetpoint ;
+  s223:hasRole s223:Role-Controller ;
   rdfs:label "HVACZone1Thermostat" ;
 .
 psm:HVACZone2
@@ -635,7 +638,7 @@ psm:HeatingCoilOutletTemperature
 .
 psm:HeatingCoilValveActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:HeatingCoilValvePosition ;
+  s223:actuatedByProperty psm:HeatingCoilValvePosition ;
   rdfs:label "A4" ;
 .
 psm:HeatingCoilValvePosition
@@ -647,7 +650,7 @@ psm:HeatingCoilValvePosition
 .
 psm:InletIntraCorridor4CP
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:isConnectionPointOf psm:HVACSpace4 ;
   rdfs:label "Inlet intra corridor4CP" ;
 .
@@ -660,7 +663,7 @@ psm:Kitchenette
 .
 psm:KitchenetteInletConnectionPoint
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Kitchenette inlet connection point" ;
 .
 psm:KitchenetteLight1
@@ -684,7 +687,7 @@ psm:KitchenetteLightingSystem
 .
 psm:KitchenetteOutletConnectionPoint
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Kitchenette outlet connection point" ;
 .
 psm:LIghtingSpace1DLInlet
@@ -701,7 +704,7 @@ psm:LightEngine1
 .
 psm:LightEngine1Inlet
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Electricity ;
+  s223:hasMedium s223:Constituent-Electricity ;
   rdfs:label "Light engine1Inlet" ;
 .
 psm:LightEngine1Outlet
@@ -883,8 +886,8 @@ psm:Luminaire1CCT
   qudt:hasUnit unit:K ;
   rdfs:label "Luminaire1CCT" ;
 .
-psm:Luminaire1FunctionBlock
-  a s223:FunctionBlock ;
+psm:Luminaire1Function
+  a s223:Function ;
   s223:hasInput psm:OccupancyProp1 ;
   s223:hasInput psm:OpenOfficeDaylightLevel ;
   s223:hasOutput psm:Luminaire1CCT ;
@@ -908,7 +911,7 @@ psm:Luminaire1Intensity
 psm:Luminaire1InternalWire
   a s223:ElectricWire ;
   s223:cnx psm:LightEngine1Inlet ;
-  s223:hasMedium s223:Medium-Electricity ;
+  s223:hasMedium s223:Constituent-Electricity ;
   rdfs:label "Luminaire1Internal wire" ;
 .
 psm:Luminaire1OnOff
@@ -925,9 +928,9 @@ psm:Luminaire1Outlet
 .
 psm:Luminaire2
   a s223:Luminaire ;
-  s223:commandedByProperty psm:Luminaire2CCT ;
-  s223:commandedByProperty psm:Luminaire2Intensity ;
-  s223:commandedByProperty psm:Luminaire2OnOff ;
+  s223:actuatedByProperty psm:Luminaire2CCT ;
+  s223:actuatedByProperty psm:Luminaire2Intensity ;
+  s223:actuatedByProperty psm:Luminaire2OnOff ;
   s223:hasConnectionPoint psm:Luminaire2Inlet ;
   s223:hasConnectionPoint psm:Luminaire2Outlet ;
   s223:hasProperty psm:Luminaire2OnOffStatus ;
@@ -939,8 +942,8 @@ psm:Luminaire2CCT
   qudt:hasUnit unit:K ;
   rdfs:label "Luminaire2CCT" ;
 .
-psm:Luminaire2FunctionBlock
-  a s223:FunctionBlock ;
+psm:Luminaire2Function
+  a s223:Function ;
   s223:hasInput psm:OccupancyProp1 ;
   s223:hasInput psm:OpenOfficeDaylightLevel ;
   s223:hasOutput psm:Luminaire2CCT ;
@@ -1244,7 +1247,7 @@ psm:MainGridPowerSource
 .
 psm:MixedAirDamperActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:MixedAirDamperPosition ;
+  s223:actuatedByProperty psm:MixedAirDamperPosition ;
   rdfs:label "A2" ;
 .
 psm:MixedAirDamperPosition
@@ -1270,13 +1273,13 @@ psm:MixedAirPressureSensor
 psm:OA-to-EconDamper
   a s223:Connection ;
   s223:cnx psm:i00018 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "OA-to-Econ damper" ;
 .
 psm:OA-to-MinDamper
   a s223:Connection ;
   s223:cnx psm:OAJunctionOutletToMin ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "OA-to-Min damper" ;
 .
 psm:OAJunctionInlet
@@ -1287,12 +1290,12 @@ psm:OAJunctionInlet
 psm:OAJunctionOutletToEcon
   a s223:OutletConnectionPoint ;
   s223:cnx psm:OA-to-EconDamper ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "OAJunction outlet to econ" ;
 .
 psm:OAJunctionOutletToMin
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "OAJunction outlet to min" ;
 .
 psm:OccSensor1
@@ -1411,13 +1414,13 @@ psm:OpenOfficeDaylightLevel
 .
 psm:OpenOfficeInletConnectionPoint
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Open office inlet connection point" ;
 .
 psm:OpenOfficeOutletConnectionPoint
   a s223:OutletConnectionPoint ;
   s223:cnx psm:ReturnDuct ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Open office outlet connection point" ;
 .
 psm:OpenOfficeWindows
@@ -1430,39 +1433,39 @@ psm:OpeningCB
   a s223:Connection ;
   s223:cnx psm:BathroomInletConnectionPoint ;
   s223:cnx psm:CorridorOutletConnectionPointB ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Opening CB" ;
 .
 psm:OpeningCOO
   a s223:Connection ;
   s223:cnx psm:CorridorOutletConnectionPointOO ;
   s223:cnx psm:OpenOfficeInletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Opening COO" ;
 .
 psm:OpeningKC
   a s223:Connection ;
   s223:cnx psm:CorridorInletConnectionPointK ;
   s223:cnx psm:KitchenetteOutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Opening KC" ;
 .
 psm:OpeningPOC
   a s223:Connection ;
   s223:cnx psm:CorridorInletConnectionPointPO ;
   s223:cnx psm:PrivateOfficeOutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Opening POC" ;
 .
 psm:OutletIntraCorridor5CP
   a s223:OutletConnectionPoint ;
   s223:cnx psm:HVAC4-5Connection ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Outlet intra corridor5CP" ;
 .
 psm:OutsideAirDamperActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:OutsideAirDamperPosition ;
+  s223:actuatedByProperty psm:OutsideAirDamperPosition ;
   rdfs:label "A3" ;
 .
 psm:OutsideAirDamperPosition
@@ -1477,7 +1480,7 @@ psm:OutsideAirJunction
   s223:hasConnectionPoint psm:OAJunctionInlet ;
   s223:hasConnectionPoint psm:OAJunctionOutletToEcon ;
   s223:hasConnectionPoint psm:OAJunctionOutletToMin ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Outside air junction" ;
 .
 psm:PipeFromBoiler
@@ -1487,7 +1490,7 @@ psm:PipeFromBoiler
 .
 psm:PipeFromChiller
   a s223:Connection ;
-  s223:hasMedium s223:Water-ChilledWater ;
+  s223:hasMedium s223:GlycolSolution-30Percent ;
   rdfs:label "Pipe from chiller" ;
 .
 psm:PipeToBoiler
@@ -1497,7 +1500,7 @@ psm:PipeToBoiler
 .
 psm:PipeToChiller
   a s223:Connection ;
-  s223:hasMedium s223:Water-ChilledWater ;
+  s223:hasMedium s223:GlycolSolution-30Percent ;
   rdfs:label "Pipe to chiller" ;
 .
 psm:PrivateOffice
@@ -1509,7 +1512,7 @@ psm:PrivateOffice
 .
 psm:PrivateOfficeInletConnectionPoint
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Private office inlet connection point" ;
 .
 psm:PrivateOfficeLight1
@@ -1525,7 +1528,7 @@ psm:PrivateOfficeLightInletCP
 .
 psm:PrivateOfficeOutletConnectionPoint
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Private office outlet connection point" ;
 .
 psm:ReturnAirFlowRate
@@ -1538,13 +1541,13 @@ psm:ReturnAirFlowRate
 psm:ReturnDuct
   a s223:Connection ;
   s223:cnx psm:AHUReturnInlet ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:hasProperty psm:ratmp ;
   rdfs:label "Return duct" ;
 .
 psm:ReturnFanActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:ReturnFanSpeed ;
+  s223:actuatedByProperty psm:ReturnFanSpeed ;
   rdfs:label "A8" ;
 .
 psm:ReturnFanSpeed
@@ -1570,18 +1573,18 @@ psm:ReturnSystem
 psm:RoomSupply1
   a s223:Connection ;
   s223:cnx psm:PrivateOfficeInletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Room supply1" ;
 .
 psm:RoomSupply2
   a s223:Connection ;
   s223:cnx psm:KitchenetteInletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Room supply2" ;
 .
 psm:SupplyFanActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:SupplyFanSpeed ;
+  s223:actuatedByProperty psm:SupplyFanSpeed ;
   rdfs:label "A9" ;
 .
 psm:SupplyFanElectricInCP
@@ -1605,7 +1608,7 @@ psm:SupplyFanStatus
 .
 psm:SupplyFromExteriorAir
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Supply from exterior air" ;
 .
 psm:SupplySystem
@@ -1634,8 +1637,8 @@ psm:TU1InternalPipe
 .
 psm:TU1ReheatValve
   a s223:Valve ;
+  s223:actuatedByProperty psm:TU1ReheatValvePositionCommand ;
   s223:cnx psm:TU1ReheatValveOCP ;
-  s223:commandedByProperty psm:TU1ReheatValvePositionCommand ;
   s223:hasConnectionPoint psm:TU1ReheatValveICP ;
   rdfs:label "TU1Reheat valve" ;
 .
@@ -1669,8 +1672,8 @@ psm:TempSensor_2
   s223:observes psm:HeatingCoilOutletTemperature ;
   rdfs:label "S6" ;
 .
-psm:TerminalUnit1FunctionBlock
-  a s223:FunctionBlock ;
+psm:TerminalUnit1Function
+  a s223:Function ;
   s223:hasInput psm:HVACZone1Temperature ;
   s223:hasInput psm:HVACZone1TemperatureSetpoint ;
   s223:hasInput psm:OccupancyProp1 ;
@@ -1692,13 +1695,13 @@ psm:VAV1BoxSupplyFluidOutlet
 .
 psm:VAV1DamperInletCP
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:VAVBox1Inlet ;
   rdfs:label "VAV1Damper inlet CP" ;
 .
 psm:VAV1DamperOutletCP
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV1Damper outlet CP" ;
 .
 psm:VAV1InletFlow
@@ -1710,7 +1713,7 @@ psm:VAV1InletFlow
 .
 psm:VAV1InletReheatCoilCP
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV1Inlet reheat coil CP" ;
 .
 psm:VAV1InletTemperature
@@ -1724,12 +1727,12 @@ psm:VAV1InternalConnection
   a s223:Connection ;
   s223:cnx psm:VAV1DamperOutletCP ;
   s223:cnx psm:VAV1InletReheatCoilCP ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV1Internal connection" ;
 .
 psm:VAV1OuletReheatCoilCP
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:VAVBox1Outlet ;
   rdfs:label "VAV1Oulet reheat coil CP" ;
 .
@@ -1753,13 +1756,13 @@ psm:VAV1ReheatCoilSupplyFluidOutlet
 .
 psm:VAV2DamperInletCP
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:VAVBox2Inlet ;
   rdfs:label "VAV2Damper inlet CP" ;
 .
 psm:VAV2DamperOutletCP
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV2Damper outlet CP" ;
 .
 psm:VAV2InletFlow
@@ -1771,19 +1774,19 @@ psm:VAV2InletFlow
 .
 psm:VAV2InletReheatCoilCP
   a s223:InletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV2Inlet reheat coil CP" ;
 .
 psm:VAV2InternalConnection
   a s223:Connection ;
   s223:cnx psm:VAV2DamperOutletCP ;
   s223:cnx psm:VAV2InletReheatCoilCP ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAV2Internal connection" ;
 .
 psm:VAV2OuletReheatCoilCP
   a s223:OutletConnectionPoint ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:VAVBox2Outlet ;
   rdfs:label "VAV2Oulet reheat coil CP" ;
 .
@@ -1840,7 +1843,7 @@ psm:VAVBox1
 .
 psm:VAVBox1DamperActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:VAVBox1DamperPosition ;
+  s223:actuatedByProperty psm:VAVBox1DamperPosition ;
   rdfs:label "A10" ;
 .
 psm:VAVBox1DamperPosition
@@ -1861,7 +1864,7 @@ psm:VAVBox1HeatingCoil
 psm:VAVBox1Inlet
   a s223:InletConnectionPoint ;
   s223:cnx psm:VAVSupply ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAVBox1Inlet" ;
 .
 psm:VAVBox1InletFlowSensor
@@ -1872,7 +1875,7 @@ psm:VAVBox1InletFlowSensor
 .
 psm:VAVBox1MotorizedDamper
   a s223:Damper ;
-  s223:commandedByProperty psm:TU1DamperPositionCommand ;
+  s223:actuatedByProperty psm:TU1DamperPositionCommand ;
   s223:hasConnectionPoint psm:VAV1DamperInletCP ;
   s223:hasConnectionPoint psm:VAV1DamperOutletCP ;
   rdfs:label "VAVBox1Motorized damper " ;
@@ -1880,7 +1883,7 @@ psm:VAVBox1MotorizedDamper
 psm:VAVBox1Outlet
   a s223:OutletConnectionPoint ;
   s223:cnx psm:RoomSupply1 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAVBox1Outlet" ;
 .
 psm:VAVBox1OutletTemperatureSensor
@@ -1891,7 +1894,7 @@ psm:VAVBox1OutletTemperatureSensor
 .
 psm:VAVBox1ReheatValveActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:VAVBox1ReheatValvePosition ;
+  s223:actuatedByProperty psm:VAVBox1ReheatValvePosition ;
   rdfs:label "A11" ;
 .
 psm:VAVBox1ReheatValvePosition
@@ -1915,7 +1918,7 @@ psm:VAVBox2
 .
 psm:VAVBox2DamperActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:VAVBox2DamperPosition ;
+  s223:actuatedByProperty psm:VAVBox2DamperPosition ;
   rdfs:label "A6" ;
 .
 psm:VAVBox2DamperPosition
@@ -1936,7 +1939,7 @@ psm:VAVBox2HeatingCoil
 psm:VAVBox2Inlet
   a s223:InletConnectionPoint ;
   s223:cnx psm:VAVSupply ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAVBox2Inlet" ;
 .
 psm:VAVBox2InletFlowSensor
@@ -1954,7 +1957,7 @@ psm:VAVBox2MotorizedDamper
 psm:VAVBox2Outlet
   a s223:OutletConnectionPoint ;
   s223:cnx psm:RoomSupply2 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAVBox2Outlet" ;
 .
 psm:VAVBox2OutletTemperatureSensor
@@ -1965,7 +1968,7 @@ psm:VAVBox2OutletTemperatureSensor
 .
 psm:VAVBox2ReheatValveActuator
   a s223:Actuator ;
-  s223:commandedByProperty psm:VAVBox2ReheatValvePosition ;
+  s223:actuatedByProperty psm:VAVBox2ReheatValvePosition ;
   rdfs:label "A7" ;
 .
 psm:VAVBox2ReheatValvePosition
@@ -1977,7 +1980,7 @@ psm:VAVBox2ReheatValvePosition
 .
 psm:VAVSupply
   a s223:Connection ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "VAVSupply" ;
 .
 psm:i00001
@@ -2004,12 +2007,13 @@ psm:i00001
   s223:hasConnectionPoint psm:AHUOAInlet ;
   s223:hasConnectionPoint psm:AHUReturnInlet ;
   s223:hasConnectionPoint psm:AHUSupplyOutlet ;
+  s223:hasRole s223:Role-OutdoorAirIntake ;
   rdfs:label "AHU" ;
 .
 psm:i00006
   a s223:Connection ;
   s223:cnx psm:SupplyFromExteriorAir ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:hasProperty psm:oatmp ;
   rdfs:label "A-9.outside_air" ;
 .
@@ -2021,8 +2025,9 @@ psm:i00007
   rdfs:label "A-9.min_oa_damper" ;
 .
 psm:i00008
-  a s223:QuantifiableProperty ;
-  qudt:hasQuantityKind qudtqk:Dimensionless ;
+  a s223:QuantifiableActuatableProperty ;
+  s223:hasAspect s223:EnumerationKind-Position ;
+  qudt:hasQuantityKind qudtqk:DimensionlessRatio ;
   qudt:hasUnit unit:PERCENT ;
   rdfs:label "Minimum outdoor air damper command" ;
 .
@@ -2030,14 +2035,14 @@ psm:i00009
   a s223:InletConnectionPoint ;
   s223:cnx psm:OA-to-MinDamper ;
   s223:cnx psm:i00007 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.min_oa_damper.airInlet" ;
 .
 psm:i00010
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00007 ;
   s223:cnx psm:i00015 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.min_oa_damper.airOutlet" ;
 .
 psm:i00011
@@ -2057,21 +2062,21 @@ psm:i00013
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00011 ;
   s223:cnx psm:i00015 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.outside_air_afms.airInlet" ;
 .
 psm:i00014
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00011 ;
   s223:cnx psm:i00020 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.outside_air_afms.airOutlet" ;
 .
 psm:i00015
   a s223:Connection ;
   s223:cnx psm:i00010 ;
   s223:cnx psm:i00013 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Outside air connection" ;
 .
 psm:i00016
@@ -2082,22 +2087,23 @@ psm:i00016
   rdfs:label "A-9.economizer_oa_damper" ;
 .
 psm:i00017
-  a s223:QuantifiableProperty ;
-  qudt:hasQuantityKind qudtqk:Dimensionless ;
+  a s223:QuantifiableActuatableProperty ;
+  s223:hasAspect s223:EnumerationKind-Position ;
+  qudt:hasQuantityKind qudtqk:DimensionlessRatio ;
   qudt:hasUnit unit:PERCENT ;
   rdfs:label "Economizer outside air damper command" ;
 .
 psm:i00018
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00016 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.economizer_oa_damper.airInlet" ;
 .
 psm:i00019
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00016 ;
   s223:cnx psm:i00020 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.economizer_oa_damper.airOutlet" ;
 .
 psm:i00020
@@ -2106,7 +2112,7 @@ psm:i00020
   s223:cnx psm:i00019 ;
   s223:cnx psm:i00023 ;
   s223:cnx psm:i00064 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.mixed_air" ;
 .
 psm:i00021
@@ -2127,7 +2133,7 @@ psm:i00023
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00020 ;
   s223:cnx psm:i00021 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:hasProperty psm:mxtmp ;
   rdfs:label "A-9.mixed_air_filter.airInlet" ;
 .
@@ -2135,7 +2141,7 @@ psm:i00024
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00021 ;
   s223:cnx psm:i00035 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.mixed_air_filter.airOutlet" ;
 .
 psm:i00025
@@ -2150,14 +2156,14 @@ psm:i00026
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00025 ;
   s223:cnx psm:i00035 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.hot_water_coil.airInlet" ;
 .
 psm:i00027
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00025 ;
   s223:cnx psm:i00046 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.hot_water_coil.airOutlet" ;
 .
 psm:i00028
@@ -2210,7 +2216,7 @@ psm:i00035
   a s223:Connection ;
   s223:cnx psm:i00024 ;
   s223:cnx psm:i00026 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Mixed air connection to filter" ;
 .
 psm:i00036
@@ -2225,14 +2231,14 @@ psm:i00037
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00036 ;
   s223:cnx psm:i00046 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.chilled_water_coil.airInlet" ;
 .
 psm:i00038
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00036 ;
   s223:cnx psm:i00050 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.chilled_water_coil.airOutlet" ;
 .
 psm:i00039
@@ -2285,7 +2291,7 @@ psm:i00046
   a s223:Connection ;
   s223:cnx psm:i00027 ;
   s223:cnx psm:i00037 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Connection from heating coil" ;
 .
 psm:i00047
@@ -2300,13 +2306,13 @@ psm:i00048
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00047 ;
   s223:cnx psm:i00050 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.supply_fan.airInlet" ;
 .
 psm:i00049
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00047 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:AHUSupplyOutlet ;
   rdfs:label "A-9.supply_fan.airOutlet" ;
 .
@@ -2314,7 +2320,7 @@ psm:i00050
   a s223:Connection ;
   s223:cnx psm:i00038 ;
   s223:cnx psm:i00048 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Connection from Cooling Coil" ;
 .
 psm:i00051
@@ -2327,14 +2333,14 @@ psm:i00051
 psm:i00052
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00051 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:AHUReturnInlet ;
   rdfs:label "A-9.return_fan.airInlet" ;
 .
 psm:i00053
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00051 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.return_fan.airOutlet" ;
 .
 psm:i00055
@@ -2342,7 +2348,7 @@ psm:i00055
   s223:cnx psm:i00053 ;
   s223:cnx psm:i00058 ;
   s223:cnx psm:i00063 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.return_air" ;
 .
 psm:i00056
@@ -2353,8 +2359,9 @@ psm:i00056
   rdfs:label "A-9.exhaust_air_damper" ;
 .
 psm:i00057
-  a s223:QuantifiableProperty ;
-  qudt:hasQuantityKind qudtqk:Dimensionless ;
+  a s223:QuantifiableActuatableProperty ;
+  s223:hasAspect s223:EnumerationKind-Position ;
+  qudt:hasQuantityKind qudtqk:DimensionlessRatio ;
   qudt:hasUnit unit:PERCENT ;
   rdfs:label "Exhaust air damper command" ;
 .
@@ -2362,20 +2369,20 @@ psm:i00058
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00055 ;
   s223:cnx psm:i00056 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.exhaust_air_damper.airInlet" ;
 .
 psm:i00059
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00056 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   s223:mapsTo psm:AHUExhaustOutlet ;
   rdfs:label "A-9.exhaust_air_damper.airOutlet" ;
 .
 psm:i00060
   a s223:Connection ;
   s223:cnx psm:ExhaustToExteriorAir ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "Exhaust air connection" ;
 .
 psm:i00061
@@ -2386,8 +2393,9 @@ psm:i00061
   rdfs:label "A-9.return_air_damper" ;
 .
 psm:i00062
-  a s223:QuantifiableProperty ;
-  qudt:hasQuantityKind qudtqk:Dimensionless ;
+  a s223:QuantifiableActuatableProperty ;
+  s223:hasAspect s223:EnumerationKind-Position ;
+  qudt:hasQuantityKind qudtqk:DimensionlessRatio ;
   qudt:hasUnit unit:PERCENT ;
   rdfs:label "Return air damper command" ;
 .
@@ -2395,14 +2403,14 @@ psm:i00063
   a s223:InletConnectionPoint ;
   s223:cnx psm:i00055 ;
   s223:cnx psm:i00061 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.return_air_damper.airInlet" ;
 .
 psm:i00064
   a s223:OutletConnectionPoint ;
   s223:cnx psm:i00020 ;
   s223:cnx psm:i00061 ;
-  s223:hasMedium s223:Medium-Air ;
+  s223:hasMedium s223:Fluid-Air ;
   rdfs:label "A-9.return_air_damper.airOutlet" ;
 .
 psm:masen