diff --git a/mozilla/directory/xpcom/datasource/nsLDAPDataSource.js b/mozilla/directory/xpcom/datasource/nsLDAPDataSource.js
index bee468457ac..8aac014580a 100644
--- a/mozilla/directory/xpcom/datasource/nsLDAPDataSource.js
+++ b/mozilla/directory/xpcom/datasource/nsLDAPDataSource.js
@@ -66,7 +66,7 @@ ArrayEnumerator.prototype = {
 // the datasource object itself
 //
 const NS_LDAPDATASOURCE_CONTRACTID = 
-    '@mozilla.org/rdf/datasource;1?name=?name=ldap';
+    '@mozilla.org/rdf/datasource;1?name=ldap';
 const NS_LDAPDATASOURCE_CID =
     Components.ID('{8da18684-6486-4a7e-b261-35331f3e7163}');
 
diff --git a/mozilla/js/src/xpconnect/tests/js/old/xpctest_enum_create.js b/mozilla/js/src/xpconnect/tests/js/old/xpctest_enum_create.js
index 6900b003ae5..a81bf8c348b 100644
--- a/mozilla/js/src/xpconnect/tests/js/old/xpctest_enum_create.js
+++ b/mozilla/js/src/xpconnect/tests/js/old/xpctest_enum_create.js
@@ -140,7 +140,7 @@ var contractIDsTo_NOT_Create = [
 // fixed    "@mozilla.org/addressbook/directoryproperty;1",  // fails to init refcount
 
 // fixed    "@mozilla.org/rdf/datasource;1?name=local-store", //NS_NewLocalStore calls stuff that asserts
-// fixed    "@mozilla.org/rdf/datasource;1?name=?name=xpinstall-update-notifier", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere)
+// fixed    "@mozilla.org/rdf/datasource;1?name=xpinstall-update-notifier", //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere)
 // fixed    "@mozilla.org/rdf/xul-template-builder;1",    //RDFXMLDataSourceImpl::Refresh does CreateInstance of parser but fails to check the result (I think I've seen this elsewhere)
 
 // fixed    "@mozilla.org/rdf/xul-content-sink;1", // nsXULContentSink.cpp, XULContentSinkImpl::XULContentSinkImpl needs to init mNameSpaceManager
@@ -164,15 +164,15 @@ var contractIDsTo_NOT_Create = [
 
 
 /* BUG 11512 */    "@mozilla.org/rdf/datasource;1?name=files", // FileSystemDataSource::~FileSystemDataSource calls gRDFService->UnregisterDataSource(this); even though it was not registered
-/* BUG 11512 */    "@mozilla.org/rdf/datasource;1?name=?name=find", // FindDataSource::~FindDataSource calls gRDFService->UnregisterDataSource(this) even if it was not actaully registered.
+/* BUG 11512 */    "@mozilla.org/rdf/datasource;1?name=find", // FindDataSource::~FindDataSource calls gRDFService->UnregisterDataSource(this) even if it was not actaully registered.
 
-/* BUG 11514 */    "@mozilla.org/rdf/datasource;1?name=?name=msgaccounts", // nsMsgAccountDataSource::QueryInterface is COMPLETELY <censor>screwed</censor> up
+/* BUG 11514 */    "@mozilla.org/rdf/datasource;1?name=msgaccounts", // nsMsgAccountDataSource::QueryInterface is COMPLETELY <censor>screwed</censor> up
 
 /* BUG 11516 */    "@mozilla.org/rdf/xul-sort-service;1",  // XULSortServiceImpl releases itself in its own destructor!
 
 /* BUG 11570 */    "componment://netscape/intl/charsetconvertermanager", // another case where CreateInstance returned NS_OK, but the instance pointer was null!
 
-/* BUG 11571 */    "@mozilla.org/rdf/datasource;1?name=?name=mail-messageview", // nsMessageViewDataSource::RemoveDataSource uses mDataSource without checking for validity
+/* BUG 11571 */    "@mozilla.org/rdf/datasource;1?name=mail-messageview", // nsMessageViewDataSource::RemoveDataSource uses mDataSource without checking for validity
 
 
 /* BUG 11575 */    "@mozilla.org/rdf/resource-factory;1",  // calling a property - trying to copy a null value in nsRDFResource::GetValue
diff --git a/mozilla/mailnews/base/resources/content/mailWindow.js b/mozilla/mailnews/base/resources/content/mailWindow.js
index 90e5f008d06..f5b0c3f4731 100644
--- a/mozilla/mailnews/base/resources/content/mailWindow.js
+++ b/mozilla/mailnews/base/resources/content/mailWindow.js
@@ -44,7 +44,7 @@ var mailSession;
 var Bundle;
 var BrandBundle;
 
-var datasourceContractIDPrefix = "@mozilla.org/rdf/datasource;1?name=?name=";
+var datasourceContractIDPrefix = "@mozilla.org/rdf/datasource;1?name=";
 var accountManagerDSContractID = datasourceContractIDPrefix + "msgaccountmanager";
 var folderDSContractID         = datasourceContractIDPrefix + "mailnewsfolders";
 var messageDSContractID        = datasourceContractIDPrefix + "mailnewsmessages";
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.js b/mozilla/mailnews/base/search/resources/content/SearchDialog.js
index f3a54ee4fac..8bacae15503 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.js
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.js
@@ -18,7 +18,7 @@
  * Rights Reserved.
  */
 
-var rdfDatasourcePrefix = "@mozilla.org/rdf/datasource;1?name=?name=";
+var rdfDatasourcePrefix = "@mozilla.org/rdf/datasource;1?name=";
 var rdfServiceContractID    = "@mozilla.org/rdf/rdf-service;1";
 var searchSessionContractID = "@mozilla.org/messenger/searchSession;1";
 var folderDSContractID         = rdfDatasourcePrefix + "mailnewsfolders";
diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
index 0bc9ad45fd4..28ea60cf822 100644
--- a/mozilla/xpcom/components/nsComponentManager.cpp
+++ b/mozilla/xpcom/components/nsComponentManager.cpp
@@ -1119,6 +1119,10 @@ nsComponentManagerImpl::ContractIDToClassID(const char *aContractID, nsCID *aCla
     }
 #endif /* USE_REGISTRY */
 
+    if (PL_strcmp(aContractID, "@mozilla.org/rdf/datasource") == 0)
+    {
+PR_ASSERT(false);
+    }
     if (PR_LOG_TEST(nsComponentManagerLog, PR_LOG_ALWAYS)) {
         char *buf = 0;
         if (NS_SUCCEEDED(res))