--- a/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.meta.ttl	Fri Mar 23 10:42:41 2012 -0400
+++ b/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.meta.ttl	Fri Mar 23 11:18:40 2012 -0400
@@ -1,3 +1,5 @@
+# df-epoch-metadata.py evaluation http://aquarius.tw.rpi.edu/projects 2012-03-23 http://sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation 1 https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#collection 1 __PIVOT_faqt/sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation/__PIVOT_dataset/raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl/__PIVOT_epoch/2012-03-23/evaluation.ttl text/turtle 27
+
 @prefix rdfs:     <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix xsd:      <http://www.w3.org/2001/XMLSchema#> .
 @prefix dcterms:  <http://purl.org/dc/terms/> .
@@ -8,36 +10,36 @@
 @prefix prov:     <http://www.w3.org/ns/prov-o/> .
 @prefix datafaqs: <http://purl.org/twc/vocab/datafaqs#> .
 
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23>
    a datafaqs:Epoch, void:Dataset;
-   void:subset <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
+   void:subset <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
 .
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1/local-copy>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1/local-copy>
    a sd:NamedGraph;
-   sd:name  <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
-   sd:graph <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
-   rdfs:comment "The local copy of evaluation graph http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1 in http://datafaqs.tw.rpi.edu's SPARQL endpoint.";
+   sd:name  <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
+   sd:graph <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>;
+   rdfs:comment "The local copy of evaluation graph http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1 in http://aquarius.tw.rpi.edu/projects's SPARQL endpoint.";
 .
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1>
    a prov:Account, sd:Graph, void:Graph, datafaqs:Evaluation;
-   void:triples          28;
-   prov:wasAttributedTo <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1>;
-   foaf:primaryTopic    <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/dataset/1>;
-   void:dataDump        <http://datafaqs.tw.rpi.edu/datafaqs/dump/__PIVOT_faqt/sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation/__PIVOT_dataset/raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl/__PIVOT_epoch/2012-03-23/evaluation.ttl>;
+   void:triples          27;
+   prov:wasAttributedTo <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1>;
+   foaf:primaryTopic    <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/dataset/1>;
+   void:dataDump        <http://aquarius.tw.rpi.edu/projects/datafaqs/dump/__PIVOT_faqt/sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation/__PIVOT_dataset/raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl/__PIVOT_epoch/2012-03-23/evaluation.ttl>;
    rdfs:comment "The abstract RDF graph received from the FAqTService during epoch 2012-03-23. This can appear in any SPARQL endpoint.";
 .
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/dataset/1>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/dataset/1>
    a void:Dataset;
    prov:specializationOf <https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#collection>;
    dcterms:date "2012-03-23"^^xsd:date;
    dcterms:identifier 1;
 .
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch>
    a datafaqs:FAqTBrick, void:Dataset;
-   void:subset <http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23>;
+   void:subset <http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23>;
 .
 
-<http://datafaqs.tw.rpi.edu/datafaqs/dump/__PIVOT_faqt/sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation/__PIVOT_dataset/raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl/__PIVOT_epoch/2012-03-23/evaluation.ttl>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/dump/__PIVOT_faqt/sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation/__PIVOT_dataset/raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl/__PIVOT_epoch/2012-03-23/evaluation.ttl>
    formats:media_type <http://www.w3.org/ns/formats/Turtle>;
 .
 <http://www.w3.org/ns/formats/Turtle> 
@@ -45,9 +47,10 @@
    dcterms:identifier "text/turtle";
 .
 
-<http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1>
+<http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1>
    a datafaqs:FAqTService;
    prov:specializationOf <http://sparql.tw.rpi.edu/services/datafaqs/faqt/provenance/named-graph-derivation>;
    dcterms:date "2012-03-23"^^xsd:date;
    dcterms:identifier 1;
-. 
+.
+

--- a/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.ttl	Fri Mar 23 10:42:41 2012 -0400
+++ b/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.ttl	Fri Mar 23 11:18:40 2012 -0400
@@ -1,51 +1,41 @@
-@prefix foaf:     <http://xmlns.com/foaf/0.1/> .
-@prefix void:     <http://rdfs.org/ns/void#> .
-@prefix sd:       <http://www.w3.org/ns/sparql-service-description#> .
-@prefix prov:     <http://www.w3.org/ns/prov#> .
-@prefix datafaqs: <http://purl.org/twc/vocab/datafaqs#> .
+@prefix prov: <http://www.w3.org/ns/prov#> .
+@prefix sd: <http://www.w3.org/ns/sparql-service-description#> .
 
-<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#service> 
-    a sd:Service;
+<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#service> a <http://www.w3.org/ns/sparql-service-description#Service>;
     sd:availableGraphs <https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#collection>;
