Renamed Data to DataField, made CompletelyFreeField to subclass of DataField, re…

…named Value to DataValue

@@ -480,10 +480,9 @@
 .
 :CompletelyFreeField
   rdf:type owl:Class ;
-  rdfs:comment "A Data Field that holds variables and values defined by the User."^^xsd:string ;
+  rdfs:comment "A Data Field defined by the user that holds free text values."^^xsd:string ;
   rdfs:label "Completely free field"^^xsd:string ;
-  rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS17611736> ;
-  rdfs:subClassOf owl:Thing ;
+  rdfs:subClassOf :DataField ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:onDataRange xsd:anyType ;
@@ -622,7 +621,7 @@
   rdfs:label "Daily Repeat Period"^^xsd:string ;
   rdfs:subClassOf :Period ;
 .
-:Data
+:DataField
   rdf:type owl:Class ;
   rdfs:comment "An Information Object that is produced or stored by a computer in the context of a given Objective, used usually to calculate, analyze or plan something (adapted from Merriam-Webster)."^^xsd:string ;
   rdfs:label "Data"^^xsd:string ;
@@ -667,6 +666,14 @@
   rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS318059> ;
   rdfs:subClassOf owl:Thing ;
 .
+:DataValue
+  rdf:type owl:Class ;
+  rdfs:comment "A Property that denotes the material or monetary worth of something relative to the price asked for it (from Oxforddictionaries.com)."^^xsd:string ;
+  rdfs:label "Value"^^xsd:string ;
+  rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS7275639> ;
+  rdfs:subClassOf owl:Thing ;
+  owl:equivalentClass <http://data.posccaesar.org/rdl/RDS7945844> ;
+.
 :Decision_Milestone
   rdf:type :MilestoneType ;
   rdfs:label "Decision Milestone"^^xsd:string ;
@@ -833,9 +840,9 @@
 .
 :FreeField
   rdf:type owl:Class ;
-  rdfs:comment "A Data Field that holds variables defined by the User."^^xsd:string ;
+  rdfs:comment "A Data Field defined by the user that holds FreeFieldValues."^^xsd:string ;
   rdfs:label "Free Field"^^xsd:string ;
-  rdfs:subClassOf :Data ;
+  rdfs:subClassOf :DataField ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       :shouldHaveID "true"^^xsd:boolean ;
@@ -854,7 +861,7 @@
   rdf:type owl:Class ;
   rdfs:comment "A Data Field that is a collection of Free Fields."^^xsd:string ;
   rdfs:label "Free Field Set"^^xsd:string ;
-  rdfs:subClassOf :Data ;
+  rdfs:subClassOf :DataField ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
@@ -877,10 +884,9 @@
 :FreeFieldValue
   rdf:type owl:Class ;
   :shouldHaveID "true" ;
-  rdfs:comment "A Data Value that holds Free Field variable values."^^xsd:string ;
+  rdfs:comment "A Data Value for a FreeField variable."^^xsd:string ;
   rdfs:label "Free Field Value"^^xsd:string ;
-  rdfs:subClassOf :Data ;
-  rdfs:subClassOf :Value ;
+  rdfs:subClassOf :DataValue ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
@@ -2281,14 +2287,6 @@ NOTE 2  A Plan for Activity can define a number of part activities which are rel
   rdf:type :ActivityStatus ;
   rdfs:label "Unknown"^^xsd:string ;
 .
-:Value
-  rdf:type owl:Class ;
-  rdfs:comment "A Property that denotes the material or monetary worth of something relative to the price asked for it (from Oxforddictionaries.com)."^^xsd:string ;
-  rdfs:label "Value"^^xsd:string ;
-  rdfs:subClassOf <http://data.posccaesar.org/rdl/RDS7275639> ;
-  rdfs:subClassOf owl:Thing ;
-  owl:equivalentClass <http://data.posccaesar.org/rdl/RDS7945844> ;
-.
 :VeselOperation
   rdf:type :RiskFactor ;
   rdfs:label "Vesel operation"^^xsd:string ;