Change TestTurtle... to TestTrig...
authorAndy Seaborne <andy.seaborne@epimorphics.com>
Fri, 14 Jun 2013 17:22:07 +0100
changeset 842 b42a637ab9e6
parent 841 8ecea2fa54f6
child 843 89b1696d5a21
Change TestTurtle... to TestTrig...
trig/tests/manifest.ttl
--- a/trig/tests/manifest.ttl	Thu Jun 13 17:17:41 2013 -0700
+++ b/trig/tests/manifest.ttl	Fri Jun 14 17:22:07 2013 +0100
@@ -324,7 +324,7 @@
     ) .
 
 # TriG tests
-<#anonymous_blank_node_graph> rdf:type rdft:TestTurtleEval ;
+<#anonymous_blank_node_graph> rdf:type rdft:TestTrigEval ;
    mf:name      "anonymous_blank_node_graph" ;
    rdfs:comment "anonymous blank node graph" ;
    rdft:approval rdft:Proposed ;
@@ -332,14 +332,14 @@
    mf:result    <labeled_blank_node_graph.nq> ;
    .
 
-<#labeled_blank_node_graph> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_graph> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_graph" ;
    rdfs:comment "labeled blank node graph" ;
    rdft:approval rdft:Proposed ;
    mf:action    <labeled_blank_node_graph.trig> ;
    mf:result    <labeled_blank_node_graph.nq> ;
    .
-<#alternating_iri_graphs> rdf:type rdft:TestTurtleEval ;
+<#alternating_iri_graphs> rdf:type rdft:TestTrigEval ;
    mf:name      "alternating_iri_graphs" ;
    rdfs:comment "alternating graphs with IRI names" ;
    rdft:approval rdft:Proposed ;
@@ -347,7 +347,7 @@
    mf:result    <alternating_iri_graphs.nq> ;
    .
 
-<#alternating_bnode_graphs> rdf:type rdft:TestTurtleEval ;
+<#alternating_bnode_graphs> rdf:type rdft:TestTrigEval ;
    mf:name      "alternating_bnode_graphs" ;
    rdfs:comment "alternating graphs with BNode names" ;
    rdft:approval rdft:Proposed ;
@@ -355,28 +355,28 @@
    mf:result    <alternating_bnode_graphs.nq> ;
    .
 
-<#trig-syntax-bad-base-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-base-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-04" ;
    rdfs:comment "@base inside graph (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-04.trig> ;
    .
 
-<#trig-syntax-bad-base-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-base-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-05" ;
    rdfs:comment "BASE inside graph (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-05.trig> ;
    .
 
-<#trig-syntax-bad-prefix-06> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-06> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-06" ;
    rdfs:comment "@prefix inside graph (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-06.trig> ;
    .
 
-<#trig-syntax-bad-prefix-07> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-07> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-07" ;
    rdfs:comment "PREFIX inside graph (negative test)" ;
    rdft:approval rdft:Proposed ;
@@ -385,7 +385,7 @@
 
 # Original Turtle tests
 # atomic tests
-<#IRI_subject> rdf:type rdft:TestTurtleEval ;
+<#IRI_subject> rdf:type rdft:TestTrigEval ;
    mf:name      "IRI_subject" ;
    rdfs:comment "IRI subject" ;
    rdft:approval rdft:Proposed ;
@@ -393,7 +393,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#IRI_with_four_digit_numeric_escape> rdf:type rdft:TestTurtleEval ;
+<#IRI_with_four_digit_numeric_escape> rdf:type rdft:TestTrigEval ;
    mf:name      "IRI_with_four_digit_numeric_escape" ;
    rdfs:comment "IRI with four digit numeric escape (\\u)" ;
    rdft:approval rdft:Proposed ;
@@ -401,7 +401,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#IRI_with_eight_digit_numeric_escape> rdf:type rdft:TestTurtleEval ;
+<#IRI_with_eight_digit_numeric_escape> rdf:type rdft:TestTrigEval ;
    mf:name      "IRI_with_eight_digit_numeric_escape" ;
    rdfs:comment "IRI with eight digit numeric escape (\\U)" ;
    rdft:approval rdft:Proposed ;
@@ -409,7 +409,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#IRI_with_all_punctuation> rdf:type rdft:TestTurtleEval ;
+<#IRI_with_all_punctuation> rdf:type rdft:TestTrigEval ;
    mf:name      "IRI_with_all_punctuation" ;
    rdfs:comment "IRI with all punctuation" ;
    rdft:approval rdft:Proposed ;
@@ -417,7 +417,7 @@
    mf:result    <IRI_with_all_punctuation.nq> ;
    .
 
-<#bareword_a_predicate> rdf:type rdft:TestTurtleEval ;
+<#bareword_a_predicate> rdf:type rdft:TestTrigEval ;
    mf:name      "bareword_a_predicate" ;
    rdfs:comment "bareword a predicate" ;
    rdft:approval rdft:Proposed ;
@@ -425,7 +425,7 @@
    mf:result    <bareword_a_predicate.nq> ;
    .
 
-<#old_style_prefix> rdf:type rdft:TestTurtleEval ;
+<#old_style_prefix> rdf:type rdft:TestTrigEval ;
    mf:name      "old_style_prefix" ;
    rdfs:comment "old-style prefix" ;
    rdft:approval rdft:Proposed ;
@@ -433,7 +433,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#SPARQL_style_prefix> rdf:type rdft:TestTurtleEval ;
+<#SPARQL_style_prefix> rdf:type rdft:TestTrigEval ;
    mf:name      "SPARQL_style_prefix" ;
    rdfs:comment "SPARQL-style prefix" ;
    rdft:approval rdft:Proposed ;
@@ -441,7 +441,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefixed_IRI_predicate> rdf:type rdft:TestTurtleEval ;
+<#prefixed_IRI_predicate> rdf:type rdft:TestTrigEval ;
    mf:name      "prefixed_IRI_predicate" ;
    rdfs:comment "prefixed IRI predicate" ;
    rdft:approval rdft:Proposed ;
@@ -449,7 +449,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefixed_IRI_object> rdf:type rdft:TestTurtleEval ;
+<#prefixed_IRI_object> rdf:type rdft:TestTrigEval ;
    mf:name      "prefixed_IRI_object" ;
    rdfs:comment "prefixed IRI object" ;
    rdft:approval rdft:Proposed ;
@@ -457,7 +457,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefix_only_IRI> rdf:type rdft:TestTurtleEval ;
+<#prefix_only_IRI> rdf:type rdft:TestTrigEval ;
    mf:name      "prefix_only_IRI" ;
    rdfs:comment "prefix-only IRI (p:)" ;
    rdft:approval rdft:Proposed ;
@@ -465,7 +465,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefix_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#prefix_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "prefix_with_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "prefix with PN CHARS BASE character boundaries (prefix: AZazÀÖØöø...:)" ;
    rdft:approval rdft:Proposed ;
@@ -473,7 +473,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefix_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
+<#prefix_with_non_leading_extras> rdf:type rdft:TestTrigEval ;
    mf:name      "prefix_with_non_leading_extras" ;
    rdfs:comment "prefix with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
    rdft:approval rdft:Proposed ;
@@ -481,7 +481,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with assigned, NFC-normalized, basic-multilingual-plane PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
    rdft:approval rdft:Proposed ;
@@ -489,7 +489,7 @@
    mf:result    <localName_with_assigned_nfc_bmp_PN_CHARS_BASE_character_boundaries.nq> ;
    .
 
-<#localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with assigned, NFC-normalized PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
    rdft:approval rdft:Proposed ;
@@ -497,7 +497,7 @@
    mf:result    <localName_with_assigned_nfc_PN_CHARS_BASE_character_boundaries.nq> ;
    .
 
-<#localName_with_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#localName_with_nfc_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_nfc_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with nfc-normalize PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
    rdft:approval rdft:Proposed ;
@@ -505,7 +505,7 @@
    mf:result    <localName_with_nfc_PN_CHARS_BASE_character_boundaries.nq> ;
    .
 
-<#localName_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#localName_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "localName with PN CHARS BASE character boundaries (p:AZazÀÖØöø...)" ;
    rdft:approval rdft:Rejected ;
@@ -513,7 +513,7 @@
    mf:result    <localName_with_PN_CHARS_BASE_character_boundaries.nq> ;
    .
 
-<#default_namespace_IRI> rdf:type rdft:TestTurtleEval ;
+<#default_namespace_IRI> rdf:type rdft:TestTrigEval ;
    mf:name      "default_namespace_IRI" ;
    rdfs:comment "default namespace IRI (:ln)" ;
    rdft:approval rdft:Proposed ;
@@ -521,7 +521,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#prefix_reassigned_and_used> rdf:type rdft:TestTurtleEval ;
+<#prefix_reassigned_and_used> rdf:type rdft:TestTrigEval ;
    mf:name      "prefix_reassigned_and_used" ;
    rdfs:comment "prefix reassigned and used" ;
    rdft:approval rdft:Proposed ;
@@ -529,7 +529,7 @@
    mf:result    <prefix_reassigned_and_used.nq> ;
    .
 
-<#reserved_escaped_localName> rdf:type rdft:TestTurtleEval ;
+<#reserved_escaped_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "reserved_escaped_localName" ;
    rdfs:comment "reserved-escaped local name" ;
    rdft:approval rdft:Proposed ;
