diff --git a/examples/doorswitch.ttl b/examples/doorswitch.ttl
index 2c20a1fa8cfc088c09c3b75cb47cfe3c901a0835..e593aec5e413a20294685399c3ec516d2f5fee94 100644
--- a/examples/doorswitch.ttl
+++ b/examples/doorswitch.ttl
@@ -1,80 +1,81 @@
-# baseURI: http://ontology.tno.nl/saref/doorswitch
-# imports: https://w3id.org/saref
-
 @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#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-ds: <http://ontology.tno.nl/saref/doorswitch#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/doorswitch/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/doorswitch>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
-saref-ds:BuildingObject_MainDoor
+<https://saref.etsi.org/core/v3.1.1/example/doorswitch#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example doorswitch"@en ;
+  dcterms:description "Example doorswitch"@en .
+
+ex:BuildingObject_MainDoor
   rdf:type saref:Door ;
   rdfs:label "Building object Main door"^^xsd:string ;
 .
-saref-ds:BuildingSpace_OfficeHall
+ex:BuildingSpace_OfficeHall
   rdf:type saref:BuildingSpace ;
   rdfs:label "Office Hall"^^xsd:string ;
   geo:lat "52.0821"^^xsd:string ;
   geo:long "4.3251"^^xsd:string ;
-  saref:contains saref-ds:BuildingObject_MainDoor ;
+  saref:contains ex:BuildingObject_MainDoor ;
   saref:hasSpaceType "Office hall"^^xsd:string ;
 .
-saref-ds:CloseCommand
+ex:CloseCommand
   rdf:type saref:CloseCommand ;
   rdfs:label "CLOSE command "^^xsd:string ;
-  saref:actsUpon saref-ds:OpenState ;
+  saref:actsUpon ex:OpenState ;
 .
-saref-ds:CloseDoorService
+ex:CloseDoorService
   rdf:type saref:Service ;
   rdfs:label "CLOSE Door service "^^xsd:string ;
-  saref:hasInputParameter saref-ds:OpenState ;
-  saref:hasOutputParameter saref-ds:CloseState ;
-  saref:isOfferedBy saref-ds:DoorSwitch_DS3001 ;
-  saref:represents saref-ds:OpenCloseFunction ;
+  saref:hasInputParameter ex:OpenState ;
+  saref:hasOutputParameter ex:CloseState ;
+  saref:isOfferedBy ex:DoorSwitch_DS3001 ;
+  saref:represents ex:OpenCloseFunction ;
 .
-saref-ds:CloseState
+ex:CloseState
   rdf:type saref:CloseState ;
   rdfs:label "CLOSE state"^^xsd:string ;
 .
-saref-ds:Comfort
+ex:Comfort
   rdf:type saref:Task ;
   rdfs:label "Comfort"^^xsd:string ;
 .
-saref-ds:DoorSwitch_DS001
+ex:DoorSwitch_DS001
   rdf:type saref:DoorSwitch ;
   rdfs:label "Door switch DS3001"^^xsd:string ;
-  saref:IsUsedFor saref-ds:BuildingObject_MainDoor ;
-  saref:accomplishes saref-ds:Comfort ;
+  saref:IsUsedFor ex:BuildingObject_MainDoor ;
+  saref:accomplishes ex:Comfort ;
   saref:consistsOf saref:Switch ;
   saref:hasCategory saref:Actuator ;
   saref:hasDescription "Door switch DS3001 is an example of how to instantiate a door switch using SAREF"^^xsd:string ;
-  saref:hasFunction saref-ds:OpenCloseFunction ;
+  saref:hasFunction ex:OpenCloseFunction ;
   saref:hasManufacturer "manufacturer-mno"^^xsd:string ;
   saref:hasModel "mno-DS3001-16"^^xsd:string ;
-  saref:hasState saref-ds:CloseState ;
-  saref:hasState saref-ds:OpenState ;
-  saref:isLocatedIn saref-ds:BuildingSpace_OfficeHall ;
-  saref:offers saref-ds:CloseDoorService ;
+  saref:hasState ex:CloseState ;
+  saref:hasState ex:OpenState ;
+  saref:isLocatedIn ex:BuildingSpace_OfficeHall ;
+  saref:offers ex:CloseDoorService ;
 .
-saref-ds:OpenCloseFunction
+ex:OpenCloseFunction
   rdf:type saref:OpenCloseFunction ;
   rdfs:label "OPEN CLOSE function "^^xsd:string ;
-  saref:hasCommand saref-ds:CloseCommand ;
-  saref:hasCommand saref-ds:OpenCommand ;
+  saref:hasCommand ex:CloseCommand ;
+  saref:hasCommand ex:OpenCommand ;
 .
-saref-ds:OpenCommand
+ex:OpenCommand
   rdf:type saref:OpenCommand ;
   rdfs:label "OPEN command"^^xsd:string ;
