diff --git a/documentation/description.html b/documentation/description.html
index 56c14d9a01118ed279e4bcbf6e6c074997dcbf09..b6c4bb54b56c37c965c9f8828fd29ca201f16968 100644
--- a/documentation/description.html
+++ b/documentation/description.html
@@ -75,13 +75,13 @@ There are different types of tariffs, depending on whether they are based on thr
 </figure>
 
 
-<h3>Water types</h3>
+<h3>Water kinds</h3>
 
-<p>SAREF4WATR defines four types of water as instances of the <a href="#s4watr:Water">s4watr:Water</a> class: raw water (<a href="#s4watr:RawWater">s4watr:RawWater</a>), drinking water (<a href="#s4watr:DrinkingWater">s4watr:DrinkingWater</a>), storm water (<a href="#s4watr:StormWater">s4watr:StormWater</a>), and waste water (<a href="#s4watr:WasteWater">s4watr:WasteWater</a>). All these types of water, depicted in <a href="#Figure_8">Figure 8</a>, are defined as features of interest (<a href="https://saref.etsi.org/core/FeatureOfInterest">saref:FeatureOfInterest</a>), so measurements and key performance indicators can be defined over them.</p>
+<p>SAREF4WATR defines four kinds of water as instances of the <a href="#s4watr:WaterKind">s4watr:WaterKind</a> class: raw water (<a href="#s4watr:RawWater">s4watr:RawWater</a>), drinking water (<a href="#s4watr:DrinkingWater">s4watr:DrinkingWater</a>), storm water (<a href="#s4watr:StormWater">s4watr:StormWater</a>), and waste water (<a href="#s4watr:WasteWater">s4watr:WasteWater</a>). All these kinds of water, depicted in <a href="#Figure_8">Figure 8</a>, are defined as feature kinds (<a href="https://saref.etsi.org/core/FeatureKind">saref:FeatureKind</a>).</p>
  
 <figure>
-  <a href="diagrams/SAREF4WATR Water types.png"><img src="diagrams/SAREF4WATR Water types.png" alt="Water types model"/></a>
-  <figcaption id="Figure_8">Figure 8: Water types model</figcaption>
+  <a href="diagrams/SAREF4WATR Water kinds.png"><img src="diagrams/SAREF4WATR Water kinds.png" alt="Water kinds model"/></a>
+  <figcaption id="Figure_8">Figure 8: Water kinds model</figcaption>
 </figure>
 
 
@@ -98,7 +98,7 @@ The extension defines different individuals for each type of water property, bas
 
 <h3>Water infrastructure</h3>
 
-<p>In SAREF4WATR water infrastructures can be defined using the <a href="#s4watr:WaterInfrastructure">s4watr:WaterInfrastructure</a> class. Such infrastructures may be designed for one of the water types described above (through the <a href="#s4watr:isDesignedFor">s4watr:isDesignedFor</a> property), may have an intended use (through the <a href="#s4watr:isIntendedFor">s4watr:isIntendedFor</a> property), and may be classified into five different types, although others may be defined if needed: distribution systems (<a href="#s4watr:DistributionSystem">s4watr:DistributionSystem</a>), storage infrastructures (<a href="#s4watr:StorageInfrastructure">s4watr:StorageInfrastructure</a>), treatment plants (<a href="#s4watr:TreatmentPlant">s4watr:TreatmentPlant</a>), hydroelectric power plants (<a href="#s4watr:HydroelectricPowerPlant">s4watr:HydroelectricPowerPlant</a>), and monitoring infrastructures (<a href="#s4watr:MonitoringInfrastructure">s4watr:MonitoringInfrastructure</a>).</p>
+<p>In SAREF4WATR water infrastructures can be defined using the <a href="#s4watr:WaterInfrastructure">s4watr:WaterInfrastructure</a> class. Such infrastructures may be designed for one of the water kinds described above (through the <a href="#s4watr:isDesignedFor">s4watr:isDesignedFor</a> property), may have an intended use (through the <a href="#s4watr:isIntendedFor">s4watr:isIntendedFor</a> property), and may be classified into five different types, although others may be defined if needed: distribution systems (<a href="#s4watr:DistributionSystem">s4watr:DistributionSystem</a>), storage infrastructures (<a href="#s4watr:StorageInfrastructure">s4watr:StorageInfrastructure</a>), treatment plants (<a href="#s4watr:TreatmentPlant">s4watr:TreatmentPlant</a>), hydroelectric power plants (<a href="#s4watr:HydroelectricPowerPlant">s4watr:HydroelectricPowerPlant</a>), and monitoring infrastructures (<a href="#s4watr:MonitoringInfrastructure">s4watr:MonitoringInfrastructure</a>).</p>
 
 <p>In order to represent the topology of a water infrastructure or its assets, the GeoSPARQL ontology has been reused and connected to the SARE4WATR terms. As shown in <a href="#Figure_10">Figure 10</a>, for representing spatial objects the geo:SpatialObject class from GeoSPARQL has been reused along with its subclasses that allow defining spatial features (geo:Feature) and geometries (geo:Geometry). Different properties from GeoSPARQL can be reused to define spatial relations among spatial objects (e.g., geo:sfContains, or geo:sfWithin)or to define the geometry of a feature (geo:hasGeometry). Two types of geometries from the GeoSPARQL Simple Features ontology are proposed to be used: points (sf:Point) and polygons (sf:Polygon), although others may also be used from that same ontology or from another one.
 We refer to the GeoSPARQL standard for further details on how to define the topology of water infrastructures.</p>