@@ -537,7 +537,7 @@
    mf:result    <reserved_escaped_localName.nq> ;
    .
 
-<#percent_escaped_localName> rdf:type rdft:TestTurtleEval ;
+<#percent_escaped_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "percent_escaped_localName" ;
    rdfs:comment "percent-escaped local name" ;
    rdft:approval rdft:Proposed ;
@@ -545,7 +545,7 @@
    mf:result    <percent_escaped_localName.nq> ;
    .
 
-<#HYPHEN_MINUS_in_localName> rdf:type rdft:TestTurtleEval ;
+<#HYPHEN_MINUS_in_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "HYPHEN_MINUS_in_localName" ;
    rdfs:comment "HYPHEN-MINUS in local name" ;
    rdft:approval rdft:Proposed ;
@@ -553,7 +553,7 @@
    mf:result    <HYPHEN_MINUS_in_localName.nq> ;
    .
 
-<#underscore_in_localName> rdf:type rdft:TestTurtleEval ;
+<#underscore_in_localName> rdf:type rdft:TestTrigEval ;
    mf:name      "underscore_in_localName" ;
    rdfs:comment "underscore in local name" ;
    rdft:approval rdft:Proposed ;
@@ -561,7 +561,7 @@
    mf:result    <underscore_in_localName.nq> ;
    .
 
-<#localname_with_COLON> rdf:type rdft:TestTurtleEval ;
+<#localname_with_COLON> rdf:type rdft:TestTrigEval ;
    mf:name      "localname_with_COLON" ;
    rdfs:comment "localname with COLON" ;
    rdft:approval rdft:Proposed ;
@@ -569,7 +569,7 @@
    mf:result    <localname_with_COLON.nq> ;
    .
 
-<#localName_with_leading_underscore> rdf:type rdft:TestTurtleEval ;
+<#localName_with_leading_underscore> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_leading_underscore" ;
    rdfs:comment "localName with leading underscore (p:_)" ;
    rdft:approval rdft:Proposed ;
@@ -577,7 +577,7 @@
    mf:result    <localName_with_leading_underscore.nq> ;
    .
 
-<#localName_with_leading_digit> rdf:type rdft:TestTurtleEval ;
+<#localName_with_leading_digit> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_leading_digit" ;
    rdfs:comment "localName with leading digit (p:_)" ;
    rdft:approval rdft:Proposed ;
@@ -585,7 +585,7 @@
    mf:result    <localName_with_leading_digit.nq> ;
    .
 
-<#localName_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
+<#localName_with_non_leading_extras> rdf:type rdft:TestTrigEval ;
    mf:name      "localName_with_non_leading_extras" ;
    rdfs:comment "localName with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
    rdft:approval rdft:Proposed ;
@@ -593,7 +593,7 @@
    mf:result    <localName_with_non_leading_extras.nq> ;
    .
 
-<#old_style_base> rdf:type rdft:TestTurtleEval ;
+<#old_style_base> rdf:type rdft:TestTrigEval ;
    mf:name      "old_style_base" ;
    rdfs:comment "old-style base" ;
    rdft:approval rdft:Proposed ;
@@ -601,7 +601,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#SPARQL_style_base> rdf:type rdft:TestTurtleEval ;
+<#SPARQL_style_base> rdf:type rdft:TestTrigEval ;
    mf:name      "SPARQL_style_base" ;
    rdfs:comment "SPARQL-style base" ;
    rdft:approval rdft:Proposed ;
@@ -609,7 +609,7 @@
    mf:result    <IRI_spo.nq> ;
    .
 
-<#labeled_blank_node_subject> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_subject> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_subject" ;
    rdfs:comment "labeled blank node subject" ;
    rdft:approval rdft:Proposed ;
@@ -617,7 +617,7 @@
    mf:result    <labeled_blank_node_subject.nq> ;
    .
 
-<#labeled_blank_node_object> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_object> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_object" ;
    rdfs:comment "labeled blank node object" ;
    rdft:approval rdft:Proposed ;
@@ -625,7 +625,7 @@
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
-<#labeled_blank_node_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_with_PN_CHARS_BASE_character_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_with_PN_CHARS_BASE_character_boundaries" ;
    rdfs:comment "labeled blank node with PN_CHARS_BASE character boundaries (_:AZazÀÖØöø...)" ;
    rdft:approval rdft:Proposed ;
@@ -633,7 +633,7 @@
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
-<#labeled_blank_node_with_leading_underscore> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_with_leading_underscore> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_with_leading_underscore" ;
    rdfs:comment "labeled blank node with_leading_underscore (_:_)" ;
    rdft:approval rdft:Proposed ;
@@ -641,7 +641,7 @@
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
-<#labeled_blank_node_with_leading_digit> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_with_leading_digit> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_with_leading_digit" ;
    rdfs:comment "labeled blank node with_leading_digit (_:0)" ;
    rdft:approval rdft:Proposed ;
@@ -649,7 +649,7 @@
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
-<#labeled_blank_node_with_non_leading_extras> rdf:type rdft:TestTurtleEval ;
+<#labeled_blank_node_with_non_leading_extras> rdf:type rdft:TestTrigEval ;
    mf:name      "labeled_blank_node_with_non_leading_extras" ;
    rdfs:comment "labeled blank node with_non_leading_extras (_:a·̀ͯ‿.⁀)" ;
    rdft:approval rdft:Proposed ;
@@ -657,7 +657,7 @@
    mf:result    <labeled_blank_node_object.nq> ;
    .
 
-<#anonymous_blank_node_subject> rdf:type rdft:TestTurtleEval ;
+<#anonymous_blank_node_subject> rdf:type rdft:TestTrigEval ;
    mf:name      "anonymous_blank_node_subject" ;
    rdfs:comment "anonymous blank node subject" ;
    rdft:approval rdft:Proposed ;
@@ -665,7 +665,7 @@
    mf:result    <anonymous_blank_node_subject.nq> ;
    .
 
-<#anonymous_blank_node_object> rdf:type rdft:TestTurtleEval ;
+<#anonymous_blank_node_object> rdf:type rdft:TestTrigEval ;
    mf:name      "anonymous_blank_node_object" ;
    rdfs:comment "anonymous blank node object" ;
    rdft:approval rdft:Proposed ;
@@ -673,7 +673,7 @@
    mf:result    <anonymous_blank_node_object.nq> ;
    .
 
-<#sole_blankNodePropertyList> rdf:type rdft:TestTurtleEval ;
+<#sole_blankNodePropertyList> rdf:type rdft:TestTrigEval ;
    mf:name      "sole_blankNodePropertyList" ;
    rdfs:comment "sole blankNodePropertyList [ <p> <o> ] ." ;
    rdft:approval rdft:Proposed ;
@@ -681,7 +681,7 @@
    mf:result    <anonymous_blank_node_subject.nq> ;
    .
 
-<#blankNodePropertyList_as_subject> rdf:type rdft:TestTurtleEval ;
+<#blankNodePropertyList_as_subject> rdf:type rdft:TestTrigEval ;
    mf:name      "blankNodePropertyList_as_subject" ;
    rdfs:comment "blankNodePropertyList as subject [ … ] <p> <o> ." ;
    rdft:approval rdft:Proposed ;
@@ -689,7 +689,7 @@
    mf:result    <blankNodePropertyList_as_subject.nq> ;
    .
 
-<#blankNodePropertyList_as_object> rdf:type rdft:TestTurtleEval ;
+<#blankNodePropertyList_as_object> rdf:type rdft:TestTrigEval ;
    mf:name      "blankNodePropertyList_as_object" ;
    rdfs:comment "blankNodePropertyList as object <s> <p> [ … ] ." ;
    rdft:approval rdft:Proposed ;
@@ -697,7 +697,7 @@
    mf:result    <blankNodePropertyList_as_object.nq> ;
    .
 
-<#blankNodePropertyList_with_multiple_triples> rdf:type rdft:TestTurtleEval ;
+<#blankNodePropertyList_with_multiple_triples> rdf:type rdft:TestTrigEval ;
    mf:name      "blankNodePropertyList_with_multiple_triples" ;
    rdfs:comment "blankNodePropertyList with multiple triples [ <s> <p> ; <s2> <p2> ]" ;
    rdft:approval rdft:Proposed ;
@@ -705,7 +705,7 @@
    mf:result    <blankNodePropertyList_with_multiple_triples.nq> ;
    .
 
-<#nested_blankNodePropertyLists> rdf:type rdft:TestTurtleEval ;
+<#nested_blankNodePropertyLists> rdf:type rdft:TestTrigEval ;
    mf:name      "nested_blankNodePropertyLists" ;
    rdfs:comment "nested blankNodePropertyLists [ <p1> [ <p2> <o2> ] ; <p3> <o3> ]" ;
    rdft:approval rdft:Proposed ;
@@ -713,7 +713,7 @@
    mf:result    <nested_blankNodePropertyLists.nq> ;
    .
 
-<#blankNodePropertyList_containing_collection> rdf:type rdft:TestTurtleEval ;
+<#blankNodePropertyList_containing_collection> rdf:type rdft:TestTrigEval ;
    mf:name      "blankNodePropertyList_containing_collection" ;
    rdfs:comment "blankNodePropertyList containing collection [ <p1> ( … ) ]" ;
    rdft:approval rdft:Proposed ;
