diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 088c21bc58e6940f6ce532aff2cfa3e38bb18688..7683e492e9073624577efb7e0cc18ea6e19cc20d 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -1,4 +1,4 @@
-@prefix : <https://saref.etsi.org/saref4wear#> .
+@prefix : <https://saref.etsi.org/saref4wear/> .
 @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -10,14 +10,15 @@
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
 @prefix geosp: <http://www.opengis.net/ont/geosparql#> .
-@prefix saref: <https://saref.etsi.org/saref#> .
-@prefix s4city: <https://saref.etsi.org/saref4city#> .
-@prefix s4wear: <https://saref.etsi.org/saref4wear#> .
+@prefix saref: <https://saref.etsi.org/saref/> .
+@prefix s4city: <https://saref.etsi.org/saref4city/> .
+@prefix s4syst: <https://saref.etsi.org/saref4syst/> .
+@prefix s4wear: <https://saref.etsi.org/saref4wear/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
-@base <https://saref.etsi.org/saref4wear#> .
+@base <https://saref.etsi.org/saref4wear/> .
 
-<https://saref.etsi.org/saref4wear#> rdf:type owl:Ontology ;
-                                      owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear#> ;
+<https://saref.etsi.org/saref4wear/> rdf:type owl:Ontology ;
+                                      owl:versionIRI <https://saref.etsi.org/saref4wear/v0.1.2/saref4wear/> ;
                                       dcterms:contributor <https://www.linkedin.com/in/maurodragoni/MauroDragoni> ;
                                       dcterms:created "start date of the STF 2019-01-01"^^xsd:date ;
                                       dcterms:description "SAREF4WEAR is an extension of SAREF for Wearables"@en ;
@@ -28,7 +29,7 @@
                                       dcterms:source <https://forge.etsi.org/rep/SAREF/saref4wear/> ;
                                       dcterms:title "SAREF4WEAR: an extension of SAREF for Wearables"@en ;
                                       vann:preferredNamespacePrefix "s4wear" ;
-                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4wear#" ;
+                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4wear/" ;
                                       owl:versionInfo "v0.1.2" .
 
 #################################################################
@@ -115,149 +116,153 @@ geo:location rdf:type owl:ObjectProperty ;
              rdfs:label "location" .
 
 
-###  https://saref.etsi.org/saref#controlsProperty
+###  https://saref.etsi.org/saref/controlsProperty
 saref:controlsProperty rdf:type owl:ObjectProperty ;
                        rdfs:isDefinedBy saref: ;
                        rdfs:label "controls property"@en .
 
 
-###  https://saref.etsi.org/saref#isControlledByDevice
+###  https://saref.etsi.org/saref/hasFunction
+saref:hasFunction rdf:type owl:ObjectProperty ;
+                  rdfs:domain s4wear:Wearable ;
+                  rdfs:range saref:Function .
+
+
+###  https://saref.etsi.org/saref/isControlledByDevice
 saref:isControlledByDevice rdf:type owl:ObjectProperty ;
                            rdfs:isDefinedBy saref: ;
                            rdfs:label "is controlled by device"@en .
 
 
-###  https://saref.etsi.org/saref#isMeasuredByDevice
+###  https://saref.etsi.org/saref/isMeasuredByDevice
 saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;
                          rdfs:isDefinedBy saref: ;
                          rdfs:label "is measured by device"@en .
 
 
-###  https://saref.etsi.org/saref#isMeasuredIn
+###  https://saref.etsi.org/saref/isMeasuredIn
 saref:isMeasuredIn rdf:type owl:ObjectProperty ;
                    rdfs:isDefinedBy saref: ;
                    rdfs:label "is measured in"@en .
 
 
-###  https://saref.etsi.org/saref#makesMeasurement
+###  https://saref.etsi.org/saref/makesMeasurement
 saref:makesMeasurement rdf:type owl:ObjectProperty ;
                        owl:inverseOf saref:measurementMadeBy ;
                        rdfs:isDefinedBy saref: ;
                        rdfs:label "makes measurement"@en .
 
 
