diff --git a/plugins/News.py b/plugins/ChannelNews.py
similarity index 99%
rename from plugins/News.py
rename to plugins/ChannelNews.py
index d2ad5ec0b..6f3889fa6 100644
--- a/plugins/News.py
+++ b/plugins/ChannelNews.py
@@ -76,7 +76,7 @@ be a lot more detailed. (Subject: "Another test news item", added by Strike on
 07:12 PM, September 12, 2003, expires at 08:36 PM, September 12, 2003)
 """)
 
-class News(plugins.ChannelDBHandler, callbacks.Privmsg):
+class ChannelNews(plugins.ChannelDBHandler, callbacks.Privmsg):
     def __init__(self):
         plugins.ChannelDBHandler.__init__(self)
         callbacks.Privmsg.__init__(self)
@@ -273,6 +273,6 @@ class News(plugins.ChannelDBHandler, callbacks.Privmsg):
 
 
                     
-Class = News
+Class = ChannelNews
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_News.py b/test/test_ChannelNews.py
similarity index 97%
rename from test/test_News.py
rename to test/test_ChannelNews.py
index df6ead9ac..7d9d26bb9 100644
--- a/test/test_News.py
+++ b/test/test_ChannelNews.py
@@ -42,8 +42,8 @@ except ImportError:
 
 
 if sqlite is not None:
-    class NewsTestCase(ChannelPluginTestCase):
-        plugins = ('News',)
+    class ChannelNewsTestCase(ChannelPluginTestCase):
+        plugins = ('ChannelNews',)
         def testAddnews(self):
             self.assertNotError('addnews 0 subject: foo')
             self.assertRegexp('news', 'subject')