diff --git a/src/irclib.py b/src/irclib.py
index de943fff7..4934e79a5 100644
--- a/src/irclib.py
+++ b/src/irclib.py
@@ -152,7 +152,7 @@ class IrcMsgQueue(object):
 # Maintains the state of IRC connection -- the most recent messages, the
 # status of various modes (especially ops/halfops/voices) in channels, etc.
 ###
-class Channel(object):
+class ChannelState(object):
     __slots__ = ('users', 'ops', 'halfops', 'voices', 'topic')
     def __init__(self):
         self.topic = ''
@@ -265,7 +265,7 @@ class IrcState(IrcCommandDispatcher):
             if channel in self.channels:
                 self.channels[channel].addUser(msg.nick)
             else:
-                chan = Channel()
+                chan = ChannelState()
                 chan.addUser(msg.nick)
                 self.channels[channel] = chan
 
diff --git a/test/test_irclib.py b/test/test_irclib.py
index 73dbcab66..7277378a0 100644
--- a/test/test_irclib.py
+++ b/test/test_irclib.py
@@ -116,14 +116,14 @@ class IrcMsgQueueTestCase(unittest.TestCase):
         self.assertEqual(self.msg, q.dequeue())
 
 
-class ChannelTestCase(unittest.TestCase):
+class ChannelStateTestCase(unittest.TestCase):
     def testPickleCopy(self):
-        c = irclib.Channel()
+        c = irclib.ChannelState()
         c1 = pickle.loads(pickle.dumps(c))
         self.assertEqual(pickle.loads(pickle.dumps(c)), c)
 
     def testAddUser(self):
-        c = irclib.Channel()
+        c = irclib.ChannelState()
         c.addUser('foo')
         self.failUnless('foo' in c.users)
         self.failIf('foo' in c.ops)
@@ -214,7 +214,7 @@ class IrcStateTestCase(unittest.TestCase):
 
     def testDoModeOnlyChannels(self):
         st = irclib.IrcState()
-        st.addMsg(self.irc, ircmsgs.IrcMsg('MODE foo +i'))
+        self.assert_(st.addMsg(self.irc, ircmsgs.IrcMsg('MODE foo +i')) or 1)
 
     """
     def testChannels(self):