-###  https://saref.etsi.org/saref#measurementMadeBy
+###  https://saref.etsi.org/saref/measurementMadeBy
 saref:measurementMadeBy rdf:type owl:ObjectProperty ;
                         rdfs:isDefinedBy saref: ;
                         rdfs:label "measurement made by"@en .
 
 
-###  https://saref.etsi.org/saref#measuresProperty
+###  https://saref.etsi.org/saref/measuresProperty
 saref:measuresProperty rdf:type owl:ObjectProperty ;
                        rdfs:isDefinedBy saref: ;
                        rdfs:label "measures property"@en .
 
 
-###  https://saref.etsi.org/saref#relatesToMeasurement
+###  https://saref.etsi.org/saref/relatesToMeasurement
 saref:relatesToMeasurement rdf:type owl:ObjectProperty ;
                            rdfs:isDefinedBy saref: ;
                            rdfs:label "relates to measurement"@en .
 
 
-###  https://saref.etsi.org/saref#relatesToProperty
+###  https://saref.etsi.org/saref/relatesToProperty
 saref:relatesToProperty rdf:type owl:ObjectProperty ;
                         rdfs:isDefinedBy saref: ;
                         rdfs:label "relates to property"@en .
 
 
-###  https://saref.etsi.org/saref4city#takesPlaceAtFacility
+###  https://saref.etsi.org/saref4city/takesPlaceAtFacility
 s4city:takesPlaceAtFacility rdf:type owl:ObjectProperty ;
                             rdfs:isDefinedBy s4city: ;
                             rdfs:label "takes place at facility"@en .
 
 
-###  https://saref.etsi.org/saref4wear#actsOn
-s4wear:actsOn rdf:type owl:ObjectProperty ;
-              rdfs:domain s4wear:Action ;
-              rdfs:range s4wear:ActuableObject .
+###  https://saref.etsi.org/saref4syst/connectedTo
+s4syst:connectedTo rdf:type owl:ObjectProperty .
 
 
-###  https://saref.etsi.org/saref4wear#canSendInformationTo
-s4wear:canSendInformationTo rdf:type owl:ObjectProperty ;
-                            rdfs:domain s4wear:Wearable ;
-                            rdfs:range s4wear:Wearable .
+###  https://saref.etsi.org/saref4wear/actsOn
+s4wear:actsOn rdf:type owl:ObjectProperty ;
+              rdfs:domain s4wear:ActionFunction ;
+              rdfs:range s4wear:ActuableObject .
 
 
-###  https://saref.etsi.org/saref4wear#hasInterface
+###  https://saref.etsi.org/saref4wear/hasInterface
 s4wear:hasInterface rdf:type owl:ObjectProperty ;
-                    rdfs:domain s4wear:Wearable ;
+                    rdfs:domain saref:Device ;
                     rdfs:range s4wear:Interface .
 
 
-###  https://saref.etsi.org/saref4wear#hasLocation
+###  https://saref.etsi.org/saref4wear/hasLocation
 s4wear:hasLocation rdf:type owl:ObjectProperty ;
                    rdfs:domain owl:Thing ;
                    rdfs:range s4wear:Location .
 
 
-###  https://saref.etsi.org/saref4wear#hasPowerSupply
+###  https://saref.etsi.org/saref4wear/hasPowerSupply
 s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
-                      rdfs:domain s4wear:Wearable ;
+                      rdfs:domain saref:Device ;
                       rdfs:range s4wear:PowerSupply .
 
 
-###  https://saref.etsi.org/saref4wear#hasSensor
+###  https://saref.etsi.org/saref4wear/hasSensor
 s4wear:hasSensor rdf:type owl:ObjectProperty ;
-                 rdfs:domain s4wear:Wearable ;
+                 rdfs:domain saref:Device ;
                  rdfs:range s4wear:Sensor .
 
 
