diff --git a/ontology/saref4agri.ttl b/ontology/saref4agri.ttl
index 2232c823d1cf302780e981d636f1af0908660273..36382eeb4f4114d153f0fc2a64502f4ed9c86728 100644
--- a/ontology/saref4agri.ttl
+++ b/ontology/saref4agri.ttl
@@ -10,7 +10,7 @@
 @prefix time: <http://www.w3.org/2006/time#> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix vann:    <http://purl.org/vocab/vann/>.
-@prefix geo: <http://www.opengis.net/ont/geosparql#> .
+@prefix geosp: <http://www.opengis.net/ont/geosparql#> .
 @prefix wgs84: <http://www.w3.org/2003/01/geo/wgs84_pos#> .
 
 @base <https://saref.etsi.org/saref4agri/> .
@@ -49,7 +49,6 @@ dcterms:contributor rdf:type owl:AnnotationProperty .
 ###  http://purl.org/dc/terms/created
 dcterms:created rdf:type owl:AnnotationProperty .
 
-wgs84:SpatialThing a owl:Class .
 foaf:Organization a owl:Class ; rdfs:isDefinedBy foaf: .
 foaf:Person a owl:Class ; rdfs:isDefinedBy foaf: .
 
@@ -114,18 +113,18 @@ xsd:duration rdf:type rdfs:Datatype .
 
 
 ###  http://www.opengis.net/ont/geosparql#hasGeometry
-geo:hasGeometry rdf:type owl:ObjectProperty ;
-  rdfs:domain geo:Feature ;
-  rdfs:range geo:Geometry ;
+geosp:hasGeometry rdf:type owl:ObjectProperty ;
+  rdfs:domain geosp:Feature ;
+  rdfs:range geosp:Geometry ;
   rdfs:comment "A spatial representation for a given feature."@en ;
   rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql#> ;
   rdfs:label "has geometry"@en .
 
 
 ###  http://www.opengis.net/ont/geosparql#sfContains
-geo:sfContains rdf:type owl:ObjectProperty ;
-  rdfs:domain geo:SpatialObject ;
-  rdfs:range geo:SpatialObject ;
+geosp:sfContains rdf:type owl:ObjectProperty ;
+  rdfs:domain geosp:SpatialObject ;
+  rdfs:range geosp:SpatialObject ;
   rdfs:comment "Exists if the subject SpatialObject spatially contains the object SpatialObject. DE-9IM: T*****FF*"@en ;
   rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ,
                      <http://www.opengis.net/spec/geosparql/1.0> ;
@@ -133,9 +132,9 @@ geo:sfContains rdf:type owl:ObjectProperty ;
 
 
 ###  http://www.opengis.net/ont/geosparql#sfWithin
-geo:sfWithin rdf:type owl:ObjectProperty ;
-  rdfs:domain geo:SpatialObject ;
-  rdfs:range geo:SpatialObject ;
+geosp:sfWithin rdf:type owl:ObjectProperty ;
+  rdfs:domain geosp:SpatialObject ;
+  rdfs:range geosp:SpatialObject ;
   rdfs:comment "Exists if the subject SpatialObject is spatially within the object SpatialObject. DE-9IM: T*F**F***"@en ;
   rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ,
                    <http://www.opengis.net/spec/geosparql/1.0> ;
@@ -201,7 +200,7 @@ foaf:member rdf:type owl:ObjectProperty ;
 s4agri:contains rdf:type owl:ObjectProperty ;
   rdfs:comment "contains"@en ;
   rdfs:label "contains"@en ;
-  rdfs:subPropertyOf geo:sfContains ;
+  rdfs:subPropertyOf geosp:sfContains ;
   owl:inverseOf s4agri:isContainedIn .
 
 
@@ -321,13 +320,13 @@ s4agri:hasPlantDate rdf:type owl:DatatypeProperty ;
 
 
 ###  http://www.opengis.net/ont/geosparql#Feature
-geo:Feature rdf:type owl:Class ;
-  rdfs:subClassOf geo:SpatialObject ,
+geosp:Feature rdf:type owl:Class ;
+  rdfs:subClassOf geosp:SpatialObject ,
     [ rdf:type owl:Restriction ;
-      owl:onProperty geo:hasGeometry ;
-      owl:allValuesFrom geo:Geometry
+      owl:onProperty geosp:hasGeometry ;
+      owl:allValuesFrom geosp:Geometry
     ] ;
-      owl:disjointWith geo:Geometry ;
+      owl:disjointWith geosp:Geometry ;
   rdfs:comment "This class represents the top-level feature type. This class is equivalent to GFI_Feature defined in ISO 19156:2011, and it is superclass of all feature types."@en ;
   rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ,
                   <http://www.opengis.net/ont/gml> ;
