diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index a576bb3bb33229500b300062d4dbbd336c0799e5..65717287e695d9f55a11d8e986412cbb6c4f8bb6 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -1,4 +1,4 @@
-@prefix : <https://saref.etsi.org/saref4ehaw/> .
+@prefix : <https://saref.etsi.org/s4ehaw/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xml: <http://www.w3.org/XML/1998/namespace> .
@@ -9,15 +9,14 @@
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
 @prefix saref: <https://saref.etsi.org/saref#> .
-@prefix s4ehaw: <https://saref.etsi.org/saref4ehaw/> .
+@prefix s4ehaw: <https://saref.etsi.org/s4ehaw/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@base <https://saref.etsi.org/saref4ehaw/> .
+@base <https://saref.etsi.org/s4ehaw/> .
 
-<https://saref.etsi.org/saref4ehaw/> rdf:type owl:Ontology ;
-                                  owl:versionIRI <https://saref.etsi.org/s4ehaw/v0.1.2/saref4ehaw/> ;
-                                  rdfs:label "communication period"@en ;
-                                  rdfs:comment "the period of time for sending data within a BAN."@en ,
-                                               "the minimum value that a data can take." ;
+<https://saref.etsi.org/s4ehaw/> rdf:type owl:Ontology ;
+                                  owl:versionIRI <https://saref.etsi.org/s4ehaw/v0.1.2/s4ehaw/> ;
+                                  rdfs:label "SAREF4EHAW"@en ;
+                                  rdfs:comment "Extension of SAREF for eHealth Ageing Well domain." ;
                                   dcterms:source <https://forge.etsi.org/rep/SAREF/s44ehaw/> ;
                                   owl:versionInfo "v0.1.2" ;
                                   vann:preferredNamespacePrefix "s4ehaw" ;
@@ -27,7 +26,7 @@
                                   dcterms:issued "date when the document is online"^^xsd:date ;
                                   dcterms:created "start date of the STF 2019-01-01"^^xsd:date ;
                                   rdfs:label "min value"@en ;
-                                  vann:preferredNamespaceUri "https://saref.etsi.org/saref4ehaw/" ;
+                                  vann:preferredNamespaceUri "https://saref.etsi.org/s4ehaw/" ;
                                   dcterms:title "s4ehaw: an extension of SAREF for eHealth Ageing Well"@en ;
                                   dcterms:modified "do not set this"^^xsd:date ;
                                   dcterms:license <https://forge.etsi.org/etsi-software-license> ;
@@ -90,7 +89,7 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
-###  https://saref.etsi.org/saref4ehaw/IsUsedFor
+###  https://saref.etsi.org/s4ehaw/IsUsedFor
 s4ehaw:IsUsedFor rdf:type owl:ObjectProperty ;
                  rdfs:domain s4ehaw:FunctionalDevice ,
                              s4ehaw:HealthDevice ;
@@ -99,7 +98,7 @@ s4ehaw:IsUsedFor rdf:type owl:ObjectProperty ;
                               "Defines the relatonship between a non purely health device called functional device and that is used for certain process (luminosity measurement, air pressure measurement, heat level measurement)" ;
                  rdfs:label "is used for"@en .
 
-###  https://saref.etsi.org/saref4ehaw/contains
+###  https://saref.etsi.org/s4ehaw/contains
 s4ehaw:contains rdf:type owl:ObjectProperty ;
                 rdfs:domain s4ehaw:Ban ;
                 rdfs:range s4ehaw:HealthDevice ;
@@ -107,7 +106,7 @@ s4ehaw:contains rdf:type owl:ObjectProperty ;
                 rdfs:label "contains"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/elects
+###  https://saref.etsi.org/s4ehaw/elects
 s4ehaw:elects rdf:type owl:ObjectProperty ;
               rdfs:domain s4ehaw:Ban ;
               rdfs:range s4ehaw:Hub ;
@@ -115,7 +114,7 @@ s4ehaw:elects rdf:type owl:ObjectProperty ;
               rdfs:label "elects"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasActivities
+###  https://saref.etsi.org/s4ehaw/hasActivities
 :hasActivitiesDeviceType rdf:type owl:ObjectProperty ;
                rdfs:domain :Patient ,
                            :User ;
@@ -125,7 +124,7 @@ s4ehaw:elects rdf:type owl:ObjectProperty ;
                rdfs:label "has activities"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasCommand
+###  https://saref.etsi.org/s4ehaw/hasCommand
 s4ehaw:hasCommand rdf:type owl:ObjectProperty ;
                   rdfs:domain s4ehaw:Process ;
                   rdfs:range saref:Command ;
@@ -133,7 +132,7 @@ s4ehaw:hasCommand rdf:type owl:ObjectProperty ;
                   rdfs:label "has command"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasCommunicationProcess
+###  https://saref.etsi.org/s4ehaw/hasCommunicationProcess
 s4ehaw:hasCommunicationProcess rdf:type owl:ObjectProperty ;
                                rdfs:domain s4ehaw:Ban ;
                                rdfs:range s4ehaw:CommunicationProcess ;
@@ -141,7 +140,7 @@ s4ehaw:hasCommunicationProcess rdf:type owl:ObjectProperty ;
                                rdfs:label "has communication process"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasConstraints
+###  https://saref.etsi.org/s4ehaw/hasConstraints
 s4ehaw:hasConstraints rdf:type owl:ObjectProperty ;
                       rdfs:domain s4ehaw:Data ;
                       rdfs:range s4ehaw:Constraints ;
@@ -149,7 +148,7 @@ s4ehaw:hasConstraints rdf:type owl:ObjectProperty ;
                       rdfs:label "has constraints"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasContact
+###  https://saref.etsi.org/s4ehaw/hasContact
 s4ehaw:hasContact rdf:type owl:ObjectProperty ;
                   rdfs:domain s4ehaw:Ban ,
                               s4ehaw:HealthDevice ;
@@ -159,7 +158,7 @@ s4ehaw:hasContact rdf:type owl:ObjectProperty ;
                   rdfs:label "has contact"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasData
+###  https://saref.etsi.org/s4ehaw/hasData
 s4ehaw:hasData rdf:type owl:ObjectProperty ;
                rdfs:domain s4ehaw:Process ;
                rdfs:range s4ehaw:Data ;
@@ -167,15 +166,17 @@ s4ehaw:hasData rdf:type owl:ObjectProperty ;
                rdfs:label "has data"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasDeviceType
+###  https://saref.etsi.org/s4ehaw/hasDeviceType
 s4ehaw:hasDeviceType rdf:type owl:ObjectProperty ;
-                     rdfs:domain saref:Device ;
+                     rdfs:domain s4ehaw:HealthDevice ,
+		                 s4ehaw:FunctionalDevice ;
                      rdfs:range s4ehaw:DeviceType ;