diff --git a/examples/WaterInfrastructure.ttl b/examples/WaterInfrastructure.ttl
index ed93dd6649d06b7dc1a840250023d47475d3176e..79acd198411060678f5582c50224c2f248efbd0a 100644
--- a/examples/WaterInfrastructure.ttl
+++ b/examples/WaterInfrastructure.ttl
@@ -47,7 +47,7 @@ om:litrePerHour rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4watr/DrinkingWater
 s4watr:DrinkingWater rdf:type owl:NamedIndividual ,
-                              s4watr:Water ;
+                              s4watr:WaterKind ;
                      rdfs:label "Drinking water"@en ,
                                 "Potable water"@en .
 
diff --git a/ontology/saref4watr.ttl b/ontology/saref4watr.ttl
index ab8afdb2e2988c7d0d0522987b7af7753b72fba5..c894f5d88fe7d7b26bac2edab738a9d1dae27af9 100644
--- a/ontology/saref4watr.ttl
+++ b/ontology/saref4watr.ttl
@@ -664,7 +664,7 @@ s4watr:WaterInfrastructure rdf:type owl:Class ;
                                            saref:FeatureOfInterest ,
                                            [ rdf:type owl:Restriction ;
                                              owl:onProperty s4watr:isDesignedFor ;
-                                             owl:someValuesFrom s4watr:Water
+                                             owl:someValuesFrom s4watr:WaterKind
                                            ] ,
                                            [ rdf:type owl:Restriction ;
                                              owl:onProperty s4watr:isIntendedFor ;
@@ -674,6 +674,13 @@ s4watr:WaterInfrastructure rdf:type owl:Class ;
                            rdfs:label "Water infrastructure"@en .
 
 
+###  https://saref.etsi.org/saref4watr/WaterKind
+s4watr:WaterKind rdf:type owl:Class ;
+             rdfs:subClassOf saref:FeatureKind ;
+             rdfs:comment "This class is used to define kinds of water features."@en ;
+             rdfs:label "Water kind"@en .
+
+
 ###  https://saref.etsi.org/saref4watr/WaterMeter
 s4watr:WaterMeter rdf:type owl:Class ;
                   rdfs:subClassOf s4watr:WaterDevice ,
@@ -928,7 +935,7 @@ s4watr:Domestic rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4watr/DrinkingWater
 s4watr:DrinkingWater rdf:type owl:NamedIndividual ,
-                              s4watr:Water ;
+                              s4watr:WaterKind ;
                      rdfs:comment "Drinking water is water that is treated to comply with drinking water standards."@en ;
                      rdfs:label "Drinking water"@en ,
                                 "Potable water"@en .
@@ -1136,7 +1143,7 @@ s4watr:PseudomonasAeruginosa rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4watr/RawWater
 s4watr:RawWater rdf:type owl:NamedIndividual ,
-                         s4watr:Water ;
+                         s4watr:WaterKind ;
                 rdfs:comment "Raw water is water found in the environment that has not been treated and does not have any of its minerals, ions, particles, bacteria, or parasites removed."@en ;
                 rdfs:label "Raw water"@en .
 
@@ -1164,7 +1171,7 @@ s4watr:Sodium rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4watr/Stormwater
 s4watr:Stormwater rdf:type owl:NamedIndividual ,
-                           s4watr:Water ;
+                           s4watr:WaterKind ;
                   rdfs:comment "Stormwater is water that originates during precipitation events and snow/ice melt."@en ;
                   rdfs:label "Storm water"@en .
 
@@ -1263,7 +1270,7 @@ s4watr:VinylChloride rdf:type owl:NamedIndividual ,
 
 ###  https://saref.etsi.org/saref4watr/Wastewater
 s4watr:Wastewater rdf:type owl:NamedIndividual ,
-                           s4watr:Water ;
+                           s4watr:WaterKind ;
                   rdfs:comment "Wastewater is water that has been used in the home, in a business, or as part of an industrial process."@en ;
                   rdfs:label "Waste water"@en .
 
diff --git a/tests/tests.csv b/tests/tests.csv
index d8046aea28ac2cfeefdcb37f2f8dc08e74849ff8..54db7f8e324a3a507a5fc2b8eb2b6e89ac900703 100644
--- a/tests/tests.csv
+++ b/tests/tests.csv
@@ -4,8 +4,8 @@ WATR-TEST-2;WATR-1;Water infrastructure;Reservoir subClassOf WaterAsset
 WATR-TEST-3;WATR-1;Water infrastructure;Pipe subClassOf WaterAsset
 WATR-TEST-4;WATR-2;Water infrastructure;CatchmentWell subClassOf Well
 WATR-TEST-5;WATR-3;Water infrastructure;TreatmentPlant subClassOf WaterInfrastructure
-WATR-TEST-6;WATR-3;Water infrastructure;TreatmentPlant isDesignedFor Water
-WATR-TEST-7;WATR-3;Water infrastructure;Wastewater type Water
+WATR-TEST-6;WATR-3;Water infrastructure;TreatmentPlant isDesignedFor WaterKind
+WATR-TEST-7;WATR-3;Water infrastructure;Wastewater type WaterKind
 WATR-TEST-8;WATR-4;Water infrastructure;WaterInfrastructure hasSubSystem Sensor
 WATR-TEST-9;WATR-4;Water infrastructure;WaterMeter subClassOf Sensor
 WATR-TEST-10;WATR-5;Water infrastructure;WaterInfrastructure hasSubSystem Actuator