-  saref:actsUpon saref-ds:CloseState ;
+  saref:actsUpon ex:CloseState ;
 .
-saref-ds:OpenState
+ex:OpenState
   rdf:type saref:OpenState ;
   rdfs:label "Open state"^^xsd:string ;
 .
diff --git a/examples/energymeter.ttl b/examples/energymeter.ttl
index dbef95435969d93e3e1ab0b49b792d912f18cec0..1de8db842b3c3d50343cd4437e41998a49f7a3e5 100644
--- a/examples/energymeter.ttl
+++ b/examples/energymeter.ttl
@@ -1,77 +1,78 @@
-# baseURI: http://ontology.tno.nl/saref/energymeter
-# imports: https://w3id.org/saref
-
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-em: <http://ontology.tno.nl/saref/energymeter#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/energymeter/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/energymeter>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
-saref-em:MicroRenewable rdf:type owl:Class ;
+<https://saref.etsi.org/core/v3.1.1/example/energymeter#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example energymeter"@en ;
+  dcterms:description "Example energymeter"@en .
+
+ex:MicroRenewable rdf:type owl:Class ;
                      rdfs:subClassOf saref:FunctionRelated ;
                      rdfs:comment "A device that generates renewable energy from natural resources such as the sun, wind and water.  A saref:MicroRenewable is typically used to accomplish saref:EnergyEfficiency."@en ;
                      rdfs:label "Micro renewable"@en .
-saref-em:Efficiency
+ex:Efficiency
   rdf:type saref:Task ;
   rdfs:label "Efficiency"^^xsd:string ;
 .
-saref-em:Energy
+ex:Energy
   rdf:type saref:Energy ;
   rdfs:label "Energy "^^xsd:string ;
   saref:hasValue "not applicable"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour> ;
 .
-saref-em:EnergyMeter_EM5004
+ex:EnergyMeter_EM5004
   rdf:type saref:EnergyMeter ;
   rdfs:label "Energy meter EM5004"^^xsd:string ;
-  saref:IsUsedFor saref-em:Energy ;
-  saref:accomplishes saref-em:Efficiency ;
+  saref:IsUsedFor ex:Energy ;
+  saref:accomplishes ex:Efficiency ;
   saref:hasCategory saref:Meter ;
   saref:hasDescription "Energy meter EM5004 is an example of how to instantiate an energy meter using SAREF"^^xsd:string ;
-  saref:hasFunction saref-em:MeteringFunction ;
+  saref:hasFunction ex:MeteringFunction ;
   saref:hasManufacturer "manufacturer_stv"^^xsd:string ;
   saref:hasModel "EM5004-stv-16"^^xsd:string ;
-  saref:offers saref-em:MeasureEnergyService ;
+  saref:offers ex:MeasureEnergyService ;
 .
-saref-em:Energy_value1
+ex:Energy_value1
   rdf:type saref:Energy ;
   rdfs:label "Energy value1"^^xsd:string ;
   saref:hasValue "1"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt_hour> ;
 .
-saref-em:GetCurrentMeterValueCommand
+ex:GetCurrentMeterValueCommand
   rdf:type saref:GetCurrentMeterValueCommand ;
   rdfs:label "Get current meter value command"^^xsd:string ;
-  saref:isCommandOf saref-em:MeteringFunction ;
+  saref:isCommandOf ex:MeteringFunction ;
 .
-saref-em:Instant_1
+ex:Instant_1
   rdf:type time:Instant ;
   rdfs:label "Instant 1"^^xsd:string ;
   time:inXSDDateTime "2015-03-17T11:10:50.53"^^xsd:dateTime ;
 .
-saref-em:MeasureEnergyService
+ex:MeasureEnergyService
   rdf:type saref:Service ;
   rdfs:label "Measure energy service"^^xsd:string ;
-  saref:hasOutputParameter saref-em:Energy ;
-  saref:isOfferedBy saref-em:EnergyMeter_EM5004 ;
-  saref:represents saref-em:MeteringFunction ;
+  saref:hasOutputParameter ex:Energy ;
+  saref:isOfferedBy ex:EnergyMeter_EM5004 ;
+  saref:represents ex:MeteringFunction ;
 .
-saref-em:MeteringFunction
+ex:MeteringFunction
   rdf:type saref:MeteringFunction ;
   rdfs:label "Metering function "^^xsd:string ;
-  saref:hasCommand saref-em:GetCurrentMeterValueCommand ;
-  saref:hasMeterReadingTime saref-em:Time_value1 ;
+  saref:hasCommand ex:GetCurrentMeterValueCommand ;
+  saref:hasMeterReadingTime ex:Time_value1 ;
   saref:hasMeterReadingType "Energy"^^xsd:string ;
-  saref:hasMeterReadingValue saref-em:Energy_value1 ;
+  saref:hasMeterReadingValue ex:Energy_value1 ;
 .
