diff --git a/examples/COVIDCase.ttl b/examples/COVIDCase.ttl
index 18c1586a6f77f12253f08fa0dc429c24fbddbcbc..9feb09a51067beecdabca7afb363c55de674b69c 100644
--- a/examples/COVIDCase.ttl
+++ b/examples/COVIDCase.ttl
@@ -79,7 +79,7 @@ s4ehawInst:BobBodyThermo rdf:type owl:NamedIndividual ,
                                   s4ehaw:hasDeviceCharacteristic s4ehawInst:TuckyThermometer ;
                                   s4ehaw:hasLocation s4ehaw:ArmpitLocation ;
                                   s4ehaw:isAttachedTo s4ehawInst:Bob ;
-                                  s4ehaw:hasFunction s4ehawInst:BodyThermometer .
+                                  saref:hasFunction s4ehawInst:BodyThermometer .
 
 
 ###  https://saref.etsi.org/saref4ehaw/examples/COVIDCase/BobMonitorBan
@@ -88,7 +88,7 @@ s4ehawInst:BobMonitorBan rdf:type owl:NamedIndividual ,
                                   s4ehaw:contains s4ehawInst:BobBodyThermo ,
                                   s4ehawInst:BobScanWatch ,
                                   s4ehawInst:BobSpireHealth ;
-                                  s4ehaw:hasBanApplicationDomain s4ehaw:prevention ;
+                                  s4ehaw:hasBanApplicationDomain s4ehaw:Prevention ;
                                   s4ehaw:hasContact s4ehawInst:Bob ,
                                   s4ehawInst:DrKnock ;
                                   s4ehaw:hasHub s4ehawInst:BobAndroidphone ;
@@ -262,7 +262,7 @@ s4ehawInst:SystolicPressureSens rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4ehaw/examples/COVIDCase/TuckyThermometer
 s4ehawInst:TuckyThermometer rdf:type owl:NamedIndividual ,
-                                     s4ehaw:DeviceType ;
+                                     s4ehaw:DeviceCharacteristic ;
                                      s4ehaw:hasInterface s4ehawInst:Bluetooth .
 
 
@@ -289,9 +289,9 @@ s4ehawInst:WithingsWatchBattery rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4ehaw/examples/COVIDCase/Withings_ScanWatch
 s4ehawInst:Withings_ScanWatch rdf:type owl:NamedIndividual ,
-                                       s4ehaw:DeviceType ;
+                                       s4ehaw:DeviceCharacteristic ;
                                        s4ehaw:hasPowerSource s4ehaw:WithingsWatchBattery ;
-                                       s4ehaw:deviceTypeName "WITHINGS ScanWatch"^^xsd:string .
+                                       s4ehaw:deviceCharacteristicName "WITHINGS ScanWatch"^^xsd:string .
 
 
 ###  https://saref.etsi.org/saref4ehaw/Bpm
@@ -424,7 +424,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> :hasFunction ;
+                                                                  <http://www.w3.org/2003/11/swrl#propertyPredicate> saref:hasFunction ;
                                                                   <http://www.w3.org/2003/11/swrl#argument1> <urn:swrl:var#d1> ;
                                                                   <http://www.w3.org/2003/11/swrl#argument2> s4ehawInst:Respiration
                                                                 ] ;