diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index dce3ebb314728c6485a84e21876a0434abac018f..d6dc37f9b25ce61022ccde757d5b2dec265ab521 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -7,16 +7,18 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix voaf: <http://purl.org/vocommons/voaf#> .
-@prefix saref: <https://saref.etsi.org/saref/> .
-@prefix s4ehaw: <https://saref.etsi.org/s4ehaw/core/> .
+@prefix saref: <https://saref.etsi.org/saref/core> .
+@prefix s4ehaw: <https://saref.etsi.org/s4ehaw/> .
 @prefix s4envi: <https://saref.etsi.org/saref4envi/> .
 @prefix s4wear: <https://saref.etsi.org/s4wear/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/s4ehaw/> .
 
-<https://saref.etsi.org/s4ehaw/> rdf:type owl:Ontology ;
+<https://saref.etsi.org/s4ehaw/> rdf:type owl:Ontology  , voaf:Vocabulary ;
                                  
                                  rdfs:label "SAREF4EHAW"@en ;
+
+                                 dcterms:title "SAREF4EHAW: an extension of SAREF for eHealth Ageing Well domain"@en ;
                                  
                                  dcterms:issued "date when the document is online"^^xsd:date ;
                                  
@@ -29,8 +31,6 @@
                                  vann:preferredNamespaceUri "https://saref.etsi.org/s4ehaw/" ;
 
                                  vann:preferredNamespacePrefix "s4ehaw" ;
-                                 
-                                 dcterms:description "s4ehaw is an extension of SAREF for eHealth Ageing Well"@en ;
 
                                  dcterms:description """The objective of SAREF4EHAW is to extend SAREF ontology for the eHealth/Ageing-well (EHAW) vertical. Clause 4.1 of the present document shortly introduces a high level view of the envisioned SAREF4EHAW semantic model and modular ontology, with the retained concepts (i.e. classes) and their relations. 
 SAREF4EHAW extension has been specified and formalised by investigating EHAW domain related resources, as reported in ETSI TR 103 509, such as: potential stakeholders, standardization initiatives, alliances/associations, European projects, EC directives, existing ontologies, and data repositories. Therefore, SAREF4EHAW modular ontology shall both:
@@ -39,13 +39,12 @@ SAREF4EHAW extension has been specified and formalised by investigating EHAW dom
  - Use case 2 “monitoring and support of healthy lifestyles for citizens”,
  - Use case 3 “Early Warning System (EWS) and Cardiovascular Accidents detection”.
  - Fulfil the eHealth Ageing Well related requirements provided in ETSI TR 103 509, mainly the ontological ones that were mostly taken as input for the ontology specification.
+
 SAREF4EHAW mainly reuses the following existing ontologies: SAREF, ETSI SmartBAN reference model, SAREF 4 Environment extension, SAREF 4 Wearables extension, SAREF4health ontology which is a very first try to somehow extend SAREF ontology for the health vertical (it has nothing to do with ETSI SAREF4XYZ naming convention). The following figure presents the high level view of SAREF4EHAW ontology.
-![SAREF4SYST overview](diagram/SAREF4EHAW_Model.jpg)
+![SAREF4SYST overview](diagrams/SAREF4EHAW_Model.jpg)
 For semantic interoperability handling purposes, an ontology based solution, combined with sensing-as-a-service and WoT strategies, is retained for SAREF4EHAW. Therefore, an upper level ontology, at service level, shall also behas been fully modelled (Service class and sub-classes depicted in the previous figure).
 For embedded semantic analytics purposes, SAREF4EHAW shall behas been designed using the modularity principle (see ETSI TR 103 509) and can thus be mainly described by the following self-contained knowledge sub-ontologies (or modules): HealthActor, Ban, HealthDevice, Function (measured data related concepts included) and Service."""^^<http://www.iana.org/assignments/media-types/text/markdown> ;
                                  
-                                 dcterms:title "SAREF4EHAW: an extension of SAREF for the eHealth Ageing Well domain."@en ;
-                                 
                                  owl:versionInfo "v1.1.1" ;
                                  
                                  dcterms:license <https://forge.etsi.org/etsi-software-license> ;