diff --git a/schema/SCHEMA_QUDT-DATATYPE-v2.1.ttl b/schema/SCHEMA_QUDT-DATATYPE-v2.1.ttl
index f95c6a4e..7e114c49 100644
--- a/schema/SCHEMA_QUDT-DATATYPE-v2.1.ttl
+++ b/schema/SCHEMA_QUDT-DATATYPE-v2.1.ttl
@@ -143,9 +143,9 @@ qudt:AlignmentType
   rdfs:label "Alignment type" ;
   rdfs:subClassOf qudt:EnumeratedValue ;
   owl:oneOf (
-      qudt.type:BitAligned
-      qudt.type:ByteAligned
-      qudt.type:WordAligned
+      qudt:BitAligned
+      qudt:ByteAligned
+      qudt:WordAligned
     ) ;
 .
 qudt:Array
@@ -2330,7 +2330,7 @@ qudt:InertialCoordinateFrame
   rdfs:subClassOf qudt:InertialReferenceFrame ;
   rdfs:subClassOf [
       a owl:Restriction ;
-      owl:hasValue qudt.type:FT_NON-ROTATING ;
+      owl:hasValue qudt:FT_NON-ROTATING ;
       owl:onProperty qudt:frameType ;
     ] ;
   owl:equivalentClass qudt:NonRotatingInertialFrame ;
@@ -2339,7 +2339,7 @@ qudt:InertialCoordinateFrame
 qudt:InertialCoordinateFrame-frameType
   a sh:PropertyShape ;
   sh:path qudt:frameType ;
-  sh:hasValue qudt.type:FT_NON-ROTATING ;
+  sh:hasValue qudt:FT_NON-ROTATING ;
 .
 qudt:InertialReferenceFrame
   a owl:Class ;
@@ -2716,8 +2716,8 @@ qudt:MemoryOrderType
   rdfs:label "Memory order type" ;
   rdfs:subClassOf qudt:EnumeratedValue ;
   owl:oneOf (
-      qudt.type:HighToLow
-      qudt.type:LowToHigh
+      qudt:HighToLow
+      qudt:LowToHigh
     ) ;
 .
 qudt:Misc
@@ -2746,7 +2746,7 @@ qudt:ModalEnumeration
   rdfs:subClassOf qudt:Enumeration ;
   rdfs:subClassOf [
       a owl:Restriction ;
-      owl:allValuesFrom <http://qudt.org/schema/type#ModalCue> ;
+      owl:allValuesFrom qudt:ModalCue ;
       owl:onProperty qudt:defaultValue ;
     ] ;
   sh:property qudt:ModalEnumeration-defaultValue ;
@@ -2805,27 +2805,27 @@ qudt:MultiModalEnumeration
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:allValuesFrom qudt:ModalEnumeration ;
-      owl:onProperty <http://qudt.org/schema/type#modalCueEnumeration> ;
+      owl:onProperty qudt:modalCueEnumeration ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#auralCueEnumeration> ;
+      owl:onProperty qudt:auralCueEnumeration ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#iconicCueEnumeration> ;
+      owl:onProperty qudt:iconicCueEnumeration ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#kinestheticCueEnumeration> ;
+      owl:onProperty qudt:kinestheticCueEnumeration ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#visualCueEnumeration> ;
+      owl:onProperty qudt:visualCueEnumeration ;
     ] ;
   sh:property qudt:MultiModalEnumeration-auralCueEnumeration ;
   sh:property qudt:MultiModalEnumeration-iconicCueEnumeration ;
