--- modules/rdf/rdf.test	2010-11-21 11:17:33.000000000 +0100
+++ modules/rdf/rdf-copy.test	2010-12-10 17:16:03.482361000 +0100
@@ -26,13 +26,13 @@ class RdfMappingHookTestCase extends Dru
     // Test that the mapping is returned correctly by the hook.
     $mapping = rdf_mapping_load('test_entity', 'test_bundle');
     $this->assertIdentical($mapping['rdftype'], array('sioc:Post'), t('Mapping for rdftype is sioc:Post.'));
-    $this->assertIdentical($mapping['title'], array('predicates' => array('dc:title')), t('Mapping for title is dc:title.'));
+    $this->assertIdentical($mapping['title'], array('predicates' => array('dcterms:title')), t('Mapping for title is dcterms:title.'));
     $this->assertIdentical($mapping['created'], array(
-      'predicates' => array('dc:created'),
+      'predicates' => array('dcterms:created'),
       'datatype' => 'xsd:dateTime',
       'callback' => 'date_iso8601',
-    ), t('Mapping for created is dc:created with datatype xsd:dateTime and callback date_iso8601.'));
-    $this->assertIdentical($mapping['uid'], array('predicates' => array('sioc:has_creator', 'dc:creator'), 'type' => 'rel'), t('Mapping for uid is sioc:has_creator and dc:creator, and type is rel.'));
+    ), t('Mapping for created is dcterms:created with datatype xsd:dateTime and callback date_iso8601.'));
+    $this->assertIdentical($mapping['uid'], array('predicates' => array('sioc:has_creator', 'dcterms:creator'), 'type' => 'rel'), t('Mapping for uid is sioc:has_creator and dcterms:creator, and type is rel.'));
 
     $mapping = rdf_mapping_load('test_entity', 'test_bundle_no_mapping');
     $this->assertEqual($mapping, array(), t('Empty array returned when an entity type, bundle pair has no mapping.'));