@@ -721,7 +721,7 @@
    mf:result    <blankNodePropertyList_containing_collection.nq> ;
    .
 
-<#collection_subject> rdf:type rdft:TestTurtleEval ;
+<#collection_subject> rdf:type rdft:TestTrigEval ;
    mf:name      "collection_subject" ;
    rdfs:comment "collection subject" ;
    rdft:approval rdft:Proposed ;
@@ -729,7 +729,7 @@
    mf:result    <collection_subject.nq> ;
    .
 
-<#collection_object> rdf:type rdft:TestTurtleEval ;
+<#collection_object> rdf:type rdft:TestTrigEval ;
    mf:name      "collection_object" ;
    rdfs:comment "collection object" ;
    rdft:approval rdft:Proposed ;
@@ -737,7 +737,7 @@
    mf:result    <collection_object.nq> ;
    .
 
-<#empty_collection> rdf:type rdft:TestTurtleEval ;
+<#empty_collection> rdf:type rdft:TestTrigEval ;
    mf:name      "empty_collection" ;
    rdfs:comment "empty collection ()" ;
    rdft:approval rdft:Proposed ;
@@ -745,7 +745,7 @@
    mf:result    <empty_collection.nq> ;
    .
 
-<#nested_collection> rdf:type rdft:TestTurtleEval ;
+<#nested_collection> rdf:type rdft:TestTrigEval ;
    mf:name      "nested_collection" ;
    rdfs:comment "nested collection (())" ;
    rdft:approval rdft:Proposed ;
@@ -753,7 +753,7 @@
    mf:result    <nested_collection.nq> ;
    .
 
-<#first> rdf:type rdft:TestTurtleEval ;
+<#first> rdf:type rdft:TestTrigEval ;
    mf:name      "first" ;
    rdfs:comment "first, not last, non-empty nested collection" ;
    rdft:approval rdft:Proposed ;
@@ -761,7 +761,7 @@
    mf:result    <first.nq> ;
    .
 
-<#last> rdf:type rdft:TestTurtleEval ;
+<#last> rdf:type rdft:TestTrigEval ;
    mf:name      "last" ;
    rdfs:comment "last, not first, non-empty nested collection" ;
    rdft:approval rdft:Proposed ;
@@ -769,7 +769,7 @@
    mf:result    <last.nq> ;
    .
 
-<#LITERAL1> rdf:type rdft:TestTurtleEval ;
+<#LITERAL1> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL1" ;
    rdfs:comment "LITERAL1 'x'" ;
    rdft:approval rdft:Proposed ;
@@ -777,7 +777,7 @@
    mf:result    <LITERAL1.nq> ;
    .
 
-<#LITERAL1_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL1_ascii_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL1_ascii_boundaries" ;
    rdfs:comment "LITERAL1_ascii_boundaries '\\x00\\x09\\x0b\\x0c\\x0e\\x26\\x28...'" ;
    rdft:approval rdft:Proposed ;
@@ -785,7 +785,7 @@
    mf:result    <LITERAL1_ascii_boundaries.nq> ;
    .
 
-<#LITERAL1_all_controls> rdf:type rdft:TestTurtleEval ;
+<#LITERAL1_all_controls> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL1_all_controls" ;
    rdfs:comment "LITERAL1_all_controls '\\x00\\x01\\x02\\x03\\x04...'" ;
    rdft:approval rdft:Proposed ;
@@ -793,7 +793,7 @@
    mf:result    <LITERAL1_all_controls.nq> ;
    .
 
-<#LITERAL1_all_punctuation> rdf:type rdft:TestTurtleEval ;
+<#LITERAL1_all_punctuation> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL1_all_punctuation" ;
    rdfs:comment "LITERAL1_all_punctuation '!\"#$%&()...'" ;
    rdft:approval rdft:Proposed ;
@@ -801,7 +801,7 @@
    mf:result    <LITERAL1_all_punctuation.nq> ;
    .
 
-<#LITERAL_LONG1> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG1> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG1" ;
    rdfs:comment "LITERAL_LONG1 '''x'''" ;
    rdft:approval rdft:Proposed ;
@@ -809,7 +809,7 @@
    mf:result    <LITERAL1.nq> ;
    .
 
-<#LITERAL_LONG1_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG1_ascii_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG1_ascii_boundaries" ;
    rdfs:comment "LITERAL_LONG1_ascii_boundaries '\\x00\\x26\\x28...'" ;
    rdft:approval rdft:Proposed ;
@@ -817,7 +817,7 @@
    mf:result    <LITERAL_LONG1_ascii_boundaries.nq> ;
    .
 
-<#LITERAL_LONG1_with_1_squote> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG1_with_1_squote> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG1_with_1_squote" ;
    rdfs:comment "LITERAL_LONG1 with 1 squote '''a'b'''" ;
    rdft:approval rdft:Proposed ;
@@ -825,7 +825,7 @@
    mf:result    <LITERAL_LONG1_with_1_squote.nq> ;
    .
 
-<#LITERAL_LONG1_with_2_squotes> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG1_with_2_squotes> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG1_with_2_squotes" ;
    rdfs:comment "LITERAL_LONG1 with 2 squotes '''a''b'''" ;
    rdft:approval rdft:Proposed ;
@@ -833,7 +833,7 @@
    mf:result    <LITERAL_LONG1_with_2_squotes.nq> ;
    .
 
-<#LITERAL2> rdf:type rdft:TestTurtleEval ;
+<#LITERAL2> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL2" ;
    rdfs:comment "LITERAL2 \"x\"" ;
    rdft:approval rdft:Proposed ;
@@ -841,7 +841,7 @@
    mf:result    <LITERAL1.nq> ;
    .
 
-<#LITERAL2_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL2_ascii_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL2_ascii_boundaries" ;
    rdfs:comment "LITERAL2_ascii_boundaries '\\x00\\x09\\x0b\\x0c\\x0e\\x21\\x23...'" ;
    rdft:approval rdft:Proposed ;
@@ -849,7 +849,7 @@
    mf:result    <LITERAL2_ascii_boundaries.nq> ;
    .
 
-<#LITERAL_LONG2> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG2" ;
    rdfs:comment "LITERAL_LONG2 \"\"\"x\"\"\"" ;
    rdft:approval rdft:Proposed ;
@@ -857,7 +857,7 @@
    mf:result    <LITERAL1.nq> ;
    .
 
-<#LITERAL_LONG2_ascii_boundaries> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2_ascii_boundaries> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG2_ascii_boundaries" ;
    rdfs:comment "LITERAL_LONG2_ascii_boundaries '\\x00\\x21\\x23...'" ;
    rdft:approval rdft:Proposed ;
@@ -865,7 +865,7 @@
    mf:result    <LITERAL_LONG2_ascii_boundaries.nq> ;
    .
 
-<#LITERAL_LONG2_with_1_squote> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2_with_1_squote> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG2_with_1_squote" ;
    rdfs:comment "LITERAL_LONG2 with 1 squote \"\"\"a\"b\"\"\"" ;
    rdft:approval rdft:Proposed ;
@@ -873,7 +873,7 @@
    mf:result    <LITERAL_LONG2_with_1_squote.nq> ;
    .
 
-<#LITERAL_LONG2_with_2_squotes> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2_with_2_squotes> rdf:type rdft:TestTrigEval ;
    mf:name      "LITERAL_LONG2_with_2_squotes" ;
    rdfs:comment "LITERAL_LONG2 with 2 squotes \"\"\"a\"\"b\"\"\"" ;
    rdft:approval rdft:Proposed ;
@@ -881,7 +881,7 @@
    mf:result    <LITERAL_LONG2_with_2_squotes.nq> ;
    .
 
-<#literal_with_CHARACTER_TABULATION> rdf:type rdft:TestTurtleEval ;
+<#literal_with_CHARACTER_TABULATION> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_CHARACTER_TABULATION" ;
    rdfs:comment "literal with CHARACTER TABULATION" ;
    rdft:approval rdft:Proposed ;
@@ -889,7 +889,7 @@
    mf:result    <literal_with_CHARACTER_TABULATION.nq> ;
    .
 
-<#literal_with_BACKSPACE> rdf:type rdft:TestTurtleEval ;
+<#literal_with_BACKSPACE> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_BACKSPACE" ;
    rdfs:comment "literal with BACKSPACE" ;
    rdft:approval rdft:Proposed ;
@@ -897,7 +897,7 @@
    mf:result    <literal_with_BACKSPACE.nq> ;
    .
 
-<#literal_with_LINE_FEED> rdf:type rdft:TestTurtleEval ;
+<#literal_with_LINE_FEED> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_LINE_FEED" ;
    rdfs:comment "literal with LINE FEED" ;
    rdft:approval rdft:Proposed ;
@@ -905,7 +905,7 @@
    mf:result    <literal_with_LINE_FEED.nq> ;
    .
 
-<#literal_with_CARRIAGE_RETURN> rdf:type rdft:TestTurtleEval ;
+<#literal_with_CARRIAGE_RETURN> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_CARRIAGE_RETURN" ;
    rdfs:comment "literal with CARRIAGE RETURN" ;
    rdft:approval rdft:Proposed ;
@@ -913,7 +913,7 @@
    mf:result    <literal_with_CARRIAGE_RETURN.nq> ;
    .
 