-saref-em:Time_value1
+ex:Time_value1
   rdf:type saref:Time ;
   rdfs:label "Time value 1"^^xsd:string ;
-  saref:consistsOf saref-em:Instant_1 ;
+  saref:consistsOf ex:Instant_1 ;
 .
diff --git a/examples/lightswitch.ttl b/examples/lightswitch.ttl
index 57304906dcbd7f2aed6b09d60d67ec7ec94cb091..ad5d1fed5acf7026cb337b89f5654c34c72b00d7 100644
--- a/examples/lightswitch.ttl
+++ b/examples/lightswitch.ttl
@@ -1,86 +1,87 @@
-# baseURI: http://ontology.tno.nl/saref/lightswitch
-# imports: https://w3id.org/saref
-
 @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#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-ls: <http://ontology.tno.nl/saref/lightswitch#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/lightswitch/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/lightswitch>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
-saref-ls:LightingDevice rdf:type owl:Class ;
+<https://saref.etsi.org/core/v3.1.1/example/lightswitch#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example lightswitch"@en ;
+  dcterms:description "Example lightswitch"@en .
+
+ex:LightingDevice rdf:type owl:Class ;
                      rdfs:subClassOf saref:FunctionRelated ;
                      rdfs:comment "A device used for illumination, irradiation, signaling, or projection. A saref:LightingDevice is typically used to accomplish saref:Comfort."@en ;
                      rdfs:label "Lighting device"@en .
-saref-ls:BuildingSpace_OfficeHall
+ex:BuildingSpace_OfficeHall
   rdf:type saref:BuildingSpace ;
   rdfs:label "Office Hall"^^xsd:string ;
   geo:lat "52.0821"^^xsd:string ;
   geo:long "4.3251"^^xsd:string ;
   saref:hasSpaceType "Office hall"^^xsd:string ;
 .
-saref-ls:Light
+ex:Light
   rdf:type saref:Light ;
   rdfs:label "Light "^^xsd:string ;
   saref:hasValue "not applicable"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/lux> ;
 .
-saref-ls:LightSwitch_LS1001
+ex:LightSwitch_LS1001
   rdf:type saref:LightSwitch ;
   rdfs:label "Light switch LS1001"^^xsd:string ;
-  saref:IsUsedFor saref-ls:Light ;
-  saref:accomplishes saref-ls:Lighting ;
+  saref:IsUsedFor ex:Light ;
+  saref:accomplishes ex:Lighting ;
   saref:consistsOf saref:Switch ;
   saref:hasCategory saref:Actuator ;
   saref:hasDescription "Light switch LS1001 is an example of how to instantiate a light switch using SAREF"^^xsd:string ;
-  saref:hasFunction saref-ls:OnOffFunction ;
+  saref:hasFunction ex:OnOffFunction ;
   saref:hasManufacturer "manufacturer-abc"^^xsd:string ;
   saref:hasModel "890-09w"^^xsd:string ;
-  saref:hasState saref-ls:OffState ;
-  saref:hasState saref-ls:OnState ;
-  saref:isLocatedIn saref-ls:BuildingSpace_OfficeHall ;
-  saref:offers saref-ls:SwitchOnService ;
+  saref:hasState ex:OffState ;
+  saref:hasState ex:OnState ;
+  saref:isLocatedIn ex:BuildingSpace_OfficeHall ;
+  saref:offers ex:SwitchOnService ;
 .
-saref-ls:Lighting
+ex:Lighting
   rdf:type saref:Task ;
   rdfs:label "Lighting"^^xsd:string ;
-  saref:isAccomplishedBy saref-ls:LightSwitch_LS1001 ;
+  saref:isAccomplishedBy ex:LightSwitch_LS1001 ;
 .
-saref-ls:OffCommand
+ex:OffCommand
   rdf:type saref:OffCommand ;
   rdfs:label "OFF command "^^xsd:string ;
-  saref:actsUpon saref-ls:OnState ;
+  saref:actsUpon ex:OnState ;
 .
-saref-ls:OffState
+ex:OffState
   rdf:type saref:OffState ;
   rdfs:label "OFF state"^^xsd:string ;
 .
-saref-ls:OnCommand
+ex:OnCommand
   rdf:type saref:OnCommand ;
   rdfs:label "ON command"^^xsd:string ;
-  saref:actsUpon saref-ls:OffState ;
+  saref:actsUpon ex:OffState ;
 .
-saref-ls:OnOffFunction
+ex:OnOffFunction
   rdf:type saref:OnOffFunction ;
   rdfs:label "ON OFF function "^^xsd:string ;
-  saref:hasCommand saref-ls:OffCommand ;
-  saref:hasCommand saref-ls:OnCommand ;
+  saref:hasCommand ex:OffCommand ;
+  saref:hasCommand ex:OnCommand ;
 .
-saref-ls:OnState
+ex:OnState
   rdf:type saref:OnState ;
   rdfs:label "ON state"^^xsd:string ;
 .