@@ -2867,33 +2867,33 @@ qudt:MultiModalType
   rdfs:subClassOf qudt:EnumeratedValue ;
   rdfs:subClassOf [
       a owl:Restriction ;
-      owl:allValuesFrom <http://qudt.org/schema/type#ModalCue> ;
-      owl:onProperty <http://qudt.org/schema/type#modalCue> ;
+      owl:allValuesFrom qudt:ModalCue ;
+      owl:onProperty qudt:modalCue ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#auralCue> ;
+      owl:onProperty qudt:auralCue ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#iconicCue> ;
+      owl:onProperty qudt:iconicCue ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#kinestheticCue> ;
+      owl:onProperty qudt:kinestheticCue ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
       owl:maxCardinality 1 ;
-      owl:onProperty <http://qudt.org/schema/type#visualCue> ;
+      owl:onProperty qudt:visualCue ;
     ] ;
   rdfs:subClassOf [
       a owl:Restriction ;
-      owl:onProperty <http://qudt.org/schema/type#modalCue> ;
-      owl:someValuesFrom <http://qudt.org/schema/type#ModalCue> ;
+      owl:onProperty qudt:modalCue ;
+      owl:someValuesFrom qudt:ModalCue ;
     ] ;
   sh:property qudt:MultiModalType-auralCue ;
   sh:property qudt:MultiModalType-iconicCue ;
@@ -2999,7 +2999,7 @@ qudt:NonRotatingInertialFrame
   rdfs:subClassOf qudt:InertialReferenceFrame ;
   rdfs:subClassOf [
       a owl:Restriction ;
-      owl:hasValue qudt.type:FT_NON-ROTATING ;
+      owl:hasValue qudt:FT_NON-ROTATING ;
       owl:onProperty qudt:frameType ;
     ] ;
   owl:equivalentClass qudt:InertialCoordinateFrame ;
@@ -3008,7 +3008,7 @@ qudt:NonRotatingInertialFrame
 qudt:NonRotatingInertialFrame-frameType
   a sh:PropertyShape ;
   sh:path qudt:frameType ;
-  sh:hasValue qudt.type:FT_NON-ROTATING ;
+  sh:hasValue qudt:FT_NON-ROTATING ;
 .
 qudt:NumericType
   a owl:Class ;
diff --git a/schema/SCHEMA_QUDT-v2.1.ttl b/schema/SCHEMA_QUDT-v2.1.ttl
index b966ce73..8db73ab6 100644
--- a/schema/SCHEMA_QUDT-v2.1.ttl
+++ b/schema/SCHEMA_QUDT-v2.1.ttl
@@ -581,8 +581,8 @@ qudt:EndianType
   rdfs:label "Endian Type" ;
   rdfs:subClassOf qudt:EnumeratedValue ;
   owl:oneOf (
-      qudt.type:LittleEndian
-      qudt.type:BigEndian
+      qudt:LittleEndian
+      qudt:BigEndian
     ) ;
 .
 qudt:EnumeratedQuantity
diff --git a/schema/shacl/SCHEMA_QUDT_NoOWL-v2.1.ttl b/schema/shacl/SCHEMA_QUDT_NoOWL-v2.1.ttl
index e2d08ca0..5e175016 100644
--- a/schema/shacl/SCHEMA_QUDT_NoOWL-v2.1.ttl
+++ b/schema/shacl/SCHEMA_QUDT_NoOWL-v2.1.ttl
@@ -732,8 +732,8 @@ qudt:EndianType
         ] ;
       rdfs:isDefinedBy <http://qudt.org/2.1/schema/shacl/qudt> ;
       sh:in (
-          qudt.type:LittleEndian
-          qudt.type:BigEndian
+          qudt:LittleEndian
+          qudt:BigEndian
         ) ;
     ] ;
 .
diff --git a/vocab/constants/VOCAB_QUDT-CONSTANTS-v2.1.ttl b/vocab/constants/VOCAB_QUDT-CONSTANTS-v2.1.ttl
index 6ea900cd..ba46dd03 100644
--- a/vocab/constants/VOCAB_QUDT-CONSTANTS-v2.1.ttl
+++ b/vocab/constants/VOCAB_QUDT-CONSTANTS-v2.1.ttl
@@ -29,12 +29,6 @@
   owl:imports <http://qudt.org/2.1/vocab/unit> ;
   owl:versionIRI <http://qudt.org/2.1/vocab/constant> ;
 .
