diff --git a/examples/COVIDCase.ttl b/examples/COVIDCase.ttl
index efda4104b52c819240675c22fb6c79e6f25a491b..6bc89588ab5942c18ce188dbbe9bcda60b77dacd 100644
--- a/examples/COVIDCase.ttl
+++ b/examples/COVIDCase.ttl
@@ -42,7 +42,7 @@
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/AlertForHosp
s4ehawInst:AlertForHosp rdf:type owl:NamedIndividual ,
saref:Service ;
- s4ehaw:supports s4ehaw:SMS .
+ s4ehaw:supports s4ehawInst:SMS .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bluetooth
@@ -177,14 +177,14 @@ s4ehawInst:BobSystolicPressure rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BodyTemperature
s4ehawInst:BodyTemperature rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobBodyTemp1 .
+ s4ehaw:hasMeasurement s4ehawInst:BobBodyTemp1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BodyThermometer
s4ehawInst:BodyThermometer rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:BodyTemperature ;
- s4ehaw:uom s4ehaw:DegreeCelsius .
+ s4ehaw:uom s4ehawInst:DegreeCelsius .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/DrKnock
@@ -213,13 +213,13 @@ s4ehawInst:PolymerBattery rdf:type owl:NamedIndividual ,
s4ehawInst:Respiration rdf:type owl:NamedIndividual ,
s4ehaw:MeasurementFunction ;
s4ehaw:hasData s4ehawInst:RespiratoryRate ;
- s4ehaw:uom s4ehaw:Bpm .
+ s4ehaw:uom s4ehawInst:Bpm .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/RespiratoryRate
s4ehawInst:RespiratoryRate rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobRespMeas1 .
+ s4ehaw:hasMeasurement s4ehawInst:BobRespMeas1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SMS
@@ -230,7 +230,7 @@ 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:hasMeasurement s4ehawInst:BobSpo2Lev1 .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SpireStone
@@ -250,8 +250,8 @@ s4ehawInst:SpireStoneProcessingUnit rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SystolicPressure
s4ehawInst:SystolicPressure rdf:type owl:NamedIndividual ,
s4ehaw:Data ;
- s4ehaw:hasMesurement s4ehawInst:BobSystolicPressure ;
- s4ehaw:uom s4ehaw:MmHG .
+ s4ehaw:hasMeasurement s4ehawInst:BobSystolicPressure ;
+ s4ehaw:uom s4ehawInst:MmHG .
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/SystolicPressureSens
@@ -290,26 +290,26 @@ s4ehawInst:WithingsWatchBattery rdf:type owl:NamedIndividual ,
### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Withings_ScanWatch
s4ehawInst:Withings_ScanWatch rdf:type owl:NamedIndividual ,
s4ehaw:DeviceCharacteristic ;
- s4ehaw:hasPowerSource s4ehaw:WithingsWatchBattery ;
+ s4ehaw:hasPowerSource s4ehawInst:WithingsWatchBattery ;
s4ehaw:deviceCharacteristicName "WITHINGS ScanWatch"^^xsd:string .
-### https://saref.etsi.org/saref4ehaw/Bpm
-s4ehaw:Bpm rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Bpm
+s4ehawInst: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/DegreeCelsius
-s4ehaw:DegreeCelsius rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/DegreeCelsius
+s4ehawInst: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/MmHG
-s4ehaw:MmHG rdf:type owl:NamedIndividual ,
+### https://saref.etsi.org/saref4ehaw/examples/COVIDCase/saref4ehaw/MmHG
+s4ehawInst: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 .
@@ -453,13 +453,13 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data1> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas1>
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas>
] ;
@@ -538,7 +538,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data2> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas2>
] ;
@@ -650,7 +650,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas>
] ;
@@ -696,7 +696,7 @@ s4ehaw:MmHG rdf:type owl:NamedIndividual ,
] ;
rdf:rest [ rdf:type <http://www.w3.org/2003/11/swrl#AtomList> ;
rdf:first [ rdf:type <http://www.w3.org/2003/11/swrl#IndividualPropertyAtom> ;
- <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMesurement ;
+ <http://www.w3.org/2003/11/swrl#propertyPredicate> s4ehaw:hasMeasurement ;
<http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#data1> ;
<http://www.w3.org/2003/11/swrl#argument2> <urn:swrl:var#meas1>
] ;