-saref-ls:SwitchOnService
+ex:SwitchOnService
   rdf:type saref:SwitchOnService ;
   rdfs:label "Switch ON service "^^xsd:string ;
-  saref:hasInputParameter saref-ls:OffState ;
-  saref:hasOutputParameter saref-ls:OnState ;
-  saref:isOfferedBy saref-ls:LightSwitch_LS1001 ;
-  saref:represents saref-ls:OnOffFunction ;
+  saref:hasInputParameter ex:OffState ;
+  saref:hasOutputParameter ex:OnState ;
+  saref:isOfferedBy ex:LightSwitch_LS1001 ;
+  saref:represents ex:OnOffFunction ;
 .
diff --git a/examples/multimedia.ttl b/examples/multimedia.ttl
index ac021aedaea51e5f64b8c8fa68b5455e1b377f33..2a62739d9f40041266e198616e5c4987a05ec690 100644
--- a/examples/multimedia.ttl
+++ b/examples/multimedia.ttl
@@ -3,16 +3,19 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-mm: <http://ontology.tno.nl/saref/multimedia#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/multimedia/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/multimedia>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
+<https://saref.etsi.org/core/v3.1.1/example/multimedia#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example multimedia"@en ;
+  dcterms:description "Example multimedia"@en .
 
-saref-mm:Multimedia rdf:type owl:Class ;
+ex:Multimedia rdf:type owl:Class ;
                  rdfs:subClassOf saref:FunctionRelated ;
                  rdfs:comment "A device designed to display, store, record or play multimedia content such as audio, images, animation, video. A saref:Multimedia is typically used to accomplish saref:Entertainment."@en ;
                  rdfs:label "Multimedia"@en .
diff --git a/examples/smokesensor.ttl b/examples/smokesensor.ttl
index 49c0b0cb19d559ca9434250e8295734862d823dc..2527334a47cdc5189e2d6fbace91d92a1e8899dd 100644
--- a/examples/smokesensor.ttl
+++ b/examples/smokesensor.ttl
@@ -1,30 +1,31 @@
-# baseURI: http://ontology.tno.nl/saref/smokesensor
-# imports: https://w3id.org/saref
-
 @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#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-ss: <http://ontology.tno.nl/saref/smokesensor#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/smokesensor/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/smokesensor>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
-saref-ss:Audio
+<https://saref.etsi.org/core/v3.1.1/example/smokesensor#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example smokesensor"@en ;
+  dcterms:description "Example smokesensor"@en .
+
+ex:Audio
   rdf:type saref:Property ;
   rdfs:label "Audio"^^xsd:string ;
   saref:hasValue "70"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.6/decibel> ;
 .
-saref-ss:BuildingObject_Window
+ex:BuildingObject_Window
   rdf:type saref:Window ;
   rdfs:label "Window"^^xsd:string ;
 .
-saref-ss:BuildingSpace_HotelRoom
+ex:BuildingSpace_HotelRoom
   rdf:type saref:BuildingSpace ;
   rdfs:label "Hotel room"^^xsd:string ;
   geo:lat "52.0705"^^xsd:string ;
@@ -32,89 +33,89 @@ saref-ss:BuildingSpace_HotelRoom
   saref:contains <http://ontology.tno.nl/saref/tempsensor#BuildingObject_window> ;
   saref:hasSpaceType "Hotel room"^^xsd:string ;
 .
-saref-ss:Comfort
+ex:Comfort
   rdf:type saref:Task ;
   rdfs:label "Comfort"^^xsd:string ;
 .
-saref-ss:EventFunction
+ex:EventFunction
   rdf:type saref:EventFunction ;
   rdfs:label "Event function"^^xsd:string ;
-  saref:hasCommand saref-ss:NotifyCommand ;
-  saref:hasThreshold saref-ss:Smoke_threshold_value ;
+  saref:hasCommand ex:NotifyCommand ;
+  saref:hasThreshold ex:Smoke_threshold_value ;
 .
-saref-ss:GetSensingDataCommand
+ex:GetSensingDataCommand
   rdf:type saref:GetCommand ;
   rdfs:comment "The GetSensingDataCommand does not act upon any state, since it only gives a directive to retrieve a certain value."^^xsd:string ;
   rdfs:label "Get sensing data command"^^xsd:string ;
-  saref:isCommandOf saref-ss:SensingFunction ;
+  saref:isCommandOf ex:SensingFunction ;
 .
-saref-ss:NotifyCommand
+ex:NotifyCommand
   rdf:type saref:NotifyCommand ;
   rdfs:label "Notify command"^^xsd:string ;
-  saref:isCommandOf saref-ss:EventFunction ;
+  saref:isCommandOf ex:EventFunction ;
 .
-saref-ss:OffState
+ex:OffState
   rdf:type saref:OffState ;
   rdfs:label "OFF state"^^xsd:string ;
 .
