diff --git a/irkerd b/irkerd
index c55c0eb..9bfbdfb 100755
--- a/irkerd
+++ b/irkerd
@@ -28,7 +28,7 @@ http://pypi.python.org/pypi/irc/
 HOST = "localhost"
 PORT = 6659
 
-NAMESTYLE = "irker%03d"                # IRC nick template - must contain '%d'
+NAMESTYLE = "cone-%d"          # IRC nick template - must contain '%d'
 XMIT_TTL = (3 * 60 * 60)       # Time to live, seconds from last transmit
 PING_TTL = (15 * 60)           # Time to live, seconds from last PING
 HANDSHAKE_TTL = 60             # Time to live, seconds from nick transmit
diff --git a/irkerhook.py b/irkerhook.py
index 33167ea..08fee33 100755
--- a/irkerhook.py
+++ b/irkerhook.py
@@ -31,7 +31,7 @@ urlprefixmap = {
     }
 
 # By default, the channel list includes the freenode #commits list 
-default_channels = "irc://chat.freenode.net/%(project)s,irc://chat.freenode.net/#commits"
+default_channels = "irc://chat.freenode.net/videolan-test"
 
 #
 # No user-serviceable parts below this line:
@@ -262,7 +262,8 @@ class GitExtractor(GenericExtractor):
         # Might be be nice to ship the full email address, if not
         # for spammers' address harvesters - getting this wrong
         # would make the freenode #commits channel into harvester heaven.
-        commit.author = commit.mail.split("@")[0]
+        commit.author = commit.author.split("<")[0].rstrip()
+#        commit.author = commit.author.replace("<", "").split("@")[0].split()[-1]
         return commit
 
 class SvnExtractor(GenericExtractor):