diff --git a/ontology/saref4ehaw.ttl b/ontology/saref4ehaw.ttl
index c128b767aeeaf2a43b7a4c1d57dbb11f059a6f0e..42d144506baad00c48918c978c723116851ec3dc 100644
--- a/ontology/saref4ehaw.ttl
+++ b/ontology/saref4ehaw.ttl
@@ -7,7 +7,8 @@
 @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 saref: <https://saref.etsi.org/s4wear/> .
+@prefix s4wear: <https://saref.etsi.org/s4ehaw/> .
 @prefix s4ehaw: <https://saref.etsi.org/s4ehaw/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @base <https://saref.etsi.org/s4ehaw/> .
@@ -1003,9 +1004,9 @@ s4ehaw:Action rdf:type owl:Class ;
 s4ehaw:Actor rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4ehaw/Actuator
-s4ehaw:Actuator rdf:type owl:Class ;
-                rdfs:subClassOf s4ehaw:HealthDevice .
+###  https://saref.etsi.org/saref#Actuator
+saref:Actuator rdf:type owl:Class ;
+               rdfs:subClassOf s4ehaw:HealthDevice .
 
 
 ###  https://saref.etsi.org/s4ehaw/Address
@@ -1058,7 +1059,7 @@ s4ehaw:Composite rdf:type owl:Class ;
 
 ###  https://saref.etsi.org/s4ehaw/Contact
 s4ehaw:Contact rdf:type owl:Class ;                                                       
-               owl:equivalentClass s4ehaw:Actor.
+               owl:equivalentClass s4ehaw:Actor .
 
 
 ###  https://saref.etsi.org/s4ehaw/Constraints
@@ -1203,9 +1204,9 @@ s4ehaw:Security rdf:type owl:Class ;
                 rdfs:comment "This is an empty container for describing the security constraints a data can be submitted to, like e.g. encryption."@en .
 
 
-###  https://saref.etsi.org/s4ehaw/Sensor
-s4ehaw:Sensor rdf:type owl:Class ;
-              rdfs:subClassOf s4ehaw:HealthDevice .
+###  https://saref.etsi.org/saref#Sensor
+saref:Sensor rdf:type owl:Class ;
+             rdfs:subClassOf s4ehaw:HealthDevice .
 
 
 ###  https://saref.etsi.org/s4ehaw/ServiceCategory
@@ -1247,11 +1248,6 @@ s4ehaw:Validity rdf:type owl:Class ;
                 rdfs:subClassOf s4ehaw:Constraints .
 
 
-###  https://saref.etsi.org/s4ehaw/Wearable
-s4ehaw:Wearable rdf:type owl:Class ;
-                rdfs:subClassOf s4ehaw:HealthDevice .
-
-
 ###  https://saref.etsi.org/saref#Command
 saref:Command rdf:type owl:Class .
 
@@ -1264,6 +1260,11 @@ saref:Device rdf:type owl:Class .
 saref:Service rdf:type owl:Class .
 
 
+###  https://saref.etsi.org/s4wear#Wearable
+s4wear:Wearable rdf:type owl:Class ;
+                rdfs:subClassOf s4ehaw:HealthDevice .
+
+
 #################################################################
 #    Individuals
 #################################################################