-saref-ss:OnState
+ex:OnState
   rdf:type saref:OnState ;
   rdfs:label "ON state"^^xsd:string ;
 .
-saref-ss:SenseSmoke
+ex:SenseSmoke
   rdf:type saref:Service ;
   rdfs:label "Sense smoke"^^xsd:string ;
-  saref:hasInputParameter saref-ss:Smoke ;
-  saref:hasOutputParameter saref-ss:Smoke ;
-  saref:isOfferedBy saref-ss:SmokeSensor_SS4001 ;
-  saref:represents saref-ss:SensingFunction ;
+  saref:hasInputParameter ex:Smoke ;
+  saref:hasOutputParameter ex:Smoke ;
+  saref:isOfferedBy ex:SmokeSensor_SS4001 ;
+  saref:represents ex:SensingFunction ;
 .
-saref-ss:SensingFunction
+ex:SensingFunction
   rdf:type saref:SensingFunction ;
   rdfs:label "Sensing function"^^xsd:string ;
-  saref:hasCommand saref-ss:GetSensingDataCommand ;
+  saref:hasCommand ex:GetSensingDataCommand ;
   saref:hasSensorType "Smoke"^^xsd:string ;
 .
-saref-ss:Smoke
+ex:Smoke
   rdf:type saref:Smoke ;
   rdfs:label "Smoke"^^xsd:string ;
 .
-saref-ss:SmokeAlarm
+ex:SmokeAlarm
   rdf:type saref:Service ;
   rdfs:label "Smoke alarm"^^xsd:string ;
-  saref:hasInputParameter saref-ss:Smoke ;
-  saref:hasOutputParameter saref-ss:Audio ;
-  saref:isOfferedBy saref-ss:SmokeSensor_SS4001 ;
-  saref:represents saref-ss:EventFunction ;
+  saref:hasInputParameter ex:Smoke ;
+  saref:hasOutputParameter ex:Audio ;
+  saref:isOfferedBy ex:SmokeSensor_SS4001 ;
+  saref:represents ex:EventFunction ;
 .
-saref-ss:SmokeSensor_SS4001
+ex:SmokeSensor_SS4001
   rdf:type saref:SmokeSensor ;
   rdfs:label "Smoke sensor SS4001"^^xsd:string ;
-  saref:IsUsedFor saref-ss:Smoke ;
+  saref:IsUsedFor ex:Smoke ;
   saref:accomplishes saref:Safety ;
   saref:hasCategory saref:Sensor ;
   saref:hasDescription "Temperature sensor TS2001 is an example of how to instantiate a temperature sensor using SAREF"^^xsd:string ;
-  saref:hasFunction saref-ss:EventFunction ;
-  saref:hasFunction saref-ss:SensingFunction ;
+  saref:hasFunction ex:EventFunction ;
+  saref:hasFunction ex:SensingFunction ;
   saref:hasManufacturer "manufacturer-ccsd"^^xsd:string ;
   saref:hasModel "SS-4001-ccsd-15"^^xsd:string ;
-  saref:hasState saref-ss:OffState ;
-  saref:hasState saref-ss:OnState ;
-  saref:isLocatedIn saref-ss:BuildingSpace_HotelRoom ;
-  saref:offers saref-ss:SenseSmoke ;
-  saref:offers saref-ss:SmokeAlarm ;
+  saref:hasState ex:OffState ;
+  saref:hasState ex:OnState ;
+  saref:isLocatedIn ex:BuildingSpace_HotelRoom ;
+  saref:offers ex:SenseSmoke ;
+  saref:offers ex:SmokeAlarm ;
 .
-saref-ss:SmokeUnit
+ex:SmokeUnit
   rdf:type saref:UnitOfMeasure ;
   rdfs:label "Smoke unit"^^xsd:string ;
 .
-saref-ss:Smoke_threshold_value
+ex:Smoke_threshold_value
   rdf:type saref:Smoke ;
   rdfs:label "Smoke threshold value"^^xsd:string ;
   saref:hasValue "00000"^^xsd:string ;
-  saref:isMeasuredIn saref-ss:SmokeUnit ;
+  saref:isMeasuredIn ex:SmokeUnit ;
 .
-saref-ss:Temperature
+ex:Temperature
   rdf:type saref:Temperature ;
   rdfs:label "Temperature"^^xsd:string ;
   saref:hasValue "not applicable"^^xsd:string ;
diff --git a/examples/temperaturesensor.ttl b/examples/temperaturesensor.ttl
index 6cc3527ba302ca2d0d27d879ea94b9ea340882c1..85e48c095733cce0ff1c098f2cd1f468531c7763 100644
--- a/examples/temperaturesensor.ttl
+++ b/examples/temperaturesensor.ttl
@@ -1,80 +1,81 @@
-# baseURI: http://ontology.tno.nl/saref/tempsensor
-# imports: https://w3id.org/saref
-
 @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#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-ts: <http://ontology.tno.nl/saref/tempsensor#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/temperaturesensor/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/tempsensor>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
