diff --git a/csv2json/index.html b/csv2json/index.html index b81e4156..a27875d5 100644 --- a/csv2json/index.html +++ b/csv2json/index.html @@ -301,7 +301,7 @@

Row-level processing

"").

  • -

    The value of name SHALL be _col=[N] +

    The value of name SHALL be _col.[N] where [N] is the column number, whilst the value of value SHALL be provided by the associated @@ -377,23 +377,23 @@

    Examples

    "downloadURL": "http://example.org/people-and-points.csv" }, "row": [{ - "_col=1": "1", - "_col=2": "Jill", - "_col=3": "Smith", - "_col=4": "50" + "_col.1": "1", + "_col.2": "Jill", + "_col.3": "Smith", + "_col.4": "50" },{ - "_col=1": "2", - "_col=2": "Eve", - "_col=4": "94" + "_col.1": "2", + "_col.2": "Eve", + "_col.4": "94" },{ - "_col=1": "3", - "_col=2": "Adam", - "_col=3": "Johnson" + "_col.1": "3", + "_col.2": "Adam", + "_col.3": "Johnson" },{ - "_col=1": "4", - "_col=2": "John", - "_col=3": "Doe", - "_col=4": "80" + "_col.1": "4", + "_col.2": "John", + "_col.3": "Doe", + "_col.4": "80" }] } @@ -498,7 +498,7 @@

    Table-level processing

    within the column description object for that column.

    Where the column header is null, the value assigned to name SHALL be - _col=[N] where [N] is the + _col.[N] where [N] is the column number.

  • @@ -998,7 +998,7 @@

    Examples

    "required": true, "unique": true }, { - "name": "on-street", + "name": "on_street", "title": "On Street", "dc:description": "The street that the tree is on.", "datatype": "string" @@ -1008,12 +1008,12 @@

    Examples

    "dc:description": "The species of the tree.", "datatype": "string" }, { - "name": "trim-cycle", + "name": "trim_cycle", "title": "Trim Cycle", "dc:description": "The operation performed on the tree.", "datatype": "string" }, { - "name": "inventory-date", + "name": "inventory_date", "title": "Inventory Date", "dc:description": "The date of the operation that was performed.", "datatype": "date" @@ -1043,24 +1043,24 @@

    Examples

    "row": [{ "url": "http://example.org/tree-ops.csv#gid-1", "GID": "1", - "on-street": "ADDISON AV", + "on_street": "ADDISON AV", "species": "Celtis australis", - "trim-cycle": "Large Tree Routine Prune", - "inventory-date": "10/18/2010" + "trim_cycle": "Large Tree Routine Prune", + "inventory_date": "10/18/2010" },{ "url": "http://example.org/tree-ops.csv#gid-2", "GID": "2", - "on-street": "EMERSON ST", + "on_street": "EMERSON ST", "species": "Liquidambar styraciflua", - "trim-cycle": "Large Tree Routine Prune", - "inventory-date": "6/2/2010" + "trim_cycle": "Large Tree Routine Prune", + "inventory_date": "6/2/2010" },{ "url": "http://example.org/tree-ops.csv#gid-3", "GID": "3", - "on-street": "EMERSON ST", + "on_street": "EMERSON ST", "species": "Liquidambar styraciflua", - "trim-cycle": "Large Tree Routine Prune", - "inventory-date": "6/2/2010" + "trim_cycle": "Large Tree Routine Prune", + "inventory_date": "6/2/2010" }], "describedBy": "http://example.org/tree-ops.csv-metadata.json" } diff --git a/csv2rdf/index.html b/csv2rdf/index.html index 2cfcdb04..7afbd75d 100644 --- a/csv2rdf/index.html +++ b/csv2rdf/index.html @@ -413,7 +413,7 @@

    Row-level processing

  • The cell value SHALL be related to the row resource using a triple with - the predicate [CSV Location]#_col=[N], + the predicate [CSV Location]#_col.[N], where [CSV Location] is the absolute URL of the source CSV file. and [N] is the column number.

    @@ -502,23 +502,23 @@

    Examples

    dcat:downloadURL <http://example.org/people-and-points.csv> ] ; csvw:row [ - :_col=1 "1" ; - :_col=2 "Jill" ; - :_col=3 "Smith" ; - :_col=4 "50" ; + :_col.1 "1" ; + :_col.2 "Jill" ; + :_col.3 "Smith" ; + :_col.4 "50" ; ] , [ - :_col=1 "2" ; - :_col=2 "Eve" ; - :_col=4 "94" ; + :_col.1 "2" ; + :_col.2 "Eve" ; + :_col.4 "94" ; ] , [ - :_col=1 "3" ; - :_col=2 "Adam" ; - :_col=3 "Johnson" ; + :_col.1 "3" ; + :_col.2 "Adam" ; + :_col.3 "Johnson" ; ] , [ - :_col=1 "4" ; - :_col=2 "John" ; - :_col=3 "Doe" ; - :_col=4 "80" ; + :_col.1 "4" ; + :_col.2 "John" ; + :_col.3 "Doe" ; + :_col.4 "80" ; ] ; prov:activity [ a prov:Activity ; @@ -653,7 +653,7 @@

    Table-level processing

    inherited property lang.

    Where the column header is null, the value assigned to name SHALL be - _col=[N] where [N] is the + _col.[N] where [N] is the column number and no value assigned to title.

    • @@ -1312,7 +1312,7 @@

    Examples

    "required": true, "unique": true }, { - "name": "on-street", + "name": "on_street", "title": "On Street", "dc:description": "The street that the tree is on.", "datatype": "string" @@ -1322,12 +1322,12 @@

    Examples

    "dc:description": "The species of the tree.", "datatype": "string" }, { - "name": "trim-cycle", + "name": "trim_cycle", "title": "Trim Cycle", "dc:description": "The operation performed on the tree.", "datatype": "string" }, { - "name": "inventory-date", + "name": "inventory_date", "title": "Inventory Date", "dc:description": "The date of the operation that was performed.", "datatype": "date" @@ -1360,7 +1360,7 @@

    Examples

    rdfs:label "GID" , "GID" , "Generic Identifier" ; dc:description "An identifier for the operation on a tree." . -:on-street a rdf:Property ; +:on_street a rdf:Property ; rdfs:label "On Street" , "On Street" ; dc:description "The street that the tree is on." . @@ -1368,11 +1368,11 @@

    Examples

    rdfs:label "Species" , "Species" ; dc:description "The species of the tree." . -:trim-cycle a rdf:Property ; +:trim_cycle a rdf:Property ; rdfs:label "Trim Cycle" , "Trim Cycle" ; dc:description "The operation performed on the tree." . -:inventory-date a rdf:Property ; +:inventory_date a rdf:Property ; rdfs:label "Inventory Date" , "Inventory Date" ; dc:description "The date of the operation that was performed." . @@ -1410,26 +1410,26 @@

    Examples

    :gid-1 :GID "1"^^xsd:string ; - :on-street "ADDISON AV"^^xsd:string ; + :on_street "ADDISON AV"^^xsd:string ; :species "Celtis australis"^^xsd:string ; - :trim-cycle "Large Tree Routine Prune"^^xsd:string ; - :inventory-date "2010-10-18"^^xsd:date ; + :trim_cycle "Large Tree Routine Prune"^^xsd:string ; + :inventory_date "2010-10-18"^^xsd:date ; . :gid-2 :GID "2"^^xsd:string ; - :on-street "EMERSON ST"^^xsd:string ; + :on_street "EMERSON ST"^^xsd:string ; :species "Liquidambar styraciflua"^^xsd:string ; - :trim-cycle "Large Tree Routine Prune"^^xsd:string ; - :inventory-date "2010-06-02"^^xsd:date ; + :trim_cycle "Large Tree Routine Prune"^^xsd:string ; + :inventory_date "2010-06-02"^^xsd:date ; . :gid-3 :GID "3"^^xsd:string ; - :on-street "EMERSON ST"^^xsd:string ; + :on_street "EMERSON ST"^^xsd:string ; :species "Liquidambar styraciflua"^^xsd:string ; - :trim-cycle "Large Tree Routine Prune"^^xsd:string ; - :inventory-date "2010-06-02"^^xsd:date ; + :trim_cycle "Large Tree Routine Prune"^^xsd:string ; + :inventory_date "2010-06-02"^^xsd:date ; . diff --git a/metadata/index.html b/metadata/index.html index f2ba68f2..2e15558d 100644 --- a/metadata/index.html +++ b/metadata/index.html @@ -154,7 +154,7 @@

    Introduction

    "datatype": "string", "required": true }, { - "name": "on-street", + "name": "on_street", "title": "On Street", "dc:description": "The street that the tree is on.", "datatype": "string" @@ -164,12 +164,12 @@

    Introduction

    "dc:description": "The species of the tree.", "datatype": "string" }, { - "name": "trim-cycle", + "name": "trim_cycle", "title": "Trim Cycle", "dc:description": "The operation performed on the tree.", "datatype": "string" }, { - "name": "inventory-date", + "name": "inventory_date", "title": "Inventory Date", "dc:description": "The date of the operation that was performed.", "datatype": "date", @@ -224,7 +224,7 @@

    Annotating Tables

     {
-  "name": "inventory-date",
+  "name": "inventory_date",
   "title": "Inventory Date",
   "dc:description": "The date of the operation that was performed.",
   "datatype": "date",
@@ -327,16 +327,16 @@ 
    Property Syntax
    
                 
               
               
    column names
    
-              
    a variable is set for each column within the schema; the name of the variable is the percent-encoded name of the column and the value is the canonical representation of the value of the cell in that column in the row that is currently being processed
    
+              
    a variable is set for each column within the schema; the name of the variable is the name of the column and the value is the canonical representation of the value of the cell in that column in the row that is currently being processed
    
             
             
    
               For example, the urlTemplate property holds a URI template that is used to generate a URL identifier for each row, which might look like:
             
    
             
    -"urlTemplate": "http://example.org/example.csv#row={_row}"
+"urlTemplate": "http://example.org/example.csv#row.{_row}"
             
    
             
    
-              The identifiers that are generated for the rows would then look like http://example.org/example.csv#row=1, http://example.org/example.csv#row=2 and so on.
+              The identifiers that are generated for the rows would then look like http://example.org/example.csv#row.1, http://example.org/example.csv#row.2 and so on.
             
    
             
    
               Alternatively, with the CSV and metadata in the , the urlTemplate might look like:
@@ -351,10 +351,10 @@ 
    Property Syntax
    
               Once the URI has been generated, it is resolved against the location of the resource (eg the CSV file) to create an absolute URI. For example, given a urlTemplate within a schema such as:
             
    
             
    -"urlTemplate": "#row={_row}"
+"urlTemplate": "#row.{_row}"
             
    
             
    
-              and given a CSV file at http://example.com/temp.csv, the URL for the first row will be http://example.com/temp.csv#row=1.
+              and given a CSV file at http://example.com/temp.csv, the URL for the first row will be http://example.com/temp.csv#row.1.
             
    
           
           
    column reference properties
    
@@ -1203,10 +1203,10 @@ 
    Optional Properties
    
               
    
                 An atomic property that gives a single canonical name for the column. This MUST be a string. Conversion specifications MUST use this property as the basis for the names of properties/elements/attributes in the results of conversions.
               
    
-              
    The property value of name is that defined within metadata, if it exists. Otherwise, it is the first value from the property value of title having the same language tag as default language or und of not specified, as a string without language, if any. Otherwise, it is the string "_col=[N]" where [N] is the column number.
+              
    The property value of name is that defined within metadata, if it exists. Otherwise, it is the first value from the property value of title having the same language tag as default language or und of not specified percent-encoded as necessary to conform to the syntactic requirements described below, as a string without language, if any. Otherwise, it is the string "_col.[N]" where [N] is the column number.
               
    
               
    
-                For ease of reference within URI template properties, column names SHOULD consist only of alphanumeric characters or underscores ([a-zA-Z0-9_]+). Names beginning with _ are reserved by this specification and MUST NOT be used.
+                For ease of reference within URI template properties, column names MUST consist only of alphanumeric characters, underscores, or "." ([a-zA-Z0-9][a-zA-Z0-9_\.]*). Names beginning with "_" or  "." are reserved by this specification and MUST NOT be used.
               
    
               
    
                 We invite comment on what the syntactic limitations should be on column names to make them most useful when used as the basis of conversion into other formats, bearing in mind that different target languages such as JSON, RDF and XML have different syntactic limitations and common naming conventions.
diff --git a/syntax/index.html b/syntax/index.html
index a37353f4..5196e45d 100644
--- a/syntax/index.html
+++ b/syntax/index.html
@@ -754,7 +754,7 @@ 
    Using Overriding Metadata
    
           	
    
           	
     data.parse({
-  "column-names": ["GID", "on-street", "species", "trim-cycle", "inventory-date"],
+  "column-names": ["GID", "on_street", "species", "trim_cycle", "inventory_date"],
   "datatypes": ["string", "string", "string", "string", "date"],
   "formats": [null,null,null,null,"M/D/YYYY"]
 });
@@ -772,10 +772,10 @@ 
    Using Overriding Metadata
    
 	            
 	            
 	              C1T1C1.1, C2.1GIDGID
-	              C2T2C1.2, C2.2on-streetOn Street
+	              C2T2C1.2, C2.2on_streetOn Street
 	              C3T3C1.3, C2.3speciesSpecies
-	              C4T4C1.4, C2.4trim-cycleTrim Cycle
-	              C5T5C1.5, C2.5inventory-dateInventory Date
+	              C4T4C1.4, C2.4trim_cycleTrim Cycle
+	              C5T5C1.5, C2.5inventory_dateInventory Date
 	            
 	          
           
    After creating embedded metadata and merging with overriding metadata:
    
@@ -786,11 +786,11 @@ 
    Using Overriding Metadata
    
   "tableSchema": {
     "columns": [
       {"name": "GID", "title": "GID", "datatype": "string"},
-      {"name": "on-street", "title": "On Street", "datatype": "string"},
+      {"name": "on_street", "title": "On Street", "datatype": "string"},
       {"name": "species", "title": "Species", "datatype": "string"},
-      {"name": "trim-cycle", "title": "Trim Cycle", "datatype": "string"},
+      {"name": "trim_cycle", "title": "Trim Cycle", "datatype": "string"},
       {
-        "name": "inventory-date",
+        "name": "inventory_date",
         "title": "Inventory Date",
         "datatype": "date",
         "format": "M/D/YYYY"
@@ -849,7 +849,7 @@ 
    Using a Metadata File
    
       "datatype": "string",
       "required": true
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street",
       "dc:description": "The street that the tree is on.",
       "datatype": "string"
@@ -859,12 +859,12 @@ 
    Using a Metadata File
    
       "dc:description": "The species of the tree.",
       "datatype": "string"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle",
       "dc:description": "The operation performed on the tree.",
       "datatype": "string"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "dc:description": "The date of the operation that was performed.",
       "datatype": "date",
@@ -904,10 +904,10 @@ 
    Using a Metadata File
    
 	            
 	            
 	              C1T1C1.1, C2.1GIDGID, Generic IdentifierAn identifier for the operation on a tree.
-	              C2T2C1.2, C2.2on-streetOn StreetThe street that the tree is on.
+	              C2T2C1.2, C2.2on_streetOn StreetThe street that the tree is on.
 	              C3T3C1.3, C2.3speciesSpeciesThe species of the tree.
-	              C4T4C1.4, C2.4trim-cycleTrim CycleThe operation performed on the tree.
-	              C5T5C1.5, C2.5inventory-dateInventory DateThe date of the operation that was performed.
+	              C4T4C1.4, C2.4trim_cycleTrim CycleThe operation performed on the tree.
+	              C5T5C1.5, C2.5inventory_dateInventory DateThe date of the operation that was performed.
 	            
 	          
 	          
    
@@ -976,7 +976,7 @@ 
    Tabular Data Embedding Annotations
    
 	        
     #	publisher	City of Palo Alto
 #	updated	12/31/2010
-#name	GID	on-street	species	trim-cycle	inventory-date
+#name	GID	on_street	species	trim_cycle	inventory_date
 #datatype	string	string	string	string	date:M/D/YYYY
 	GID	On Street	Species	Trim Cycle	Inventory Date
 	1	ADDISON AV	Celtis australis	Large Tree Routine Prune	10/18/2010
@@ -1023,7 +1023,7 @@ 
    Naive Parsing
    
 	            
 	            
 	              C1.1TC1R1"# updated 12/31/2010""# updated 12/31/2010"
-	              C1.1TC1R1"#name	GID	on-street	species	trim-cycle	inventory-date""#name	GID	on-street	species	trim-cycle	inventory-date"
+	              C1.1TC1R1"#name	GID	on_street	species	trim_cycle	inventory_date""#name	GID	on_street	species	trim_cycle	inventory_date"
 	              C2.1TC1R2"#datatype	string	string	string	string	date:M/D/YYYY""#datatype	string	string	string	string	date:M/D/YYYY"
 	              C3.1TC1R3"	GID	On Street	Species	Trim Cycle	Inventory Date""	GID	On Street	Species	Trim Cycle	Inventory Date"
 	              C4.1TC1R4"	1 ADDISON AV	Celtis australis	Large Tree Routine Prune	10/18/2010""	1 ADDISON AV	Celtis australis	Large Tree Routine Prune	10/18/2010"
@@ -1057,7 +1057,7 @@ 
    Parsing with Flags
    
 	          
      
 	            
    1.  publisher	City of Palo Alto
      2. 
 	            
    2.  updated	12/31/2010
      3. 
-	            
    3. name	GID	on-street	species	trim-cycle	inventory-date
      4. 
+	            
    4. name	GID	on_street	species	trim_cycle	inventory_date
      5. 
 	            
    5. datatype	string	string	string	string	date:M/D/YYYY
      6. 
 	          
    
 	        
@@ -1094,10 +1094,10 @@ 
    Recognising Tabular Data Formats
    
 	            
 	            
 	              C1T1C1.1, C2.1GIDGID
-	              C2T2C1.2, C2.2on-streetOn Street
+	              C2T2C1.2, C2.2on_streetOn Street
 	              C3T3C1.3, C2.3speciesSpecies
-	              C4T4C1.4, C2.4trim-cycleTrim Cycle
-	              C5T5C1.5, C2.5inventory-dateInventory Date
+	              C4T4C1.4, C2.4trim_cycleTrim Cycle
+	              C5T5C1.5, C2.5inventory_dateInventory Date
 	            
 	          
 	          
    
diff --git a/tests/test011.csv-metadata.json b/tests/test011.csv-metadata.json
index a8d84832..2d7c66cb 100644
--- a/tests/test011.csv-metadata.json
+++ b/tests/test011.csv-metadata.json
@@ -17,7 +17,7 @@
       "datatype": "string",
       "required": true
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street",
       "dc:description": "The street that the tree is on.",
       "datatype": "string"
@@ -27,12 +27,12 @@
       "dc:description": "The species of the tree.",
       "datatype": "string"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle",
       "dc:description": "The operation performed on the tree.",
       "datatype": "string"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "dc:description": "The date of the operation that was performed.",
       "datatype": "date",
diff --git a/tests/test011.json b/tests/test011.json
index 23cd4bb4..4fedcf0f 100644
--- a/tests/test011.json
+++ b/tests/test011.json
@@ -12,26 +12,26 @@
     {
       "url": "http://w3c.github.io/csvw/tests/test011.csv#gid-1",
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "url": "http://w3c.github.io/csvw/tests/test011.csv#gid-2",
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "url": "http://w3c.github.io/csvw/tests/test011.csv#gid-3",
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test011.ttl b/tests/test011.ttl
index daf7b576..bead8280 100644
--- a/tests/test011.ttl
+++ b/tests/test011.ttl
@@ -11,11 +11,11 @@
    rdfs:label "GID"@en, "Generic Identifier"@en;
    dc:description "An identifier for the operation on a tree."@en .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date"@en;
    dc:description "The date of the operation that was performed."@en .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street"@en;
    dc:description "The street that the tree is on."@en .
 
@@ -23,7 +23,7 @@
    rdfs:label "Species"@en;
    dc:description "The species of the tree."@en .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle"@en;
    dc:description "The operation performed on the tree."@en .
 
@@ -42,19 +42,19 @@
    ] .
 
 :gid-1 :GID "1";
-   :inventory-date "10/18/2010"^^xsd:date;
-   :on-street "ADDISON AV";
+   :inventory_date "10/18/2010"^^xsd:date;
+   :on_street "ADDISON AV";
    :species "Celtis australis";
-   :trim-cycle "Large Tree Routine Prune" .
+   :trim_cycle "Large Tree Routine Prune" .
 
 :gid-2 :GID "2";
-   :inventory-date "6/2/2010"^^xsd:date;
-   :on-street "EMERSON ST";
+   :inventory_date "6/2/2010"^^xsd:date;
+   :on_street "EMERSON ST";
    :species "Liquidambar styraciflua";
-   :trim-cycle "Large Tree Routine Prune" .
+   :trim_cycle "Large Tree Routine Prune" .
 
 :gid-3 :GID "3";
-   :inventory-date "6/2/2010"^^xsd:date;
-   :on-street "EMERSON ST";
+   :inventory_date "6/2/2010"^^xsd:date;
+   :on_street "EMERSON ST";
    :species "Liquidambar styraciflua";
-   :trim-cycle "Large Tree Routine Prune" .
+   :trim_cycle "Large Tree Routine Prune" .
diff --git a/tests/test012/metadata.json b/tests/test012/metadata.json
index 1cd73e62..a2b462bb 100644
--- a/tests/test012/metadata.json
+++ b/tests/test012/metadata.json
@@ -9,16 +9,16 @@
         "Generic Identifier"
       ]
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test012/result.json b/tests/test012/result.json
index a16abc3c..e05f9fbc 100644
--- a/tests/test012/result.json
+++ b/tests/test012/result.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test012/result.ttl b/tests/test012/result.ttl
index 7686d588..14dd61d2 100644
--- a/tests/test012/result.ttl
+++ b/tests/test012/result.ttl
@@ -10,37 +10,37 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test013-user-metadata.json b/tests/test013-user-metadata.json
index a105568a..cdb2d8e1 100644
--- a/tests/test013-user-metadata.json
+++ b/tests/test013-user-metadata.json
@@ -9,16 +9,16 @@
         "Generic Identifier"
       ]
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test013.json b/tests/test013.json
index 3cc41988..960fa1cd 100644
--- a/tests/test013.json
+++ b/tests/test013.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test013.ttl b/tests/test013.ttl
index ce4458e2..316bfb5c 100644
--- a/tests/test013.ttl
+++ b/tests/test013.ttl
@@ -10,37 +10,37 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test014-linked-metadata.json b/tests/test014-linked-metadata.json
index a67f1dad..a779d31d 100644
--- a/tests/test014-linked-metadata.json
+++ b/tests/test014-linked-metadata.json
@@ -9,16 +9,16 @@
         "Generic Identifier"
       ]
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test014.json b/tests/test014.json
index b1458f98..de52415b 100644
--- a/tests/test014.json
+++ b/tests/test014.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test014.ttl b/tests/test014.ttl
index a6bb2f9a..c3eeebf9 100644
--- a/tests/test014.ttl
+++ b/tests/test014.ttl
@@ -10,37 +10,37 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test015/metadata.json b/tests/test015/metadata.json
index 51976af3..fb302d19 100644
--- a/tests/test015/metadata.json
+++ b/tests/test015/metadata.json
@@ -7,16 +7,16 @@
       "name": "GID",
       "title": "Generic Identifier"
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test015/result.json b/tests/test015/result.json
index 14ecae93..7346685e 100644
--- a/tests/test015/result.json
+++ b/tests/test015/result.json
@@ -7,24 +7,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test015/result.ttl b/tests/test015/result.ttl
index 4d741be2..7ce87d54 100644
--- a/tests/test015/result.ttl
+++ b/tests/test015/result.ttl
@@ -10,38 +10,38 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    dc:label "user", "metadata";
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test016/metadata.json b/tests/test016/metadata.json
index 51976af3..fb302d19 100644
--- a/tests/test016/metadata.json
+++ b/tests/test016/metadata.json
@@ -7,16 +7,16 @@
       "name": "GID",
       "title": "Generic Identifier"
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test016/result.json b/tests/test016/result.json
index 3ef12913..bbaa72fc 100644
--- a/tests/test016/result.json
+++ b/tests/test016/result.json
@@ -7,24 +7,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test016/result.ttl b/tests/test016/result.ttl
index b978acee..89318874 100644
--- a/tests/test016/result.ttl
+++ b/tests/test016/result.ttl
@@ -10,38 +10,38 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    dc:label "linked", "metadata";
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test017/metadata.json b/tests/test017/metadata.json
index 51976af3..fb302d19 100644
--- a/tests/test017/metadata.json
+++ b/tests/test017/metadata.json
@@ -7,16 +7,16 @@
       "name": "GID",
       "title": "Generic Identifier"
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test017/result.json b/tests/test017/result.json
index 7fba0e8f..42b600e0 100644
--- a/tests/test017/result.json
+++ b/tests/test017/result.json
@@ -7,24 +7,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test017/result.ttl b/tests/test017/result.ttl
index 1e3b5252..6f32dc7a 100644
--- a/tests/test017/result.ttl
+++ b/tests/test017/result.ttl
@@ -10,38 +10,38 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    dc:label "file", "metadata";
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test018/metadata.json b/tests/test018/metadata.json
index 2464560f..e235b555 100644
--- a/tests/test018/metadata.json
+++ b/tests/test018/metadata.json
@@ -7,16 +7,16 @@
       "name": "GID",
       "title": "Generic Identifier"
     }, {
-      "name": "on-street",
+      "name": "on_street",
       "title": "On Street"
     }, {
       "name": "species",
       "title": "Species"
     }, {
-      "name": "trim-cycle",
+      "name": "trim_cycle",
       "title": "Trim Cycle"
     }, {
-      "name": "inventory-date",
+      "name": "inventory_date",
       "title": "Inventory Date",
       "datatype": "date",
       "format": "M/D/YYYY"
diff --git a/tests/test018/result.json b/tests/test018/result.json
index a26e5b29..7af4cd7c 100644
--- a/tests/test018/result.json
+++ b/tests/test018/result.json
@@ -7,24 +7,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test018/result.ttl b/tests/test018/result.ttl
index a71d3be7..80f7411f 100644
--- a/tests/test018/result.ttl
+++ b/tests/test018/result.ttl
@@ -10,38 +10,38 @@
 :GID a rdf:Property;
    rdfs:label "GID", "Generic Identifier" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
    rdfs:label "Species" .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
 :table a csvw:Table;
    dc:label "user", "linked", "file", "directory";
    csvw:row [
      :GID "1";
-     :on-street "ADDISON AV";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "10/18/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "10/18/2010"^^xsd:date;
    ],  [
      :GID "2";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ],  [
      :GID "3";
-     :on-street "EMERSON ST";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune";
-     :inventory-date "6/2/2010"^^xsd:date;
+     :trim_cycle "Large Tree Routine Prune";
+     :inventory_date "6/2/2010"^^xsd:date;
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test019.json b/tests/test019.json
index 40ebb021..bf9d798a 100644
--- a/tests/test019.json
+++ b/tests/test019.json
@@ -5,32 +5,32 @@
   },
   "row": [
     {
-      "_col=1": "GID",
-      "_col=2": "On Street",
-      "_col=3": "Species",
-      "_col=4": "Trim Cycle",
-      "_col=5": "Inventory Date"
+      "_col.1": "GID",
+      "_col.2": "On Street",
+      "_col.3": "Species",
+      "_col.4": "Trim Cycle",
+      "_col.5": "Inventory Date"
     },
     {
-      "_col=1": "1",
-      "_col=2": "ADDISON AV",
-      "_col=3": "Celtis australis",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "10/18/2010"
+      "_col.1": "1",
+      "_col.2": "ADDISON AV",
+      "_col.3": "Celtis australis",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "10/18/2010"
     },
     {
-      "_col=1": "2",
-      "_col=2": "EMERSON ST",
-      "_col=3": "Liquidambar styraciflua",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "6/2/2010"
+      "_col.1": "2",
+      "_col.2": "EMERSON ST",
+      "_col.3": "Liquidambar styraciflua",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "6/2/2010"
     },
     {
-      "_col=1": "3",
-      "_col=2": "EMERSON ST",
-      "_col=3": "Liquidambar styraciflua",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "6/2/2010"
+      "_col.1": "3",
+      "_col.2": "EMERSON ST",
+      "_col.3": "Liquidambar styraciflua",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test019.ttl b/tests/test019.ttl
index 7bc7fb79..685387a2 100644
--- a/tests/test019.ttl
+++ b/tests/test019.ttl
@@ -6,29 +6,29 @@
 
 :table a csvw:Table;
    csvw:row [
-      "GID";
-      "On Street";
-      "Species";
-      "Trim Cycle";
-      "Inventory Date"
+      "GID";
+      "On Street";
+      "Species";
+      "Trim Cycle";
+      "Inventory Date"
    ],  [
-      "1";
-      "ADDISON AV";
-      "Celtis australis";
-      "Large Tree Routine Prune";
-      "10/18/2010"
+      "1";
+      "ADDISON AV";
+      "Celtis australis";
+      "Large Tree Routine Prune";
+      "10/18/2010"
    ],  [
-      "2";
-      "EMERSON ST";
-      "Liquidambar styraciflua";
-      "Large Tree Routine Prune";
-      "6/2/2010"
+      "2";
+      "EMERSON ST";
+      "Liquidambar styraciflua";
+      "Large Tree Routine Prune";
+      "6/2/2010"
    ],  [
-      "3";
-      "EMERSON ST";
-      "Liquidambar styraciflua";
-      "Large Tree Routine Prune";
-      "6/2/2010"
+      "3";
+      "EMERSON ST";
+      "Liquidambar styraciflua";
+      "Large Tree Routine Prune";
+      "6/2/2010"
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test020.csv-metadata.json b/tests/test020.csv-metadata.json
index 0b8b64e0..6c7a4d19 100644
--- a/tests/test020.csv-metadata.json
+++ b/tests/test020.csv-metadata.json
@@ -5,10 +5,10 @@
   "tableSchema": {
     "columns": [
       {"name": "GID", "title": "GID"},
-      {"name": "on-street", "title": "On Street"},
+      {"name": "on_street", "title": "On Street"},
       {"name": "species", "title": "Species"},
-      {"name": "trim-cycle", "title": "Trim Cycle"},
-      {"name": "inventory-date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
+      {"name": "trim_cycle", "title": "Trim Cycle"},
+      {"name": "inventory_date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
     ]
   }
 }
\ No newline at end of file
diff --git a/tests/test020.json b/tests/test020.json
index a8fe5f71..df8bdb45 100644
--- a/tests/test020.json
+++ b/tests/test020.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1 ",
-      "on-street": "ADDISON AV ",
+      "on_street": "ADDISON AV ",
       "species": "Celtis australis ",
-      "trim-cycle": "Large Tree Routine Prune ",
-      "inventory-date": "10/18/2010 "
+      "trim_cycle": "Large Tree Routine Prune ",
+      "inventory_date": "10/18/2010 "
     },
     {
       "GID": "2 ",
-      "on-street": "EMERSON ST ",
+      "on_street": "EMERSON ST ",
       "species": "Liquidambar styraciflua ",
-      "trim-cycle": "Large Tree Routine Prune ",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune ",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3 ",
-      "on-street": "EMERSON ST ",
+      "on_street": "EMERSON ST ",
       "species": "Liquidambar styraciflua ",
-      "trim-cycle": "Large Tree Routine Prune ",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune ",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test020.ttl b/tests/test020.ttl
index 95749add..b4b821bf 100644
--- a/tests/test020.ttl
+++ b/tests/test020.ttl
@@ -8,10 +8,10 @@
 :GID a rdf:Property;
    rdfs:label "GID" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
@@ -20,27 +20,27 @@
 :table a csvw:Table;
    csvw:row [
      :GID "1 ";
-     :inventory-date "10/18/2010 "^^xsd:date;
-     :on-street "ADDISON AV ";
+     :inventory_date "10/18/2010 "^^xsd:date;
+     :on_street "ADDISON AV ";
      :species "Celtis australis ";
-     :trim-cycle "Large Tree Routine Prune "
+     :trim_cycle "Large Tree Routine Prune "
    ],  [
      :GID "2 ";
-     :inventory-date "6/2/2010"^^xsd:date;
-     :on-street "EMERSON ST ";
+     :inventory_date "6/2/2010"^^xsd:date;
+     :on_street "EMERSON ST ";
      :species "Liquidambar styraciflua ";
-     :trim-cycle "Large Tree Routine Prune "
+     :trim_cycle "Large Tree Routine Prune "
    ],  [
      :GID "3 ";
-     :inventory-date "6/2/2010"^^xsd:date;
-     :on-street "EMERSON ST ";
+     :inventory_date "6/2/2010"^^xsd:date;
+     :on_street "EMERSON ST ";
      :species "Liquidambar styraciflua ";
-     :trim-cycle "Large Tree Routine Prune "
+     :trim_cycle "Large Tree Routine Prune "
    ];
    dcat:distribution [
      a dcat:Distribution;
      dcat:downloadURL 
    ] .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
diff --git a/tests/test021.csv-metadata.json b/tests/test021.csv-metadata.json
index 62b6788a..4ac08032 100644
--- a/tests/test021.csv-metadata.json
+++ b/tests/test021.csv-metadata.json
@@ -5,10 +5,10 @@
   "tableSchema": {
     "columns": [
       {"name": "GID", "title": "GID"},
-      {"name": "on-street", "title": "On Street"},
+      {"name": "on_street", "title": "On Street"},
       {"name": "species", "title": "Species"},
-      {"name": "trim-cycle", "title": "Trim Cycle"},
-      {"name": "inventory-date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
+      {"name": "trim_cycle", "title": "Trim Cycle"},
+      {"name": "inventory_date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
     ]
   }
 }
\ No newline at end of file
diff --git a/tests/test021.json b/tests/test021.json
index 57aec960..d1cf95ff 100644
--- a/tests/test021.json
+++ b/tests/test021.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": " 1",
-      "on-street": " ADDISON AV",
+      "on_street": " ADDISON AV",
       "species": " Celtis australis",
-      "trim-cycle": " Large Tree Routine Prune",
-      "inventory-date": " 10/18/2010"
+      "trim_cycle": " Large Tree Routine Prune",
+      "inventory_date": " 10/18/2010"
     },
     {
       "GID": " 2",
-      "on-street": " EMERSON ST",
+      "on_street": " EMERSON ST",
       "species": " Liquidambar styraciflua",
-      "trim-cycle": " Large Tree Routine Prune",
-      "inventory-date": " 6/2/2010"
+      "trim_cycle": " Large Tree Routine Prune",
+      "inventory_date": " 6/2/2010"
     },
     {
       "GID": " 3",
-      "on-street": " EMERSON ST",
+      "on_street": " EMERSON ST",
       "species": " Liquidambar styraciflua",
-      "trim-cycle": " Large Tree Routine Prune",
-      "inventory-date": " 6/2/2010"
+      "trim_cycle": " Large Tree Routine Prune",
+      "inventory_date": " 6/2/2010"
     }
   ]
 }
diff --git a/tests/test021.ttl b/tests/test021.ttl
index 52e5ee69..632024cb 100644
--- a/tests/test021.ttl
+++ b/tests/test021.ttl
@@ -8,10 +8,10 @@
 :GID a rdf:Property;
    rdfs:label "GID" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
@@ -20,27 +20,27 @@
 :table a csvw:Table;
    csvw:row [
      :GID " 1";
-     :inventory-date " 10/18/2010"^^xsd:date;
-     :on-street " ADDISON AV";
+     :inventory_date " 10/18/2010"^^xsd:date;
+     :on_street " ADDISON AV";
      :species " Celtis australis";
-     :trim-cycle " Large Tree Routine Prune"
+     :trim_cycle " Large Tree Routine Prune"
    ],  [
      :GID " 2";
-     :inventory-date " 6/2/2010"^^xsd:date;
-     :on-street " EMERSON ST";
+     :inventory_date " 6/2/2010"^^xsd:date;
+     :on_street " EMERSON ST";
      :species " Liquidambar styraciflua";
-     :trim-cycle " Large Tree Routine Prune"
+     :trim_cycle " Large Tree Routine Prune"
    ],  [
      :GID " 3";
-     :inventory-date " 6/2/2010"^^xsd:date;
-     :on-street " EMERSON ST";
+     :inventory_date " 6/2/2010"^^xsd:date;
+     :on_street " EMERSON ST";
      :species " Liquidambar styraciflua";
-     :trim-cycle " Large Tree Routine Prune"
+     :trim_cycle " Large Tree Routine Prune"
    ];
    dcat:distribution [
      a dcat:Distribution;
      dcat:downloadURL 
    ] .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
diff --git a/tests/test022.csv-metadata.json b/tests/test022.csv-metadata.json
index 8ef03969..df871345 100644
--- a/tests/test022.csv-metadata.json
+++ b/tests/test022.csv-metadata.json
@@ -5,10 +5,10 @@
   "tableSchema": {
     "columns": [
       {"name": "GID", "title": "GID"},
-      {"name": "on-street", "title": "On Street"},
+      {"name": "on_street", "title": "On Street"},
       {"name": "species", "title": "Species"},
-      {"name": "trim-cycle", "title": "Trim Cycle"},
-      {"name": "inventory-date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
+      {"name": "trim_cycle", "title": "Trim Cycle"},
+      {"name": "inventory_date", "title": "Inventory Date", "datatype": "date","format": "M/D/YYYY"}
     ]
   }
 }
\ No newline at end of file
diff --git a/tests/test022.json b/tests/test022.json
index ebcc32f4..cc821d49 100644
--- a/tests/test022.json
+++ b/tests/test022.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test022.ttl b/tests/test022.ttl
index 797c828d..f03ece5d 100644
--- a/tests/test022.ttl
+++ b/tests/test022.ttl
@@ -8,10 +8,10 @@
 :GID a rdf:Property;
    rdfs:label "GID" .
 
-:inventory-date a rdf:Property;
+:inventory_date a rdf:Property;
    rdfs:label "Inventory Date" .
 
-:on-street a rdf:Property;
+:on_street a rdf:Property;
    rdfs:label "On Street" .
 
 :species a rdf:Property;
@@ -20,27 +20,27 @@
 :table a csvw:Table;
    csvw:row [
      :GID "1";
-     :inventory-date "10/18/2010"^^xsd:date;
-     :on-street "ADDISON AV";
+     :inventory_date "10/18/2010"^^xsd:date;
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ],  [
      :GID "2";
-     :inventory-date "6/2/2010"^^xsd:date;
-     :on-street "EMERSON ST";
+     :inventory_date "6/2/2010"^^xsd:date;
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ],  [
      :GID "3";
-     :inventory-date "6/2/2010"^^xsd:date;
-     :on-street "EMERSON ST";
+     :inventory_date "6/2/2010"^^xsd:date;
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ];
    dcat:distribution [
      a dcat:Distribution;
      dcat:downloadURL 
    ] .
 
-:trim-cycle a rdf:Property;
+:trim_cycle a rdf:Property;
    rdfs:label "Trim Cycle" .
diff --git a/tests/test023.json b/tests/test023.json
index 9219388a..2755b55d 100644
--- a/tests/test023.json
+++ b/tests/test023.json
@@ -5,32 +5,32 @@
   },
   "row": [
     {
-      "_col=1": "GID",
-      "_col=2": "On Street",
-      "_col=3": "Species",
-      "_col=4": "Trim Cycle",
-      "_col=5": "Inventory Date"
+      "_col.1": "GID",
+      "_col.2": "On Street",
+      "_col.3": "Species",
+      "_col.4": "Trim Cycle",
+      "_col.5": "Inventory Date"
     },
     {
-      "_col=1": "1",
-      "_col=2": "ADDISON AV",
-      "_col=3": "Celtis australis",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "10/18/2010"
+      "_col.1": "1",
+      "_col.2": "ADDISON AV",
+      "_col.3": "Celtis australis",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "10/18/2010"
     },
     {
-      "_col=1": "2",
-      "_col=2": "EMERSON ST",
-      "_col=3": "Liquidambar styraciflua",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "6/2/2010"
+      "_col.1": "2",
+      "_col.2": "EMERSON ST",
+      "_col.3": "Liquidambar styraciflua",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "6/2/2010"
     },
     {
-      "_col=1": "3",
-      "_col=2": "EMERSON ST",
-      "_col=3": "Liquidambar styraciflua",
-      "_col=4": "Large Tree Routine Prune",
-      "_col=5": "6/2/2010"
+      "_col.1": "3",
+      "_col.2": "EMERSON ST",
+      "_col.3": "Liquidambar styraciflua",
+      "_col.4": "Large Tree Routine Prune",
+      "_col.5": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test023.ttl b/tests/test023.ttl
index 0769211c..c5fdb9c9 100644
--- a/tests/test023.ttl
+++ b/tests/test023.ttl
@@ -6,29 +6,29 @@
 
 :table a csvw:Table;
    csvw:row [
-      "GID";
-      "On Street";
-      "Species";
-      "Trim Cycle";
-      "Inventory Date"
+      "GID";
+      "On Street";
+      "Species";
+      "Trim Cycle";
+      "Inventory Date"
    ],  [
-      "1";
-      "ADDISON AV";
-      "Celtis australis";
-      "Large Tree Routine Prune";
-      "10/18/2010"
+      "1";
+      "ADDISON AV";
+      "Celtis australis";
+      "Large Tree Routine Prune";
+      "10/18/2010"
    ],  [
-      "2";
-      "EMERSON ST";
-      "Liquidambar styraciflua";
-      "Large Tree Routine Prune";
-      "6/2/2010"
+      "2";
+      "EMERSON ST";
+      "Liquidambar styraciflua";
+      "Large Tree Routine Prune";
+      "6/2/2010"
    ],  [
-      "3";
-      "EMERSON ST";
-      "Liquidambar styraciflua";
-      "Large Tree Routine Prune";
-      "6/2/2010"
+      "3";
+      "EMERSON ST";
+      "Liquidambar styraciflua";
+      "Large Tree Routine Prune";
+      "6/2/2010"
    ];
    dcat:distribution [
      a dcat:Distribution;
diff --git a/tests/test025-user-metadata.json b/tests/test025-user-metadata.json
index f05c780a..a6dfb4d0 100644
--- a/tests/test025-user-metadata.json
+++ b/tests/test025-user-metadata.json
@@ -5,10 +5,10 @@
   "tableSchema": {
     "columns": [
       {"name": "GID"},
-      {"name": "on-street"},
+      {"name": "on_street"},
       {"name": "species"},
-      {"name": "trim-cycle"},
-      {"name": "inventory-date"}
+      {"name": "trim_cycle"},
+      {"name": "inventory_date"}
     ]
   }
 }
\ No newline at end of file
diff --git a/tests/test025.json b/tests/test025.json
index 519b668e..48eb6fdc 100644
--- a/tests/test025.json
+++ b/tests/test025.json
@@ -6,24 +6,24 @@
   "row": [
     {
       "GID": "1",
-      "on-street": "ADDISON AV",
+      "on_street": "ADDISON AV",
       "species": "Celtis australis",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "10/18/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "10/18/2010"
     },
     {
       "GID": "2",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     },
     {
       "GID": "3",
-      "on-street": "EMERSON ST",
+      "on_street": "EMERSON ST",
       "species": "Liquidambar styraciflua",
-      "trim-cycle": "Large Tree Routine Prune",
-      "inventory-date": "6/2/2010"
+      "trim_cycle": "Large Tree Routine Prune",
+      "inventory_date": "6/2/2010"
     }
   ]
 }
diff --git a/tests/test025.ttl b/tests/test025.ttl
index cfdeb167..bf2989cb 100644
--- a/tests/test025.ttl
+++ b/tests/test025.ttl
@@ -6,35 +6,35 @@
 
 :GID a rdf:Property .
 
-:inventory-date a rdf:Property .
+:inventory_date a rdf:Property .
 
-:on-street a rdf:Property .
+:on_street a rdf:Property .
 
 :species a rdf:Property .
 
 :table a csvw:Table;
    csvw:row [
      :GID "1";
-     :inventory-date "10/18/2010";
-     :on-street "ADDISON AV";
+     :inventory_date "10/18/2010";
+     :on_street "ADDISON AV";
      :species "Celtis australis";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ],  [
      :GID "2";
-     :inventory-date "6/2/2010";
-     :on-street "EMERSON ST";
+     :inventory_date "6/2/2010";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ],  [
      :GID "3";
-     :inventory-date "6/2/2010";
-     :on-street "EMERSON ST";
+     :inventory_date "6/2/2010";
+     :on_street "EMERSON ST";
      :species "Liquidambar styraciflua";
-     :trim-cycle "Large Tree Routine Prune"
+     :trim_cycle "Large Tree Routine Prune"
    ];
    dcat:distribution [
      a dcat:Distribution;
      dcat:downloadURL 
    ] .
 
-:trim-cycle a rdf:Property .
+:trim_cycle a rdf:Property .