diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 385667d8998ec3dda0280af5eb0a240f90702316..79b1d3272c4459b7f60c37895970da13c388b24b 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -1,4 +1,4 @@
-@prefix : <https://saref.etsi.org/s4wear#> .
+@prefix : <https://saref.etsi.org/saref4wear#> .
 @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> .
@@ -11,7 +11,7 @@
 @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/s4wear#> .
+@prefix s4wear: <https://saref.etsi.org/saref4wear#> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/saref4wear#> .
 
@@ -117,52 +117,52 @@ s4city:takesPlaceAtFacility rdf:type owl:ObjectProperty ;
 	                        rdfs:label "takes place at facility"@en .
 
 
-###  https://saref.etsi.org/s4wear#canSendInformationTo
+###  https://saref.etsi.org/saref4wear#canSendInformationTo
 s4wear:canSendInformationTo rdf:type owl:ObjectProperty ;
                             rdfs:domain s4wear:Wearable ;
                             rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#interactsWith
+###  https://saref.etsi.org/saref4wear#interactsWith
 s4wear:interactsWith rdf:type owl:ObjectProperty ;
                      rdfs:domain s4wear:User ;
                      rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#isActedBy
+###  https://saref.etsi.org/saref4wear#isActedBy
 s4wear:isActedBy rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearer ;
                  rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#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/s4wear#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/s4wear#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/s4wear#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/s4wear#isSensedBy
+###  https://saref.etsi.org/saref4wear#isSensedBy
 s4wear:isSensedBy rdf:type owl:ObjectProperty ;
                   rdfs:domain s4wear:Wearer ;
                   rdfs:range s4wear:Wearable ;
