diff --git a/.saref-repositories.yml b/.saref-repositories.yml
index 416e6106c7f821b51fc8c782eacc0283e556bb83..1d6f5d3c65779d650661d419b3c9294c79881293 100644
--- a/.saref-repositories.yml
+++ b/.saref-repositories.yml
@@ -1,4 +1,4 @@
-forge.etsi.org/rep/:
+labs.etsi.org/rep/:
   repos:
     - saref/saref-core
     - saref/saref4syst
diff --git a/examples/example1.ttl b/examples/example1.ttl
index d623e9ef52ea0e95460bf04bdeff012579e66b28..d9efc5b4f596778e124213ba239f5739f43fd3cd 100644
--- a/examples/example1.ttl
+++ b/examples/example1.ttl
@@ -59,7 +59,7 @@
 
 
 ###  https://saref.etsi.org/core/hasConfidenceUnitOfMeasure
-saref:hasConfidenceUnitOfMeasure rdf:type owl:ObjectProperty .
+<https://saref.etsi.org/saref4auto/hasConfidenceUnitOfMeasure> rdf:type owl:ObjectProperty .
 
 
 ###  https://saref.etsi.org/core/hasProperty
@@ -456,7 +456,7 @@ om:metre rdf:type owl:NamedIndividual ,
 :BlackMoto rdf:type owl:NamedIndividual ,
                     <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> .
+           <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/Static> .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Car1
@@ -887,7 +887,7 @@ om:metre rdf:type owl:NamedIndividual ,
 ###  https://saref.etsi.org/saref4auto/example/RoadConeObject
 :RoadConeObject rdf:type owl:NamedIndividual ,
                          <https://saref.etsi.org/saref4auto/SmallObject> ;
-                <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/static> ;
+                <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/Static> ;
                 <https://saref.etsi.org/saref4auto/hasShape> :cone .
 
 
@@ -968,7 +968,7 @@ om:metre rdf:type owl:NamedIndividual ,
                           :WidthTruck1 ;
         <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID4 ;
         <https://saref.etsi.org/saref4auto/hasPlatoonPosition> :PlatoonPosition1 ;
-        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/leader> ;
+        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/Leader> ;
         <https://saref.etsi.org/saref4auto/hasRoute> :Truck1Route .
 
 
@@ -1011,7 +1011,7 @@ om:metre rdf:type owl:NamedIndividual ,
                  <https://saref.etsi.org/saref4auto/Truck> ;
         <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID5 ;
         <https://saref.etsi.org/saref4auto/hasPlatoonPosition> :PlatoonPosition2 ;
-        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/follower> .
+        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/Follower> .
 
 
 ###  https://saref.etsi.org/saref4auto/example/Truck3
@@ -1019,7 +1019,7 @@ om:metre rdf:type owl:NamedIndividual ,
                  <https://saref.etsi.org/saref4auto/Truck> ;
         <https://saref.etsi.org/saref4auto/hasIdentifier> :StationID6 ;
         <https://saref.etsi.org/saref4auto/hasPlatoonPosition> :PlatoonPosition3 ;
-        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/trailing> ;
+        <https://saref.etsi.org/saref4auto/hasPlatoonRole> <https://saref.etsi.org/saref4auto/Trailing> ;
         <https://saref.etsi.org/saref4auto/isMemberOfPlatoon> :Platoon1 .
 
 
@@ -1089,7 +1089,7 @@ om:metre rdf:type owl:NamedIndividual ,
 :adult1 rdf:type owl:NamedIndividual ,
                  <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> .
+        <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/Static> .
 
 
 ###  https://saref.etsi.org/saref4auto/example/adult1Height
@@ -1102,7 +1102,7 @@ om:metre rdf:type owl:NamedIndividual ,
 :child1 rdf:type owl:NamedIndividual ,
                  <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> .
+        <https://saref.etsi.org/saref4auto/hasMovement> <https://saref.etsi.org/saref4auto/CrossingLeft> .
 
 
 ###  https://saref.etsi.org/saref4auto/example/child1Height
