diff --git a/examples/COVIDCase.ttl b/examples/COVIDCase.ttl
index c1dcca159099bcc3e6acbc979763714369c76ae7..18c1586a6f77f12253f08fa0dc429c24fbddbcbc 100644
--- a/examples/COVIDCase.ttl
+++ b/examples/COVIDCase.ttl
@@ -38,120 +38,6 @@
# Individuals
#################################################################
-### http://www.wurvoc.org/vocabularies/om-1.8/hertz
-<http://www.wurvoc.org/vocabularies/om-1.8/hertz> rdf:type owl:NamedIndividual ,
- s4envi:FrequencyUnit .
-
-
-### https://saref.etsi.org/saref4ehaw/alcoholDrinking
-s4ehaw:alcoholDrinking rdf:type owl:NamedIndividual ,
- s4ehaw:Habit .
-
-
-### https://saref.etsi.org/saref4ehaw/assistedLiving
-s4ehaw:assistedLiving rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/blindImpairment
-s4ehaw:blindImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/deafImpairment
-s4ehaw:deafImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/emergency
-s4ehaw:emergency rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/exercising
-s4ehaw:exercising rdf:type owl:NamedIndividual ,
- s4ehaw:Posture .
-
-
-### https://saref.etsi.org/saref4ehaw/handlingImpairment
-s4ehaw:handlingImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/healthcare
-s4ehaw:healthcare rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/hearingImpairment
-s4ehaw:hearingImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/lying
-s4ehaw:lying rdf:type owl:NamedIndividual ,
- s4ehaw:Posture .
-
-
-### https://saref.etsi.org/saref4ehaw/mobilityImpairment
-s4ehaw:mobilityImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/overeating
-s4ehaw:overeating rdf:type owl:NamedIndividual ,
- s4ehaw:Habit .
-
-
-### https://saref.etsi.org/saref4ehaw/pervasiveComputing
-s4ehaw:pervasiveComputing rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/running
-s4ehaw:running rdf:type owl:NamedIndividual ,
- s4ehaw:Posture .
-
-
-### https://saref.etsi.org/saref4ehaw/safety
-s4ehaw:safety rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/sitting
-s4ehaw:sitting rdf:type owl:NamedIndividual ,
- s4ehaw:Posture .
-
-
-### https://saref.etsi.org/saref4ehaw/smoking
-s4ehaw:smoking rdf:type owl:NamedIndividual ,
- s4ehaw:Habit .
-
-
-### https://saref.etsi.org/saref4ehaw/sportTraining
-s4ehaw:sportTraining rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/telemedicine
-s4ehaw:telemedicine rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
-
-
-### https://saref.etsi.org/saref4ehaw/undereating
-s4ehaw:undereating rdf:type owl:NamedIndividual ,
- s4ehaw:Habit .
-
-
-### https://saref.etsi.org/saref4ehaw/visualImpairment
-s4ehaw:visualImpairment rdf:type owl:NamedIndividual ,
- s4ehaw:Impairment .
-
-
-### https://saref.etsi.org/saref4ehaw/walking
-s4ehaw:walking rdf:type owl:NamedIndividual ,
- s4ehaw:Posture .
-
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/AlertForHosp
s4ehawInst:AlertForHosp rdf:type owl:NamedIndividual ,
@@ -159,16 +45,6 @@ s4ehawInst:AlertForHosp rdf:type owl:NamedIndividual ,
s4ehaw:supports s4ehaw:SMS .
-### https://saref.etsi.org/saref4ehaw/armpitlocation
-s4ehaw:armpitLocation rdf:type owl:NamedIndividual ,
- s4ehaw:BodySurfaceLocation .
-
-
-### https://saref.etsi.org/saref4ehaw/asthma
-s4ehaw:asthma rdf:type owl:NamedIndividual ,
- s4ehaw:ChronicDisease .
-
-
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bluetooth
s4ehawInst:Bluetooth rdf:type owl:NamedIndividual ,
s4ehaw:Interface .
@@ -177,7 +53,7 @@ s4ehawInst:Bluetooth rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bob
s4ehawInst:Bob rdf:type owl:NamedIndividual ,
s4ehaw:Patient ;
- s4ehaw:hasHabit s4ehaw:overeating ;
+ s4ehaw:hasHabit s4ehaw:Overeating ;
s4ehaw:usesBan s4ehawInst:BobMonitorBan ;
s4ehaw:dob "1970-10-26T21:32:52"^^xsd:dateTime ;
s4ehaw:firstName "Bob"^^xsd:string ;
@@ -200,8 +76,8 @@ s4ehawInst:BobBodyTemp1 rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BobBodyThermo
s4ehawInst:BobBodyThermo rdf:type owl:NamedIndividual ,
s4ehaw:HealthSensor ;
- s4ehaw:hasDeviceType s4ehawInst:TuckyThermometer ;
- s4ehaw:hasLocation s4ehaw:armpitLocation ;
+ s4ehaw:hasDeviceCharacteristic s4ehawInst:TuckyThermometer ;
+ s4ehaw:hasLocation s4ehaw:ArmpitLocation ;
s4ehaw:isAttachedTo s4ehawInst:Bob ;
s4ehaw:hasFunction s4ehawInst:BodyThermometer .
@@ -229,10 +105,10 @@ s4ehawInst:BobRespMeas1 rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BobScanWatch
s4ehawInst:BobScanWatch rdf:type owl:NamedIndividual ,
s4ehaw:HealthWearable ;
- s4ehaw:hasDeviceType s4ehawInst:Withings_ScanWatch ;
- s4ehaw:hasLocation s4ehaw:wristLocation ;
+ s4ehaw:hasDeviceCharacteristic s4ehawInst:Withings_ScanWatch ;
+ s4ehaw:hasLocation s4ehaw:WristLocation ;
s4ehaw:isAttachedTo s4ehawInst:Bob ;
- s4ehaw:consistsOf s4ehawInst:BobScanWatchAltimeter ,
+ saref:consistsOf s4ehawInst:BobScanWatchAltimeter ,
s4ehawInst:BobScanWatchBloodPressureSens ,
s4ehawInst:BobScanWatchHeartrateSens ,
s4ehawInst:BobScanWatchSPO2Sens ;
@@ -273,9 +149,9 @@ s4ehawInst:BobSpireBreathSens rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BobSpireHealth
s4ehawInst:BobSpireHealth rdf:type owl:NamedIndividual ,
s4ehaw:HealthWearable ;
- s4ehaw:hasDeviceType s4ehawInst:SpireStone ;
+ s4ehaw:hasDeviceCharacteristic s4ehawInst:SpireStone ;
s4ehaw:isAttachedTo s4ehawInst:Bob ;
- s4ehaw:consistsOf s4ehawInst:BobSpireAccelero ,
+ saref:consistsOf s4ehawInst:BobSpireAccelero ,
s4ehawInst:BobSpireBreathSens ,
s4ehawInst:InstBobSpireVibro ;
saref:hasFunction s4ehawInst:Respiration .
@@ -308,12 +184,7 @@ s4ehawInst:BodyTemperature rdf:type owl:NamedIndividual ,
s4ehawInst:BodyThermometer rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:BodyTemperature ;
- s4ehaw:uom s4ehaw:degreeCelsius .
-
-
-### https://saref.etsi.org/saref4ehaw/Diabetes
-s4ehaw:Diabetes rdf:type owl:NamedIndividual ,
- s4ehaw:ChronicDisease .
+ s4ehaw:uom s4ehaw:DegreeCelsius .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/DrKnock
@@ -331,11 +202,6 @@ s4ehawInst:Oxymeter rdf:type owl:NamedIndividual ,
s4ehaw:hasData s4ehawInst:SPO2 .
-### https://saref.etsi.org/saref4ehaw/Percent
-s4ehaw:Percent rdf:type owl:NamedIndividual ,
- saref:UnitOfMeasure .
-
-
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/PolymerBattery
s4ehawInst:PolymerBattery rdf:type owl:NamedIndividual ,
s4ehaw:PowerSource ;
@@ -347,7 +213,7 @@ s4ehawInst:PolymerBattery rdf:type owl:NamedIndividual ,
s4ehawInst:Respiration rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:RespiratoryRate ;
- s4ehaw:uom s4ehaw:bpm .
+ s4ehaw:uom s4ehaw:Bpm .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/RespiratoryRate
@@ -364,16 +230,15 @@ s4ehawInst:SMS rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SPO2
s4ehawInst:SPO2 rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobSpo2Lev1 ;
- s4ehaw:uom s4ehaw:Percent .
+ s4ehaw:hasMesurement s4ehawInst:BobSpo2Lev1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SpireStone
s4ehawInst:SpireStone rdf:type owl:NamedIndividual ,
- s4ehaw:DeviceType ;
+ s4ehaw:DeviceCharacteristic ;
s4ehaw:hasComputingPower s4ehawInst:SpireStoneProcessingUnit ;
s4ehaw:hasPowerSource s4ehawInst:PolymerBattery ;
- s4ehaw:deviceTypeName "Spire Stone"^^xsd:string ;
+ s4ehaw:deviceCharacteristicName "Spire Stone"^^xsd:string ;
s4ehaw:dimension "1.7 x 0.6 x 1.2 inches"^^xsd:string .
@@ -386,7 +251,7 @@ s4ehawInst:SpireStoneProcessingUnit rdf:type owl:NamedIndividual ,
s4ehawInst:SystolicPressure rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
s4ehaw:hasMesurement s4ehawInst:BobSystolicPressure ;
- s4ehaw:uom s4ehaw:mmHG .
+ s4ehaw:uom s4ehaw:MmHG .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SystolicPressureSens
@@ -429,29 +294,25 @@ s4ehawInst:Withings_ScanWatch rdf:type owl:NamedIndividual ,
s4ehaw:deviceTypeName "WITHINGS ScanWatch"^^xsd:string .
-### https://saref.etsi.org/saref4ehaw/Wrist
-s4ehaw:Wrist rdf:type owl:NamedIndividual ,
- s4ehaw:BodySurfaceLocation .
-
-
-### https://saref.etsi.org/saref4ehaw/bpm
-s4ehaw:bpm rdf:type owl:NamedIndividual ,
- saref:UnitOfMeasure .
-
-
-### https://saref.etsi.org/saref4ehaw/degreeCelsius
-s4ehaw:degreeCelsius rdf:type owl:NamedIndividual ,
- saref:UnitOfMeasure .
+### https://saref.etsi.org/saref4ehaw/Bpm
+s4ehaw:Bpm rdf:type owl:NamedIndividual ,
+ saref:UnitOfMeasure ;
+ rdfs:comment "bpm (beats per minute), a unit of measure used in eHealth."@en ;
+ rdfs:label "bpm"@en .
-### https://saref.etsi.org/saref4ehaw/mmHG
-s4ehaw:mmHG rdf:type owl:NamedIndividual ,
- saref:UnitOfMeasure .
+### https://saref.etsi.org/saref4ehaw/DegreeCelsius
+s4ehaw:DegreeCelsius rdf:type owl:NamedIndividual ,
+ saref:UnitOfMeasure ;
+ rdfs:comment "Degree celsius, a unit of measure often used in eHealth, e.g. for body temperature."@en ;
+ rdfs:label "Degree celsius"@en .
-### https://saref.etsi.org/saref4ehaw/prevention
-s4ehaw:prevention rdf:type owl:NamedIndividual ,
- s4ehaw:BanApplicationDomain .
+### https://saref.etsi.org/saref4ehaw/MmHG
+s4ehaw:MmHG rdf:type owl:NamedIndividual ,
+ saref:UnitOfMeasure ;
+ rdfs:comment "mmHG (millimeter of mercury), a manometric unit of pressure used in eHealth for systolic blood pressure."@en ;
+ rdfs:label "mmHG"@en .
#################################################################