-<#literal_with_FORM_FEED> rdf:type rdft:TestTurtleEval ;
+<#literal_with_FORM_FEED> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_FORM_FEED" ;
    rdfs:comment "literal with FORM FEED" ;
    rdft:approval rdft:Proposed ;
@@ -921,7 +921,7 @@
    mf:result    <literal_with_FORM_FEED.nq> ;
    .
 
-<#literal_with_REVERSE_SOLIDUS> rdf:type rdft:TestTurtleEval ;
+<#literal_with_REVERSE_SOLIDUS> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_REVERSE_SOLIDUS" ;
    rdfs:comment "literal with REVERSE SOLIDUS" ;
    rdft:approval rdft:Proposed ;
@@ -929,7 +929,7 @@
    mf:result    <literal_with_REVERSE_SOLIDUS.nq> ;
    .
 
-<#literal_with_escaped_CHARACTER_TABULATION> rdf:type rdft:TestTurtleEval ;
+<#literal_with_escaped_CHARACTER_TABULATION> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_escaped_CHARACTER_TABULATION" ;
    rdfs:comment "literal with escaped CHARACTER TABULATION" ;
    rdft:approval rdft:Proposed ;
@@ -937,7 +937,7 @@
    mf:result    <literal_with_CHARACTER_TABULATION.nq> ;
    .
 
-<#literal_with_escaped_BACKSPACE> rdf:type rdft:TestTurtleEval ;
+<#literal_with_escaped_BACKSPACE> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_escaped_BACKSPACE" ;
    rdfs:comment "literal with escaped BACKSPACE" ;
    rdft:approval rdft:Proposed ;
@@ -945,7 +945,7 @@
    mf:result    <literal_with_BACKSPACE.nq> ;
    .
 
-<#literal_with_escaped_LINE_FEED> rdf:type rdft:TestTurtleEval ;
+<#literal_with_escaped_LINE_FEED> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_escaped_LINE_FEED" ;
    rdfs:comment "literal with escaped LINE FEED" ;
    rdft:approval rdft:Proposed ;
@@ -953,7 +953,7 @@
    mf:result    <literal_with_LINE_FEED.nq> ;
    .
 
-<#literal_with_escaped_CARRIAGE_RETURN> rdf:type rdft:TestTurtleEval ;
+<#literal_with_escaped_CARRIAGE_RETURN> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_escaped_CARRIAGE_RETURN" ;
    rdfs:comment "literal with escaped CARRIAGE RETURN" ;
    rdft:approval rdft:Proposed ;
@@ -961,7 +961,7 @@
    mf:result    <literal_with_CARRIAGE_RETURN.nq> ;
    .
 
-<#literal_with_escaped_FORM_FEED> rdf:type rdft:TestTurtleEval ;
+<#literal_with_escaped_FORM_FEED> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_escaped_FORM_FEED" ;
    rdfs:comment "literal with escaped FORM FEED" ;
    rdft:approval rdft:Proposed ;
@@ -969,7 +969,7 @@
    mf:result    <literal_with_FORM_FEED.nq> ;
    .
 
-<#literal_with_numeric_escape4> rdf:type rdft:TestTurtleEval ;
+<#literal_with_numeric_escape4> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_numeric_escape4" ;
    rdfs:comment "literal with numeric escape4 \\u" ;
    rdft:approval rdft:Proposed ;
@@ -977,7 +977,7 @@
    mf:result    <literal_with_numeric_escape4.nq> ;
    .
 
-<#literal_with_numeric_escape8> rdf:type rdft:TestTurtleEval ;
+<#literal_with_numeric_escape8> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_with_numeric_escape8" ;
    rdfs:comment "literal with numeric escape8 \\U" ;
    rdft:approval rdft:Proposed ;
@@ -985,7 +985,7 @@
    mf:result    <literal_with_numeric_escape4.nq> ;
    .
 
-<#IRIREF_datatype> rdf:type rdft:TestTurtleEval ;
+<#IRIREF_datatype> rdf:type rdft:TestTrigEval ;
    mf:name      "IRIREF_datatype" ;
    rdfs:comment "IRIREF datatype \"\"^^<t>" ;
    rdft:approval rdft:Proposed ;
@@ -993,7 +993,7 @@
    mf:result    <IRIREF_datatype.nq> ;
    .
 
-<#prefixed_name_datatype> rdf:type rdft:TestTurtleEval ;
+<#prefixed_name_datatype> rdf:type rdft:TestTrigEval ;
    mf:name      "prefixed_name_datatype" ;
    rdfs:comment "prefixed name datatype \"\"^^p:t" ;
    rdft:approval rdft:Proposed ;
@@ -1001,7 +1001,7 @@
    mf:result    <IRIREF_datatype.nq> ;
    .
 
-<#bareword_integer> rdf:type rdft:TestTurtleEval ;
+<#bareword_integer> rdf:type rdft:TestTrigEval ;
    mf:name      "bareword_integer" ;
    rdfs:comment "bareword integer" ;
    rdft:approval rdft:Proposed ;
@@ -1009,7 +1009,7 @@
    mf:result    <IRIREF_datatype.nq> ;
    .
 
-<#bareword_decimal> rdf:type rdft:TestTurtleEval ;
+<#bareword_decimal> rdf:type rdft:TestTrigEval ;
    mf:name      "bareword_decimal" ;
    rdfs:comment "bareword decimal" ;
    rdft:approval rdft:Proposed ;
@@ -1017,7 +1017,7 @@
    mf:result    <bareword_decimal.nq> ;
    .
 
-<#bareword_double> rdf:type rdft:TestTurtleEval ;
+<#bareword_double> rdf:type rdft:TestTrigEval ;
    mf:name      "bareword_double" ;
    rdfs:comment "bareword double" ;
    rdft:approval rdft:Proposed ;
@@ -1025,7 +1025,7 @@
    mf:result    <bareword_double.nq> ;
    .
 
-<#double_lower_case_e> rdf:type rdft:TestTurtleEval ;
+<#double_lower_case_e> rdf:type rdft:TestTrigEval ;
    mf:name      "double_lower_case_e" ;
    rdfs:comment "double lower case e" ;
    rdft:approval rdft:Proposed ;
@@ -1033,7 +1033,7 @@
    mf:result    <double_lower_case_e.nq> ;
    .
 
-<#negative_numeric> rdf:type rdft:TestTurtleEval ;
+<#negative_numeric> rdf:type rdft:TestTrigEval ;
    mf:name      "negative_numeric" ;
    rdfs:comment "negative numeric" ;
    rdft:approval rdft:Proposed ;
@@ -1041,7 +1041,7 @@
    mf:result    <negative_numeric.nq> ;
    .
 
-<#positive_numeric> rdf:type rdft:TestTurtleEval ;
+<#positive_numeric> rdf:type rdft:TestTrigEval ;
    mf:name      "positive_numeric" ;
    rdfs:comment "positive numeric" ;
    rdft:approval rdft:Proposed ;
@@ -1049,7 +1049,7 @@
    mf:result    <positive_numeric.nq> ;
    .
 
-<#numeric_with_leading_0> rdf:type rdft:TestTurtleEval ;
+<#numeric_with_leading_0> rdf:type rdft:TestTrigEval ;
    mf:name      "numeric_with_leading_0" ;
    rdfs:comment "numeric with leading 0" ;
    rdft:approval rdft:Proposed ;
@@ -1057,7 +1057,7 @@
    mf:result    <numeric_with_leading_0.nq> ;
    .
 
-<#literal_true> rdf:type rdft:TestTurtleEval ;
+<#literal_true> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_true" ;
    rdfs:comment "literal true" ;
    rdft:approval rdft:Proposed ;
@@ -1065,7 +1065,7 @@
    mf:result    <literal_true.nq> ;
    .
 
-<#literal_false> rdf:type rdft:TestTurtleEval ;
+<#literal_false> rdf:type rdft:TestTrigEval ;
    mf:name      "literal_false" ;
    rdfs:comment "literal false" ;
    rdft:approval rdft:Proposed ;
@@ -1073,7 +1073,7 @@
    mf:result    <literal_false.nq> ;
    .
 
-<#langtagged_non_LONG> rdf:type rdft:TestTurtleEval ;
+<#langtagged_non_LONG> rdf:type rdft:TestTrigEval ;
    mf:name      "langtagged_non_LONG" ;
    rdfs:comment "langtagged non-LONG \"x\"@en" ;
    rdft:approval rdft:Proposed ;
@@ -1081,7 +1081,7 @@
    mf:result    <langtagged_non_LONG.nq> ;
    .
 
-<#langtagged_LONG> rdf:type rdft:TestTurtleEval ;
+<#langtagged_LONG> rdf:type rdft:TestTrigEval ;
    mf:name      "langtagged_LONG" ;
    rdfs:comment "langtagged LONG \"\"\"x\"\"\"@en" ;
    rdft:approval rdft:Proposed ;
@@ -1089,7 +1089,7 @@
    mf:result    <langtagged_non_LONG.nq> ;
    .
 
-<#lantag_with_subtag> rdf:type rdft:TestTurtleEval ;
+<#lantag_with_subtag> rdf:type rdft:TestTrigEval ;
    mf:name      "lantag_with_subtag" ;
    rdfs:comment "lantag with subtag \"x\"@en-us" ;
    rdft:approval rdft:Proposed ;