-qudt:PhysicsForums
-  a org:Organization ;
-  qudt:url "http://www.physicsforums.com"^^xsd:anyURI ;
-  rdfs:isDefinedBy <http://qudt.org/2.1/vocab/sources> ;
-  rdfs:label "Physics Forums" ;
-.
 constant:AlphaParticleElectronMassRatio
   a qudt:PhysicalConstant ;
   qudt:hasQuantityKind quantitykind:DimensionlessRatio ;
@@ -1456,7 +1450,7 @@ constant:JosephsonConstant
   qudt:quantityValue constant:Value_JosephsonConstant ;
   rdfs:isDefinedBy <http://qudt.org/2.1/vocab/constant> ;
   rdfs:label "Josephson Constant"@en ;
-  skos:closeMatch quantitykind:MagneticFluxQuantum ;
+  skos:closeMatch constant:MagneticFluxQuantum ;
 .
 constant:JouleAtomicMassUnitRelationship
   a qudt:PhysicalConstant ;
@@ -2220,7 +2214,7 @@ constant:NuclearMagneton
   qudt:quantityValue constant:Value_NuclearMagneton ;
   rdfs:isDefinedBy <http://qudt.org/2.1/vocab/constant> ;
   rdfs:label "Nuclear Magneton"@en ;
-  skos:related quantitykind:BohrMagneton ;
+  skos:related constant:BohrMagneton ;
 .
 constant:NuclearMagnetonInEVPerT
   a qudt:PhysicalConstant ;
diff --git a/vocab/dimensionvectors/VOCAB_QUDT-DIMENSION-VECTORS-v2.1.ttl b/vocab/dimensionvectors/VOCAB_QUDT-DIMENSION-VECTORS-v2.1.ttl
index 5fe38104..5f92cedf 100644
--- a/vocab/dimensionvectors/VOCAB_QUDT-DIMENSION-VECTORS-v2.1.ttl
+++ b/vocab/dimensionvectors/VOCAB_QUDT-DIMENSION-VECTORS-v2.1.ttl
@@ -3157,7 +3157,6 @@ qkdv:A0E1L0I0M-1H0T0D0
   qudt:hasReferenceQuantityKind quantitykind:SpecificElectricCurrent ;
   qudt:isDimensionInSystem qudt:SOQ_ISQ ;
   qudt:latexDefinition "\\(I M^{-1}\\)"^^qudt:LatexString ;
-  rdfs:isDefinedBy <http://qudt.org/2.1/vocab/dimension> ;
   rdfs:isDefinedBy <http://qudt.org/2.1/vocab/dimensionvector> ;
   rdfs:label "A0E1L0I0M-1H0T0D0" ;
 .
diff --git a/vocab/unit/VOCAB_QUDT-UNITS-ALL-v2.1.ttl b/vocab/unit/VOCAB_QUDT-UNITS-ALL-v2.1.ttl
index e1ec97a6..f4360e2a 100644
--- a/vocab/unit/VOCAB_QUDT-UNITS-ALL-v2.1.ttl
+++ b/vocab/unit/VOCAB_QUDT-UNITS-ALL-v2.1.ttl
@@ -4,6 +4,7 @@
 # imports: http://qudt.org/2.1/vocab/quantitykind
 # imports: http://qudt.org/2.1/vocab/sou
 
+@prefix constant: <http://qudt.org/vocab/constant/> .
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
@@ -5762,7 +5763,7 @@ unit:EV
   qudt:hasQuantityKind quantitykind:Energy ;
   qudt:informativeReference "http://en.wikipedia.org/wiki/Electron_volt?oldid=344021738"^^xsd:anyURI ;
   qudt:informativeReference "http://physics.nist.gov/cuu/Constants/bibliography.html"^^xsd:anyURI ;
-  qudt:quantityValue qudt:ValueForElectronVolt ;
+  qudt:quantityValue constant:ValueForElectronVolt ;
   qudt:symbol "eV" ;
   qudt:ucumCode "eV"^^qudt:UCUMcs ;
   qudt:udunitsCode "eV" ;