diff --git a/ontology/saref4auto.ttl b/ontology/saref4auto.ttl
index b832915833baf65e80c330005d0e126fa56e863f..e1397c47f8b9bf6733b1091666f9ffbba8199b82 100644
--- a/ontology/saref4auto.ttl
+++ b/ontology/saref4auto.ttl
@@ -20,9 +20,12 @@
                                      dcterms:description "This ontology extends the SAREF ontology for the automotive domain. This work has been developed in the context of the STF 566, which was established with the goal to create four SAREF extensions, one of them for the automotive domain."@en ;
                                      dcterms:creator <https://www.linkedin.com/in/lauradaniele> , <http://netellany.fr/> ;
                                      dcterms:contributor <https://scholar.google.com/citations?user=coCDIj8AAAAJ> ;
+                                     dcterms:issued "2020-07-27"^^xsd:date ;
+                                     dcterms:modified "2021-07-26"^^xsd:date ;
                                      dcterms:license <https://forge.etsi.org/etsi-software-license> ;
                                      dcterms:publisher <https://www.etsi.org/> ;
-                                     dcterms:source <https://forge.etsi.org/rep/SAREF/saref4auto/> ;
+                                     dcterms:source <https://saref.etsi.org/sources/saref4auto/> ;
+                                     rdfs:seeAlso <https://www.etsi.org/deliver/etsi_ts/103400_103499/10341007/01.01.01_60/ts_10341007v010101p.pdf> ;
                                      dcterms:title "SAREF extension for automotive"@en ;
                                      vann:preferredNamespacePrefix "s4auto" ;
                                      vann:preferredNamespaceUri "https://saref.etsi.org/saref4auto/" ;
@@ -34,6 +37,8 @@
 #################################################################
 
 dcterms:contributor rdf:type owl:AnnotationProperty .
+dcterms:issued rdf:type owl:AnnotationProperty .
+dcterms:modified rdf:type owl:AnnotationProperty .
 
 dcterms:creator rdf:type owl:AnnotationProperty .
 
@@ -2011,154 +2016,154 @@ s4syst:System rdf:type owl:Class ;
 #################################################################
 
 ###  https://saref.etsi.org/saref4auto/agriculture
-:agriculture rdf:type owl:NamedIndividual ,
+:Agriculture rdf:type owl:NamedIndividual ,
                       :VehicleRole ;
              rdfs:comment "A type of vehicle role"@en ;
              rdfs:label "agriculture"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/commercial
-:commercial rdf:type owl:NamedIndividual ,
+:Commercial rdf:type owl:NamedIndividual ,
                      :VehicleRole ;
             rdfs:comment "A type of vehicle role"@en ;
             rdfs:label "commercial"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/crossingLeft
-:crossingLeft rdf:type owl:NamedIndividual ,
+:CrossingLeft rdf:type owl:NamedIndividual ,
                        :Movement ;
               rdfs:comment "A type of movement"@en ;
               rdfs:label "crossing Left"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/crossingRight
-:crossingRight rdf:type owl:NamedIndividual ,
+:CrossingRight rdf:type owl:NamedIndividual ,
                         :Movement ;
                rdfs:comment "A type of movement"@en ;
                rdfs:label "crossing Right"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/dangerousGood
-:dangerousGood rdf:type owl:NamedIndividual ,
+:DangerousGood rdf:type owl:NamedIndividual ,
                         :VehicleRole ;
                rdfs:comment "A type of vehicle role"@en ;
                rdfs:label "dangerousGoods"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/emergency
-:emergency rdf:type owl:NamedIndividual ,
+:Emergency rdf:type owl:NamedIndividual ,
                     :VehicleRole ;
            rdfs:comment "A type of vehicle role"@en ;
            rdfs:label "emergency"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/follower
-:follower rdf:type owl:NamedIndividual ,
+:Follower rdf:type owl:NamedIndividual ,
                    :PlatoonRole ;
           rdfs:comment "A type of platoon role"@en ;
           rdfs:label "follower"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/leader