-                     rdfs:comment "Defines the relatonship between a device that has a device type describing the physical characteristics of the device" ;
+                     rdfs:comment "Defines the relatonship between a health device that has a device type describing the physical characteristics of the device" ,
+		                  "Defines the relatonship between a functional device that has a device type describing the physical characteristics of the device" ;
                      rdfs:label "has device type"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasEnergy
+###  https://saref.etsi.org/s4ehaw/hasEnergy
 :hasEnergy rdf:type owl:ObjectProperty ;
                        rdfs:domain s4ehaw:DeviceType ;
                        rdfs:range s4ehaw:Energy ;
@@ -183,15 +184,17 @@ s4ehaw:hasDeviceType rdf:type owl:ObjectProperty ;
                        rdfs:label "has energy"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasInterface
+###  https://saref.etsi.org/s4ehaw/hasInterface
 s4ehaw:hasInterface rdf:type owl:ObjectProperty ;
-                    rdfs:domain saref:Device ;
+                    rdfs:domain s4ehaw:HealthDevice ,
+		                s4ehaw:FunctionalDevice ;
                     rdfs:range s4ehaw:Interface ;
-                    rdfs:comment "Defines the relatonship between a device that has one or multiple interfaces (Bluetooth, UWB, IEEE 802.15.6, serial interface...)" ;
+                    rdfs:comment "Defines the relatonship between a health device that has one or multiple interfaces (Bluetooth, UWB, IEEE 802.15.6, serial interface...)." ,
+		                 "Defines the relatonship between a functional device that has one or multiple interfaces (Bluetooth, UWB, IEEE 802.15.6, serial interface...)." ;
                     rdfs:label "has interface"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasInterfaceType
+###  https://saref.etsi.org/s4ehaw/hasInterfaceType
 s4ehaw:hasInterfaceType rdf:type owl:ObjectProperty ;
                         rdfs:domain s4ehaw:DeviceType ,
                                     s4ehaw:Interface ;
@@ -201,20 +204,22 @@ s4ehaw:hasInterfaceType rdf:type owl:ObjectProperty ;
                         rdfs:label "has interface type"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/position
-s4ehaw:position rdf:type owl:ObjectProperty ;
-                   rdfs:domain s4ehaw:HealthDevice ;
+###  https://saref.etsi.org/s4ehaw/hasLocation
+s4ehaw:hasLocation rdf:type owl:ObjectProperty ;
+                   rdfs:domain s4ehaw:HealthDevice ,
+		               s4ehaw:FunctionalDevice ;
                    rdfs:range  s4ehaw:Location ,
                                     [ rdf:type owl:Class ;
                                       owl:unionOf ( s4ehaw:BodySurface
                                                     s4ehaw:Implant
                                                   )
                                     ] ;
-                   rdfs:comment "The position of an Health Device, i.e. its location against the body - on or in the body - and/or its geolocation" ;
-                   rdfs:label "position"@en .
+                   rdfs:comment "The location of an health device, i.e. its position against the body - on or in the body - and/or its geolocation." ,
+		                "The location of a functional device, i.e. its position against the body - on or in the body - and/or its geolocation." ;
+                   rdfs:label "has location"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasMesurement
+###  https://saref.etsi.org/s4ehaw/hasMesurement
 s4ehaw:hasMesurement rdf:type owl:ObjectProperty ;
                      rdfs:domain s4ehaw:Data ;
                      rdfs:range s4ehaw:Measurement ;
@@ -222,7 +227,7 @@ s4ehaw:hasMesurement rdf:type owl:ObjectProperty ;
                      rdfs:label "has measurement"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasMode
+###  https://saref.etsi.org/s4ehaw/hasMode
 s4ehaw:hasMode rdf:type owl:ObjectProperty ;
                 rdfs:domain saref:DeviceType ;
                 rdfs:range s4ehaw:Mode ;
@@ -230,7 +235,7 @@ s4ehaw:hasMode rdf:type owl:ObjectProperty ;
                 rdfs:label "has mode"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasParticipants
+###  https://saref.etsi.org/s4ehaw/hasParticipants
 s4ehaw:hasParticipants rdf:type owl:ObjectProperty ;
                        rdfs:domain s4ehaw:MeasurementSession ;
                        rdfs:range s4ehaw:Actor ,
@@ -240,7 +245,7 @@ s4ehaw:hasParticipants rdf:type owl:ObjectProperty ;
                        rdfs:label "has participants"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasPhysicalLocation
+###  https://saref.etsi.org/s4ehaw/hasPhysicalLocation
 s4ehaw:hasPhysicalLocation rdf:type owl:ObjectProperty ;
                            rdfs:domain s4ehaw:Patient ;
                            rdfs:range s4ehaw:Physical ;
@@ -248,7 +253,7 @@ s4ehaw:hasPhysicalLocation rdf:type owl:ObjectProperty ;
                            rdfs:label "has physical location"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasPower
+###  https://saref.etsi.org/s4ehaw/hasPower
 :hasPower rdf:type owl:ObjectProperty ;
                     rdfs:domain s4ehaw:DeviceType ;
                     rdfs:range s4ehaw:Power ;
@@ -256,15 +261,15 @@ s4ehaw:hasPhysicalLocation rdf:type owl:ObjectProperty ;
                     rdfs:label "has power"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasResponsabilityParty
+###  https://saref.etsi.org/s4ehaw/hasResponsabilityParty
 s4ehaw:hasResponsabilityParty rdf:type owl:ObjectProperty ;
                               rdfs:domain s4ehaw:Contact ;
                               rdfs:range s4ehaw:ResponsabilityParty ;
-                              rdfs:comment "Defines the relatonship between a contact that has a responsability party which plays the role of the reference of the patient/user. It should be an organization or a person" ;
+                              rdfs:comment "Defines the relatonship between a contact that has a responsability party which plays the role of the legal entity responsible for a BAN - i.e. to contact in case of problem -. It should be an organization or a person" ;
                               rdfs:label "has responsability party"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasServiceCategory
+###  https://saref.etsi.org/s4ehaw/hasServiceCategory
 s4ehaw:hasServiceCategory rdf:type owl:ObjectProperty ;
                           rdfs:domain s4ehaw:ServiceProfile ;
                           rdfs:range s4ehaw:ServiceCategory ;
@@ -272,7 +277,7 @@ s4ehaw:hasServiceCategory rdf:type owl:ObjectProperty ;
                           rdfs:label "has service category"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasTimeSeriesMesurements
+###  https://saref.etsi.org/s4ehaw/hasTimeSeriesMesurements
 s4ehaw:hasTimeSeriesMesurements rdf:type owl:ObjectProperty ;
                                 rdfs:domain s4ehaw:Data ;
                                 rdfs:range s4ehaw:TimeSeriesMeasurements ;
@@ -280,7 +285,7 @@ s4ehaw:hasTimeSeriesMesurements rdf:type owl:ObjectProperty ;
                                 rdfs:label "has time series measurements"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/inCurrentMode