@@ -335,26 +334,26 @@ geo:Feature rdf:type owl:Class ;
 
 
 ###  http://www.opengis.net/ont/geosparql#Geometry
-geo:Geometry rdf:type owl:Class ;
-  rdfs:subClassOf geo:SpatialObject ;
+geosp:Geometry rdf:type owl:Class ;
+  rdfs:subClassOf geosp:SpatialObject ;
   rdfs:comment "The class represents the top-level geometry type. This class is equivalent to the UML class GM_Object defined in ISO 19107, and it is superclass of all geometry types."@en ;
   rdfs:isDefinedBy <http://www.opengis.net/ont/geosparql> ;
   rdfs:label "Geometry"@en .
 
 
 ###  http://www.opengis.net/ont/geosparql#SpatialObject
-geo:SpatialObject rdf:type owl:Class ;
+geosp:SpatialObject rdf:type owl:Class ;
   rdfs:subClassOf [ rdf:type owl:Restriction ;
-      owl:onProperty geo:hasGeometry ;
-      owl:allValuesFrom geo:Geometry
+      owl:onProperty geosp:hasGeometry ;
+      owl:allValuesFrom geosp:Geometry
     ] ,
     [ rdf:type owl:Restriction ;
-      owl:onProperty geo:sfContains ;
-      owl:allValuesFrom geo:SpatialObject
+      owl:onProperty geosp:sfContains ;
+      owl:allValuesFrom geosp:SpatialObject
     ] ,
     [ rdf:type owl:Restriction ;
-      owl:onProperty geo:sfWithin ;
-      owl:allValuesFrom geo:SpatialObject
+      owl:onProperty geosp:sfWithin ;
+      owl:allValuesFrom geosp:SpatialObject
     ] ,
     [ rdf:type owl:Restriction ;
       owl:onProperty wgs84:location ;
@@ -367,7 +366,7 @@ geo:SpatialObject rdf:type owl:Class ;
 
 ###  http://www.w3.org/2003/01/geo/wgs84_pos#Point
 wgs84:Point rdf:type owl:Class ;
-  rdfs:subClassOf geo:Geometry ;
+  rdfs:subClassOf geosp:Geometry ;
   rdfs:comment """ 
 Uniquely identified by lat/long/alt. i.e.
 
@@ -414,7 +413,7 @@ s4agri:Animal rdf:type owl:Class ;
     ] ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:isLocatedIn ;
-      owl:someValuesFrom geo:Feature
+      owl:someValuesFrom geosp:Feature
     ] ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:isMemberOf ;
@@ -448,7 +447,7 @@ s4agri:AnimalGroup rdf:type owl:Class ;
     ] ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:isLocatedIn ;
-      owl:someValuesFrom geo:Feature
+      owl:someValuesFrom geosp:Feature
     ]  ;
   rdfs:comment "A collection of one or multiple animals."@en ;
   rdfs:label "Animal Group"@en .
@@ -456,7 +455,7 @@ s4agri:AnimalGroup rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4agri/Building
 s4agri:Building rdf:type owl:Class ;
-  rdfs:subClassOf geo:Feature ,
+  rdfs:subClassOf geosp:Feature ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:contains ;
       owl:someValuesFrom s4agri:BuildingSpace
@@ -467,7 +466,7 @@ s4agri:Building rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4agri/BuildingSpace
 s4agri:BuildingSpace rdf:type owl:Class ;
-  rdfs:subClassOf geo:Feature ;
+  rdfs:subClassOf geosp:Feature ;
   rdfs:comment "An entity used to define the physical spaces of the building. A building space contains devices or building objects."@en ;
   rdfs:label "Building space"@en .
 
@@ -508,7 +507,7 @@ s4agri:Deployment rdf:type owl:Class ;
     ] ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:isDeployedAtSpace ;
-      owl:someValuesFrom geo:SpatialObject
+      owl:someValuesFrom geosp:SpatialObject
     ] ;
   rdfs:comment "Deployment"@en ,
                          "The scenario, including temporal and spatial information, in which the systems and devices are installed."@en ;
@@ -524,7 +523,7 @@ s4agri:EatingActivitySensor rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4agri/Farm
 s4agri:Farm rdf:type owl:Class ;
-  rdfs:subClassOf geo:Feature ,
+  rdfs:subClassOf geosp:Feature ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:contains ;
       owl:someValuesFrom s4agri:Building
@@ -575,7 +574,7 @@ s4agri:MovementActivitySensor rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/saref4agri/Parcel
 s4agri:Parcel rdf:type owl:Class ;
-  rdfs:subClassOf geo:Feature ,
+  rdfs:subClassOf geosp:Feature ,
     [ rdf:type owl:Restriction ;
       owl:onProperty s4agri:contains ;
       owl:someValuesFrom s4agri:Crop