@@ -1097,7 +1097,7 @@
    mf:result    <lantag_with_subtag.nq> ;
    .
 
-<#objectList_with_two_objects> rdf:type rdft:TestTurtleEval ;
+<#objectList_with_two_objects> rdf:type rdft:TestTrigEval ;
    mf:name      "objectList_with_two_objects" ;
    rdfs:comment "objectList with two objects … <o1>,<o2>" ;
    rdft:approval rdft:Proposed ;
@@ -1105,7 +1105,7 @@
    mf:result    <objectList_with_two_objects.nq> ;
    .
 
-<#predicateObjectList_with_two_objectLists> rdf:type rdft:TestTurtleEval ;
+<#predicateObjectList_with_two_objectLists> rdf:type rdft:TestTrigEval ;
    mf:name      "predicateObjectList_with_two_objectLists" ;
    rdfs:comment "predicateObjectList with two objectLists … <o1>,<o2>" ;
    rdft:approval rdft:Proposed ;
@@ -1113,7 +1113,7 @@
    mf:result    <predicateObjectList_with_two_objectLists.nq> ;
    .
 
-<#repeated_semis_at_end> rdf:type rdft:TestTurtleEval ;
+<#repeated_semis_at_end> rdf:type rdft:TestTrigEval ;
    mf:name      "repeated_semis_at_end" ;
    rdfs:comment "repeated semis at end <s> <p> <o> ;; <p2> <o2> ." ;
    rdft:approval rdft:Proposed ;
@@ -1121,7 +1121,7 @@
    mf:result    <predicateObjectList_with_two_objectLists.nq> ;
    .
 
-<#repeated_semis_not_at_end> rdf:type rdft:TestTurtleEval ;
+<#repeated_semis_not_at_end> rdf:type rdft:TestTrigEval ;
    mf:name      "repeated_semis_not_at_end" ;
    rdfs:comment "repeated semis not at end <s> <p> <o> ;;." ;
    rdft:approval rdft:Proposed ;
@@ -1130,987 +1130,987 @@
    .
 
 # original tests-ttl
-<#trig-syntax-file-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-file-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-file-01" ;
    rdfs:comment "Empty file" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-01.trig> ;
    .
 
-<#trig-syntax-file-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-file-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-file-02" ;
    rdfs:comment "Only comment" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-02.trig> ;
    .
 
-<#trig-syntax-file-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-file-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-file-03" ;
    rdfs:comment "One comment, one empty line" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-file-03.trig> ;
    .
 
-<#trig-syntax-uri-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-uri-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-uri-01" ;
    rdfs:comment "Only IRIs" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-01.trig> ;
    .
 
-<#trig-syntax-uri-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-uri-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-uri-02" ;
    rdfs:comment "IRIs with Unicode escape" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-02.trig> ;
    .
 
-<#trig-syntax-uri-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-uri-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-uri-03" ;
    rdfs:comment "IRIs with long Unicode escape" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-03.trig> ;
    .
 
-<#trig-syntax-uri-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-uri-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-uri-04" ;
    rdfs:comment "Legal IRIs" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-uri-04.trig> ;
    .
 
-<#trig-syntax-base-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-base-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-base-01" ;
    rdfs:comment "@base" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-01.trig> ;
    .
 
-<#trig-syntax-base-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-base-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-base-02" ;
    rdfs:comment "BASE" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-02.trig> ;
    .
 
-<#trig-syntax-base-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-base-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-base-03" ;
    rdfs:comment "@base with relative IRIs" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-03.trig> ;
    .
 
-<#trig-syntax-base-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-base-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-base-04" ;
    rdfs:comment "base with relative IRIs" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-base-04.trig> ;
    .
 
-<#trig-syntax-prefix-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-01" ;
    rdfs:comment "@prefix" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-01.trig> ;
    .
 
-<#trig-syntax-prefix-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-02" ;
    rdfs:comment "PreFIX" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-02.trig> ;
    .
 
-<#trig-syntax-prefix-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-03" ;
    rdfs:comment "Empty PREFIX" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-03.trig> ;
    .
 
-<#trig-syntax-prefix-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-04" ;
    rdfs:comment "Empty @prefix with % escape" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-04.trig> ;
    .
 
-<#trig-syntax-prefix-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-05" ;
    rdfs:comment "@prefix with no suffix" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-05.trig> ;
    .
 
-<#trig-syntax-prefix-06> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-06> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-06" ;
    rdfs:comment "colon is a legal pname character" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-06.trig> ;
    .
 
-<#trig-syntax-prefix-07> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-07> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-07" ;
    rdfs:comment "dash is a legal pname character" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-07.trig> ;
    .
 
-<#trig-syntax-prefix-08> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-08> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-08" ;
    rdfs:comment "underscore is a legal pname character" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-08.trig> ;
    .
 
-<#trig-syntax-prefix-09> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-prefix-09> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-prefix-09" ;
    rdfs:comment "percents in pnames" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-prefix-09.trig> ;
    .
 
-<#trig-syntax-string-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-01" ;
    rdfs:comment "string literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-01.trig> ;
    .
 
-<#trig-syntax-string-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-02" ;
    rdfs:comment "langString literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-02.trig> ;
    .
 
-<#trig-syntax-string-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-03" ;
    rdfs:comment "langString literal with region" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-03.trig> ;
    .
 
-<#trig-syntax-string-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-04" ;
    rdfs:comment "squote string literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-04.trig> ;
    .
 
-<#trig-syntax-string-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-05" ;
    rdfs:comment "squote langString literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-05.trig> ;
    .
 
-<#trig-syntax-string-06> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-06> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-06" ;
    rdfs:comment "squote langString literal with region" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-06.trig> ;
    .
 
-<#trig-syntax-string-07> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-07> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-07" ;
    rdfs:comment "long string literal with embedded single- and double-quotes" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-07.trig> ;
    .
 
-<#trig-syntax-string-08> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-08> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-08" ;
    rdfs:comment "long string literal with embedded newline" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-08.trig> ;
    .
 
-<#trig-syntax-string-09> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-09> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-09" ;
    rdfs:comment "squote long string literal with embedded single- and double-quotes" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-09.trig> ;
    .
 
-<#trig-syntax-string-10> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-10> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-10" ;
    rdfs:comment "long langString literal with embedded newline" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-10.trig> ;
    .
 
-<#trig-syntax-string-11> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-string-11> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-string-11" ;
    rdfs:comment "squote long langString literal with embedded newline" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-string-11.trig> ;
    .
 
-<#trig-syntax-str-esc-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-str-esc-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-str-esc-01" ;
    rdfs:comment "string literal with escaped newline" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-01.trig> ;
    .
 
-<#trig-syntax-str-esc-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-str-esc-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-str-esc-02" ;
    rdfs:comment "string literal with Unicode escape" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-02.trig> ;
    .
 
-<#trig-syntax-str-esc-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-str-esc-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-str-esc-03" ;
    rdfs:comment "string literal with long Unicode escape" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-str-esc-03.trig> ;
    .
 
-<#trig-syntax-pname-esc-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-pname-esc-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-01" ;
    rdfs:comment "pname with back-slash escapes" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-01.trig> ;
    .
 
-<#trig-syntax-pname-esc-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-pname-esc-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-02" ;
    rdfs:comment "pname with back-slash escapes (2)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-02.trig> ;
    .
 
-<#trig-syntax-pname-esc-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-pname-esc-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-pname-esc-03" ;
    rdfs:comment "pname with back-slash escapes (3)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-pname-esc-03.trig> ;
    .
 
-<#trig-syntax-bnode-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-01" ;
    rdfs:comment "bnode subject" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-01.trig> ;
    .
 
-<#trig-syntax-bnode-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-02" ;
    rdfs:comment "bnode object" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-02.trig> ;
    .
 
-<#trig-syntax-bnode-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-03" ;
    rdfs:comment "bnode property list object" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-03.trig> ;
    .
 
-<#trig-syntax-bnode-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-04" ;
    rdfs:comment "bnode property list object (2)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-04.trig> ;
    .
 
-<#trig-syntax-bnode-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-05" ;
    rdfs:comment "bnode property list subject" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-05.trig> ;
    .
 
-<#trig-syntax-bnode-06> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-06> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-06" ;
    rdfs:comment "labeled bnode subject" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-06.trig> ;
    .
 
-<#trig-syntax-bnode-07> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-07> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-07" ;
    rdfs:comment "labeled bnode subject and object" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-07.trig> ;
    .
 
-<#trig-syntax-bnode-08> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-08> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-08" ;
    rdfs:comment "bare bnode property list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-08.trig> ;
    .
 
-<#trig-syntax-bnode-09> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-09> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-09" ;
    rdfs:comment "bnode property list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-09.trig> ;
    .
 
-<#trig-syntax-bnode-10> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-bnode-10> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-bnode-10" ;
    rdfs:comment "mixed bnode property list and triple" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bnode-10.trig> ;
    .
 
-<#trig-syntax-number-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-01" ;
    rdfs:comment "integer literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-01.trig> ;
    .
 
-<#trig-syntax-number-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-02" ;
    rdfs:comment "negative integer literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-02.trig> ;
    .
 
