Removed cases of 2 rdfs:label in classes and improved DPR tables fluids section.

@@ -1074,7 +1074,7 @@ ep-core:definingType
 ep-core:degreesOfAngle
       rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:domain ep-core:PlaneAngle ;
-      rdfs:label "degree of an angle"^^xsd:string , "degrees of angle"^^xsd:string ;
+      rdfs:label "degrees of angle"^^xsd:string ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS43166353217"^^xsd:string .
 
@@ -3955,6 +3955,13 @@ ep-core:secondOfPair
 ep-core:seeReferenceData
       rdf:type owl:AnnotationProperty .
 
+ep-core:shortName
+      rdf:type owl:DatatypeProperty ;
+      rdfs:comment "a short or abbreviated name"^^xsd:string ;
+      rdfs:label "short name"^^xsd:string ;
+      rdfs:range xsd:string ;
+      rdfs:subPropertyOf ep-core:name .
+
 ep-core:sm3_sm-3
       rdf:type owl:FunctionalProperty , owl:DatatypeProperty , ep-core:Scale ;
       rdfs:domain ep-core:VolumePerVolume ;

@@ -31,7 +31,7 @@ ep-material:AqueousMaterial
 
 ep-material:BasicSedimentAndWater
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "bsw"^^xsd:string , "basic sediment and water"^^xsd:string ;
+      rdfs:label "basic sediment and water"^^xsd:string ;
       rdfs:subClassOf ep-material:Fluid ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS16681480"^^xsd:string .
@@ -326,8 +326,9 @@ ep-material:HydrogenSulfide
 
 ep-material:Isobutane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "isobutane"^^xsd:string , "IC4"^^xsd:string ;
+      rdfs:label "IC4"^^xsd:string ;
       rdfs:subClassOf ep-material:Material ;
+      ep-core:name "isobutane"^^xsd:string ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS419309"^^xsd:string .
 
@@ -338,8 +339,9 @@ ep-material:Isobutane-component
 
 ep-material:Isopentane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "isopentane"^^xsd:string , "IC5"^^xsd:string ;
+      rdfs:label "IC5"^^xsd:string ;
       rdfs:subClassOf ep-material:Material ;
+      ep-core:name "isopentane"^^xsd:string ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS419399"^^xsd:string .
 
@@ -447,8 +449,9 @@ ep-material:NonHcGas
 
 ep-material:NormalButane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "normal butane"^^xsd:string , "NC4"^^xsd:string ;
-      rdfs:subClassOf ep-material:Material .
+      rdfs:label "NC4"^^xsd:string ;
+      rdfs:subClassOf ep-material:Material ;
+      ep-core:name "normal butane"^^xsd:string .
 
 ep-material:NormalButane-component
       rdf:type owl:Class ;
@@ -457,8 +460,9 @@ ep-material:NormalButane-component
 
 ep-material:NormalPentane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "normal pentane"^^xsd:string , "NC5"^^xsd:string ;
-      rdfs:subClassOf ep-material:Material .
+      rdfs:label "NC5"^^xsd:string ;
+      rdfs:subClassOf ep-material:Material ;
+      ep-core:name "normal pentane"^^xsd:string .
 
 ep-material:Oil
       rdf:type owl:Class ;
@@ -525,8 +529,9 @@ ep-material:PlusFraction
 
 ep-material:Propane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "propane"^^xsd:string , "C3"^^xsd:string ;
+      rdfs:label "C3"^^xsd:string ;
       rdfs:subClassOf ep-material:Material ;
+      ep-core:name "propane"^^xsd:string ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS419264"^^xsd:string .
 
@@ -800,8 +805,9 @@ ep-material:substance-3mPentane
 
 ep-material:substance-Ar
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "Argon"^^xsd:string , "Ar"^^xsd:string ;
-      rdfs:subClassOf ep-material:Material .
+      rdfs:label "Argon"^^xsd:string ;
+      rdfs:subClassOf ep-material:Material ;
+      ep-core:shortName "Ar"^^xsd:string .
 
 ep-material:substance-Benzene
       rdf:type owl:Class , ep-material:SubstanceType ;
@@ -1053,8 +1059,9 @@ ep-material:substance-EtcyPentane
 
 ep-material:substance-Ethane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "ethane"^^xsd:string , "C2"^^xsd:string ;
+      rdfs:label "C2"^^xsd:string ;
       rdfs:subClassOf ep-material:Material ;
+      ep-core:name "ethane"^^xsd:string ;
       ep-core:seeReferenceData
               "http://posccaesar.org/rdl/RDS419219"^^xsd:string .
 
@@ -1107,8 +1114,9 @@ ep-material:substance-McyPentane
 
 ep-material:substance-Methane
       rdf:type owl:Class , ep-material:SubstanceType ;
-      rdfs:label "methane"^^xsd:string , "C1"^^xsd:string ;
-      rdfs:subClassOf ep-material:Material .
+      rdfs:label "C1"^^xsd:string ;
+      rdfs:subClassOf ep-material:Material ;
+      ep-core:name "methane"^^xsd:string .
 
 ep-material:substance-N2
       rdf:type owl:Class , ep-material:SubstanceType ;