diff --git a/.saref-repositories.yml b/.saref-repositories.yml
index f9e12a0a8b393485c3019baafff15e775f20bdf4..416e6106c7f821b51fc8c782eacc0283e556bb83 100644
--- a/.saref-repositories.yml
+++ b/.saref-repositories.yml
@@ -1,3 +1,4 @@
 forge.etsi.org/rep/:
   repos:
     - saref/saref-core
+    - saref/saref4syst
diff --git a/examples/example1.ttl b/examples/example1.ttl
index 2336024e81af85f3b77235f5995bbd7f2c264314..d623e9ef52ea0e95460bf04bdeff012579e66b28 100644
--- a/examples/example1.ttl
+++ b/examples/example1.ttl
@@ -1,4 +1,5 @@
-@prefix ex: <https://saref.etsi.org/saref4auto/example> .
+@prefix : <https://saref.etsi.org/saref4auto/v1.1.1/example/example1/> .
+@prefix ex: <https://saref.etsi.org/saref4auto/v1.1.1/example/example1/> .
 @prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@@ -8,13 +9,13 @@
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix s4auto: <https://saref.etsi.org/saref4auto> .
+@prefix s4auto: <https://saref.etsi.org/saref4auto/> .
 @prefix s4syst: <https://saref.etsi.org/saref4syst/> .
 @prefix dctype: <http://purl.org/dc/dcmitype/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 
 
-<https://saref.etsi.org/saref4auto/example> a dctype:Dataset ;
+<https://saref.etsi.org/saref4auto/v1.1.1/example/example1#> a dctype:Dataset ;
                                             dcterms:license <https://forge.etsi.org/etsi-software-license> ;
 											dcterms:conformsTo <https://saref.etsi.org/saref4auto/v1.1.1/> ;
 											dcterms:title "Example instances for SAREF extension to automotive"@en ;
@@ -301,12 +302,12 @@ saref:Measurement rdf:type owl:Class .
 <https://saref.etsi.org/saref4auto/Occupied> rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4auto/P1-Pedestrian
-<https://saref.etsi.org/saref4auto/P1-Pedestrian> rdf:type owl:Class .
+###  https://saref.etsi.org/saref4auto/P1Pedestrian
+<https://saref.etsi.org/saref4auto/P1Pedestrian> rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/saref4auto/P3-Motorcyclist
-<https://saref.etsi.org/saref4auto/P3-Motorcyclist> rdf:type owl:Class .
+###  https://saref.etsi.org/saref4auto/P3Motorcyclist
+<https://saref.etsi.org/saref4auto/P3Motorcyclist> rdf:type owl:Class .
 
 
 ###  https://saref.etsi.org/saref4auto/Parked
@@ -453,7 +454,7 @@ om:metre rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4auto/example/BlackMoto
 :BlackMoto rdf:type owl:NamedIndividual ,
-                    <https://saref.etsi.org/saref4auto/P3-Motorcyclist> ;
+                    <https://saref.etsi.org/saref4auto/P3Motorcyclist> ;
            <https://saref.etsi.org/saref4auto/hasHeight> :Moto1Height ;
            <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/static> .
 
@@ -645,7 +646,7 @@ om:metre rdf:type owl:NamedIndividual ,
 ###  https://saref.etsi.org/saref4auto/example/Confidence1
 :Confidence1 rdf:type owl:NamedIndividual ,
                       <https://saref.etsi.org/saref4auto/SpeedConfidence> ;
-             saref:hasConfidenceUnitOfMeasure om:kilometrePerHour ;
+             s4auto:hasConfidenceUnitOfMeasure om:kilometrePerHour ;
              <https://saref.etsi.org/saref4auto/hasConfidenceValue> 3 .
 
 
@@ -1086,7 +1087,7 @@ om:metre rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4auto/example/adult1
 :adult1 rdf:type owl:NamedIndividual ,
-                 <https://saref.etsi.org/saref4auto/P1-Pedestrian> ;
+                 <https://saref.etsi.org/saref4auto/P1Pedestrian> ;
         <https://saref.etsi.org/saref4auto/hasHeight> :adult1Height ;
         <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/static> .
 
@@ -1099,7 +1100,7 @@ om:metre rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4auto/example/child1
 :child1 rdf:type owl:NamedIndividual ,
-                 <https://saref.etsi.org/saref4auto/P1-Pedestrian> ;
+                 <https://saref.etsi.org/saref4auto/P1Pedestrian> ;
         <https://saref.etsi.org/saref4auto/hasHeight> :child1Height ;
         <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/crossingLeft> .
 
diff --git a/ontology/saref4auto.ttl b/ontology/saref4auto.ttl
index ffe3565e9f57408134d143b98dbc70fb53562011..b832915833baf65e80c330005d0e126fa56e863f 100644
--- a/ontology/saref4auto.ttl
+++ b/ontology/saref4auto.ttl
@@ -124,8 +124,8 @@ saref:controlsProperty rdf:type owl:ObjectProperty ;
                        rdfs:label "controls property"@en .
 
 
-###  https://saref.etsi.org/core/hasConfidenceUnitOfMeasure
-saref:hasConfidenceUnitOfMeasure rdf:type owl:ObjectProperty ;
+###  https://saref.etsi.org/saref4auto/hasConfidenceUnitOfMeasure
+:hasConfidenceUnitOfMeasure rdf:type owl:ObjectProperty ;
                                  rdfs:comment "A relation that allows to specify the unit of measure associated with a certain confidence"@en ;
                                  rdfs:label "has confidence unit of measure"@en .
 
@@ -520,7 +520,7 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4auto/isMemberOfVehicleEnvironment
 :isMemberOfVehicleEnvironment rdf:type owl:ObjectProperty ;
                               rdfs:subPropertyOf :isMemberOf ;
-                              rdfs:comment "A relation to express that an entity, e.g., a vehicle, can be member of  another vehicle’s environment"@en ;
+                              rdfs:comment "A relation to express that an entity, e.g., a vehicle, can be member of  another vehicle's environment"@en ;
                               rdfs:label "isMemberOfVehicleEnvironment"@en .
 
 
@@ -533,7 +533,7 @@ saref:relatesToProperty rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/saref4syst/hasSubSystem
 s4syst:hasSubSystem rdf:type owl:ObjectProperty ;
                     owl:inverseOf s4syst:subSystemOf ;
-                    rdfs:comment "In SAREF4AUTO, a  relation to express that the vehicle has a subsystem called ‘ElectronicControlUnit’ (ECU) that provides measurements about relevant properties, such as speed, acceleration, position, etc."@en ,
+                    rdfs:comment "In SAREF4AUTO, a  relation to express that the vehicle has a subsystem called ‘ElectronicControlUnit' (ECU) that provides measurements about relevant properties, such as speed, acceleration, position, etc."@en ,
                                  "Links a system to one of its sub systems"@en ;
                     rdfs:isDefinedBy s4syst: ;
                     rdfs:label "hasSubSystem"@en .
@@ -995,7 +995,7 @@ saref:UnitOfMeasure rdf:type owl:Class ;
 ###  https://saref.etsi.org/saref4auto/Confidence
 :Confidence rdf:type owl:Class ;
             rdfs:subClassOf [ rdf:type owl:Restriction ;
-                              owl:onProperty saref:hasConfidenceUnitOfMeasure ;
+                              owl:onProperty :hasConfidenceUnitOfMeasure ;
                               owl:someValuesFrom saref:UnitOfMeasure
                             ] ,
                             [ rdf:type owl:Restriction ;