@@ -171,7 +171,7 @@ The definition of this object property satisfies the requirement WEAR-2.""" ;
                   rdfs:label "is sensed by"@en .
 
 
-###  https://saref.etsi.org/s4wear#monitors
+###  https://saref.etsi.org/saref4wear#monitors
 s4wear:monitors rdf:type owl:ObjectProperty ;
                 rdfs:domain s4wear:Wearable ;
                 rdfs:range s4wear:Wearable .
@@ -236,31 +236,31 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
 #    Data properties
 #################################################################
 
-###  https://saref.etsi.org/s4wear#hasCapacity
+###  https://saref.etsi.org/saref4wear#hasCapacity
 s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4city:Facility ;
                 rdfs:range xsd:long .
 
 
-###  https://saref.etsi.org/s4wear#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/s4wear#meansOfTransport
+###  https://saref.etsi.org/saref4wear#meansOfTransport
 s4wear:meansOfTransport rdf:type owl:DatatypeProperty ;
                         rdfs:domain s4wear:Wearer ;
                         rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#wearerRangeAge
+###  https://saref.etsi.org/saref4wear#wearerRangeAge
 s4wear:wearerRangeAge rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4wear:Wearer ;
                       rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/s4wear#wearerStatus
+###  https://saref.etsi.org/saref4wear#wearerStatus
 s4wear:wearerStatus rdf:type owl:DatatypeProperty ;
                     rdfs:domain s4wear:Wearer ;
                     rdfs:range xsd:string .
@@ -361,50 +361,50 @@ s4city:Facility rdf:type owl:Class ;
 	            rdfs:label "Facility"@en .
 
 
-###  https://saref.etsi.org/s4wear#Biometric
+###  https://saref.etsi.org/saref4wear#Biometric
 s4wear:Biometric rdf:type owl:Class ;
                  rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Capability
+###  https://saref.etsi.org/saref4wear#Capability
 s4wear:Capability rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Child
+###  https://saref.etsi.org/saref4wear#Child
 s4wear:Child rdf:type owl:Class ;
              rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#Communication
+###  https://saref.etsi.org/saref4wear#Communication
 s4wear:Communication rdf:type owl:Class ;
                     rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#Control
+###  https://saref.etsi.org/saref4wear#Control
 s4wear:Control rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#ElecticalSafety
+###  https://saref.etsi.org/saref4wear#ElecticalSafety
 s4wear:ElecticalSafety rdf:type owl:Class ;
                        rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Emission
+###  https://saref.etsi.org/saref4wear#Emission
 s4wear:Emission rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Information .
 
 
-###  https://saref.etsi.org/s4wear#Entity
+###  https://saref.etsi.org/saref4wear#Entity
 s4wear:Entity rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Fabric
+###  https://saref.etsi.org/saref4wear#Fabric
 s4wear:Fabric rdf:type owl:Class ;
               rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#InBodyWearable
+###  https://saref.etsi.org/saref4wear#InBodyWearable
 s4wear:InBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -416,17 +416,17 @@ s4wear:InBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/s4wear#Information
+###  https://saref.etsi.org/saref4wear#Information
 s4wear:Information rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#LivingOrganism
+###  https://saref.etsi.org/saref4wear#LivingOrganism
 s4wear:LivingOrganism rdf:type owl:Class ;
                       rdfs:subClassOf s4wear:Entity ,
                                       geosp:Feature .
 
 
-###  https://saref.etsi.org/s4wear#NearBodyWearable
+###  https://saref.etsi.org/saref4wear#NearBodyWearable
 s4wear:NearBodyWearable rdf:type owl:Class ;
                         rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                                [ rdf:type owl:Restriction ;
@@ -438,7 +438,7 @@ s4wear:NearBodyWearable rdf:type owl:Class ;
                                         ] .
 
 
-###  https://saref.etsi.org/s4wear#OnBodyWearable
+###  https://saref.etsi.org/saref4wear#OnBodyWearable
 s4wear:OnBodyWearable rdf:type owl:Class ;
                       rdfs:subClassOf [ owl:intersectionOf ( s4wear:PositionedWearable
                                                              [ rdf:type owl:Restriction ;
@@ -450,62 +450,62 @@ s4wear:OnBodyWearable rdf:type owl:Class ;
                                       ] .
 
 
-###  https://saref.etsi.org/s4wear#Parent
+###  https://saref.etsi.org/saref4wear#Parent
 s4wear:Parent rdf:type owl:Class ;
               rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#PhysicalObject
+###  https://saref.etsi.org/saref4wear#PhysicalObject
 s4wear:PhysicalObject rdf:type owl:Class ;
                       rdfs:subClassOf s4wear:Entity ,
                                       geosp:Feature .
 
 
-###  https://saref.etsi.org/s4wear#PositionedWearable
+###  https://saref.etsi.org/saref4wear#PositionedWearable
 s4wear:PositionedWearable rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#Sensing
+###  https://saref.etsi.org/saref4wear#Sensing
 s4wear:Sensing rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#Sensor
+###  https://saref.etsi.org/saref4wear#Sensor
 s4wear:Sensor rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#Software
+###  https://saref.etsi.org/saref4wear#Software
 s4wear:Software rdf:type owl:Class ;
                 rdfs:subClassOf s4wear:Entity .
 
 
-###  https://saref.etsi.org/s4wear#StaffMember
+###  https://saref.etsi.org/saref4wear#StaffMember
 s4wear:StaffMember rdf:type owl:Class ;
                    rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#Storage
+###  https://saref.etsi.org/saref4wear#Storage
 s4wear:Storage rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedComponent
+###  https://saref.etsi.org/saref4wear#TextileBasedComponent
 s4wear:TextileBasedComponent rdf:type owl:Class ;
                              rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedDevice
+###  https://saref.etsi.org/saref4wear#TextileBasedDevice
 s4wear:TextileBasedDevice rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:TextileBasedWearable .
 
 
-###  https://saref.etsi.org/s4wear#TextileBasedWearable
+###  https://saref.etsi.org/saref4wear#TextileBasedWearable
 s4wear:TextileBasedWearable rdf:type owl:Class ;
                             rdfs:subClassOf s4wear:Wearable .
 
 
-###  https://saref.etsi.org/s4wear#User
+###  https://saref.etsi.org/saref4wear#User
 s4wear:User rdf:type owl:Class ;
             rdfs:subClassOf [ owl:intersectionOf ( s4wear:LivingOrganism
                                                    [ rdf:type owl:Restriction ;
@@ -517,7 +517,7 @@ s4wear:User rdf:type owl:Class ;
                             ] .
 
 
-###  https://saref.etsi.org/s4wear#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.
@@ -525,7 +525,7 @@ The definition of this concept satisfies the requirement WEAR-1."""@en ;
                 rdfs:label "Wearable device"@en .
 
 
-###  https://saref.etsi.org/s4wear#Wearer
+###  https://saref.etsi.org/saref4wear#Wearer
 s4wear:Wearer rdf:type owl:Class ;
               rdfs:subClassOf [ owl:intersectionOf ( s4wear:Entity
                                                      [ rdf:type owl:Restriction ;