-:leader rdf:type owl:NamedIndividual ,
+:Leader rdf:type owl:NamedIndividual ,
                  :PlatoonRole ;
         rdfs:comment "A type of platoon role"@en ;
         rdfs:label "leader"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/military
-:military rdf:type owl:NamedIndividual ,
+:Military rdf:type owl:NamedIndividual ,
                    :VehicleRole ;
           rdfs:comment "A type of vehicle role"@en ;
           rdfs:label "military"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/publicTransport
-:publicTransport rdf:type owl:NamedIndividual ,
+:PublicTransport rdf:type owl:NamedIndividual ,
                           :VehicleRole ;
                  rdfs:comment "A type of vehicle role"@en ;
                  rdfs:label "publicTransport"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/ready_for_leading
-:ready_for_leading rdf:type owl:NamedIndividual ,
+:ReadyForLeading rdf:type owl:NamedIndividual ,
                             :PlatoonRole ;
                    rdfs:comment "A type of platoon role"@en ;
                    rdfs:label "ready for leading"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/rescue
-:rescue rdf:type owl:NamedIndividual ,
+:Rescue rdf:type owl:NamedIndividual ,
                  :VehicleRole ;
         rdfs:comment "A type of vehicle role"@en ;
         rdfs:label "rescue"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/reverseDirection
-:reverseDirection rdf:type owl:NamedIndividual ,
+:ReverseDirection rdf:type owl:NamedIndividual ,
                            :Movement ;
                   rdfs:comment "A type of movement"@en ;
                   rdfs:label "reverse Direction"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/roadOperator
-:roadOperator rdf:type owl:NamedIndividual ,
+:RoadOperator rdf:type owl:NamedIndividual ,
                        :VehicleRole ;
               rdfs:comment "A type of vehicle role"@en ;
               rdfs:label "roadOperator"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/roadWork
-:roadWork rdf:type owl:NamedIndividual ,
+:RoadWork rdf:type owl:NamedIndividual ,
                    :VehicleRole ;
           rdfs:comment "A type of vehicle role"@en ;
           rdfs:label "roadWork"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/safetyCar
-:safetyCar rdf:type owl:NamedIndividual ,
+:SafetyCar rdf:type owl:NamedIndividual ,
                     :VehicleRole ;
            rdfs:comment "A type of vehicle role"@en ;
            rdfs:label "safetyCar"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/sameDirection
-:sameDirection rdf:type owl:NamedIndividual ,
+:SameDirection rdf:type owl:NamedIndividual ,
                         :Movement ;
                rdfs:comment "A type of movement"@en ;
                rdfs:label "same Direction"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/specialTransport
-:specialTransport rdf:type owl:NamedIndividual ,
+:SpecialTransport rdf:type owl:NamedIndividual ,
                            :VehicleRole ;
                   rdfs:comment "A type of vehicle role"@en ;
                   rdfs:label "specialTransport"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/static
-:static rdf:type owl:NamedIndividual ,
+:Static rdf:type owl:NamedIndividual ,
                  :Movement ;
         rdfs:comment "A type of movement"@en ;
         rdfs:label "static"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/taxi
-:taxi rdf:type owl:NamedIndividual ,
+:Taxi rdf:type owl:NamedIndividual ,
                :VehicleRole ;
       rdfs:comment "A type of vehicle role"@en ;
       rdfs:label "taxi"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/trailing
-:trailing rdf:type owl:NamedIndividual ,
+:Trailing rdf:type owl:NamedIndividual ,
                    :PlatoonRole ;
           rdfs:comment "A type of platoon role"@en ;
           rdfs:label "trailing"@en .
 
 
 ###  https://saref.etsi.org/saref4auto/unknown
-:unknown rdf:type owl:NamedIndividual ,
+:Unknown rdf:type owl:NamedIndividual ,
                   :PlatoonRole ;
          rdfs:comment "A type of platoon role"@en ;
          rdfs:label "unknown"@en .