diff --git a/src/asyncoreDrivers.py b/src/asyncoreDrivers.py
index b0025f6bd..3a2c2342a 100644
--- a/src/asyncoreDrivers.py
+++ b/src/asyncoreDrivers.py
@@ -52,7 +52,7 @@ class AsyncoreRunnerDriver(drivers.IrcDriver):
     def run(self):
         #debug.printf(asyncore.socket_map)
         try:
-            asyncore.poll(conf.asyncorePoll)
+            asyncore.poll(conf.poll)
         except:
             debug.recoverableException()
 
diff --git a/src/conf.py b/src/conf.py
index c8193cac5..ddfe78734 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -108,15 +108,15 @@ telnetEnable = False
 telnetPort = 31337
 
 ###
-# asyncorePoll: the length of an asyncore's polling term.
-#               If asyncore drivers are all you're using, feel free to make
-#               this arbitrarily large -- be warned, however, that all other
-#               drivers are just sitting around while asyncore waits during
-#               this poll period (including the schedule).  It'll take more
-#               CPU, but you probably don't want to set this more than 0.01
-#               when you've got non-asyncore drivers to worry about.
+# poll: the length of a polling term.
+#       If asyncore drivers are all you're using, feel free to make
+#       this arbitrarily large -- be warned, however, that all other
+#       drivers are just sitting around while asyncore waits during
+#       this poll period (including the schedule).  It'll take more
+#       CPU, but you probably don't want to set this more than 0.01
+#       when you've got non-asyncore drivers to worry about.
 ###
-asyncorePoll = 1
+poll = 1
 
 ###
 # maxHistory: Maximum number of messages kept in an Irc object's state.
@@ -171,6 +171,7 @@ prefixChars = '@'
 ###
 detailedTracebacks = True
 
+
 ###############################
 ###############################
 ###############################