-saref-ts:BuildingObject_Window
+<https://saref.etsi.org/core/v3.1.1/example/temperaturesensor#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example temperaturesensor"@en ;
+  dcterms:description "Example temperaturesensor"@en .
+
+ex:BuildingObject_Window
   rdf:type saref:Window ;
   rdfs:label "Window"^^xsd:string ;
 .
-saref-ts:BuildingSpace_HotelRoom
+ex:BuildingSpace_HotelRoom
   rdf:type saref:BuildingSpace ;
   rdfs:label "Hotel room"^^xsd:string ;
   geo:lat "52.0705"^^xsd:string ;
   geo:long "4.30070"^^xsd:string ;
-  saref:contains saref-ts:BuildingObject_window ;
+  saref:contains ex:BuildingObject_window ;
   saref:hasSpaceType "Hotel room"^^xsd:string ;
 .
-saref-ts:Comfort
+ex:Comfort
   rdf:type saref:Task ;
   rdfs:label "Comfort"^^xsd:string ;
 .
-saref-ts:GetSensingDataCommand
+ex:GetSensingDataCommand
   rdf:type saref:GetCommand ;
   rdfs:comment "The GetSensingDataCommand does not act upon any state, since it only gives a directive to retrieve a certain value."^^xsd:string ;
   rdfs:label "Get sensing data command"^^xsd:string ;
-  saref:isCommandOf saref-ts:SensingFunction ;
+  saref:isCommandOf ex:SensingFunction ;
 .
-saref-ts:OffState
+ex:OffState
   rdf:type saref:OffState ;
   rdfs:label "OFF state"^^xsd:string ;
 .
-saref-ts:OnState
+ex:OnState
   rdf:type saref:OnState ;
   rdfs:label "ON state"^^xsd:string ;
 .
-saref-ts:SenseTemperature
+ex:SenseTemperature
   rdf:type saref:Service ;
   rdfs:label "Sense temperature"^^xsd:string ;
-  saref:hasInputParameter saref-ts:Temperature ;
-  saref:hasOutputParameter saref-ts:Temperature ;
-  saref:isOfferedBy saref-ts:TemperatureSensor_TS2001 ;
-  saref:represents saref-ts:SensingFunction ;
+  saref:hasInputParameter ex:Temperature ;
+  saref:hasOutputParameter ex:Temperature ;
+  saref:isOfferedBy ex:TemperatureSensor_TS2001 ;
+  saref:represents ex:SensingFunction ;
 .
-saref-ts:SensingFunction
+ex:SensingFunction
   rdf:type saref:SensingFunction ;
   rdfs:label "Sensing function"^^xsd:string ;
-  saref:hasCommand saref-ts:GetSensingDataCommand ;
+  saref:hasCommand ex:GetSensingDataCommand ;
   saref:hasSensorType "Temperature"^^xsd:string ;
 .
-saref-ts:Temperature
+ex:Temperature
   rdf:type saref:Temperature ;
   rdfs:label "Temperature"^^xsd:string ;
   saref:hasValue "not applicable"^^xsd:string ;
 .
-saref-ts:TemperatureSensor_TS2001
+ex:TemperatureSensor_TS2001
   rdf:type saref:TemperatureSensor ;
   rdfs:label "Temperature sensor TS2001"^^xsd:string ;
-  saref:IsUsedFor saref-ts:Temperature ;
-  saref:accomplishes saref-ts:Comfort ;
+  saref:IsUsedFor ex:Temperature ;
+  saref:accomplishes ex:Comfort ;
   saref:hasCategory saref:Sensor ;
   saref:hasDescription "Temperature sensor TS2001 is an example of how to instantiate a temperature sensor using SAREF"^^xsd:string ;
-  saref:hasFunction saref-ts:SensingFunction ;
+  saref:hasFunction ex:SensingFunction ;
   saref:hasManufacturer "manufacturer-efg"^^xsd:string ;
   saref:hasModel "153899L"^^xsd:string ;
-  saref:hasState saref-ts:OffState ;
-  saref:hasState saref-ts:OnState ;
-  saref:isLocatedIn saref-ts:BuildingSpace_HotelRoom ;
-  saref:offers saref-ts:SenseTemperature ;
+  saref:hasState ex:OffState ;
+  saref:hasState ex:OnState ;
+  saref:isLocatedIn ex:BuildingSpace_HotelRoom ;
+  saref:offers ex:SenseTemperature ;
 .