-<#trig-syntax-number-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-03" ;
    rdfs:comment "positive integer literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-03.trig> ;
    .
 
-<#trig-syntax-number-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-04" ;
    rdfs:comment "decimal literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-04.trig> ;
    .
 
-<#trig-syntax-number-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-05" ;
    rdfs:comment "decimal literal (no leading digits)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-05.trig> ;
    .
 
-<#trig-syntax-number-06> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-06> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-06" ;
    rdfs:comment "negative decimal literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-06.trig> ;
    .
 
-<#trig-syntax-number-07> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-07> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-07" ;
    rdfs:comment "positive decimal literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-07.trig> ;
    .
 
-<#trig-syntax-number-08> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-08> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-08" ;
    rdfs:comment "integer literal with decimal lexical confusion" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-08.trig> ;
    .
 
-<#trig-syntax-number-09> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-09> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-09" ;
    rdfs:comment "double literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-09.trig> ;
    .
 
-<#trig-syntax-number-10> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-10> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-10" ;
    rdfs:comment "negative double literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-10.trig> ;
    .
 
-<#trig-syntax-number-11> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-number-11> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-number-11" ;
    rdfs:comment "double literal no fraction" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-number-11.trig> ;
    .
 
-<#trig-syntax-datatypes-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-datatypes-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-datatypes-01" ;
    rdfs:comment "xsd:byte literal" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-datatypes-01.trig> ;
    .
 
-<#trig-syntax-datatypes-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-datatypes-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-datatypes-02" ;
    rdfs:comment "integer as xsd:string" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-datatypes-02.trig> ;
    .
 
-<#trig-syntax-kw-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-kw-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-kw-01" ;
    rdfs:comment "boolean literal (true)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-01.trig> ;
    .
 
-<#trig-syntax-kw-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-kw-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-kw-02" ;
    rdfs:comment "boolean literal (false)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-02.trig> ;
    .
 
-<#trig-syntax-kw-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-kw-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-kw-03" ;
    rdfs:comment "'a' as keyword" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-kw-03.trig> ;
    .
 
-<#trig-syntax-struct-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-struct-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-struct-01" ;
    rdfs:comment "object list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-01.trig> ;
    .
 
-<#trig-syntax-struct-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-struct-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-struct-02" ;
    rdfs:comment "predicate list with object list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-02.trig> ;
    .
 
-<#trig-syntax-struct-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-struct-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-struct-03" ;
    rdfs:comment "predicate list with object list and dangling ';'" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-03.trig> ;
    .
 
-<#trig-syntax-struct-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-struct-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-struct-04" ;
    rdfs:comment "predicate list with multiple ;;" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-04.trig> ;
    .
 
-<#trig-syntax-struct-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-struct-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-struct-05" ;
    rdfs:comment "predicate list with multiple ;;" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-struct-05.trig> ;
    .
 
-<#trig-syntax-lists-01> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-lists-01> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-lists-01" ;
    rdfs:comment "empty list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-01.trig> ;
    .
 
-<#trig-syntax-lists-02> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-lists-02> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-lists-02" ;
    rdfs:comment "mixed list" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-02.trig> ;
    .
 
-<#trig-syntax-lists-03> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-lists-03> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-lists-03" ;
    rdfs:comment "isomorphic list as subject and object" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-03.trig> ;
    .
 
-<#trig-syntax-lists-04> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-lists-04> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-lists-04" ;
    rdfs:comment "lists of lists" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-04.trig> ;
    .
 
-<#trig-syntax-lists-05> rdf:type rdft:TestTurtlePositiveSyntax ;
+<#trig-syntax-lists-05> rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name    "trig-syntax-lists-05" ;
    rdfs:comment "mixed lists with embedded lists" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-lists-05.trig> ;
    .
 
-<#trig-syntax-bad-uri-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-uri-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-01" ;
    rdfs:comment "Bad IRI : space (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-01.trig> ;
    .
 
-<#trig-syntax-bad-uri-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-uri-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-02" ;
    rdfs:comment "Bad IRI : bad escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-02.trig> ;
    .
 
-<#trig-syntax-bad-uri-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-uri-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-03" ;
    rdfs:comment "Bad IRI : bad long escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-03.trig> ;
    .
 
-<#trig-syntax-bad-uri-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-uri-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-04" ;
    rdfs:comment "Bad IRI : character escapes not allowed (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-04.trig> ;
    .
 
-<#trig-syntax-bad-uri-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-uri-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-uri-05" ;
    rdfs:comment "Bad IRI : character escapes not allowed (2) (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-uri-05.trig> ;
    .
 
-<#trig-syntax-bad-prefix-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-01" ;
    rdfs:comment "No prefix (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-01.trig> ;
    .
 
-<#trig-syntax-bad-prefix-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-02" ;
    rdfs:comment "No prefix (2) (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-02.trig> ;
    .
 
-<#trig-syntax-bad-prefix-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-03" ;
    rdfs:comment "@prefix without URI (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-03.trig> ;
    .
 
-<#trig-syntax-bad-prefix-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-04" ;
    rdfs:comment "@prefix without prefix name (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-04.trig> ;
    .
 
-<#trig-syntax-bad-prefix-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-prefix-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-prefix-05" ;
    rdfs:comment "@prefix without ':' (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-prefix-05.trig> ;
    .
 
-<#trig-syntax-bad-base-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-base-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-01" ;
    rdfs:comment "@base without URI (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-01.trig> ;
    .
 
-<#trig-syntax-bad-base-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-base-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-02" ;
    rdfs:comment "@base in wrong case (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-02.trig> ;
    .
 
-<#trig-syntax-bad-base-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-base-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-base-03" ;
    rdfs:comment "BASE without URI (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-base-03.trig> ;
    .
 
-<#trig-syntax-bad-struct-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-02" ;
    rdfs:comment "Turtle is not N3 (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-02.trig> ;
    .
 
-<#trig-syntax-bad-struct-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-03" ;
    rdfs:comment "Turtle is not NQuads (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-03.trig> ;
    .
 
-<#trig-syntax-bad-struct-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-04" ;
    rdfs:comment "Turtle does not allow literals-as-subjects (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-04.trig> ;
    .
 
-<#trig-syntax-bad-struct-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-05" ;
    rdfs:comment "Turtle does not allow literals-as-predicates (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-05.trig> ;
    .
 
-<#trig-syntax-bad-struct-06> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-06> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-06" ;
    rdfs:comment "Turtle does not allow bnodes-as-predicates (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-06.trig> ;
    .
 
-<#trig-syntax-bad-struct-07> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-07> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-07" ;
    rdfs:comment "Turtle does not allow labeled bnodes-as-predicates (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-07.trig> ;
    .
 
-<#trig-syntax-bad-kw-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-kw-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-01" ;
    rdfs:comment "'A' is not a keyword (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-01.trig> ;
    .
 
-<#trig-syntax-bad-kw-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-kw-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-02" ;
    rdfs:comment "'a' cannot be used as subject (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-02.trig> ;
    .
 
-<#trig-syntax-bad-kw-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-kw-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-03" ;
    rdfs:comment "'a' cannot be used as object (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-03.trig> ;
    .
 
-<#trig-syntax-bad-kw-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-kw-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-04" ;
    rdfs:comment "'true' cannot be used as subject (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-04.trig> ;
    .
 
-<#trig-syntax-bad-kw-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-kw-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-kw-05" ;
    rdfs:comment "'true' cannot be used as object (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-kw-05.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-01" ;
    rdfs:comment "{} fomulae not in Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-01.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-02" ;
    rdfs:comment "= is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-02.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-03" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-03.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-04" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-04.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-05" ;
    rdfs:comment "N3 is...of not in Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-05.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-06> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-06> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-06" ;
    rdfs:comment "N3 paths not in Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-06.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-07> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-07> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-07" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-07.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-08> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-08> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-08" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-08.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-09> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-09> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-09" ;
    rdfs:comment "=> is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-09.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-10> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-10> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-10" ;
    rdfs:comment "<= is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-10.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-11> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-11> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-11" ;
    rdfs:comment "@forSome is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-11.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-12> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-12> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-12" ;
    rdfs:comment "@forAll is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-12.trig> ;
    .
 
-<#trig-syntax-bad-n3-extras-13> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-n3-extras-13> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-n3-extras-13" ;
    rdfs:comment "@keywords is not Turtle (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-n3-extras-13.trig> ;
    .
 
-<#trig-syntax-bad-struct-08> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-08> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-08" ;
    rdfs:comment "missing '.' (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-08.trig> ;
    .
 
-<#trig-syntax-bad-struct-09> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-09> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-09" ;
    rdfs:comment "extra '.' (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-09.trig> ;
    .
 
-<#trig-syntax-bad-struct-10> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-10> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-10" ;
    rdfs:comment "extra '.' (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-10.trig> ;
    .
 
-<#trig-syntax-bad-struct-11> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-11> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-11" ;
    rdfs:comment "trailing ';' no '.' (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-11.trig> ;
    .
 
-<#trig-syntax-bad-struct-12> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-12> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-12" ;
    rdfs:comment "subject, predicate, no object (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-12.trig> ;
    .
 
-<#trig-syntax-bad-struct-13> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-13> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-13" ;
    rdfs:comment "subject, predicate, no object (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-13.trig> ;
    .
 