-###  https://saref.etsi.org/saref4wear#interactsWith
+###  https://saref.etsi.org/saref4wear/interactsWith
 s4wear:interactsWith rdf:type owl:ObjectProperty ;
                      rdfs:domain s4wear:User ;
-                     rdfs:range s4wear:Wearable .
+                     rdfs:range saref:Device .
 
 
-###  https://saref.etsi.org/saref4wear#isActedBy
+###  https://saref.etsi.org/saref4wear/isActedBy
 s4wear:isActedBy rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearer ;
-                 rdfs:range s4wear:Wearable .
+                 rdfs:range saref:Device .
 
 
-###  https://saref.etsi.org/saref4wear#isActuatedBy
+###  https://saref.etsi.org/saref4wear/isActuatedBy
 s4wear:isActuatedBy rdf:type owl:ObjectProperty ;
-                    rdfs:domain s4wear:Wearable ;
+                    rdfs:domain saref:Device ;
                     rdfs:range s4wear:Actuator .
 
 
-###  https://saref.etsi.org/saref4wear#isLocated
+###  https://saref.etsi.org/saref4wear/isLocated
 s4wear:isLocated rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/saref4wear#isLocatedIn
+###  https://saref.etsi.org/saref4wear/isLocatedIn
 s4wear:isLocatedIn rdf:type owl:ObjectProperty ;
                    rdfs:subPropertyOf s4wear:isLocated ;
                    rdfs:domain s4wear:Wearable ;
                    rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/saref4wear#isLocatedNear
+###  https://saref.etsi.org/saref4wear/isLocatedNear
 s4wear:isLocatedNear rdf:type owl:ObjectProperty ;
                      rdfs:subPropertyOf s4wear:isLocated ;
                      rdfs:domain s4wear:Wearable ;
                      rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/saref4wear#isLocatedOn
+###  https://saref.etsi.org/saref4wear/isLocatedOn
 s4wear:isLocatedOn rdf:type owl:ObjectProperty ;
                    rdfs:subPropertyOf s4wear:isLocated ;
                    rdfs:domain s4wear:Wearable ;
                    rdfs:range s4wear:Wearer .
 
 
-###  https://saref.etsi.org/saref4wear#isSensedBy
+###  https://saref.etsi.org/saref4wear/isSensedBy
 s4wear:isSensedBy rdf:type owl:ObjectProperty ;
                   rdfs:domain s4wear:Wearer ;
                   rdfs:range s4wear:Wearable ;