diff --git a/examples/time.ttl b/examples/time.ttl
deleted file mode 100644
index 6d723c523b8978e06867443d8d1d902bb72729ab..0000000000000000000000000000000000000000
--- a/examples/time.ttl
+++ /dev/null
@@ -1,15 +0,0 @@
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix saref: <https://saref.etsi.org/core/> .
-@prefix time: <http://www.w3.org/2006/time#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-<https://saref.etsi.org/saref/latest/example/time>
-  rdf:type owl:Ontology ;
-  owl:imports <https://saref.etsi.org/saref#> .
-
-###  http://www.w3.org/2006/time#TemporalUnit
-time:TemporalUnit rdfs:subClassOf saref:UnitOfMeasure ;
-                  rdfs:comment "The unit of measure for time"^^xsd:string .
-
diff --git a/examples/unitsmeasure.ttl b/examples/unitsmeasure.ttl
index a890f24c1e725da3b6905e2c70c3b8a232c28733..66d010766eeada0a76c5cc6b46dfeccb2c88cee3 100644
--- a/examples/unitsmeasure.ttl
+++ b/examples/unitsmeasure.ttl
@@ -1,13 +1,17 @@
-@prefix : <https://saref.etsi.org/> .
 @prefix om: <http://www.wurvoc.org/vocabularies/om-1.8/> .
 @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> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix saref: <https://saref.etsi.org/> .
-@base <https://saref.etsi.org/> .
-
+@prefix saref: <https://saref.etsi.org/core/> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
+
+<https://saref.etsi.org/core/v3.1.1/example/unitsmeasure#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example unitsmeasure"@en ;
+  dcterms:description "Example unitsmeasure"@en .
 
 ###  http://www.wurvoc.org/vocabularies/om-1.8/United_States_dollar
 om:United_States_dollar rdf:type owl:NamedIndividual ,
diff --git a/examples/washingmachine.ttl b/examples/washingmachine.ttl
index fcfc85d59cc9584b2ccb8e28f402769b761ff7f0..85e746275b25b6d4813c7fe5d82316613a60e7e4 100644
--- a/examples/washingmachine.ttl
+++ b/examples/washingmachine.ttl
@@ -1,20 +1,20 @@
-# baseURI: http://ontology.tno.nl/saref/washingmachine
-# imports: https://w3id.org/saref
-
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix saref: <https://saref.etsi.org/core/> .
-@prefix saref-wm: <http://ontology.tno.nl/saref/washingmachine#> .
+@prefix ex: <https://saref.etsi.org/core/v3.1.1/example/washingmachine/> .
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dctype: <http://purl.org/dc/dcmitype/> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 
-<http://ontology.tno.nl/saref/washingmachine>
-  rdf:type owl:Ontology ;
-  owl:imports <https://w3id.org/saref> ;
-.
+<https://saref.etsi.org/core/v3.1.1/example/washingmachine#> a dctype:Dataset ;
+  dcterms:license <https://forge.etsi.org/etsi-software-license> ;
+  dcterms:conformsTo <https://saref.etsi.org/core/v3.1.1/> ;
+  dcterms:title "Example washingmachine"@en ;
+  dcterms:description "Example washingmachine"@en .
 