+###  https://saref.etsi.org/s4ehaw/inCurrentMode
 s4ehaw:inCurrentMode rdf:type owl:ObjectProperty ;
                 rdfs:domain saref:HealthDevice ;
                 rdfs:range s4ehaw:Mode ;
@@ -288,51 +293,51 @@ s4ehaw:inCurrentMode rdf:type owl:ObjectProperty ;
                 rdfs:label "in current mode"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/isActor
-s4ehaw:isActor rdf:type owl:ObjectProperty ;
-               rdfs:domain s4ehaw:Caregiver ,
-                           s4ehaw:Contact ,
-                           s4ehaw:Helper ,
-                           s4ehaw:Patient ,
-                           s4ehaw:ResponsabilityParty ,
-                           s4ehaw:User ;
+###  https://saref.etsi.org/s4ehaw/isAnActor
+s4ehaw:isAnActor rdf:type owl:ObjectProperty ;
+               rdfs:domain s4ehaw:Contact ;
                rdfs:range s4ehaw:Actor ;
-               rdfs:comment "Defines the relatonship between a Helper (family member, friend or neighbor of a patient) that is an actor of an eHealth system" ,
-                            "Defines the relatonship between a ResponsabilityParty that is an actor of an eHealth system" ,
-                            "Defines the relatonship between a caregiver that is  an actor of an eHealth system" ,
-                            "Defines the relatonship between a contact that is an actor of an eHealth system (caregiver or patient or user or halper)" ,
-                            "Defines the relatonship between a monitored person called user and that is an actor of an eHealth system" ,
-                            "Defines the relatonship between patient that is an actor of an eHealth system" ;
-               rdfs:label "is actor"@en .
+               rdfs:comment "Defines the relatonship between a contact that is an actor of an eHealth system (caregiver or patient or user or halper)." ;
+               rdfs:label "is an actor"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/isAssociatedWith
+###  https://saref.etsi.org/s4ehaw/isAssociatedWith
 s4ehaw:isAssociatedWith rdf:type owl:ObjectProperty ;
                         rdfs:domain s4ehaw:Atomic ;
                         rdfs:range s4ehaw:Composite ;
-                        rdfs:comment "For a composite process, more than one atomic process are associated together" ;
+                        rdfs:comment "For a composite process, more than one atomic process are associated together." ;
                         rdfs:label "is associated with"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/isDescribedBy
+###  https://saref.etsi.org/s4ehaw/isDescribedBy
 s4ehaw:isDescribedBy rdf:type owl:ObjectProperty ;
                      rdfs:domain saref:Service ;
                      rdfs:range s4ehaw:ServiceProcess ;
-                     rdfs:comment "Defines the relatonship between a service that is described by a service process (how the service works)" ;
+                     rdfs:comment "Defines the relatonship between a service that is described by a service process (how the service works)." ;
                      rdfs:label "is described by"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/isMeasuredIn
+###  https://saref.etsi.org/s4ehaw/isMeasuredIn
 s4ehaw:isMeasuredIn rdf:type owl:ObjectProperty ;
                     rdfs:domain s4ehaw:Measurement ,
                                 s4ehaw:TimeSeriesMeasurements ;
                     rdfs:range s4ehaw:UnitOfMeasure ;
-                    rdfs:comment "Defines the relatonship between a measurement that is measured in a given unit of measure" ,
-                                 "Defines the relatonship between time series measurements that are measured in a given unit of measure" ;
+                    rdfs:comment "Defines the relatonship between a measurement that is measured in a given unit of measure." ,
+                                 "Defines the relatonship between time series measurements that are measured in a given unit of measure." ;
                     rdfs:label "is measured in"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/OperatingConstraints
+###  https://saref.etsi.org/saref#offers
+saref:offers rdf:type owl:ObjectProperty ;
+             rdfs:domain s4ehaw:HealthDevice ,
+		         s4ehaw:FunctionalDevice ;
+             rdfs:range saref:Service ;
+             rdfs:comment "Defines the relatonship between a health device that offers services." ,
+	                  "Defines the relatonship between a functional device that offers services." ;
+             rdfs:label "offers"@en .
+
+
+###  https://saref.etsi.org/s4ehaw/OperatingConstraints
 s4ehaw:OperatingConstraints rdf:type owl:ObjectProperty ;
                                rdfs:domain s4ehaw:DeviceType ;
                                rdfs:range s4ehaw:Operating ;
@@ -340,7 +345,7 @@ s4ehaw:OperatingConstraints rdf:type owl:ObjectProperty ;
                                rdfs:label "operating constraints"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/presents
+###  https://saref.etsi.org/s4ehaw/presents
 s4ehaw:presents rdf:type owl:ObjectProperty ;
                 rdfs:domain saref:Service ;
                 rdfs:range s4ehaw:ServiceProfile ;
@@ -348,7 +353,7 @@ s4ehaw:presents rdf:type owl:ObjectProperty ;
                 rdfs:label "presents"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/supports
+###  https://saref.etsi.org/s4ehaw/supports
 s4ehaw:supports rdf:type owl:ObjectProperty ;
                 rdfs:domain saref:Service ;
                 rdfs:range s4ehaw:ServiceGrounding ;
@@ -356,7 +361,7 @@ s4ehaw:supports rdf:type owl:ObjectProperty ;
                 rdfs:label "supports"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/uom
+###  https://saref.etsi.org/s4ehaw/uom
 s4ehaw:uom rdf:type owl:ObjectProperty ;
            rdfs:domain s4ehaw:Process ;
            rdfs:range s4ehaw:UnitOfMeasure ;
@@ -364,13 +369,6 @@ s4ehaw:uom rdf:type owl:ObjectProperty ;
            rdfs:label "unit of measurement"@en .
 
 
-###  https://saref.etsi.org/saref#offers
-saref:offers rdf:type owl:ObjectProperty ;
-             rdfs:domain saref:Device ;
-             rdfs:range saref:Service ;
-             rdfs:comment "Defines the relatonship between a device that offers services" ;
-             rdfs:label "offers"@en .
-
 
 #################################################################
 #    Data properties
@@ -382,7 +380,7 @@ foaf:name rdf:type owl:DatatypeProperty ;
           rdfs:range xsd:anyURI .
 
 
-###  https://saref.etsi.org/saref4ehaw/activitiesId
+###  https://saref.etsi.org/s4ehaw/activitiesId
 :activitiesId rdf:type owl:DatatypeProperty ;
               rdfs:domain :Activities ;
 	      rdfs:range xsd:anyURI ;
@@ -390,7 +388,7 @@ foaf:name rdf:type owl:DatatypeProperty ;
               rdfs:label "activities id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/activitiesType