-<#trig-syntax-bad-struct-14> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-14> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-14" ;
    rdfs:comment "literal as subject (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-14.trig> ;
    .
 
-<#trig-syntax-bad-struct-15> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-15> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-15" ;
    rdfs:comment "literal as predicate (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-15.trig> ;
    .
 
-<#trig-syntax-bad-struct-16> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-16> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-16" ;
    rdfs:comment "bnode as predicate (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-16.trig> ;
    .
 
-<#trig-syntax-bad-struct-17> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-struct-17> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-struct-17" ;
    rdfs:comment "labeled bnode as predicate (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-struct-17.trig> ;
    .
 
-<#trig-syntax-bad-lang-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-lang-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-lang-01" ;
    rdfs:comment "langString with bad lang (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-lang-01.trig> ;
    .
 
-<#trig-syntax-bad-esc-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-esc-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-01" ;
    rdfs:comment "Bad string escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-01.trig> ;
    .
 
-<#trig-syntax-bad-esc-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-esc-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-02" ;
    rdfs:comment "Bad string escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-02.trig> ;
    .
 
-<#trig-syntax-bad-esc-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-esc-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-03" ;
    rdfs:comment "Bad string escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-03.trig> ;
    .
 
-<#trig-syntax-bad-esc-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-esc-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-esc-04" ;
    rdfs:comment "Bad string escape (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-esc-04.trig> ;
    .
 
-<#trig-syntax-bad-pname-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-pname-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-01" ;
    rdfs:comment "'~' must be escaped in pname (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-01.trig> ;
    .
 
-<#trig-syntax-bad-pname-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-pname-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-02" ;
    rdfs:comment "Bad %-sequence in pname (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-02.trig> ;
    .
 
-<#trig-syntax-bad-pname-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-pname-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-pname-03" ;
    rdfs:comment "Bad unicode escape in pname (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-pname-03.trig> ;
    .
 
-<#trig-syntax-bad-string-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-01" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-01.trig> ;
    .
 
-<#trig-syntax-bad-string-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-02" ;
    rdfs:comment "mismatching string literal open/close (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-02.trig> ;
    .
 
-<#trig-syntax-bad-string-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-03" ;
    rdfs:comment "mismatching string literal long/short (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-03.trig> ;
    .
 
-<#trig-syntax-bad-string-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-04" ;
    rdfs:comment "mismatching long string literal open/close (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-04.trig> ;
    .
 
-<#trig-syntax-bad-string-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-05" ;
    rdfs:comment "Long literal with missing end (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-05.trig> ;
    .
 
-<#trig-syntax-bad-string-06> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-06> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-06" ;
    rdfs:comment "Long literal with extra quote (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-06.trig> ;
    .
 
-<#trig-syntax-bad-string-07> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-string-07> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-string-07" ;
    rdfs:comment "Long literal with extra squote (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-string-07.trig> ;
    .
 
-<#trig-syntax-bad-num-01> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-num-01> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-01" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-01.trig> ;
    .
 
-<#trig-syntax-bad-num-02> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-num-02> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-02" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-02.trig> ;
    .
 
-<#trig-syntax-bad-num-03> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-num-03> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-03" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-03.trig> ;
    .
 
-<#trig-syntax-bad-num-04> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-num-04> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-04" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-04.trig> ;
    .
 
-<#trig-syntax-bad-num-05> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-num-05> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-05" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-num-05.trig> ;
    .
 
-<#trig-eval-struct-01> rdf:type rdft:TestTurtleEval ;
+<#trig-eval-struct-01> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-eval-struct-01" ;
    rdfs:comment "triple with IRIs" ;
    rdft:approval rdft:Proposed ;
@@ -2118,7 +2118,7 @@
    mf:result    <trig-eval-struct-01.nq> ;
    .
 
-<#trig-eval-struct-02> rdf:type rdft:TestTurtleEval ;
+<#trig-eval-struct-02> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-eval-struct-02" ;
    rdfs:comment "triple with IRIs and embedded whitespace" ;
    rdft:approval rdft:Proposed ;
@@ -2126,7 +2126,7 @@
    mf:result    <trig-eval-struct-02.nq> ;
    .
 
-<#trig-subm-01> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-01> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-01" ;
    rdfs:comment "Blank subject" ;
    rdft:approval rdft:Proposed ;
@@ -2134,7 +2134,7 @@
    mf:result    <trig-subm-01.nq> ;
    .
 
-<#trig-subm-02> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-02> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-02" ;
    rdfs:comment "@prefix and qnames" ;
    rdft:approval rdft:Proposed ;
@@ -2142,7 +2142,7 @@
    mf:result    <trig-subm-02.nq> ;
    .
 
-<#trig-subm-03> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-03> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-03" ;
    rdfs:comment ", operator" ;
    rdft:approval rdft:Proposed ;
@@ -2150,7 +2150,7 @@
    mf:result    <trig-subm-03.nq> ;
    .
 
-<#trig-subm-04> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-04> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-04" ;
    rdfs:comment "; operator" ;
    rdft:approval rdft:Proposed ;
@@ -2158,7 +2158,7 @@
    mf:result    <trig-subm-04.nq> ;
    .
 
-<#trig-subm-05> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-05> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-05" ;
    rdfs:comment "empty [] as subject and object" ;
    rdft:approval rdft:Proposed ;
@@ -2166,7 +2166,7 @@
    mf:result    <trig-subm-05.nq> ;
    .
 
-<#trig-subm-06> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-06> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-06" ;
    rdfs:comment "non-empty [] as subject and object" ;
    rdft:approval rdft:Proposed ;
@@ -2174,7 +2174,7 @@
    mf:result    <trig-subm-06.nq> ;
    .
 
-<#trig-subm-07> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-07> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-07" ;
    rdfs:comment "'a' as predicate" ;
    rdft:approval rdft:Proposed ;
@@ -2182,7 +2182,7 @@
    mf:result    <trig-subm-07.nq> ;
    .
 
-<#trig-subm-08> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-08> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-08" ;
    rdfs:comment "simple collection" ;
    rdft:approval rdft:Proposed ;
@@ -2190,7 +2190,7 @@
    mf:result    <trig-subm-08.nq> ;
    .
 
-<#trig-subm-09> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-09> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-09" ;
    rdfs:comment "empty collection" ;
    rdft:approval rdft:Proposed ;
@@ -2198,7 +2198,7 @@
    mf:result    <trig-subm-09.nq> ;
    .
 
-<#trig-subm-10> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-10> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-10" ;
    rdfs:comment "integer datatyped literal" ;
    rdft:approval rdft:Proposed ;
@@ -2206,7 +2206,7 @@
    mf:result    <trig-subm-10.nq> ;
    .
 
-<#trig-subm-11> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-11> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-11" ;
    rdfs:comment "decimal integer canonicalization" ;
    rdft:approval rdft:Proposed ;
@@ -2214,7 +2214,7 @@
    mf:result    <trig-subm-11.nq> ;
    .
 
-<#trig-subm-12> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-12> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-12" ;
    rdfs:comment "- and _ in names and qnames" ;
    rdft:approval rdft:Proposed ;
@@ -2222,7 +2222,7 @@
    mf:result    <trig-subm-12.nq> ;
    .
 
-<#trig-subm-13> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-13> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-13" ;
    rdfs:comment "tests for rdf:_<numbers> and other qnames starting with _" ;
    rdft:approval rdft:Proposed ;
@@ -2230,7 +2230,7 @@
    mf:result    <trig-subm-13.nq> ;
    .
 
-<#trig-subm-14> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-14> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-14" ;
    rdfs:comment "bare : allowed" ;
    rdft:approval rdft:Proposed ;
@@ -2238,7 +2238,7 @@
    mf:result    <trig-subm-14.nq> ;
    .
 
-<#trig-subm-15> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-15> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-15" ;
    rdfs:comment "simple long literal" ;
    rdft:approval rdft:Proposed ;
@@ -2246,7 +2246,7 @@
    mf:result    <trig-subm-15.nq> ;
    .
 
-<#trig-subm-16> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-16> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-16" ;
    rdfs:comment "long literals with escapes" ;
    rdft:approval rdft:Proposed ;
@@ -2254,7 +2254,7 @@
    mf:result    <trig-subm-16.nq> ;
    .
 
-<#trig-subm-17> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-17> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-17" ;
    rdfs:comment "floating point number" ;
    rdft:approval rdft:Proposed ;
@@ -2262,7 +2262,7 @@
    mf:result    <trig-subm-17.nq> ;
    .
 
-<#trig-subm-18> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-18> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-18" ;
    rdfs:comment "empty literals, normal and long variant" ;
    rdft:approval rdft:Proposed ;
@@ -2270,7 +2270,7 @@
    mf:result    <trig-subm-18.nq> ;
    .
 
-<#trig-subm-19> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-19> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-19" ;
    rdfs:comment "positive integer, decimal and doubles" ;
    rdft:approval rdft:Proposed ;
@@ -2278,7 +2278,7 @@
    mf:result    <trig-subm-19.nq> ;
    .
 
-<#trig-subm-20> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-20> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-20" ;
    rdfs:comment "negative integer, decimal and doubles" ;
    rdft:approval rdft:Proposed ;
@@ -2286,7 +2286,7 @@
    mf:result    <trig-subm-20.nq> ;
    .
 
