diff --git a/ontology/saref4wear.ttl b/ontology/saref4wear.ttl
index 04b3504d3655cbdaf138e39e62171c5361a7498f..24af5c894a0c640b79b77d59e3287aa070abfbff 100644
--- a/ontology/saref4wear.ttl
+++ b/ontology/saref4wear.ttl
@@ -83,12 +83,30 @@ vann:preferredNamespaceUri rdf:type owl:AnnotationProperty .
 #    Object Properties
 #################################################################
 
+###  https://saref.etsi.org/s4wear#actsOn
+s4wear:actsOn rdf:type owl:ObjectProperty ;
+              rdfs:domain s4wear:Action ;
+              rdfs:range s4wear:ActuableObject .
+
+
+###  https://saref.etsi.org/s4wear#hasInterface
+s4wear:hasInterface rdf:type owl:ObjectProperty ;
+                    rdfs:domain s4wear:Wearable ;
+                    rdfs:range s4wear:Interface .
+
+
 ###  https://saref.etsi.org/s4wear#hasLocation
 s4wear:hasLocation rdf:type owl:ObjectProperty ;
                    rdfs:domain owl:Thing ;
                    rdfs:range s4wear:Location .
 
 
+###  https://saref.etsi.org/s4wear#hasPowerSupply
+s4wear:hasPowerSupply rdf:type owl:ObjectProperty ;
+                      rdfs:domain s4wear:Wearable ;
+                      rdfs:range s4wear:PowerSupply .
+
+
 ###  https://saref.etsi.org/s4wear#hasSensor
 s4wear:hasSensor rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearable ;
@@ -107,6 +125,12 @@ s4wear:isActedBy rdf:type owl:ObjectProperty ;
                  rdfs:range s4wear:Wearable .
 
 
+###  https://saref.etsi.org/s4wear#isActuatedBy
+s4wear:isActuatedBy rdf:type owl:ObjectProperty ;
+                    rdfs:domain s4wear:Wearable ;
+                    rdfs:range s4wear:Actuator .
+
+
 ###  https://saref.etsi.org/s4wear#isLocated
 s4wear:isLocated rdf:type owl:ObjectProperty ;
                  rdfs:domain s4wear:Wearable ;