@@ -266,27 +271,29 @@ The definition of this object property satisfies the requirement WEAR-2.""" ;
                   rdfs:label "is sensed by"@en .
 
 
-###  https://saref.etsi.org/saref4wear#isTriggeredBy
+###  https://saref.etsi.org/saref4wear/isTriggeredBy
 s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;
-                     rdfs:domain s4wear:Action ;
-                     rdfs:range s4wear:Wearable .
+                     rdfs:domain s4wear:ActionFunction ;
+                     rdfs:range saref:Device .
 
 
-###  https://saref.etsi.org/saref4wear#monitors
+###  https://saref.etsi.org/saref4wear/monitors
 s4wear:monitors rdf:type owl:ObjectProperty ;
-                rdfs:domain s4wear:Wearable ;
-                rdfs:range s4wear:Wearable .
+                rdfs:domain saref:Device ;
+                rdfs:range saref:Device .
 
 
-###  https://saref.etsi.org/saref4wear#sendsInformationTo
+###  https://saref.etsi.org/saref4wear/sendsInformationTo
 s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
+                          rdfs:subPropertyOf s4syst:connectedTo ;
                           rdfs:domain s4wear:Wearable ;
                           rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/saref4wear#sendsNotificationsTo
+###  https://saref.etsi.org/saref4wear/sendsNotificationsTo
 s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
-                            rdfs:domain s4wear:Wearable ;
+                            rdfs:subPropertyOf s4syst:connectedTo ;
+                            rdfs:domain saref:Device ;
                             rdfs:range s4wear:Wearer .
 
 
@@ -294,117 +301,117 @@ s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
 #    Data properties
 #################################################################
 
-###  https://saref.etsi.org/saref#hasTimestamp
+###  https://saref.etsi.org/saref/hasTimestamp
 saref:hasTimestamp rdf:type owl:DatatypeProperty ;
                    rdfs:isDefinedBy saref: ;
                    rdfs:label "has timestamp"@en .
 
 
-###  https://saref.etsi.org/saref#hasValue
+###  https://saref.etsi.org/saref/hasValue
 saref:hasValue rdf:type owl:DatatypeProperty ;
                rdfs:isDefinedBy saref: ;
                rdfs:label "has value"@en .
 
 
-###  https://saref.etsi.org/saref4wear#emittedNoise
+###  https://saref.etsi.org/saref4wear/emittedNoise
 s4wear:emittedNoise rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4wear:Wearable ;
                     rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#emittedTemperature
+###  https://saref.etsi.org/saref4wear/emittedTemperature
 s4wear:emittedTemperature rdf:type owl:DatatypeProperty ;
                           rdfs:domain s4wear:Wearable ;
                           rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#eventType
+###  https://saref.etsi.org/saref4wear/eventType
 s4wear:eventType rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4city:Event ;
                  rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/saref4wear#followsPolicies
+###  https://saref.etsi.org/saref4wear/followsPolicies
 s4wear:followsPolicies rdf:type owl:DatatypeProperty ;
                        rdfs:domain s4wear:Wearable ;
                        rdfs:range xsd:anyURI .
 
 
-###  https://saref.etsi.org/saref4wear#hasCapacity
+###  https://saref.etsi.org/saref4wear/hasCapacity
 s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4city:Facility ,
                                s4wear:Area ;
                    rdfs:range xsd:long .
 
 
-###  https://saref.etsi.org/saref4wear#hasCommand
+###  https://saref.etsi.org/saref4wear/hasCommand
 s4wear:hasCommand rdf:type owl:DatatypeProperty ;
-                  rdfs:domain s4wear:Action ;
+                  rdfs:domain s4wear:ActionFunction ;
                   rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/saref4wear#hasDataTransmissionRate
+###  https://saref.etsi.org/saref4wear/hasDataTransmissionRate
 s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
                                rdfs:domain s4wear:Wearable ;
                                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasDeep
+###  https://saref.etsi.org/saref4wear/hasDeep
 s4wear:hasDeep rdf:type owl:DatatypeProperty ;
                rdfs:domain s4wear:Wearable ;
                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasHeight
+###  https://saref.etsi.org/saref4wear/hasHeight
 s4wear:hasHeight rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasLength
+###  https://saref.etsi.org/saref4wear/hasLength
 s4wear:hasLength rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasOperatingTemperature
+###  https://saref.etsi.org/saref4wear/hasOperatingTemperature
 s4wear:hasOperatingTemperature rdf:type owl:DatatypeProperty ;
                                rdfs:domain s4wear:Wearable ;
                                rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasStorage
+###  https://saref.etsi.org/saref4wear/hasStorage
 s4wear:hasStorage rdf:type owl:DatatypeProperty ;
                   rdfs:subPropertyOf owl:topDataProperty ;
                   rdfs:domain s4wear:Wearable ;
                   rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#hasWeight
+###  https://saref.etsi.org/saref4wear/hasWeight
 s4wear:hasWeight rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Wearable ;
                  rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#latitude
+###  https://saref.etsi.org/saref4wear/latitude
 s4wear:latitude rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4wear:Location ;
                 rdfs:range xsd:double .
 
 
-###  https://saref.etsi.org/saref4wear#meansOfTransport
+###  https://saref.etsi.org/saref4wear/meansOfTransport
 s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
-                        rdfs:domain s4wear:Wearer ;
+                        rdfs:domain saref:FeatureOfInterest ;
                         rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/saref4wear#wearerRangeAge
+###  https://saref.etsi.org/saref4wear/wearerRangeAge
 s4wear:wearerRangeAge rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4wear:Wearer ;
-                      rdfs:range xsd:string .
+                      rdfs:range xsd:int .
 
 
-###  https://saref.etsi.org/saref4wear#wearerStatus
+###  https://saref.etsi.org/saref4wear/wearerStatus
 s4wear:wearerStatus rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4wear:Wearer ;
                     rdfs:range xsd:string .
@@ -465,7 +472,7 @@ geo:Point rdf:type owl:Class ;
 foaf:Person rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref#Device
+###  https://saref.etsi.org/saref/Device
 saref:Device rdf:type owl:Class ;
              rdfs:subClassOf s4wear:PhysicalObject ,
                              [ rdf:type owl:Restriction ;
@@ -479,12 +486,24 @@ saref:Device rdf:type owl:Class ;
                              [ rdf:type owl:Restriction ;
                                owl:onProperty saref:measuresProperty ;
                                owl:allValuesFrom saref:Property
+                             ] ,
+                             [ rdf:type owl:Restriction ;
+                               owl:onProperty s4wear:interactsWith ;
+                               owl:allValuesFrom saref:Device
                              ] ;
              rdfs:isDefinedBy saref: ;
              rdfs:label "Device"@en .
 
 
-###  https://saref.etsi.org/saref#Measurement
+###  https://saref.etsi.org/saref/FeatureOfInterest
+saref:FeatureOfInterest rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref/Function
+saref:Function rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/saref/Measurement
 saref:Measurement rdf:type owl:Class ;
                   rdfs:subClassOf [ rdf:type owl:Restriction ;
                                     owl:onProperty saref:isMeasuredIn ;
@@ -521,7 +540,7 @@ saref:Measurement rdf:type owl:Class ;
                   rdfs:label "Measurement"@en .
 
 
-###  https://saref.etsi.org/saref#Property
+###  https://saref.etsi.org/saref/Property
 saref:Property rdf:type owl:Class ;
                rdfs:subClassOf [ rdf:type owl:Restriction ;
                                  owl:onProperty saref:isControlledByDevice ;
@@ -539,27 +558,32 @@ saref:Property rdf:type owl:Class ;
                rdfs:label "Property"@en .
 
 
-###  https://saref.etsi.org/saref#Sensor
+###  https://saref.etsi.org/saref/SensingFunction
+saref:SensingFunction rdf:type owl:Class ;
+                      rdfs:subClassOf saref:Function .
+
+
+###  https://saref.etsi.org/saref/Sensor
 saref:Sensor rdf:type owl:Class ;
              rdfs:subClassOf saref:Device ;
              rdfs:isDefinedBy saref: ;
              rdfs:label "Sensor"@en .
 
 
-###  https://saref.etsi.org/saref#UnitOfMeasure
+###  https://saref.etsi.org/saref/UnitOfMeasure
 saref:UnitOfMeasure rdf:type owl:Class ;
                     rdfs:isDefinedBy saref: ;
                     rdfs:label "Unit of measure"@en .
 
 
-###  https://saref.etsi.org/saref4city#AdministrativeArea
+###  https://saref.etsi.org/saref4city/AdministrativeArea
 s4city:AdministrativeArea rdf:type owl:Class ;
                           rdfs:subClassOf geosp:Feature ;
                           rdfs:isDefinedBy s4city: ;
                           rdfs:label "Administrative area"@en .
 
 
-###  https://saref.etsi.org/saref4city#CityObject
+###  https://saref.etsi.org/saref4city/CityObject
 s4city:CityObject rdf:type owl:Class ;
                   rdfs:subClassOf geosp:Feature ,
                                   s4wear:PhysicalObject ;
@@ -567,7 +591,7 @@ s4city:CityObject rdf:type owl:Class ;
                   rdfs:label "City object"@en .
 
 
-###  https://saref.etsi.org/saref4city#Event
+###  https://saref.etsi.org/saref4city/Event
 s4city:Event rdf:type owl:Class ;
              rdfs:subClassOf [ rdf:type owl:Restriction ;
                                owl:onProperty s4city:takesPlaceAtFacility ;
@@ -577,85 +601,81 @@ s4city:Event rdf:type owl:Class ;
              rdfs:label "Event"@en .
 
 
-###  https://saref.etsi.org/saref4city#Facility
+###  https://saref.etsi.org/saref4city/Facility
 s4city:Facility rdf:type owl:Class ;
                 rdfs:subClassOf geosp:Feature ;
                 rdfs:isDefinedBy s4city: ;
                 rdfs:label "Facility"@en .
 
 
-###  https://saref.etsi.org/saref4wear#Action
-s4wear:Action rdf:type owl:Class ;
-              rdfs:subClassOf s4wear:Capability .
+###  https://saref.etsi.org/saref4wear/ActionFunction
+s4wear:ActionFunction rdf:type owl:Class ;
+                      rdfs:subClassOf saref:Function .
 
 
-###  https://saref.etsi.org/saref4wear#ActuableObject
+###  https://saref.etsi.org/saref4wear/ActuableObject
 s4wear:ActuableObject rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#Actuator
+###  https://saref.etsi.org/saref4wear/Actuator
 s4wear:Actuator rdf:type owl:Class ;
-                owl:equivalentClass <https://w3id.org/saref#Actuator> ;
                 rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/saref4wear#Area
+###  https://saref.etsi.org/saref4wear/Area
 s4wear:Area rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#Biometric
+###  https://saref.etsi.org/saref4wear/Biometric
 s4wear:Biometric rdf:type owl:Class ;
                  rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/saref4wear#Capability
-s4wear:Capability rdf:type owl:Class .
+###  https://saref.etsi.org/saref4wear/BusinessEvents
+s4wear:BusinessEvents rdf:type owl:Class ;
+                      rdfs:subClassOf s4city:Event .
 
 
-###  https://saref.etsi.org/saref4wear#Child
+###  https://saref.etsi.org/saref4wear/Child
 s4wear:Child rdf:type owl:Class ;
-             rdfs:subClassOf s4wear:Wearer .
+             rdfs:subClassOf s4wear:LivingOrganism .
 
 
-###  https://saref.etsi.org/saref4wear#Communication
-s4wear:Communication rdf:type owl:Class ;
-                     rdfs:subClassOf s4wear:Capability .
+###  https://saref.etsi.org/saref4wear/CommunicationFunction
+s4wear:CommunicationFunction rdf:type owl:Class ;
+                             rdfs:subClassOf saref:Function .
 
 
-###  https://saref.etsi.org/saref4wear#Control
-s4wear:Control rdf:type owl:Class ;
-               rdfs:subClassOf s4wear:Capability .
+###  https://saref.etsi.org/saref4wear/ControlFunction
+s4wear:ControlFunction rdf:type owl:Class ;
+                       rdfs:subClassOf saref:Function .
 
 
-###  https://saref.etsi.org/saref4wear#Device
+###  https://saref.etsi.org/saref4wear/Device
 s4wear:Device rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#ElecticalSafety
-s4wear:ElecticalSafety rdf:type owl:Class ;
-                       rdfs:subClassOf s4wear:Information .
-
-
-###  https://saref.etsi.org/saref4wear#ElectricalSafety
+###  https://saref.etsi.org/saref4wear/ElectricalSafety
 s4wear:ElectricalSafety rdf:type owl:Class ;
                         rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/saref4wear#Emission
+###  https://saref.etsi.org/saref4wear/Emission
 s4wear:Emission rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/saref4wear#Entity
-s4wear:Entity rdf:type owl:Class .
+###  https://saref.etsi.org/saref4wear/FabricWearable
+s4wear:FabricWearable rdf:type owl:Class ;
+                      rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/saref4wear#Fabric
-s4wear:Fabric rdf:type owl:Class ;
-              rdfs:subClassOf s4wear:TextileBasedWearable .
+###  https://saref.etsi.org/saref4wear/FunEvents
+s4wear:FunEvents rdf:type owl:Class ;
+                 rdfs:subClassOf s4city:Event .
 
 
-###  https://saref.etsi.org/saref4wear#InBodyWearable
+###  https://saref.etsi.org/saref4wear/InBodyWearable
 s4wear:InBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -667,25 +687,30 @@ s4wear:InBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/saref4wear#Information
+###  https://saref.etsi.org/saref4wear/Information
 s4wear:Information rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#Interface
+###  https://saref.etsi.org/saref4wear/Interface
 s4wear:Interface rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#LivingOrganism
+###  https://saref.etsi.org/saref4wear/LivingOrganism
 s4wear:LivingOrganism rdf:type owl:Class ;
                       rdfs:subClassOf geosp:Feature ,
-                                      s4wear:Entity .
+                                      saref:FeatureOfInterest .
 
 
-###  https://saref.etsi.org/saref4wear#Location
+###  https://saref.etsi.org/saref4wear/Location
 s4wear:Location rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#NearBodyWearable
+###  https://saref.etsi.org/saref4wear/MusicEvents
+s4wear:MusicEvents rdf:type owl:Class ;
+                   rdfs:subClassOf s4city:Event .
+
+
+###  https://saref.etsi.org/saref4wear/NearBodyWearable
 s4wear:NearBodyWearable rdf:type owl:Class ;
                         rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                                [ rdf:type owl:Restriction ;
@@ -697,7 +722,7 @@ s4wear:NearBodyWearable rdf:type owl:Class ;
                                         ] .
 
 
-###  https://saref.etsi.org/saref4wear#OnBodyWearable
+###  https://saref.etsi.org/saref4wear/OnBodyWearable
 s4wear:OnBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -709,74 +734,68 @@ s4wear:OnBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/saref4wear#Parent
+###  https://saref.etsi.org/saref4wear/Parent
 s4wear:Parent rdf:type owl:Class ;
-              rdfs:subClassOf s4wear:Wearer .
+              rdfs:subClassOf s4wear:LivingOrganism .
 
 
-###  https://saref.etsi.org/saref4wear#PhysicalObject
+###  https://saref.etsi.org/saref4wear/PhysicalObject
 s4wear:PhysicalObject rdf:type owl:Class ;
                       rdfs:subClassOf geosp:Feature ,
-                                      s4wear:Entity .
+                                      saref:FeatureOfInterest .
 
 
-###  https://saref.etsi.org/saref4wear#PositionedWearable
+###  https://saref.etsi.org/saref4wear/PositionedWearable
 s4wear:PositionedWearable rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:Wearable .
 
 
-###  https://saref.etsi.org/saref4wear#PowerSupply
+###  https://saref.etsi.org/saref4wear/PowerSupply
 s4wear:PowerSupply rdf:type owl:Class ;
                    rdfs:subClassOf s4wear:Device .
 
 
-###  https://saref.etsi.org/saref4wear#Sensing
-s4wear:Sensing rdf:type owl:Class ;
-               rdfs:subClassOf s4wear:Capability .
-
-
-###  https://saref.etsi.org/saref4wear#Sensor
+###  https://saref.etsi.org/saref4wear/Sensor
 s4wear:Sensor rdf:type owl:Class ;
-              owl:equivalentClass <https://w3id.org/saref#Sensor> ;
               rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/saref4wear#Software
+###  https://saref.etsi.org/saref4wear/Software
 s4wear:Software rdf:type owl:Class ;
-                rdfs:subClassOf s4wear:Entity .
+                rdfs:subClassOf saref:FeatureOfInterest .
 
 
-###  https://saref.etsi.org/saref4wear#SportEvents
+###  https://saref.etsi.org/saref4wear/SportEvents
 s4wear:SportEvents rdf:type owl:Class ;
                    rdfs:subClassOf s4city:Event .
 
 
-###  https://saref.etsi.org/saref4wear#StaffMember
+###  https://saref.etsi.org/saref4wear/StaffMember
 s4wear:StaffMember rdf:type owl:Class ;
-                   rdfs:subClassOf s4wear:Wearer .
+                   rdfs:subClassOf s4wear:LivingOrganism .
 
 
-###  https://saref.etsi.org/saref4wear#Storage
+###  https://saref.etsi.org/saref4wear/Storage
 s4wear:Storage rdf:type owl:Class ;
                rdfs:subClassOf s4wear:WearableComponent .
 
 
-###  https://saref.etsi.org/saref4wear#TextileBasedComponent
-s4wear:TextileBasedComponent rdf:type owl:Class ;
-                             rdfs:subClassOf s4wear:TextileBasedWearable .
-
-
-###  https://saref.etsi.org/saref4wear#TextileBasedDevice
+###  https://saref.etsi.org/saref4wear/TextileBasedDevice
 s4wear:TextileBasedDevice rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/saref4wear#TextileBasedWearable
+###  https://saref.etsi.org/saref4wear/TextileBasedSensor
+s4wear:TextileBasedSensor rdf:type owl:Class ;
+                          rdfs:subClassOf s4wear:Sensor .
+
+
+###  https://saref.etsi.org/saref4wear/TextileBasedWearable
 s4wear:TextileBasedWearable rdf:type owl:Class ;
-                            rdfs:subClassOf s4wear:Wearable .
+                            rdfs:subClassOf s4wear:OnBodyWearable .
 
 
-###  https://saref.etsi.org/saref4wear#User
+###  https://saref.etsi.org/saref4wear/User
 s4wear:User rdf:type owl:Class ;
             rdfs:subClassOf [ owl:intersectionOf ( s4wear:LivingOrganism
                                                    [ rdf:type owl:Restriction ;
@@ -788,7 +807,7 @@ s4wear:User rdf:type owl:Class ;
                             ] .
 
 
-###  https://saref.etsi.org/saref4wear#Wearable
+###  https://saref.etsi.org/saref4wear/Wearable
 s4wear:Wearable rdf:type owl:Class ;
                 rdfs:subClassOf saref:Device ;
                 rdfs:comment """A wearable device is a device that is intended to be located near, on or in an organism.