+###  https://saref.etsi.org/s4ehaw/activitiesType
 :activitiesType rdf:type owl:DatatypeProperty ;
                 rdfs:domain :Activities ;
                 rdfs:range [ rdf:type rdfs:Datatype ;
@@ -406,7 +404,7 @@ foaf:name rdf:type owl:DatatypeProperty ;
                 rdfs:label "activities type"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/activitiesDuration
+###  https://saref.etsi.org/s4ehaw/activitiesDuration
 :activitiesDuration rdf:type owl:DatatypeProperty ;
                 rdfs:domain :Activities ;
                 rdfs:range xsd:double ;
@@ -414,7 +412,7 @@ foaf:name rdf:type owl:DatatypeProperty ;
                 rdfs:label "activities duration"@en . 
 		
 
-###  https://saref.etsi.org/saref4ehaw/activitiesKind
+###  https://saref.etsi.org/s4ehaw/activitiesKind
 :activitiesKind rdf:type owl:DatatypeProperty ;
                 rdfs:domain :Activities ;
                 rdfs:range xsd:string ;
@@ -422,7 +420,7 @@ foaf:name rdf:type owl:DatatypeProperty ;
                 rdfs:label "activities kind"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/baud
+###  https://saref.etsi.org/s4ehaw/baud
 s4ehaw:baud rdf:type owl:DatatypeProperty ;
             rdfs:domain s4ehaw:InterfaceType ;
             rdfs:range xsd:double ;
@@ -430,7 +428,7 @@ s4ehaw:baud rdf:type owl:DatatypeProperty ;
             rdfs:label "baud"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/dutyCycle
+###  https://saref.etsi.org/s4ehaw/dutyCycle
 s4ehaw:dutyCycle rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Power ;
                  rdfs:range xsd:float ;
@@ -439,14 +437,14 @@ s4ehaw:dutyCycle rdf:type owl:DatatypeProperty ;
 		 
 
 
-###  https://saref.etsi.org/saref4ehaw/faultTolerence
+###  https://saref.etsi.org/s4ehaw/faultTolerence
 s4ehaw:faultTolerence rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4ehaw:Ban ,
                                   s4ehaw:Process ;
                       rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4ehaw/frequency
+###  https://saref.etsi.org/s4ehaw/frequency
 s4ehaw:frequency rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Power ;
                  rdfs:range xsd:double ;
@@ -454,7 +452,7 @@ s4ehaw:frequency rdf:type owl:DatatypeProperty ;
                  rdfs:label "frequency"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/availableFlash
+###  https://saref.etsi.org/s4ehaw/availableFlash
 s4ehaw:availableFlash rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4ehaw:Power ;
                       rdfs:range xsd:double ;
@@ -462,7 +460,7 @@ s4ehaw:availableFlash rdf:type owl:DatatypeProperty ;
                       rdfs:label "available flash"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/maximumFlash
+###  https://saref.etsi.org/s4ehaw/maximumFlash
 s4ehaw:maximumFlash rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:Power ;
                     rdfs:range xsd:double ;
@@ -470,7 +468,7 @@ s4ehaw:maximumFlash rdf:type owl:DatatypeProperty ;
                     rdfs:label "maximum flash"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/maximumRam
+###  https://saref.etsi.org/s4ehaw/maximumRam
 s4ehaw:maximumRam rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:Power ;
                   rdfs:range xsd:double ;
@@ -478,7 +476,7 @@ s4ehaw:maximumRam rdf:type owl:DatatypeProperty ;
                   rdfs:label "maximum ram"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/remainingBatteryLevel
+###  https://saref.etsi.org/s4ehaw/remainingBatteryLevel
 s4ehaw:remainingBatteryLevel rdf:type owl:DatatypeProperty ;
                      rdfs:domain s4ehaw:Energy ;
                      rdfs:range xsd:double ;
@@ -486,7 +484,7 @@ s4ehaw:remainingBatteryLevel rdf:type owl:DatatypeProperty ;
                      rdfs:label "remaining battery level"@en .
 			
 
-###  https://saref.etsi.org/saref4ehaw/availableRAM
+###  https://saref.etsi.org/s4ehaw/availableRAM
 s4ehaw:availableRAM rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:Power ;
                     rdfs:range xsd:double ;
@@ -494,7 +492,7 @@ s4ehaw:availableRAM rdf:type owl:DatatypeProperty ;
                     rdfs:label "available RAM"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/latency
+###  https://saref.etsi.org/s4ehaw/latency
 s4ehaw:latency rdf:type owl:DatatypeProperty ;
                rdfs:domain s4ehaw:Process ;
                rdfs:range xsd:float ;
@@ -502,7 +500,7 @@ s4ehaw:latency rdf:type owl:DatatypeProperty ;
                rdfs:label "latency"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/minimumValue
+###  https://saref.etsi.org/s4ehaw/minimumValue
 s4ehaw:minimumValue rdf:type owl:DatatypeProperty ;
                rdfs:domain s4ehaw:Validity ;
                rdfs:range xsd:double ;
@@ -510,7 +508,7 @@ s4ehaw:minimumValue rdf:type owl:DatatypeProperty ;
                rdfs:label "minimum value"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/maximumValue
+###  https://saref.etsi.org/s4ehaw/maximumValue
 s4ehaw:maximumValue rdf:type owl:DatatypeProperty ;
                rdfs:domain s4ehaw:Validity ;
                rdfs:range xsd:double ;
@@ -518,7 +516,7 @@ s4ehaw:maximumValue rdf:type owl:DatatypeProperty ;
                rdfs:label "maximum value"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/precision
+###  https://saref.etsi.org/s4ehaw/precision
 s4ehaw:precision rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Process ;
                  rdfs:range xsd:float ;
@@ -526,7 +524,7 @@ s4ehaw:precision rdf:type owl:DatatypeProperty ;
                  rdfs:label "precision"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/sampleTime
+###  https://saref.etsi.org/s4ehaw/sampleTime
 s4ehaw:sampleTime rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:Process ;
                   rdfs:range xsd:float ;
@@ -534,7 +532,7 @@ s4ehaw:sampleTime rdf:type owl:DatatypeProperty ;
                   rdfs:label "sample time"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/PortNumber
+###  https://saref.etsi.org/s4ehaw/PortNumber
 s4ehaw:PortNumber rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:ServiceGrounding ;
                   rdfs:range xsd:positiveInteger ;
@@ -542,7 +540,7 @@ s4ehaw:PortNumber rdf:type owl:DatatypeProperty ;
                   rdfs:label "port number"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/actorId
+###  https://saref.etsi.org/s4ehaw/actorId
 s4ehaw:actorId rdf:type owl:DatatypeProperty ;
                rdfs:domain s4ehaw:Actor ;
                rdfs:range xsd:anyURI ;
@@ -550,7 +548,7 @@ s4ehaw:actorId rdf:type owl:DatatypeProperty ;
                rdfs:label "actor id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/ageCategory
+###  https://saref.etsi.org/s4ehaw/ageCategory
 s4ehaw:ageCategory rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4ehaw:Patient ,
                                s4ehaw:User ;
@@ -568,7 +566,7 @@ s4ehaw:ageCategory rdf:type owl:DatatypeProperty ;
                    rdfs:label "age category"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/applicationDomain
+###  https://saref.etsi.org/s4ehaw/applicationDomain
 s4ehaw:applicationDomain rdf:type owl:DatatypeProperty ;
                          rdfs:domain s4ehaw:Ban ;
                          rdfs:range xsd:string ;
@@ -576,7 +574,7 @@ s4ehaw:applicationDomain rdf:type owl:DatatypeProperty ;
                          rdfs:label "application domain"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/banId
+###  https://saref.etsi.org/s4ehaw/banId
 s4ehaw:banId rdf:type owl:DatatypeProperty ;
              rdfs:domain s4ehaw:Ban ;
              rdfs:range xsd:anyURI ;
@@ -584,7 +582,7 @@ s4ehaw:banId rdf:type owl:DatatypeProperty ;
              rdfs:label "ban id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/density
+###  https://saref.etsi.org/s4ehaw/density
 s4ehaw:density rdf:type owl:DatatypeProperty ;
                rdfs:domain s4ehaw:Ban ;
                rdfs:range xsd:string ;
@@ -592,7 +590,7 @@ s4ehaw:density rdf:type owl:DatatypeProperty ;
                rdfs:label "density"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/deviceId
+###  https://saref.etsi.org/s4ehaw/deviceId
 :deviceId rdf:type owl:DatatypeProperty ;
               rdfs:domain :HealthDevice ,
 	                  :FunctionalDevice ;
@@ -602,7 +600,7 @@ s4ehaw:density rdf:type owl:DatatypeProperty ;
               rdfs:label "device id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/deviceTypeName
+###  https://saref.etsi.org/s4ehaw/deviceTypeName
 s4ehaw:deviceTypeName rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:DeviceType ;
                   rdfs:range xsd:string ;
@@ -610,7 +608,7 @@ s4ehaw:deviceTypeName rdf:type owl:DatatypeProperty ;
                   rdfs:label "device type name"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/dimension
+###  https://saref.etsi.org/s4ehaw/dimension
 s4ehaw:dimension rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:DeviceType ;
                  rdfs:range xsd:float ;
@@ -618,7 +616,7 @@ s4ehaw:dimension rdf:type owl:DatatypeProperty ;
                  rdfs:label "dimension"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/dob
+###  https://saref.etsi.org/s4ehaw/dob
 :dob rdf:type owl:DatatypeProperty ;
            rdfs:domain :Actor ;
            rdfs:range xsd:dateTime ;
@@ -626,7 +624,7 @@ s4ehaw:dimension rdf:type owl:DatatypeProperty ;
            rdfs:label "date of birth"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/email
+###  https://saref.etsi.org/s4ehaw/email
 :email rdf:type owl:DatatypeProperty ;
              rdfs:domain s4ehaw:Actor ;
              rdfs:range xsd:anyURI ;
@@ -634,12 +632,12 @@ s4ehaw:dimension rdf:type owl:DatatypeProperty ;
              rdfs:label "email"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/faultTolerence
+###  https://saref.etsi.org/s4ehaw/faultTolerence
 s4ehaw:faultTolerence rdf:type owl:DatatypeProperty ;
                       rdfs:range xsd:float .
 
 
-###  https://saref.etsi.org/saref4ehaw/gender
+###  https://saref.etsi.org/s4ehaw/gender
 s4ehaw:gender rdf:type owl:DatatypeProperty ;
               rdfs:domain s4ehaw:Actor ;
               rdfs:range [ rdf:type rdfs:Datatype ;
@@ -658,7 +656,7 @@ s4ehaw:gender rdf:type owl:DatatypeProperty ;
               rdfs:label "gender"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/groundingProtocol
+###  https://saref.etsi.org/s4ehaw/groundingProtocol
 s4ehaw:groundingProtocol rdf:type owl:DatatypeProperty ;
                          rdfs:domain s4ehaw:ServiceGrounding ;
                          rdfs:range xsd:string ;
@@ -666,7 +664,7 @@ s4ehaw:groundingProtocol rdf:type owl:DatatypeProperty ;
                          rdfs:label "grounding protocol"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasCalculationMethod
+###  https://saref.etsi.org/s4ehaw/hasCalculationMethod
 s4ehaw:hasCalculationMethod rdf:type owl:DatatypeProperty ;
                             rdfs:domain s4ehaw:ServiceProcess ;
                             rdfs:range xsd:string ;
@@ -674,7 +672,7 @@ s4ehaw:hasCalculationMethod rdf:type owl:DatatypeProperty ;
                             rdfs:label "has calculation method"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasEffect
+###  https://saref.etsi.org/s4ehaw/hasEffect
 s4ehaw:hasEffect rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:ServiceProcess ;
                  rdfs:range xsd:string ;
@@ -682,7 +680,7 @@ s4ehaw:hasEffect rdf:type owl:DatatypeProperty ;
                  rdfs:label "has effect"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasHabits
+###  https://saref.etsi.org/s4ehaw/hasHabits
 s4ehaw:hasHabits rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Patient ,
                              s4ehaw:User ;
@@ -692,7 +690,7 @@ s4ehaw:hasHabits rdf:type owl:DatatypeProperty ;
                  rdfs:label "has habits"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasInput
+###  https://saref.etsi.org/s4ehaw/hasInput
 s4ehaw:hasInput rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:ServiceProcess ;
                 rdfs:range xsd:string ;
@@ -700,7 +698,7 @@ s4ehaw:hasInput rdf:type owl:DatatypeProperty ;
                 rdfs:label "has input"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasOutput
+###  https://saref.etsi.org/s4ehaw/hasOutput
 s4ehaw:hasOutput rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:ServiceProcess ;
                  rdfs:range xsd:string ;
@@ -708,7 +706,7 @@ s4ehaw:hasOutput rdf:type owl:DatatypeProperty ;
                  rdfs:label "has output"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasPosture
+###  https://saref.etsi.org/s4ehaw/hasPosture
 s4ehaw:hasPosture rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:Patient ,
                               s4ehaw:User ;
@@ -738,7 +736,7 @@ s4ehaw:hasPosture rdf:type owl:DatatypeProperty ;
                   rdfs:label "has posture"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasPrecondition
+###  https://saref.etsi.org/s4ehaw/hasPrecondition
 s4ehaw:hasPrecondition rdf:type owl:DatatypeProperty ;
                        rdfs:domain s4ehaw:ServiceProcess ;
                        rdfs:range xsd:string ;
@@ -746,7 +744,7 @@ s4ehaw:hasPrecondition rdf:type owl:DatatypeProperty ;
                        rdfs:label "has precondition"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasResult
+###  https://saref.etsi.org/s4ehaw/hasResult
 s4ehaw:hasResult rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Patient ;
                  rdfs:range xsd:string ;
@@ -754,7 +752,7 @@ s4ehaw:hasResult rdf:type owl:DatatypeProperty ;
                  rdfs:label "has result"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/impairement
+###  https://saref.etsi.org/s4ehaw/impairement
 s4ehaw:impairement rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4ehaw:Patient ;
                    rdfs:range [ rdf:type rdfs:Datatype ;
@@ -776,7 +774,7 @@ s4ehaw:impairement rdf:type owl:DatatypeProperty ;
                    rdfs:label "impairement"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/interfaceId
+###  https://saref.etsi.org/s4ehaw/interfaceId
 :interfaceId rdf:type owl:DatatypeProperty ;
                          rdfs:domain s4ehaw:Interface ;
                          rdfs:range xsd:anyURI ;
@@ -784,7 +782,7 @@ s4ehaw:impairement rdf:type owl:DatatypeProperty ;
                          rdfs:label "interface id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/interfaceAddress
+###  https://saref.etsi.org/s4ehaw/interfaceAddress
 :interfaceAddress rdf:type owl:DatatypeProperty ;
                          rdfs:domain s4ehaw:InterfaceType ;
                          rdfs:range xsd:string ;
@@ -792,7 +790,7 @@ s4ehaw:impairement rdf:type owl:DatatypeProperty ;
                          rdfs:label "interface address"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/interfaceDescription
+###  https://saref.etsi.org/s4ehaw/interfaceDescription
 s4ehaw:interfaceDescription rdf:type owl:DatatypeProperty ;
                             rdfs:domain s4ehaw:InterfaceType ;
                             rdfs:range xsd:string ;
@@ -800,7 +798,7 @@ s4ehaw:interfaceDescription rdf:type owl:DatatypeProperty ;
                             rdfs:label "interface description"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/interfaceProtocol
+###  https://saref.etsi.org/s4ehaw/interfaceProtocol
 s4ehaw:interfaceProtocol rdf:type owl:DatatypeProperty ;
                          rdfs:domain s4ehaw:InterfaceType ;
                          rdfs:range xsd:string ;
@@ -808,7 +806,7 @@ s4ehaw:interfaceProtocol rdf:type owl:DatatypeProperty ;
                          rdfs:label "interface protocol"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/isGateway
+###  https://saref.etsi.org/s4ehaw/isGateway
 s4ehaw:isGateway rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:Interface ;
                     rdfs:range xsd:boolean ;
@@ -816,7 +814,7 @@ s4ehaw:isGateway rdf:type owl:DatatypeProperty ;
                     rdfs:label "is gateway"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/lifetime
+###  https://saref.etsi.org/s4ehaw/lifetime
 s4ehaw:lifetime rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:Ban ;
                 rdfs:range xsd:dateTime ;
@@ -824,7 +822,7 @@ s4ehaw:lifetime rdf:type owl:DatatypeProperty ;
                 rdfs:label "lifetime"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/location
+###  https://saref.etsi.org/s4ehaw/location
 s4ehaw:location rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:Ban ;
                 rdfs:range xsd:string ;
@@ -832,7 +830,7 @@ s4ehaw:location rdf:type owl:DatatypeProperty ;
                 rdfs:label "location"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/manufacturer
+###  https://saref.etsi.org/s4ehaw/manufacturer
 s4ehaw:manufacturer rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:Power ;
 		    rdfs:range xsd:string ;
@@ -840,7 +838,7 @@ s4ehaw:manufacturer rdf:type owl:DatatypeProperty ;
                     rdfs:label "manufacturer"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/modeId
+###  https://saref.etsi.org/s4ehaw/modeId
 s4ehaw:modeId rdf:type owl:DatatypeProperty ;
               rdfs:domain s4ehaw:Mode ;
               rdfs:range xsd:anyURI ;
@@ -848,7 +846,7 @@ s4ehaw:modeId rdf:type owl:DatatypeProperty ;
               rdfs:label "mode id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/modeName
+###  https://saref.etsi.org/s4ehaw/modeName
 s4ehaw:modeName rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:Mode ;
                 rdfs:range xsd:string ;
@@ -856,7 +854,7 @@ s4ehaw:modeName rdf:type owl:DatatypeProperty ;
                 rdfs:label "mode name"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/name
+###  https://saref.etsi.org/s4ehaw/name
 s4ehaw:name rdf:type owl:DatatypeProperty ;
             rdfs:domain s4ehaw:Actor ;
             rdfs:range xsd:string ;
@@ -864,7 +862,7 @@ s4ehaw:name rdf:type owl:DatatypeProperty ;
             rdfs:label "name"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/phenomena
+###  https://saref.etsi.org/s4ehaw/phenomena
 s4ehaw:phenomena rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Ban ;
                  rdfs:range xsd:string ;
@@ -872,7 +870,7 @@ s4ehaw:phenomena rdf:type owl:DatatypeProperty ;
                  rdfs:label "phenomena "@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/phoneNumber
+###  https://saref.etsi.org/s4ehaw/phoneNumber
 :phoneNumber rdf:type owl:DatatypeProperty ;
              rdfs:domain :Actor ;
              rdfs:range xsd:string ;
@@ -880,7 +878,7 @@ s4ehaw:phenomena rdf:type owl:DatatypeProperty ;
              rdfs:label "phone number"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/processId
+###  https://saref.etsi.org/s4ehaw/processId
 s4ehaw:processId rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4ehaw:Process ;
                  rdfs:range xsd:anyURI ;
@@ -888,7 +886,7 @@ s4ehaw:processId rdf:type owl:DatatypeProperty ;
                  rdfs:label "process id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/processorId
+###  https://saref.etsi.org/s4ehaw/processorId
 s4ehaw:processorId rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4ehaw:Power ;
                    rdfs:range xsd:anyURI ;
@@ -896,7 +894,7 @@ s4ehaw:processorId rdf:type owl:DatatypeProperty ;
                    rdfs:label "processor id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/rechargeable
+###  https://saref.etsi.org/s4ehaw/rechargeable
 s4ehaw:rechargeable rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4ehaw:Energy ;
                     rdfs:range xsd:boolean ;
@@ -904,7 +902,7 @@ s4ehaw:rechargeable rdf:type owl:DatatypeProperty ;
                     rdfs:label "rechargeable"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/serialNb
+###  https://saref.etsi.org/s4ehaw/serialNb
 :serialNb rdf:type owl:DatatypeProperty ;
               rdfs:domain :HealthDevice ,
 	                  :FunctionalDevice ;
@@ -914,7 +912,7 @@ s4ehaw:rechargeable rdf:type owl:DatatypeProperty ;
               rdfs:label "serial number"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/serviceDescription
+###  https://saref.etsi.org/s4ehaw/serviceDescription
 s4ehaw:serviceDescription rdf:type owl:DatatypeProperty ;
                           rdfs:domain s4ehaw:ServiceProfile ;
                           rdfs:range xsd:string ;
@@ -922,7 +920,7 @@ s4ehaw:serviceDescription rdf:type owl:DatatypeProperty ;
                           rdfs:label "service description"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/serviceName
+###  https://saref.etsi.org/s4ehaw/serviceName
 s4ehaw:serviceName rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4ehaw:ServiceProfile ;
                    rdfs:range xsd:anyURI ;
@@ -930,7 +928,7 @@ s4ehaw:serviceName rdf:type owl:DatatypeProperty ;
                    rdfs:label "service name"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/sourceType
+###  https://saref.etsi.org/s4ehaw/sourceType
 s4ehaw:sourceType rdf:type owl:DatatypeProperty ;
                   rdfs:domain s4ehaw:Energy ;
                   rdfs:range xsd:string ;
@@ -938,7 +936,7 @@ s4ehaw:sourceType rdf:type owl:DatatypeProperty ;
                   rdfs:label "source type"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/topology
+###  https://saref.etsi.org/s4ehaw/topology
 s4ehaw:topology rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:Ban ;
                 rdfs:range [ rdf:type rdfs:Datatype ;
@@ -961,7 +959,7 @@ s4ehaw:topology rdf:type owl:DatatypeProperty ;
                 rdfs:label "topology"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/userId
+###  https://saref.etsi.org/s4ehaw/userId
 :userId rdf:type owl:DatatypeProperty ;
                rdfs:domain :Caregiver ,
 	                   :Patient ,
@@ -975,7 +973,7 @@ s4ehaw:topology rdf:type owl:DatatypeProperty ;
                rdfs:label "user id"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/velocity
+###  https://saref.etsi.org/s4ehaw/velocity
 s4ehaw:velocity rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4ehaw:DeviceType ;
                 rdfs:range xsd:float ;
@@ -995,265 +993,264 @@ voaf:Vocabulary rdf:type owl:Class .
 foaf:Person rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Action
+###  https://saref.etsi.org/s4ehaw/Action
 s4ehaw:Action rdf:type owl:Class ;
               rdfs:subClassOf saref:Command .
 
 
-###  https://saref.etsi.org/saref4ehaw/Activities
+###  https://saref.etsi.org/s4ehaw/Activities
 :Activities rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Actor
+###  https://saref.etsi.org/s4ehaw/Actor
 s4ehaw:Actor rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Actuator
+###  https://saref.etsi.org/s4ehaw/Actuator
 s4ehaw:Actuator rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:HealthDevice .
 
 
-###  https://saref.etsi.org/saref4ehaw/Address
+###  https://saref.etsi.org/s4ehaw/Address
 s4ehaw:Address rdf:type owl:Class ;
                rdfs:subClassOf s4ehaw:Physical .
 
 
-###  https://saref.etsi.org/saref4ehaw/Alarm
+###  https://saref.etsi.org/s4ehaw/Alarm
 s4ehaw:Alarm rdf:type owl:Class ;
              rdfs:subClassOf saref:Command .
 
 
-###  https://saref.etsi.org/saref4ehaw/Atomic
+###  https://saref.etsi.org/s4ehaw/Atomic
 s4ehaw:Atomic rdf:type owl:Class ;
               rdfs:subClassOf s4ehaw:ServiceProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/Ban
+###  https://saref.etsi.org/s4ehaw/Ban
 s4ehaw:Ban rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Body
+###  https://saref.etsi.org/s4ehaw/Body
 s4ehaw:Body rdf:type owl:Class ;
             rdfs:subClassOf s4ehaw:ServiceCategory .
 
 
-###  https://saref.etsi.org/saref4ehaw/BodySurface
+###  https://saref.etsi.org/s4ehaw/BodySurface
 s4ehaw:BodySurface rdf:type owl:Class ;
                    rdfs:subClassOf s4ehaw:Location .
 
 
-###  https://saref.etsi.org/saref4ehaw/ByRequest
+###  https://saref.etsi.org/s4ehaw/ByRequest
 s4ehaw:ByRequest rdf:type owl:Class ;
                  rdfs:subClassOf s4ehaw:CommunicationProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/Caregiver
-s4ehaw:Caregiver rdf:type owl:Class .
+###  https://saref.etsi.org/s4ehaw/Caregiver
+s4ehaw:Caregiver rdf:type owl:Class ;
+                 rdfs:subClassOf s4ehaw:Actor .
 
 
-###  https://saref.etsi.org/saref4ehaw/CommunicationProcess
+###  https://saref.etsi.org/s4ehaw/CommunicationProcess
 s4ehaw:CommunicationProcess rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Composite
+###  https://saref.etsi.org/s4ehaw/Composite
 s4ehaw:Composite rdf:type owl:Class ;
                  rdfs:subClassOf s4ehaw:ServiceProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/Contact
-s4ehaw:Contact rdf:type owl:Class ;
-                                                       
-                   :equivalentClass [ rdf:type :Class ;
-                                         :unionOf ( :Actor
-                                                    :ResponsibleParty
-                                                  )
-                                    ] .
+###  https://saref.etsi.org/s4ehaw/Contact
+s4ehaw:Contact rdf:type owl:Class ;                                                       
+               owl:equivalentClass s4ehaw:Actor.
 
 
-###  https://saref.etsi.org/saref4ehaw/Constraints
+###  https://saref.etsi.org/s4ehaw/Constraints
 s4ehaw:Constraints rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Coordinate
+###  https://saref.etsi.org/s4ehaw/Coordinate
 s4ehaw:Coordinate rdf:type owl:Class ;
                   rdfs:subClassOf s4ehaw:Physical .
 
 
-###  https://saref.etsi.org/saref4ehaw/Data
+###  https://saref.etsi.org/s4ehaw/Data
 s4ehaw:Data rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/DeviceType
+###  https://saref.etsi.org/s4ehaw/DeviceType
 s4ehaw:DeviceType rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Energy
+###  https://saref.etsi.org/s4ehaw/Energy
 s4ehaw:Energy rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Environment
+###  https://saref.etsi.org/s4ehaw/Environment
 s4ehaw:Environment rdf:type owl:Class ;
                    rdfs:subClassOf s4ehaw:ServiceCategory .
 
 
-###  https://saref.etsi.org/saref4ehaw/EventDriven
+###  https://saref.etsi.org/s4ehaw/EventDriven
 s4ehaw:EventDriven rdf:type owl:Class ;
                    rdfs:subClassOf s4ehaw:CommunicationProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/FunctionalDevice
+###  https://saref.etsi.org/s4ehaw/FunctionalDevice
 s4ehaw:FunctionalDevice rdf:type owl:Class ;
                         rdfs:subClassOf saref:Device .
 
 
-###  https://saref.etsi.org/saref4ehaw/HealthDevice
+###  https://saref.etsi.org/s4ehaw/HealthDevice
 s4ehaw:HealthDevice rdf:type owl:Class ;
                     rdfs:subClassOf saref:Device .
 
 
-###  https://saref.etsi.org/saref4ehaw/Helper
-s4ehaw:Helper rdf:type owl:Class .
+###  https://saref.etsi.org/s4ehaw/Helper
+s4ehaw:Helper rdf:type owl:Class ;
+              rdfs:subClassOf s4ehaw:Actor .
 
 
-###  https://saref.etsi.org/saref4ehaw/Hub
+###  https://saref.etsi.org/s4ehaw/Hub
 s4ehaw:Hub rdf:type owl:Class ;
            rdfs:subClassOf s4ehaw:HealthDevice .
 
 
-###  https://saref.etsi.org/saref4ehaw/Implant
+###  https://saref.etsi.org/s4ehaw/Implant
 s4ehaw:Implant rdf:type owl:Class ;
                rdfs:subClassOf s4ehaw:Location .
 
 
-###  https://saref.etsi.org/saref4ehaw/Interface
+###  https://saref.etsi.org/s4ehaw/Interface
 s4ehaw:Interface rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/InterfaceType
+###  https://saref.etsi.org/s4ehaw/InterfaceType
 s4ehaw:InterfaceType rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Legal
+###  https://saref.etsi.org/s4ehaw/Legal
 s4ehaw:Legal rdf:type owl:Class ;
              rdfs:subClassOf s4ehaw:Constraints ;
              rdfs:comment "This is an empty container for describing the legal constraints a data can be submitted to, like e.g. anonymization."@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/Location
+###  https://saref.etsi.org/s4ehaw/Location
 s4ehaw:Location rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Measurement
+###  https://saref.etsi.org/s4ehaw/Measurement
 s4ehaw:Measurement rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/MeasurementProcess
+###  https://saref.etsi.org/s4ehaw/MeasurementProcess
 s4ehaw:MeasurementProcess rdf:type owl:Class ;
                           rdfs:subClassOf s4ehaw:Process .
 
 
-###  https://saref.etsi.org/saref4ehaw/MeasurementSession
+###  https://saref.etsi.org/s4ehaw/MeasurementSession
 s4ehaw:MeasurementSession rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/MemoEnergy
+###  https://saref.etsi.org/s4ehaw/MemoEnergy
 s4ehaw:MemoEnergy rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Mode
+###  https://saref.etsi.org/s4ehaw/Mode
 s4ehaw:Mode rdf:type owl:Class ;
             rdf:comment "The dynamic characteristics of a eHealth Device that vary during its lifetime or its BAN lifetime" .
 
 
-###  https://saref.etsi.org/saref4ehaw/Operating
+###  https://saref.etsi.org/s4ehaw/Operating
 s4ehaw:Operating rdf:type owl:Class ;
                  rdfs:subClassOf s4ehaw:Constraints ;
 		 rdfs:comment "This is an empty container for describing the operating constraints of a device, e.g. prescribed humidity and temperature range, etc.."@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/Patient
-s4ehaw:Patient rdf:type owl:Class .
+###  https://saref.etsi.org/s4ehaw/Patient
+s4ehaw:Patient rdf:type owl:Class ;
+               rdfs:subClassOf s4ehaw:Actor .
 
 
-###  https://saref.etsi.org/saref4ehaw/Periodic
+###  https://saref.etsi.org/s4ehaw/Periodic
 s4ehaw:Periodic rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:CommunicationProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/Physical
+###  https://saref.etsi.org/s4ehaw/Physical
 s4ehaw:Physical rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:Location .
 
 
-###  https://saref.etsi.org/saref4ehaw/Process
+###  https://saref.etsi.org/s4ehaw/Process
 s4ehaw:Process rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Power
+###  https://saref.etsi.org/s4ehaw/Power
 s4ehaw:Power rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Remainder
+###  https://saref.etsi.org/s4ehaw/Remainder
 s4ehaw:Remainder rdf:type owl:Class ;
                  rdfs:subClassOf saref:Command .
 
 
-###  https://saref.etsi.org/saref4ehaw/ResponsabilityParty
+###  https://saref.etsi.org/s4ehaw/ResponsabilityParty
 s4ehaw:ResponsabilityParty rdf:type owl:Class ;
-                           rdfs:equivalentClass :Actor ;
+                           rdfs:subClassOf s4ehaw:Actor ;
 			   rdfs:comment "The legal entity responsible for a BAN, i.e. to contact in case of problem" .
 
 
-###  https://saref.etsi.org/saref4ehaw/Security
+###  https://saref.etsi.org/s4ehaw/Security
 s4ehaw:Security rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:Constraints ;
                 rdfs:comment "This is an empty container for describing the security constraints a data can be submitted to, like e.g. encryption."@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/Sensor
+###  https://saref.etsi.org/s4ehaw/Sensor
 s4ehaw:Sensor rdf:type owl:Class ;
               rdfs:subClassOf s4ehaw:HealthDevice .
 
 
-###  https://saref.etsi.org/saref4ehaw/ServiceCategory
+###  https://saref.etsi.org/s4ehaw/ServiceCategory
 s4ehaw:ServiceCategory rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/ServiceGrounding
+###  https://saref.etsi.org/s4ehaw/ServiceGrounding
 s4ehaw:ServiceGrounding rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/ServiceProcess
+###  https://saref.etsi.org/s4ehaw/ServiceProcess
 s4ehaw:ServiceProcess rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/ServiceProfile
+###  https://saref.etsi.org/s4ehaw/ServiceProfile
 s4ehaw:ServiceProfile rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/Simple
+###  https://saref.etsi.org/s4ehaw/Simple
 s4ehaw:Simple rdf:type owl:Class ;
               rdfs:subClassOf s4ehaw:ServiceProcess .
 
 
-###  https://saref.etsi.org/saref4ehaw/TimeSeriesMeasurements
+###  https://saref.etsi.org/s4ehaw/TimeSeriesMeasurements
 s4ehaw:TimeSeriesMeasurements rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/UnitOfMeasure
+###  https://saref.etsi.org/s4ehaw/UnitOfMeasure
 s4ehaw:UnitOfMeasure rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4ehaw/User
-s4ehaw:User rdf:type owl:Class .
+###  https://saref.etsi.org/s4ehaw/User
+s4ehaw:User rdf:type owl:Class  ;
+            rdfs:subClassOf s4ehaw:Actor .
 
 
-###  https://saref.etsi.org/saref4ehaw/Validity
+###  https://saref.etsi.org/s4ehaw/Validity
 s4ehaw:Validity rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:Constraints .
 
 
-###  https://saref.etsi.org/saref4ehaw/Wearable
+###  https://saref.etsi.org/s4ehaw/Wearable
 s4ehaw:Wearable rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:HealthDevice .
 
@@ -1284,12 +1281,6 @@ saref:Service rdf:type owl:Class .
 #    Annotations
 #################################################################
 
-owl:topDataProperty rdfs:comment "The BAN physical topology type, i.e Adhoc or Stars or Mesh or Others." .
-
-
-s4ehaw:faultTolerence rdfs:comment "The BAN fault tolerence. BAN shall measure accurate value and shall require a small fault tolerance."@en ;
-                      rdfs:label "fault tolerence"@en .
-
 
 ###  Generated by the OWL API (version 4.2.8.20170104-2310) https://github.com/owlcs/owlapi