-<#trig-subm-21> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-21> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-21" ;
    rdfs:comment "long literal ending in double quote" ;
    rdft:approval rdft:Proposed ;
@@ -2294,7 +2294,7 @@
    mf:result    <trig-subm-21.nq> ;
    .
 
-<#trig-subm-22> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-22> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-22" ;
    rdfs:comment "boolean literals" ;
    rdft:approval rdft:Proposed ;
@@ -2302,7 +2302,7 @@
    mf:result    <trig-subm-22.nq> ;
    .
 
-<#trig-subm-23> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-23> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-23" ;
    rdfs:comment "comments" ;
    rdft:approval rdft:Proposed ;
@@ -2310,7 +2310,7 @@
    mf:result    <trig-subm-23.nq> ;
    .
 
-<#trig-subm-24> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-24> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-24" ;
    rdfs:comment "no final mewline" ;
    rdft:approval rdft:Proposed ;
@@ -2318,7 +2318,7 @@
    mf:result    <trig-subm-24.nq> ;
    .
 
-<#trig-subm-25> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-25> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-25" ;
    rdfs:comment "repeating a @prefix changes pname definition" ;
    rdft:approval rdft:Proposed ;
@@ -2326,7 +2326,7 @@
    mf:result    <trig-subm-25.nq> ;
    .
 
-<#trig-subm-26> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-26> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-26" ;
    rdfs:comment "Variations on decimal canonicalization" ;
    rdft:approval rdft:Proposed ;
@@ -2334,7 +2334,7 @@
    mf:result    <trig-subm-26.nq> ;
    .
 
-<#trig-subm-27> rdf:type rdft:TestTurtleEval ;
+<#trig-subm-27> rdf:type rdft:TestTrigEval ;
    mf:name    "trig-subm-27" ;
    rdfs:comment "Repeating @base changes base for relative IRI lookup" ;
    rdft:approval rdft:Proposed ;
@@ -2342,28 +2342,28 @@
    mf:result    <trig-subm-27.nq> ;
    .
 
-<#trig-eval-bad-01> rdf:type rdft:TestTurtleNegativeEval ;
+<#trig-eval-bad-01> rdf:type rdft:TestTrigNegativeEval ;
    mf:name    "trig-eval-bad-01" ;
    rdfs:comment "Bad IRI : good escape, bad charcater (negative evaluation test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-01.trig> ;
    .
 
-<#trig-eval-bad-02> rdf:type rdft:TestTurtleNegativeEval ;
+<#trig-eval-bad-02> rdf:type rdft:TestTrigNegativeEval ;
    mf:name    "trig-eval-bad-02" ;
    rdfs:comment "Bad IRI : hex 3C is < (negative evaluation test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-02.trig> ;
    .
 
-<#trig-eval-bad-03> rdf:type rdft:TestTurtleNegativeEval ;
+<#trig-eval-bad-03> rdf:type rdft:TestTrigNegativeEval ;
    mf:name    "trig-eval-bad-03" ;
    rdfs:comment "Bad IRI : hex 3E is  (negative evaluation test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-eval-bad-03.trig> ;
    .
 
-<#trig-eval-bad-04> rdf:type rdft:TestTurtleNegativeEval ;
+<#trig-eval-bad-04> rdf:type rdft:TestTrigNegativeEval ;
    mf:name    "trig-eval-bad-04" ;
    rdfs:comment "Bad IRI : {abc} (negative evaluation test)" ;
    rdft:approval rdft:Proposed ;
@@ -2372,7 +2372,7 @@
 
 # tests from Dave Beckett
 # http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c28
-<#LITERAL_LONG2_with_REVERSE_SOLIDUS> rdf:type rdft:TestTurtleEval ;
+<#LITERAL_LONG2_with_REVERSE_SOLIDUS> rdf:type rdft:TestTrigEval ;
    mf:name    "LITERAL_LONG2_with_REVERSE_SOLIDUS" ;
    rdfs:comment "REVERSE SOLIDUS at end of LITERAL_LONG2" ;
    rdft:approval rdft:Proposed ;
@@ -2380,14 +2380,14 @@
    mf:result    <LITERAL_LONG2_with_REVERSE_SOLIDUS.nq> ;
    .
 
-<#trig-syntax-bad-LITERAL2_with_langtag_and_datatype> rdf:type rdft:TestTurtleNegativeSyntax ;
+<#trig-syntax-bad-LITERAL2_with_langtag_and_datatype> rdf:type rdft:TestTrigNegativeSyntax ;
    mf:name    "trig-syntax-bad-num-05" ;
    rdfs:comment "Bad number format (negative test)" ;
    rdft:approval rdft:Proposed ;
    mf:action    <trig-syntax-bad-LITERAL2_with_langtag_and_datatype.trig> ;
    .
 
-<#two_LITERAL_LONG2s> rdf:type rdft:TestTurtleEval ;
+<#two_LITERAL_LONG2s> rdf:type rdft:TestTrigEval ;
    mf:name    "two_LITERAL_LONG2s" ;
    rdfs:comment "two LITERAL_LONG2s testing quote delimiter overrun" ;
    rdft:approval rdft:Proposed ;
@@ -2395,7 +2395,7 @@
    mf:result    <two_LITERAL_LONG2s.nq> ;
    .
 
-<#langtagged_LONG_with_subtag> rdf:type rdft:TestTurtleEval ;
+<#langtagged_LONG_with_subtag> rdf:type rdft:TestTrigEval ;
    mf:name      "langtagged_LONG_with_subtag" ;
    rdfs:comment "langtagged LONG with subtag \"\"\"Cheers\"\"\"@en-UK" ;
    rdft:approval rdft:Proposed ;
@@ -2406,91 +2406,91 @@
 # tests from David Robillard
 # http://www.w3.org/2011/rdf-wg/wiki/Turtle_Candidate_Recommendation_Comments#c21
 <#trig-syntax-bad-blank-label-dot-end>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Blank node label must not end in dot" ;
 	mf:name "trig-syntax-bad-blank-label-dot-end" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-blank-label-dot-end.trig> .
 
 <#trig-syntax-bad-number-dot-in-anon>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Dot delimeter may not appear in anonymous nodes" ;
 	mf:name "trig-syntax-bad-number-dot-in-anon" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-number-dot-in-anon.trig> .
 
 <#trig-syntax-bad-ln-dash-start>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Local name must not begin with dash" ;
 	mf:name "trig-syntax-bad-ln-dash-start" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-dash-start.trig> .
 
 <#trig-syntax-bad-ln-escape>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Bad hex escape in local name" ;
 	mf:name "trig-syntax-bad-ln-escape" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-escape.trig> .
 
 <#trig-syntax-bad-ln-escape-start>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Bad hex escape at start of local name" ;
 	mf:name "trig-syntax-bad-ln-escape-start" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ln-escape-start.trig> .
 
 <#trig-syntax-bad-ns-dot-end>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Prefix must not end in dot" ;
 	mf:name "trig-syntax-bad-ns-dot-end" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ns-dot-end.trig> .
 
 <#trig-syntax-bad-ns-dot-start>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Prefix must not start with dot" ;
 	mf:name "trig-syntax-bad-ns-dot-start" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-ns-dot-start.trig> .
 
 <#trig-syntax-bad-missing-ns-dot-end>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Prefix must not end in dot (error in triple, not prefix directive like trig-syntax-bad-ns-dot-end)" ;
 	mf:name "trig-syntax-bad-missing-ns-dot-end" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-missing-ns-dot-end.trig> .
 
 <#trig-syntax-bad-missing-ns-dot-start>
-	rdf:type rdft:TestTurtleNegativeSyntax ;
+	rdf:type rdft:TestTrigNegativeSyntax ;
 	rdfs:comment "Prefix must not start with dot (error in triple, not prefix directive like trig-syntax-bad-ns-dot-end)" ;
 	mf:name "trig-syntax-bad-missing-ns-dot-start" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-bad-missing-ns-dot-start.trig> .
 
 <#trig-syntax-ln-dots>
-	rdf:type rdft:TestTurtlePositiveSyntax ;
+	rdf:type rdft:TestTrigPositiveSyntax ;
 	rdfs:comment "Dots in pname local names" ;
 	mf:name "trig-syntax-ln-dots" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ln-dots.trig> .
 
 <#trig-syntax-ln-colons>
-	rdf:type rdft:TestTurtlePositiveSyntax ;
+	rdf:type rdft:TestTrigPositiveSyntax ;
 	rdfs:comment "Colons in pname local names" ;
 	mf:name "trig-syntax-ln-colons" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ln-colons.trig> .
 
 <#trig-syntax-ns-dots>
-	rdf:type rdft:TestTurtlePositiveSyntax ;
+	rdf:type rdft:TestTrigPositiveSyntax ;
 	rdfs:comment "Dots in namespace names" ;
 	mf:name "trig-syntax-ns-dots" ;
         rdft:approval rdft:Proposed ;
 	mf:action <trig-syntax-ns-dots.trig> .
 
 <#trig-syntax-blank-label>
-	rdf:type rdft:TestTurtlePositiveSyntax ;
+	rdf:type rdft:TestTrigPositiveSyntax ;
 	rdfs:comment "Characters allowed in blank node labels" ;
 	mf:name "trig-syntax-blank-label" ;
         rdft:approval rdft:Proposed ;