-saref-wm:WashingMachine rdf:type owl:Class ;
+ex:WashingMachine rdf:type owl:Class ;
                      rdfs:subClassOf saref:Appliance ,
                                      saref:Load ,
                                      [ rdf:type owl:Restriction ;
@@ -33,106 +33,106 @@ saref-wm:WashingMachine rdf:type owl:Class ;
                      rdfs:label "Washing machine"@en .
 
 
-saref-wm:BuildingSpace_LaundryRoom
+ex:BuildingSpace_LaundryRoom
   rdf:type saref:BuildingSpace ;
   rdfs:label "Laundry room"^^xsd:string ;
-  saref:contains saref-wm:WashingMachine_WM802 ;
+  saref:contains ex:WashingMachine_WM802 ;
   saref:hasSpaceType "Laundry room"^^xsd:string ;
 .
-saref-wm:Instant_1
+ex:Instant_1
   rdf:type time:Instant ;
   rdfs:label "Instant 1"^^xsd:string ;
   time:inXSDDateTime "2015-03-17T11:10:50.53"^^xsd:dateTime ;
 .
-saref-wm:Instant_2
+ex:Instant_2
   rdf:type time:Instant ;
   rdfs:label "Instant 2"^^xsd:string ;
   time:inXSDDateTime "2015-03-17T12:30:51.116"^^xsd:dateTime ;
 .
-saref-wm:Interval_1
+ex:Interval_1
   rdf:type time:Interval ;
   rdfs:label "Interval 1"^^xsd:string ;
-  time:hasBeginning saref-wm:Instant_1 ;
-  time:hasEnd saref-wm:Instant_2 ;
+  time:hasBeginning ex:Instant_1 ;
+  time:hasEnd ex:Instant_2 ;
 .
-saref-wm:OnOffFunction_1
+ex:OnOffFunction_1
   rdf:type saref:OnOffFunction ;
   rdfs:label "On off function 1"^^xsd:string ;
 .
-saref-wm:Power_value1
+ex:Power_value1
   rdf:type saref:Power ;
   rdfs:label "Power value 1"^^xsd:string ;
   saref:hasValue "0.65"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt> ;
 .
-saref-wm:Power_value2
+ex:Power_value2
   rdf:type saref:Power ;
   rdfs:label "Power value2"^^xsd:string ;
   saref:hasValue "0.40"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/kilowatt> ;
 .
-saref-wm:Price_value1
+ex:Price_value1
   rdf:type saref:Price ;
   rdfs:label "Price value1"^^xsd:string ;
   saref:hasValue "0.2"^^xsd:string ;
   saref:isMeasuredIn <http://www.wurvoc.org/vocabularies/om-1.8/euro> ;
 .
-saref-wm:Profile_1
+ex:Profile_1
   rdf:type saref:Profile ;
   rdfs:label "Profile 1"^^xsd:string ;
-  saref:hasConsumption saref-wm:Power_value2 ;
-  saref:hasPrice saref-wm:Price_value1 ;
+  saref:hasConsumption ex:Power_value2 ;
+  saref:hasPrice ex:Price_value1 ;
   saref:isFlexible "true"^^xsd:boolean ;
   saref:isInterruptionPossible "false"^^xsd:boolean ;
 .
-saref-wm:StartCommand
+ex:StartCommand
   rdf:type saref:StartCommand ;
   rdfs:label "START command "^^xsd:string ;
-  saref:actsUpon saref-wm:StopState ;
-  saref:isCommandOf saref-wm:StartStopFunction ;
+  saref:actsUpon ex:StopState ;
+  saref:isCommandOf ex:StartStopFunction ;
 .
-saref-wm:StartService
+ex:StartService
   rdf:type saref:Service ;
   rdfs:label "Start service 1"^^xsd:string ;
-  saref:hasInputParameter saref-wm:StopState ;
-  saref:hasOutputParameter saref-wm:StartState ;
-  saref:isOfferedBy saref-wm:WashingMachine_WM802 ;
-  saref:represents saref-wm:StartStopFunction ;
+  saref:hasInputParameter ex:StopState ;
+  saref:hasOutputParameter ex:StartState ;
+  saref:isOfferedBy ex:WashingMachine_WM802 ;
+  saref:represents ex:StartStopFunction ;
 .
-saref-wm:StartState
+ex:StartState
   rdf:type saref:StartState ;
   rdfs:label "Start state"^^xsd:string ;
 .
-saref-wm:StartStopFunction
+ex:StartStopFunction
   rdf:type saref:StartStopFunction ;
   rdfs:label "Start stop function "^^xsd:string ;
-  saref:hasCommand saref-wm:StartCommand ;
-  saref:hasCommand saref-wm:StopCommand ;
+  saref:hasCommand ex:StartCommand ;
+  saref:hasCommand ex:StopCommand ;
 .
-saref-wm:StopCommand
+ex:StopCommand
   rdf:type saref:StopCommand ;
   rdfs:label "STOP command "^^xsd:string ;
-  saref:actsUpon saref-wm:StartState ;
-  saref:isCommandOf saref-wm:StartStopFunction ;
+  saref:actsUpon ex:StartState ;
+  saref:isCommandOf ex:StartStopFunction ;
 .
-saref-wm:StopState
+ex:StopState
   rdf:type saref:StopState ;
   rdfs:label "Stop state"^^xsd:string ;
 .
-saref-wm:WashingMachine_WM802
-  rdf:type saref-wm:WashingMachine ;
+ex:WashingMachine_WM802
+  rdf:type ex:WashingMachine ;
   rdfs:label "Washing machine WM802"^^xsd:string ;
   saref:accomplishes saref:Washing ;
   saref:hasCategory saref:Appliance ;
   saref:hasCategory saref:Load ;
   saref:hasDescription "Washing machine WM802 is an example of how to instantiate a washing machine using SAREF"^^xsd:string ;
-  saref:hasFunction saref-wm:StartStopFunction ;
+  saref:hasFunction ex:StartStopFunction ;
   saref:hasManufacturer "manufacturer-hgfds"^^xsd:string ;
   saref:hasModel "45609WQ"^^xsd:string ;
-  saref:hasProfile saref-wm:Profile_1 ;
-  saref:hasState saref-wm:StartState ;
-  saref:hasState saref-wm:StopState ;
-  saref:hasTypicalConsumption saref-wm:Power_value1 ;
-  saref:isLocatedIn saref-wm:BuildingSpace_LaundryRoom ;
-  saref:offers saref-wm:StartService ;
+  saref:hasProfile ex:Profile_1 ;
+  saref:hasState ex:StartState ;
+  saref:hasState ex:StopState ;
+  saref:hasTypicalConsumption ex:Power_value1 ;
+  saref:isLocatedIn ex:BuildingSpace_LaundryRoom ;
+  saref:offers ex:StartService ;
 .