diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp
index f19e6700bcc..e3ce4790c29 100644
--- a/mozilla/editor/base/nsEditor.cpp
+++ b/mozilla/editor/base/nsEditor.cpp
@@ -81,7 +81,7 @@ static NS_DEFINE_IID(kIContentIteratorIID, NS_ICONTENTITERTOR_IID);
 static NS_DEFINE_CID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);
 // transaction manager
 static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID);
-static NS_DEFINE_CID(kCTransactionManagerFactoryCID, NS_TRANSACTION_MANAGER_FACTORY_CID);
+static NS_DEFINE_CID(kCTransactionManagerCID, NS_TRANSACTIONMANAGER_CID);
 // transactions
 static NS_DEFINE_IID(kEditAggregateTxnIID,  EDIT_AGGREGATE_TXN_IID);
 static NS_DEFINE_IID(kInsertTextTxnIID,     INSERT_TEXT_TXN_IID);
@@ -373,7 +373,7 @@ nsEditor::EnableUndo(PRBool aEnable)
   {
     if (!mTxnMgr)
     {
-      result = gCompMgr->CreateInstance(kCTransactionManagerFactoryCID,
+      result = gCompMgr->CreateInstance(kCTransactionManagerCID,
                                         nsnull,
                                         kITransactionManagerIID, (void **)&txnMgr);
       if (NS_FAILED(result) || !txnMgr) {
diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index f19e6700bcc..e3ce4790c29 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -81,7 +81,7 @@ static NS_DEFINE_IID(kIContentIteratorIID, NS_ICONTENTITERTOR_IID);
 static NS_DEFINE_CID(kCContentIteratorCID, NS_CONTENTITERATOR_CID);
 // transaction manager
 static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID);
-static NS_DEFINE_CID(kCTransactionManagerFactoryCID, NS_TRANSACTION_MANAGER_FACTORY_CID);
+static NS_DEFINE_CID(kCTransactionManagerCID, NS_TRANSACTIONMANAGER_CID);
 // transactions
 static NS_DEFINE_IID(kEditAggregateTxnIID,  EDIT_AGGREGATE_TXN_IID);
 static NS_DEFINE_IID(kInsertTextTxnIID,     INSERT_TEXT_TXN_IID);
@@ -373,7 +373,7 @@ nsEditor::EnableUndo(PRBool aEnable)
   {
     if (!mTxnMgr)
     {
-      result = gCompMgr->CreateInstance(kCTransactionManagerFactoryCID,
+      result = gCompMgr->CreateInstance(kCTransactionManagerCID,
                                         nsnull,
                                         kITransactionManagerIID, (void **)&txnMgr);
       if (NS_FAILED(result) || !txnMgr) {
diff --git a/mozilla/editor/txmgr/public/nsTransactionManagerCID.h b/mozilla/editor/txmgr/public/nsTransactionManagerCID.h
index b946fa7cd3d..231c011d4f1 100644
--- a/mozilla/editor/txmgr/public/nsTransactionManagerCID.h
+++ b/mozilla/editor/txmgr/public/nsTransactionManagerCID.h
@@ -19,7 +19,7 @@
 #ifndef nsTransactionManagerCID_h__
 #define nsTransactionManagerCID_h__
 
-#define NS_TRANSACTION_MANAGER_FACTORY_CID          \
+#define NS_TRANSACTIONMANAGER_CID                   \
 { /* 9C8F9601-801A-11d2-98BA-00805F297D89 */        \
 0x9c8f9601, 0x801a, 0x11d2,                         \
 { 0x98, 0xba, 0x0, 0x80, 0x5f, 0x29, 0x7d, 0x89 } }
diff --git a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp
index c3ec6fdc943..fee6fea10d7 100644
--- a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp
+++ b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp
@@ -28,7 +28,7 @@
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
-static NS_DEFINE_CID(kCTransactionManagerFactoryCID, NS_TRANSACTION_MANAGER_FACTORY_CID);
+static NS_DEFINE_CID(kCTransactionManagerCID, NS_TRANSACTIONMANAGER_CID);
 static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 
 class nsTransactionManagerFactory : public nsIFactory
@@ -148,7 +148,7 @@ extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, const char *
                            (nsISupports**)&compMgr);
   if (NS_FAILED(rv)) return rv;
 
-  rv = compMgr->RegisterComponent(kCTransactionManagerFactoryCID,
+  rv = compMgr->RegisterComponent(kCTransactionManagerCID,
                                   NULL, NULL, path,
                                   PR_TRUE, PR_TRUE);
 
@@ -169,7 +169,7 @@ extern "C" NS_EXPORT nsresult NSUnregisterSelf(nsISupports* aServMgr, const char
                            (nsISupports**)&compMgr);
   if (NS_FAILED(rv)) return rv;
 
-  rv = compMgr->UnregisterFactory(kCTransactionManagerFactoryCID, path);
+  rv = compMgr->UnregisterFactory(kCTransactionManagerCID, path);
 
   (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
   return rv;
diff --git a/mozilla/editor/txmgr/tests/TestTXMgr.cpp b/mozilla/editor/txmgr/tests/TestTXMgr.cpp
index 506988e6af6..8149fc64cc1 100644
--- a/mozilla/editor/txmgr/tests/TestTXMgr.cpp
+++ b/mozilla/editor/txmgr/tests/TestTXMgr.cpp
@@ -418,7 +418,7 @@ static NS_DEFINE_IID(kITransactionIID, NS_ITRANSACTION_IID);
 static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID);
 static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
 
-static NS_DEFINE_CID(kCTransactionManagerFactoryCID, NS_TRANSACTION_MANAGER_FACTORY_CID);
+static NS_DEFINE_CID(kCTransactionManagerCID, NS_TRANSACTIONMANAGER_CID);
 
 
 #ifdef XP_PC
@@ -865,7 +865,7 @@ quick_test(TestTransactionFactory *factory)
   nsITransaction *r1 = 0, *r2 = 0;
   nsresult result;
 
-  result = nsComponentManager::CreateInstance(kCTransactionManagerFactoryCID, nsnull,
+  result = nsComponentManager::CreateInstance(kCTransactionManagerCID, nsnull,
                                         kITransactionManagerIID, (void **)&mgr);
 
   if (NS_FAILED(result) || !mgr) {
@@ -2734,7 +2734,7 @@ quick_batch_test(TestTransactionFactory *factory)
   nsITransaction *r1 = 0, *r2 = 0;
   nsresult result;
 
-  result = nsComponentManager::CreateInstance(kCTransactionManagerFactoryCID, nsnull,
+  result = nsComponentManager::CreateInstance(kCTransactionManagerCID, nsnull,
                                         kITransactionManagerIID, (void **)&mgr);
 
   if (NS_FAILED(result) || !mgr) {
@@ -4348,7 +4348,7 @@ stress_test(TestTransactionFactory *factory, PRInt32 iterations)
   nsITransaction *tx          = 0;
   nsresult result;
 
-  result = nsComponentManager::CreateInstance(kCTransactionManagerFactoryCID, nsnull,
+  result = nsComponentManager::CreateInstance(kCTransactionManagerCID, nsnull,
                                         kITransactionManagerIID, (void **)&mgr);
 
   if (NS_FAILED(result) || !mgr) {
@@ -4542,7 +4542,7 @@ main (int argc, char *argv[])
 {
   nsresult result;
 
-  nsComponentManager::RegisterComponent(kCTransactionManagerFactoryCID, NULL, NULL,
+  nsComponentManager::RegisterComponent(kCTransactionManagerCID, NULL, NULL,
                                 TRANSACTION_MANAGER_DLL, PR_FALSE, PR_FALSE);
 
   result = simple_test();