diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index eb1a0ed10d66171a14c5cd5a6ade7447553f7ac2..fdeabca1f09d47ab1fa68f28a8071abe04d9d2ab 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -204,7 +204,7 @@ s4ehaw:hasHub rdf:type owl:ObjectProperty ;
 s4ehaw:hasImpairment rdf:type owl:ObjectProperty ;
                      rdfs:domain s4ehaw:User ;
                      rdfs:range s4ehaw:Impairment ;
-                     rdfs:comment "The impairment type of a user and a patient (as sub-class of user it also inherits habit), e.g. deaf, hearing, handling, visual, mobility..."@en ;
+                     rdfs:comment "The impairment type of a user and a patient (as sub-class of user it also inherits impairment), e.g. aural, skeletal, ocular, mobility, intellectual..."@en ;
                      rdfs:label "has impairment"@en .
 
 
@@ -567,12 +567,12 @@ s4ehaw:hasGender rdf:type owl:DatatypeProperty ;
                  rdfs:label "has gender"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hasGeolocation
-s4ehaw:hasGeolocation rdf:type owl:DatatypeProperty ;
+###  https://saref.etsi.org/saref4ehaw/banGeolocation
+s4ehaw:banGeolocation rdf:type owl:DatatypeProperty ;
                       rdfs:domain s4ehaw:Ban ;
                       rdfs:range xsd:string ;
                       rdfs:comment "The geolocation of the BAN, when available and needed, shall be given relatively to the current location - geolocation as standardized ISO 6709 - of the patient wearing the BAN."@en ;
-                      rdfs:label "has geolocation"@en .
+                      rdfs:label "BAN geolocation"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/hasInput
@@ -809,7 +809,7 @@ s4ehaw:sampleTime rdf:type owl:DatatypeProperty ;
 s4ehaw:sendingFrequency rdf:type owl:DatatypeProperty ;
                         rdfs:domain s4ehaw:PeriodicBanCommunicationFunction ;
                         rdfs:range xsd:float ;
-                        rdfs:comment "Defines the sending frequency at an health device level."@en ;
+                        rdfs:comment "Defines the sending frequency (in ms) at an health device level."@en ;
                         rdfs:label "sending frequency"@en .
 
 
@@ -1037,7 +1037,7 @@ s4ehaw:Helper rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4ehaw/Impairment
 s4ehaw:Impairment rdf:type owl:Class ;
-                  rdfs:comment "Defined for users (that can in particular be patients) impairments modelling, e.g. deaf impairment, hearing impairment, handling impairment, visual impairment, blindI impairment, mobility impairment..."@en ;
+                  rdfs:comment "Defined for users (that can in particular be patients) impairments modelling, e.g. aural impairment, skeletal impairment, ocular impairment, mobility impairment, intellectual impairment. Those non exhaustive impairments are compatible with the World Health Organization classification"@en ;
                   rdfs:label "Impairment" .
 
 
@@ -1276,18 +1276,11 @@ s4ehaw:assistedLiving rdf:type owl:NamedIndividual ,
                                rdfs:label "Assisted Living"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/blindImpairment
-s4ehaw:blindImpairment rdf:type owl:NamedIndividual ,
+###  https://saref.etsi.org/saref4ehaw/auralImpairment
+s4ehaw:auralImpairment rdf:type owl:NamedIndividual ,
                                 s4ehaw:Impairment ;
-                                rdfs:comment "Bling impairment (User level)."@en ;
-                                rdfs:label "Blind impairment"@en .
-
-
-###  https://saref.etsi.org/saref4ehaw/deafImpairment
-s4ehaw:deafImpairment rdf:type owl:NamedIndividual ,
-                               s4ehaw:Impairment ;
-                               rdfs:comment "Deaf impairment (User level)."@en ;
-                               rdfs:label "Deaf impairment"@en .
+                                rdfs:comment "Aural impairment (User level), i.e. impairments of auditory sensitivity."@en ;
+                                rdfs:label "Aural impairment"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/emergency
@@ -1304,13 +1297,6 @@ s4ehaw:exercising rdf:type owl:NamedIndividual ,
                            rdfs:label "Exercising"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/handlingImpairment
