diff --git a/ontology/saref.ttl b/ontology/saref.ttl
index dc27e9c14326c4fb2f9400f224c6749c38f39d4d..df6a30e11a4d7a9788a5e03c7a0aea05da905f97 100644
--- a/ontology/saref.ttl
+++ b/ontology/saref.ttl
@@ -53,7 +53,7 @@ saref:consistsOf rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/controlsProperty
 saref:controlsProperty rdf:type owl:ObjectProperty ;
-                       rdfs:comment "A relationship specifying the Property that can be controlled by a certain Device"@en ;
+                       rdfs:comment "A relationship specifying the property that can be controlled by a certain device"@en ;
                        rdfs:label "controls property"@en .
 
 
@@ -64,11 +64,11 @@ saref:hasCommand rdf:type owl:ObjectProperty ;
                  rdfs:label "has command"@en .
 
 
-###  https://saref.etsi.org/hasFeatureOfInterest
-saref:hasFeatureOfInterest rdf:type owl:ObjectProperty ;
-                           owl:inverseOf saref:isFeatureOfInterestOf ;
-                           rdfs:comment "A relationship between a measurement and the entity whose quality was measured"@en ;
-                           rdfs:label "has feature of interest"@en .
+###  https://saref.etsi.org/isMeasurementOf
+saref:isMeasurementOf rdf:type owl:ObjectProperty ;
+                      owl:inverseOf saref:hasMeasurement ;
+                      rdfs:comment "A relationship between a measurement and the feature of interest whose quality was measured"@en ;
+                      rdfs:label "isMeasurementOf"@en .
 
 
 ###  https://saref.etsi.org/hasFunction
@@ -91,7 +91,7 @@ saref:hasMeterReadingType rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/hasPrice
 saref:hasPrice rdf:type owl:ObjectProperty ;
-               rdfs:comment "A relationships indentifying the price associated to an entity"@en ;
+               rdfs:comment "A relationship indentifying the price associated to an entity"@en ;
                rdfs:label "has price"@en .
 
 
@@ -104,7 +104,7 @@ saref:hasProfile rdf:type owl:ObjectProperty ;
 ###  https://saref.etsi.org/hasProperty
 saref:hasProperty rdf:type owl:ObjectProperty ;
                   owl:inverseOf saref:isPropertyOf ;
-                  rdfs:comment "A relationship between an entity and a property of that entity"@en ;
+                  rdfs:comment "A relationship between a feature of interest and a property of that feature"@en ;
                   rdfs:label "has property"@en .
 
 
@@ -146,7 +146,7 @@ saref:hasTypicalConsumption rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/isAbout
 saref:isAbout rdf:type owl:ObjectProperty ;
-              rdfs:comment "A relationship identifying what an entity, such as a Profile, is about"@en ;
+              rdfs:comment "A relationship identifying what an entity, such as a profile, is about"@en ;
               rdfs:label "isAbout"@en .
 
 
@@ -168,10 +168,10 @@ saref:isControlledByDevice rdf:type owl:ObjectProperty ;
                            rdfs:label "is controlled by device"@en .
 
 
-###  https://saref.etsi.org/isFeatureOfInterestOf
-saref:isFeatureOfInterestOf rdf:type owl:ObjectProperty ;
-                            rdfs:comment "A relationship between a feature of interest and a measurement about it"@en ;
-                            rdfs:label "is feature of interest of"@en .
+###  https://saref.etsi.org/hasMeasurement
+saref:hasMeasurement rdf:type owl:ObjectProperty ;
+                     rdfs:comment "A relationship between a feature of interest and a measurement about it"@en ;
+                     rdfs:label "has measurement"@en .
 
 ###  https://saref.etsi.org/isMeasuredByDevice
 saref:isMeasuredByDevice rdf:type owl:ObjectProperty ;
@@ -194,7 +194,7 @@ saref:isOfferedBy rdf:type owl:ObjectProperty ;
 
 ###  https://saref.etsi.org/isPropertyOf
 saref:isPropertyOf rdf:type owl:ObjectProperty ;
-                   rdfs:comment "A relationship between a property and the entity it belongs to"@en ;
+                   rdfs:comment "A relationship between a property and the feature of interest it belongs to"@en ;
                    rdfs:label "is property of"@en .
 
 
@@ -513,7 +513,7 @@ saref:FeatureOfInterest rdf:type owl:Class ;
                                           owl:allValuesFrom saref:Property 
                                         ] ,
                                         [ a owl:Restriction ;
-                                          owl:onProperty saref:isFeatureOfInterestOf ;
+                                          owl:onProperty saref:hasMeasurement ;
                                           owl:allValuesFrom saref:Measurement 
                                         ] ; 
                         rdfs:comment "A feature of interest represents any real world entity from which a property is measured."@en ;
@@ -678,7 +678,7 @@ saref:Load rdf:type owl:Class ;
 ###  https://saref.etsi.org/Measurement
 saref:Measurement rdf:type owl:Class ;
                   rdfs:subClassOf [ rdf:type owl:Restriction ;
-                                    owl:onProperty saref:hasFeatureOfInterest ;
+                                    owl:onProperty saref:isMeasurementOf ;
                                     owl:allValuesFrom saref:FeatureOfInterest
                                   ] ,
                                   [ rdf:type owl:Restriction ;
@@ -975,7 +975,7 @@ saref:Property rdf:type owl:Class ;
                                  owl:onProperty saref:relatesToMeasurement ;
                                  owl:allValuesFrom saref:Measurement
                                ] ;
-               rdfs:comment "A quality of an entity that can be measured; an aspect of an entity that is intrinsic to and cannot exist without the entity"@en ;
+               rdfs:comment "A quality of a feature of interest that can be measured; an aspect of a feature of interest that is intrinsic to and cannot exist without the feature"@en ;
                rdfs:label "Property"@en .