@@ -796,13 +815,13 @@ The definition of this concept satisfies the requirement WEAR-1."""@en ;
                 rdfs:label "Wearable device"@en .
 
 
-###  https://saref.etsi.org/saref4wear#WearableComponent
+###  https://saref.etsi.org/saref4wear/WearableComponent
 s4wear:WearableComponent rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4wear#Wearer
+###  https://saref.etsi.org/saref4wear/Wearer
 s4wear:Wearer rdf:type owl:Class ;
-              rdfs:subClassOf [ owl:intersectionOf ( s4wear:Entity
+              rdfs:subClassOf [ owl:intersectionOf ( saref:FeatureOfInterest
                                                      [ rdf:type owl:Restriction ;
                                                        owl:onProperty s4wear:isSensedBy ;
                                                        owl:someValuesFrom s4wear:Wearable
@@ -815,14 +834,6 @@ The definition of this concept satisfies the requirement WEAR-2."""@en ;
               rdfs:label "Wearer"@en .
 
 
-###  https://w3id.org/saref#Actuator
-<https://w3id.org/saref#Actuator> rdf:type owl:Class .
-
-
-###  https://w3id.org/saref#Sensor
-<https://w3id.org/saref#Sensor> rdf:type owl:Class .
-
-
 #################################################################
 #    Individuals
 #################################################################