-    sd:endpoint        <http://logd.tw.rpi.edu/sparql> .
+    sd:endpoint <http://logd.tw.rpi.edu/sparql> .
 
-<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#collection> 
-    a datafaqs:EvaluatedDataset, datafaqs:Satisfactory;
+<http://logd.tw.rpi.edu/source/lebot/file/golfers/version/2012-Mar-17/conversion/lebot-golfers-2012-Mar-17.ttl.tgz> a <http://rdfs.org/ns/void#Graph>;
+    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.csv> .
+
+<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls> a <http://xmlns.com/foaf/0.1/Document>;
+    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.zip> .
+
+<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.csv> a <http://xmlns.com/foaf/0.1/Document>;
+    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls> .
+
+<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.zip> a <http://xmlns.com/foaf/0.1/Document>;
+    prov:alternateOf <https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip>;
+    prov:wasDerivedFrom <https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> .
+
+<https://github.com/timrdf/csv2rdf4lod-automation/raw/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> a <http://xmlns.com/foaf/0.1/Document>;
+    prov:wasAttributedTo <http://github.com> .
+
+<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#collection> a <http://purl.org/twc/vocab/datafaqs#Satisfactory>;
     sd:namedGraph <https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#named-graph> .
 
-<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#named-graph> 
-    a sd:NamedGraph;
+<https://raw.github.com/timrdf/DataFAQs/master/services/sadi/faqt/provenance/named-graph-derivation-materials/sample-inputs/golfers.ttl#named-graph> a <http://www.w3.org/ns/sparql-service-description#NamedGraph>;
+    prov:wasAttributedTo <http://github.com>,
+        <http://raw.github.com>;
     prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/file/golfers/version/2012-Mar-17/conversion/lebot-golfers-2012-Mar-17.ttl.tgz>,
-                        <http://logd.tw.rpi.edu/source/lebot/file/golfers/version/2012-Mar-17/conversion/lebot-golfers-2012-Mar-17.void.ttl>;
-    prov:wasAttributedTo <http://github.com>,
-                         <http://raw.github.com>;
+        <http://logd.tw.rpi.edu/source/lebot/file/golfers/version/2012-Mar-17/conversion/lebot-golfers-2012-Mar-17.void.ttl>;
     sd:name <http://logd.tw.rpi.edu/source/lebot/dataset/golfers/version/2012-Mar-17> .
 
-<http://github.com>     a prov:Agent .
-<http://raw.github.com> a prov:Agent .
-
-<http://logd.tw.rpi.edu/source/lebot/file/golfers/version/2012-Mar-17/conversion/lebot-golfers-2012-Mar-17.ttl.tgz> 
-    a void:Graph;
-    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.csv> .
-
-<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.csv> 
-    a foaf:Document;
-    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls> .
+<http://github.com> a <http://www.w3.org/ns/prov#Agent> .
 
-<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls> 
-    a foaf:Document;
-    prov:wasDerivedFrom <http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.zip> .
+<http://raw.github.com> a <http://www.w3.org/ns/prov#Agent> .
 
-<http://logd.tw.rpi.edu/source/lebot/provenance_file/golfers/version/2012-Mar-17/source/golfers.xls.zip> 
-    a foaf:Document;
-    prov:alternateOf    <https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip>;
-    prov:wasDerivedFrom <https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> .
+<https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> a <http://xmlns.com/foaf/0.1/Document>;
+    prov:alternateOf <https://github.com/timrdf/csv2rdf4lod-automation/raw/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip>;
+    prov:wasAttributedTo <http://raw.github.com> .
 
-<https://raw.github.com/timrdf/csv2rdf4lod-automation/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> 
-    a foaf:Document;
-    prov:alternateOf <https://github.com/timrdf/csv2rdf4lod-automation/raw/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip>;
-    prov:wasAttributedTo <http://raw.github.com> . 
-
-<https://github.com/timrdf/csv2rdf4lod-automation/raw/master/doc/examples/source/lebot/golfers/version/original/manual/golfers.xls.zip> 
-    a foaf:Document;
-    prov:wasAttributedTo <http://github.com> .

--- a/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.ttl.sd_name	Fri Mar 23 10:42:41 2012 -0400
+++ b/examples/eg-19-derived-named-graph-attribution/rdf/evaluation.ttl.sd_name	Fri Mar 23 11:18:40 2012 -0400
@@ -1,1 +1,1 @@
-http://datafaqs.tw.rpi.edu/datafaqs/epoch/2012-03-23/faqt/1/dataset/1
+http://aquarius.tw.rpi.edu/projects/datafaqs/epoch/2012-03-23/faqt/1/dataset/1