diff --git a/plugins/Topic.py b/plugins/ChannelTopic.py
similarity index 99%
rename from plugins/Topic.py
rename to plugins/ChannelTopic.py
index 8b8ee9b31..0f8fc3ca5 100644
--- a/plugins/Topic.py
+++ b/plugins/ChannelTopic.py
@@ -49,7 +49,7 @@ import callbacks
 example = utils.wrapLines("""
 --- Topic for #sourcereview is If you notice *anything* that seems unintuitive about supybot, post it at http://tinyurl.com/nvct (jemfinch) || Supybot 0.72.1 released! (jemfinch) || If anyone is working on the .deb package for supybot please send me or jemfinch a note via the bot (Strike)
 --- Topic for #sourcereview set by supybot at Mon Sep 29 15:56:10
-<jemfinch> @list Topic
+<jemfinch> @list ChannelTopic
 <supybot> jemfinch: addtopic, changetopic, removetopic, shuffletopic, topic
 <jemfinch> @removetopic 2
 --- supybot has changed the topic to: If you notice *anything* that seems unintuitive about supybot, post it at http://tinyurl.com/nvct (jemfinch) || If anyone is working on the .deb package for supybot please send me or jemfinch a note via the bot (Strike)
@@ -63,7 +63,7 @@ example = utils.wrapLines("""
 --- supybot has changed the topic to: If anyone is working on the .deb package for supybot please send me or jemfinch a note via the bot (Strike) || If you notice *anything* that seems unintuitive about supybot, post it at http://tinyurl.com/nvct (jemfinch) || Tenative release for Supybot 0.73.0 is set for Sunday (jemfinch)
 """)
 
-class Topic(callbacks.Privmsg):
+class ChannelTopic(callbacks.Privmsg):
     topicSeparator = ' || '
     topicFormatter = '%s (%s)'
     topicUnformatter = re.compile('(.*) \((\S+)\)')
@@ -220,5 +220,7 @@ class Topic(callbacks.Privmsg):
     removetopic = privmsgs.checkChannelCapability(removetopic, 'topic')
 
 
-Class = Topic
+Class = ChannelTopic
+
+
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
diff --git a/test/test_ChannelTopic.py b/test/test_ChannelTopic.py
index fadb4331c..f85291c6e 100644
--- a/test/test_ChannelTopic.py
+++ b/test/test_ChannelTopic.py
@@ -31,8 +31,8 @@
 
 from test import *
 
-class TopicTestCase(PluginTestCase, PluginDocumentation):
-    plugins = ('Topic', 'AdminCommands')
+class ChannelTopicTestCase(PluginTestCase, PluginDocumentation):
+    plugins = ('ChannelTopic', 'AdminCommands')
     def testAddtopic(self):
         _ = self.getMsg('join #foo')
         _ = self.getMsg(' ') # Get the WHO.
diff --git a/test/test_Topic.py b/test/test_Topic.py
deleted file mode 100644
index fadb4331c..000000000
--- a/test/test_Topic.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/env python
-
-###
-# Copyright (c) 2002, Jeremiah Fincher
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-#   * Redistributions of source code must retain the above copyright notice,
-#     this list of conditions, and the following disclaimer.
-#   * Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions, and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#   * Neither the name of the author of this software nor the name of
-#     contributors to this software may be used to endorse or promote products
-#     derived from this software without specific prior written consent.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-###
-
-from test import *
-
-class TopicTestCase(PluginTestCase, PluginDocumentation):
-    plugins = ('Topic', 'AdminCommands')
-    def testAddtopic(self):
-        _ = self.getMsg('join #foo')
-        _ = self.getMsg(' ') # Get the WHO.
-        m = self.getMsg('addtopic #foo foo')
-        self.assertEqual(m.command, 'TOPIC')
-        self.assertEqual(m.args[0], '#foo')
-        self.assertEqual(m.args[1], 'foo (test)')
-        m = self.getMsg('addtopic #foo bar')
-        self.assertEqual(m.command, 'TOPIC')
-        self.assertEqual(m.args[0], '#foo')
-
-    def testChangetopic(self):
-        _ = self.getMsg('join #foo')
-        _ = self.getMsg(' ')
-        _ = self.getMsg('addtopic #foo foo')
-        _ = self.getMsg('addtopic #foo bar')
-        _ = self.getMsg('addtopic #foo baz')
-        self.assertRegexp('changetopic #foo -1 s/baz/biff/',
-                          r'foo.*bar.*biff')
-        self.assertRegexp('changetopic #foo 2 s/bar/baz/',
-                          r'foo.*baz.*biff')
-        self.assertRegexp('changetopic #foo 1 s/foo/bar/',
-                          r'bar.*baz.*biff')
-        self.assertRegexp('changetopic #foo -2 s/baz/bazz/',
-                          r'bar.*bazz.*biff')
-
-
-# vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78:
-