-s4ehaw:handlingImpairment rdf:type owl:NamedIndividual ,
-                                   s4ehaw:Impairment ;
-                                   rdfs:comment "Handling impairment (User level)."@en ;
-                                   rdfs:label "Handling Impairment"@en .
-
-
 ###  https://saref.etsi.org/saref4ehaw/healthcare
 s4ehaw:healthcare rdf:type owl:NamedIndividual ,
                            s4ehaw:BanApplicationDomain ;
@@ -1318,11 +1304,11 @@ s4ehaw:healthcare rdf:type owl:NamedIndividual ,
                            rdfs:label "Healthcare"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/hearingImpairment
-s4ehaw:hearingImpairment rdf:type owl:NamedIndividual ,
+###  https://saref.etsi.org/saref4ehaw/intellectualImpairment
+s4ehaw:intellectualImpairment rdf:type owl:NamedIndividual ,
                                   s4ehaw:Impairment ;
-                                  rdfs:comment "Hearing impairment (User level)."@en ;
-                                  rdfs:label "Hearing impairment"@en .
+                                  rdfs:comment "Skeletal impairment (User level), e.g. ..."@en ;
+                                  rdfs:label "Intellectual impairment"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/lying
@@ -1339,6 +1325,13 @@ s4ehaw:mobilityImpairment rdf:type owl:NamedIndividual ,
                                    rdfs:label "Mobility impairment"@en .
 
 
+###  https://saref.etsi.org/saref4ehaw/ocularImpairment
+s4ehaw:ocularImpairment rdf:type owl:NamedIndividual ,
+                                 s4ehaw:Impairment ;
+                                 rdfs:comment "Ocular impairment (User level), i.e. impamnents of visual acuity."@en ;
+                                 rdfs:label "Ocular impairment"@en .
+
+
 ###  https://saref.etsi.org/saref4ehaw/overeating
 s4ehaw:overeating rdf:type owl:NamedIndividual ,
                            s4ehaw:Habit ;
@@ -1374,6 +1367,13 @@ s4ehaw:sitting rdf:type owl:NamedIndividual ,
                         rdfs:label "Sitting"@en .
 
 
+###  https://saref.etsi.org/saref4ehaw/skeletalImpairment
+s4ehaw:skeletalImpairment rdf:type owl:NamedIndividual ,
+                                  s4ehaw:Impairment ;
+                                  rdfs:comment "Skeletal impairment (User level), e.g. of head and trunk regions, limbs..."@en ;
+                                  rdfs:label "Skeletal impairment"@en .
+
+
 ###  https://saref.etsi.org/saref4ehaw/smoking
 s4ehaw:smoking rdf:type owl:NamedIndividual ,
                         s4ehaw:Habit ;
@@ -1402,11 +1402,11 @@ s4ehaw:undereating rdf:type owl:NamedIndividual ,
                             rdfs:label "Undereating"@en .
 
 
-###  https://saref.etsi.org/saref4ehaw/visualImpairment
-s4ehaw:visualImpairment rdf:type owl:NamedIndividual ,
+###  https://saref.etsi.org/saref4ehaw/ocularImpairment
+s4ehaw:ocularImpairment rdf:type owl:NamedIndividual ,
                                  s4ehaw:Impairment ;
-                                 rdfs:comment "Visual impairment (User level)."@en ;
-                                 rdfs:label "Visual impairment"@en .
+                                 rdfs:comment "Ocular impairment (User level)."@en ;
+                                 rdfs:label "Ocular impairment"@en .
 
 
 ###  https://saref.etsi.org/saref4ehaw/walking