@@ -143,6 +167,12 @@ The definition of this object property satisfies the requirement WEAR-2.""" ;
                   rdfs:label "is sensed by"@en .
 
 
+###  https://saref.etsi.org/s4wear#isTriggeredBy
+s4wear:isTriggeredBy rdf:type owl:ObjectProperty ;
+                     rdfs:domain s4wear:Action ;
+                     rdfs:range s4wear:Wearable .
+
+
 ###  https://saref.etsi.org/s4wear#monitors
 s4wear:monitors rdf:type owl:ObjectProperty ;
                 rdfs:domain s4wear:Wearable ;
@@ -155,40 +185,10 @@ s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
                           rdfs:range s4wear:Wearable .
 
 
-###  https://saref.etsi.org/saref4wear#actsOn
-:actsOn rdf:type owl:ObjectProperty ;
-        rdfs:domain :Action ;
-        rdfs:range :ActuableObject .
-
-
-###  https://saref.etsi.org/saref4wear#hasInterface
-:hasInterface rdf:type owl:ObjectProperty ;
-              rdfs:domain s4wear:Wearable ;
-              rdfs:range :Interface .
-
-
-###  https://saref.etsi.org/saref4wear#hasPowerSupply
-:hasPowerSupply rdf:type owl:ObjectProperty ;
-                rdfs:domain s4wear:Wearable ;
-                rdfs:range :PowerSupply .
-
-
-###  https://saref.etsi.org/saref4wear#isActuatedBy
-:isActuatedBy rdf:type owl:ObjectProperty ;
-              rdfs:domain s4wear:Wearable ;
-              rdfs:range :Actuator .
-
-
-###  https://saref.etsi.org/saref4wear#isTriggeredBy
-:isTriggeredBy rdf:type owl:ObjectProperty ;
-               rdfs:domain :Action ;
-               rdfs:range s4wear:Wearable .
-
-
-###  https://saref.etsi.org/saref4wear#sendsNotificationsTo
-:sendsNotificationsTo rdf:type owl:ObjectProperty ;
-                      rdfs:domain s4wear:Wearable ;
-                      rdfs:range s4wear:Wearer .
+###  https://saref.etsi.org/s4wear#sendsNotificationsTo
+s4wear:sendsNotificationsTo rdf:type owl:ObjectProperty ;
+                            rdfs:domain s4wear:Wearable ;
+                            rdfs:range s4wear:Wearer .
 
 
 #################################################################
@@ -199,18 +199,86 @@ s4wear:sendsInformationTo rdf:type owl:ObjectProperty ;
 foaf:name rdf:type owl:DatatypeProperty .
 
 
+###  https://saref.etsi.org/s4wear#emittedNoise
+s4wear:emittedNoise rdf:type owl:DatatypeProperty ;
+                    rdfs:domain s4wear:Wearable ;
+                    rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#emittedTemperature
+s4wear:emittedTemperature rdf:type owl:DatatypeProperty ;
+                          rdfs:domain s4wear:Wearable ;
+                          rdfs:range xsd:double .
+
+
 ###  https://saref.etsi.org/s4wear#eventType
 s4wear:eventType rdf:type owl:DatatypeProperty ;
                  rdfs:domain s4wear:Event ;
                  rdfs:range xsd:string .
 
 
+###  https://saref.etsi.org/s4wear#followsPolicies
+s4wear:followsPolicies rdf:type owl:DatatypeProperty ;
+                       rdfs:domain s4wear:Wearable ;
+                       rdfs:range xsd:anyURI .
+
+
 ###  https://saref.etsi.org/s4wear#hasCapacity
 s4wear:hasCapacity rdf:type owl:DatatypeProperty ;
                    rdfs:domain s4wear:Area ;
                    rdfs:range xsd:long .
 
 
+###  https://saref.etsi.org/s4wear#hasCommand
+s4wear:hasCommand rdf:type owl:DatatypeProperty ;
+                  rdfs:domain s4wear:Action ;
+                  rdfs:range xsd:string .
+
+
+###  https://saref.etsi.org/s4wear#hasDataTransmissionRate
+s4wear:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
+                               rdfs:subPropertyOf owl:topDataProperty ;
+                               rdfs:domain s4wear:Wearable ;
+                               rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#hasDeep
+s4wear:hasDeep rdf:type owl:DatatypeProperty ;
+               rdfs:domain s4wear:Wearable ;
+               rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#hasHeight
+s4wear:hasHeight rdf:type owl:DatatypeProperty ;
+                 rdfs:domain s4wear:Wearable ;
+                 rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#hasLength
+s4wear:hasLength rdf:type owl:DatatypeProperty ;
+                 rdfs:domain s4wear:Wearable ;
+                 rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#hasOperatingTemperature
+s4wear:hasOperatingTemperature rdf:type owl:DatatypeProperty ;
+                               rdfs:domain s4wear:Wearable ;
+                               rdfs:range xsd:long .
+
+
+###  https://saref.etsi.org/s4wear#hasStorage
+s4wear:hasStorage rdf:type owl:DatatypeProperty ;
+                  rdfs:subPropertyOf owl:topDataProperty ;
+                  rdfs:domain s4wear:Wearable ;
+                  rdfs:range xsd:double .
+
+
+###  https://saref.etsi.org/s4wear#hasWeight
+s4wear:hasWeight rdf:type owl:DatatypeProperty ;
+                 rdfs:domain s4wear:Wearable ;
+                 rdfs:range xsd:double .
+
+
 ###  https://saref.etsi.org/s4wear#latitude
 s4wear:latitude rdf:type owl:DatatypeProperty ;
                 rdfs:domain s4wear:Location ;
@@ -241,74 +309,6 @@ s4wear:wearerStatus rdf:type owl:DatatypeProperty ;
                     rdfs:range xsd:string .
 
 
-###  https://saref.etsi.org/saref4wear#emittedNoise
-:emittedNoise rdf:type owl:DatatypeProperty ;
-              rdfs:domain s4wear:Wearable ;
-              rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#emittedTemperature
-:emittedTemperature rdf:type owl:DatatypeProperty ;
-                    rdfs:domain s4wear:Wearable ;
-                    rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#followsPolicies
-:followsPolicies rdf:type owl:DatatypeProperty ;
-                 rdfs:domain s4wear:Wearable ;
-                 rdfs:range xsd:anyURI .
-
-
-###  https://saref.etsi.org/saref4wear#hasCommand
-:hasCommand rdf:type owl:DatatypeProperty ;
-            rdfs:domain :Action ;
-            rdfs:range xsd:string .
-
-
-###  https://saref.etsi.org/saref4wear#hasDataTransmissionRate
-:hasDataTransmissionRate rdf:type owl:DatatypeProperty ;
-                         rdfs:subPropertyOf owl:topDataProperty ;
-                         rdfs:domain s4wear:Wearable ;
-                         rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#hasDeep
-:hasDeep rdf:type owl:DatatypeProperty ;
-         rdfs:domain s4wear:Wearable ;
-         rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#hasHeight
-:hasHeight rdf:type owl:DatatypeProperty ;
-           rdfs:domain s4wear:Wearable ;
-           rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#hasLength
-:hasLength rdf:type owl:DatatypeProperty ;
-           rdfs:domain s4wear:Wearable ;
-           rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#hasOperatingTemperature
-:hasOperatingTemperature rdf:type owl:DatatypeProperty ;
-                         rdfs:domain s4wear:Wearable ;
-                         rdfs:range xsd:long .
-
-
-###  https://saref.etsi.org/saref4wear#hasStorage
-:hasStorage rdf:type owl:DatatypeProperty ;
-            rdfs:subPropertyOf owl:topDataProperty ;
-            rdfs:domain s4wear:Wearable ;
-            rdfs:range xsd:double .
-
-
-###  https://saref.etsi.org/saref4wear#hasWeight
-:hasWeight rdf:type owl:DatatypeProperty ;
-           rdfs:domain s4wear:Wearable ;
-           rdfs:range xsd:double .
-
-
 #################################################################
 #    Classes
 #################################################################
@@ -321,6 +321,20 @@ voaf:Vocabulary rdf:type owl:Class .
 foaf:Person rdf:type owl:Class .
 
 
+###  https://saref.etsi.org/s4wear#Action
+s4wear:Action rdf:type owl:Class ;
+              rdfs:subClassOf s4wear:Capability .
+
+
+###  https://saref.etsi.org/s4wear#ActuableObject
+s4wear:ActuableObject rdf:type owl:Class .
+
+
+###  https://saref.etsi.org/s4wear#Actuator
+s4wear:Actuator rdf:type owl:Class ;
+                rdfs:subClassOf s4wear:WearableComponent .
+
+
 ###  https://saref.etsi.org/s4wear#Area
 s4wear:Area rdf:type owl:Class .
 
@@ -339,9 +353,9 @@ s4wear:Child rdf:type owl:Class ;
              rdfs:subClassOf s4wear:Wearer .
 
 
-###  https://saref.etsi.org/s4wear#Comunication
-s4wear:Comunication rdf:type owl:Class ;
-                    rdfs:subClassOf s4wear:Capability .
+###  https://saref.etsi.org/s4wear#Communication
+s4wear:Communication rdf:type owl:Class ;
+                     rdfs:subClassOf s4wear:Capability .
 
 
 ###  https://saref.etsi.org/s4wear#Control
@@ -353,9 +367,9 @@ s4wear:Control rdf:type owl:Class ;
 s4wear:Device rdf:type owl:Class .
 
 
-###  https://saref.etsi.org/s4wear#ElecticalSafety
-s4wear:ElecticalSafety rdf:type owl:Class ;
-                       rdfs:subClassOf s4wear:Information .
+###  https://saref.etsi.org/s4wear#ElectricalSafety
+s4wear:ElectricalSafety rdf:type owl:Class ;
+                        rdfs:subClassOf s4wear:Information .
 
 
 ###  https://saref.etsi.org/s4wear#Emission
@@ -392,6 +406,10 @@ s4wear:InBodyWearable rdf:type owl:Class ;
 s4wear:Information rdf:type owl:Class .
 
 
+###  https://saref.etsi.org/s4wear#Interface
+s4wear:Interface rdf:type owl:Class .
+
+
 ###  https://saref.etsi.org/s4wear#LivingOrganism
 s4wear:LivingOrganism rdf:type owl:Class ;
                       rdfs:subClassOf s4wear:Entity .
@@ -440,6 +458,11 @@ s4wear:PositionedWearable rdf:type owl:Class ;
                           rdfs:subClassOf s4wear:Wearable .
 
 
+###  https://saref.etsi.org/s4wear#PowerSupply
+s4wear:PowerSupply rdf:type owl:Class ;
+                   rdfs:subClassOf s4wear:Device .
+
+
 ###  https://saref.etsi.org/s4wear#Sensing
 s4wear:Sensing rdf:type owl:Class ;
                rdfs:subClassOf s4wear:Capability .
@@ -519,29 +542,6 @@ The definition of this concept satisfies the requirement WEAR-2."""@en ;
               rdfs:label "Wearer"@en .
 
 
-###  https://saref.etsi.org/saref4wear#Action
-:Action rdf:type owl:Class ;
-        rdfs:subClassOf s4wear:Capability .
-
-
-###  https://saref.etsi.org/saref4wear#ActuableObject
-:ActuableObject rdf:type owl:Class .
-
-
-###  https://saref.etsi.org/saref4wear#Actuator
-:Actuator rdf:type owl:Class ;
-          rdfs:subClassOf s4wear:WearableComponent .
-
-
-###  https://saref.etsi.org/saref4wear#Interface
-:Interface rdf:type owl:Class .
-
-
-###  https://saref.etsi.org/saref4wear#PowerSupply
-:PowerSupply rdf:type owl:Class ;
-             rdfs:subClassOf s4wear:Device .
-
-
 #################################################################
 #    Individuals
 #################################################################