diff --git a/disciplines/computerscience.ttl b/disciplines/computerscience.ttl
index 5457d467..5e5dd4da 100644
--- a/disciplines/computerscience.ttl
+++ b/disciplines/computerscience.ttl
@@ -88,10 +88,7 @@ rdf:JSON rdf:type rdfs:Datatype .
 
 ###  https://w3id.org/emmo#EMMO_0266ec8c_bd13_4c9c_be77_607498793ed3
 :EMMO_0266ec8c_bd13_4c9c_be77_607498793ed3 rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:NCName
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_6796ec88_e49f_4628_b28d_6559f9dd630a ;
                                            skos:prefLabel "NCNameData"@en .
 
 
@@ -158,10 +155,7 @@ https://www.computer.org/education/bodies-of-knowledge/software-engineering"""@e
 
 ###  https://w3id.org/emmo#EMMO_1abe0ea7_2378_402f_b950_89b0795d2f45
 :EMMO_1abe0ea7_2378_402f_b950_89b0795d2f45 rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:NMTOKEN
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458 ;
                                            skos:prefLabel "NMTOKENData"@en .
 
 
@@ -332,9 +326,9 @@ https://www.computer.org/education/bodies-of-knowledge/software-engineering"""@e
                                            rdfs:subClassOf :EMMO_5c15f8c4_d2de_47a0_acdd_470b8dda979b ,
                                                            :EMMO_b45fbdc6_2519_4885_aa49_c56b394c3910 ;
                                            skos:prefLabel "URI"@en ;
+                                           :EMMO_157fdf31_6387_42be_8e72_10530519214a "https://en.wikipedia.org/wiki/File:URI_syntax_diagram.svg"^^xsd:anyURI ;
                                            :EMMO_967080e5_2f42_4eb2_a3a9_c58143e835f9 "A Uniform Resource Identifier (URI) is a compact sequence of characters that identifies an abstract or physical resource."@en ;
-                                           :EMMO_c7b62dd7_063a_4c2a_8504_42f7264ba83f "URI = scheme \":\" [\"//\" authority] path [\"?\" query] [\"#\" fragment]"@en ;
-                                           <https://w3id.org/emmo#EMMO_157fdf31_6387_42be_8e72_10530519214a> "https://en.wikipedia.org/wiki/File:URI_syntax_diagram.svg"^^xsd:anyURI .
+                                           :EMMO_c7b62dd7_063a_4c2a_8504_42f7264ba83f "URI = scheme \":\" [\"//\" authority] path [\"?\" query] [\"#\" fragment]"@en .
 
 [ rdf:type owl:Axiom ;
    owl:annotatedSource :EMMO_6470bbfa_04a6_4360_9534_1aa18d68329b ;
@@ -375,19 +369,13 @@ https://www.computer.org/education/bodies-of-knowledge/software-engineering"""@e
 
 ###  https://w3id.org/emmo#EMMO_6796ec88_e49f_4628_b28d_6559f9dd630a
 :EMMO_6796ec88_e49f_4628_b28d_6559f9dd630a rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:Name
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458 ;
                                            skos:prefLabel "NameData"@en .
 
 
 ###  https://w3id.org/emmo#EMMO_826bd296_d8e2_4c43_8f54_d684bf00090a
 :EMMO_826bd296_d8e2_4c43_8f54_d684bf00090a rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:normalizedString
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_5f334606_f67d_4f0e_acb9_eeb21cb10c66 ;
                                            skos:prefLabel "NormalizedStringData"@en .
 
 
@@ -460,10 +448,7 @@ Here we explicitly include in the definition also all the data (e.g. source code
 
 ###  https://w3id.org/emmo#EMMO_9e5f464a_658c_4b34_b80d_a5f8d5ec811a
 :EMMO_9e5f464a_658c_4b34_b80d_a5f8d5ec811a rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:language
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458 ;
                                            skos:prefLabel "LanguageData"@en .
 
 
@@ -518,10 +503,7 @@ Here we explicitly include in the definition also all the data (e.g. source code
 
 ###  https://w3id.org/emmo#EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458
 :EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458 rdf:type owl:Class ;
-                                           owl:equivalentClass [ rdf:type owl:Restriction ;
-                                                                 owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
-                                                                 owl:someValuesFrom xsd:token
-                                                               ] ;
+                                           rdfs:subClassOf :EMMO_826bd296_d8e2_4c43_8f54_d684bf00090a ;
                                            skos:prefLabel "TokenData"@en .
 
 
@@ -623,4 +605,50 @@ C:\\\\Users\\\\John\\\\Desktop  (DOS-like path)"""@en ;
 [ owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger
 ] .
 
+#################################################################
+#    General axioms
+#################################################################
+
+[ rdf:type owl:Restriction ;
+   owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+   owl:someValuesFrom xsd:NCName ;
+   rdfs:subClassOf :EMMO_0266ec8c_bd13_4c9c_be77_607498793ed3
+ ] .
+
+
+[ rdf:type owl:Restriction ;
+  owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+  owl:someValuesFrom xsd:NMTOKEN ;
+  rdfs:subClassOf :EMMO_1abe0ea7_2378_402f_b950_89b0795d2f45
+] .
+
+
+[ rdf:type owl:Restriction ;
+  owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+  owl:someValuesFrom xsd:Name ;
+  rdfs:subClassOf :EMMO_6796ec88_e49f_4628_b28d_6559f9dd630a
+] .
+
+
+[ rdf:type owl:Restriction ;
+  owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+  owl:someValuesFrom xsd:language ;
+  rdfs:subClassOf :EMMO_9e5f464a_658c_4b34_b80d_a5f8d5ec811a
+] .
+
+
+[ rdf:type owl:Restriction ;
+  owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+  owl:someValuesFrom xsd:normalizedString ;
+  rdfs:subClassOf :EMMO_826bd296_d8e2_4c43_8f54_d684bf00090a
+] .
+
+
+[ rdf:type owl:Restriction ;
+  owl:onProperty :EMMO_b6292331_94af_4f00_976b_ea55960c2f1c ;
+  owl:someValuesFrom xsd:token ;
+  rdfs:subClassOf :EMMO_be8680e5_28ec_4168_9206_d1cd33fbd458
+] .
+
+
 ###  Generated by the OWL API (version 4.5.26.2023-07-17T20:34:13Z) https://github.com/owlcs/owlapi