diff --git a/mozilla/mailnews/news/src/nsNNTPArticleList.cpp b/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
index 723a520acee..fd1c551826f 100644
--- a/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPArticleList.cpp
@@ -31,7 +31,7 @@ class nsNNTPArticleList
 {
 public:
 	nsNNTPArticleList(const nsINNTPHost * newshost,
-                      const nsIMsgNewsgroup* newsgroup);
+                      const nsINNTPNewsgroup* newsgroup);
                                   /* , MSG_Pane *pane); */
     virtual ~nsNNTPArticleList();
 
@@ -39,7 +39,7 @@ public:
   
     // nsINNTPArticleKeysState
     NS_METHOD Initialize(const nsINNTPHost *newsHost,
-                          const nsIMsgNewsgroup *newsgroup);
+                          const nsINNTPNewsgroup *newsgroup);
 	NS_IMETHOD AddArticleKey(PRInt32 key);
 	NS_IMETHOD FinishAddingArticleKeys();
 
@@ -50,7 +50,7 @@ protected:
 	MSG_Pane				*m_pane;
 #endif
   /* formerly m_groupName */
-	nsIMsgNewsgroup			*m_newsgroup;
+	nsINNTPNewsgroup		*m_newsgroup;
 	nsINNTPHost			*m_host;
 #ifdef HAVE_NEWSDB
 	NewsGroupDB				*m_newsDB;
@@ -66,7 +66,7 @@ protected:
 };
 
 nsNNTPArticleList::nsNNTPArticleList(const nsINNTPHost* newsHost,
-                                     const nsIMsgNewsgroup* newsgroup)
+                                     const nsINNTPNewsgroup* newsgroup)
 {
     NS_INIT_REFCNT();
     Initialize(newsHost, newsgroup);
@@ -74,7 +74,7 @@ nsNNTPArticleList::nsNNTPArticleList(const nsINNTPHost* newsHost,
 
 nsresult
 nsNNTPArticleList::Initialize(const nsINNTPHost * newsHost,
-                              const nsIMsgNewsgroup* newsgroup)
+                              const nsINNTPNewsgroup* newsgroup)
 {
 	m_host = newsHost;
     m_newsgroup = newsgroup;
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
index 7e147c4ef2d..2774b355f86 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp
@@ -87,7 +87,7 @@ public:
   NS_DECL_ISUPPORTS
 
   
-  // nsIMsgNewsArticleList
+  // nsINNTPArticleList
   NS_IMETHOD GetRangeOfArtsToDownload(nsINNTPHost* host,
                                       const char* group_name,
                                       PRInt32 first_possible,
@@ -729,7 +729,7 @@ nsNNTPNewsgroupList::FinishXOVER (int status)
 			}
 #endif
 		}
-		nsIMsgNewsgroup *newsFolder = NULL;
+		nsINNTPNewsgroup *newsFolder = NULL;
 #ifdef HAVE_PANES
 		newsFolder = (m_pane) ? savePane->GetMaster()->FindNewsFolder(m_host, m_groupName, PR_FALSE) : 0;
 		FE_PaneChanged(m_pane, PR_FALSE, MSG_PaneNotifyFolderLoaded, (PRUint32)newsFolder);
diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.h b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.h
index c6ecce742af..059d826bb08 100644
--- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.h
+++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.h
@@ -27,6 +27,7 @@
 
 #include "nsINNTPHost.h"
 #include "nsINNTPNewsgroupList.h"
+#include "nsINNTPNewsgroup.h"
 
 #include "nsNNTPArticleSet.h"
 
@@ -56,6 +57,6 @@ typedef struct MSG_NewsKnown {
 extern NS_COM nsresult
 NS_NewNewsgroupList(nsINNTPNewsgroupList **aInstancePtrResult,
                     nsINNTPHost *newsHost,
-                    nsIMsgNewsgroup *newsgroup);
+                    nsINNTPNewsgroup *newsgroup);
     
 #endif
diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
index 3909b10cdde..fdeb5b4e678 100644
--- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
@@ -849,7 +849,7 @@ PRInt32 nsNNTPProtocol::SendFirstNNTPCommand(nsIURL * url)
 		PRUint32 number = 0;
 
 		nsresult rv;
-        nsIMsgNewsgroup *newsgroup;
+        nsINNTPNewsgroup *newsgroup;
         rv = m_newsHost->GetNewsGroupAndNumberOfID(m_path, &newsgroup, &number);
 		if (NS_SUCCEEDED(rv) && newsgroup && number)
 		  {
@@ -3083,7 +3083,7 @@ PRInt32 nsNNTPProtocol::ListXActiveResponse(nsIInputStream * inputStream, PRUint
           if (m_typeWanted == NEW_GROUPS &&
               NS_SUCCEEDED(rv) && xactive)
 			{
-                nsIMsgNewsgroup* old_newsgroup = m_newsgroup;
+                nsINNTPNewsgroup* old_newsgroup = m_newsgroup;
                 m_newsHost->GetFirstGroupNeedingExtraInfo(&m_newsgroup);
                 if (old_newsgroup && m_newsgroup &&
                     old_newsgroup != m_newsgroup)
diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.h b/mozilla/mailnews/news/src/nsNNTPProtocol.h
index 97d6a2a8d12..76d95992628 100644
--- a/mozilla/mailnews/news/src/nsNNTPProtocol.h
+++ b/mozilla/mailnews/news/src/nsNNTPProtocol.h
@@ -28,7 +28,7 @@
 #include "nsINNTPNewsgroupList.h"
 #include "nsINNTPArticleList.h"
 #include "nsINNTPHost.h"
-#include "nsIMsgNewsgroup.h"
+#include "nsINNTPNewsgroup.h"
 #include "nsIMsgOfflineNewsState.h"
 
 
@@ -177,7 +177,7 @@ private:
     nsINNTPArticleList *	m_articleList;
 
 	nsINNTPHost			* m_newsHost;
-	nsIMsgNewsgroup			* m_newsgroup;
+	nsINNTPNewsgroup			* m_newsgroup;
 	nsIMsgOfflineNewsState  * m_offlineNewsState;
 
 	// Ouput stream for writing commands to the socket