@@ -61,7 +61,7 @@ class RdfRdfaMarkupTestCase extends Drup
   function testDrupalRdfaAttributes() {
     // Same value as the one in the HTML tag (no callback function).
     $expected_attributes = array(
-      'property' => array('dc:title'),
+      'property' => array('dcterms:title'),
     );
     $mapping = rdf_mapping_load('test_entity', 'test_bundle');
     $attributes = rdf_rdfa_attributes($mapping['title']);
@@ -74,7 +74,7 @@ class RdfRdfaMarkupTestCase extends Drup
     $isoDate = date('c', $date);
     $expected_attributes = array(
       'datatype' => 'xsd:dateTime',
-      'property' => array('dc:created'),
+      'property' => array('dcterms:created'),
       'content' => $isoDate,
     );
     $mapping = rdf_mapping_load('test_entity', 'test_bundle');
@@ -96,7 +96,7 @@ class RdfRdfaMarkupTestCase extends Drup
 
     // ObjectProperty mapping (rel).
     $expected_attributes = array(
-      'rel' => array('sioc:has_creator', 'dc:creator'),
+      'rel' => array('sioc:has_creator', 'dcterms:creator'),
     );
     $mapping = rdf_mapping_load('test_entity', 'test_bundle');
     $attributes = rdf_rdfa_attributes($mapping['foobar_objproperty1']);
@@ -218,10 +218,10 @@ class RdfCrudTestCase extends DrupalWebT
       'mapping' => array(
         'rdftype' => array('sioc:Post'),
         'title' => array(
-          'predicates' => array('dc:title'),
+          'predicates' => array('dcterms:title'),
         ),
         'uid' => array(
-          'predicates' => array('sioc:has_creator', 'dc:creator'),
+          'predicates' => array('sioc:has_creator', 'dcterms:creator'),
           'type' => 'rel',
         ),
       ),
@@ -283,10 +283,10 @@ class RdfMappingDefinitionTestCase exten
 
     // Ensure the default bundle mapping for node is used. These attributes come
     // from the node default bundle definition.
-    $blog_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
-    $blog_meta = $this->xpath("//div[(@about='$url') and (@typeof='sioct:Weblog')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
-    $this->assertTrue(!empty($blog_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($blog_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $blog_title = $this->xpath("//meta[@property='dcterms:title' and @content='$node->title']");
+    $blog_meta = $this->xpath("//div[(@about='$url') and (@typeof='sioct:Weblog')]//span[contains(@property, 'dcterms:date') and contains(@property, 'dcterms:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
+    $this->assertTrue(!empty($blog_title), t('Property dcterms:title is present in meta tag.'));
+    $this->assertTrue(!empty($blog_meta), t('RDF type is present on post. Properties dcterms:date and dcterms:created are present on post date.'));
   }
 
   /**
@@ -301,10 +301,10 @@ class RdfMappingDefinitionTestCase exten
     $this->drupalGet('node/' . $node->nid);
 
     // Ensure the mapping defined in rdf_module.test is used.
-    $test_bundle_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
-    $test_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'foo:mapping_install1') and contains(@typeof, 'bar:mapping_install2')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
-    $this->assertTrue(!empty($test_bundle_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($test_bundle_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $test_bundle_title = $this->xpath("//meta[@property='dcterms:title' and @content='$node->title']");
+    $test_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'foo:mapping_install1') and contains(@typeof, 'bar:mapping_install2')]//span[contains(@property, 'dcterms:date') and contains(@property, 'dcterms:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
+    $this->assertTrue(!empty($test_bundle_title), t('Property dcterms:title is present in meta tag.'));
+    $this->assertTrue(!empty($test_bundle_meta), t('RDF type is present on post. Properties dcterms:date and dcterms:created are present on post date.'));
   }
 
   /**
@@ -320,10 +320,10 @@ class RdfMappingDefinitionTestCase exten
 
     // Ensure the default bundle mapping for node is used. These attributes come
     // from the node default bundle definition.
-    $random_bundle_title = $this->xpath("//meta[@property='dc:title' and @content='$node->title']");
-    $random_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'sioc:Item') and contains(@typeof, 'foaf:Document')]//span[contains(@property, 'dc:date') and contains(@property, 'dc:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
-    $this->assertTrue(!empty($random_bundle_title), t('Property dc:title is present in meta tag.'));
-    $this->assertTrue(!empty($random_bundle_meta), t('RDF type is present on post. Properties dc:date and dc:created are present on post date.'));
+    $random_bundle_title = $this->xpath("//meta[@property='dcterms:title' and @content='$node->title']");
+    $random_bundle_meta = $this->xpath("//div[(@about='$url') and contains(@typeof, 'sioc:Item') and contains(@typeof, 'foaf:Document')]//span[contains(@property, 'dcterms:date') and contains(@property, 'dcterms:created') and @datatype='xsd:dateTime' and @content='$isoDate']");
+    $this->assertTrue(!empty($random_bundle_title), t('Property dcterms:title is present in meta tag.'));
+    $this->assertTrue(!empty($random_bundle_meta), t('RDF type is present on post. Properties dcterms:date and dcterms:created are present on post date.'));
   }
 
   /**
@@ -541,9 +541,9 @@ class RdfCommentAttributesTestCase exten
   function _testBasicCommentRdfaMarkup($comment, $account = array()) {
     $comment_container = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]');
     $this->assertTrue(!empty($comment_container), t("Comment RDF type for comment found."));
-    $comment_title = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//h3[@property="dc:title"]');
+    $comment_title = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//h3[@property="dcterms:title"]');
     $this->assertEqual((string)$comment_title[0]->a, $comment->subject, t("RDFa markup for the comment title found."));
-    $comment_date = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//*[contains(@property, "dc:date") and contains(@property, "dc:created")]');
+    $comment_date = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//*[contains(@property, "dcterms:date") and contains(@property, "dcterms:created")]');
     $this->assertTrue(!empty($comment_date), t("RDFa markup for the date of the comment found."));
     // The author tag can be either a or span
     $comment_author = $this->xpath('//div[contains(@class, "comment") and contains(@typeof, "sioct:Comment")]//span[@rel="sioc:has_creator"]/*[contains(@class, "username") and @typeof="sioc:UserAccount" and @property="foaf:name"]');
@@ -614,7 +614,7 @@ class RdfTrackerAttributesTestCase exten
     $this->assertTrue(!empty($tracker_about), t('About attribute found on table row for @user content.', array('@user'=> $user)));
 
     // Tests whether the title has the correct property attribute.
-    $tracker_title = $this->xpath('//tr[@about=:url]/td[@property="dc:title" and @datatype=""]', array(':url' => $url));
+    $tracker_title = $this->xpath('//tr[@about=:url]/td[@property="dcterms:title" and @datatype=""]', array(':url' => $url));
     $this->assertTrue(!empty($tracker_title), t('Title property attribute found on @user content.', array('@user'=> $user)));
 
     // Tests whether the relationship between the content and user has been set.
@@ -638,7 +638,7 @@ class RdfTrackerAttributesTestCase exten
     // date has been added to the tracker output before comments have been
     // posted, meaning the latest activity reflects changes to the node itself.
     $isoDate = date('c', $node->changed);
-    $tracker_activity = $this->xpath('//tr[@about=:url]//td[contains(@property, "dc:modified") and contains(@property, "sioc:last_activity_date") and contains(@datatype, "xsd:dateTime") and @content=:date]', array(':url' => $url, ':date' => $isoDate));
+    $tracker_activity = $this->xpath('//tr[@about=:url]//td[contains(@property, "dcterms:modified") and contains(@property, "sioc:last_activity_date") and contains(@datatype, "xsd:dateTime") and @content=:date]', array(':url' => $url, ':date' => $isoDate));
     $this->assertTrue(!empty($tracker_activity), t('Latest activity date and changed properties found when there are no comments on @user content. Latest activity date content is correct.', array('@user'=> $user)));
 
     // Tests that the appropriate RDFa markup to annotate the latest activity