diff --git a/docs/conf.py b/docs/conf.py
index e41bd87a1..fb037b437 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -39,7 +39,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'Supybot'
-copyright = u'2010, Jeremiah Fincher and James Vega'
+copyright = u'2010, Jeremiah Fincher and James McCoy'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -174,7 +174,7 @@ htmlhelp_basename = 'Supybotdoc'
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
   ('index', 'Supybot.tex', u'Supybot Documentation',
-   u'Jeremiah Fincher and James Vega', 'manual'),
+   u'Jeremiah Fincher and James McCoy', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/docs/man/supybot-adduser.1 b/docs/man/supybot-adduser.1
index 374db0678..b183e5049 100644
--- a/docs/man/supybot-adduser.1
+++ b/docs/man/supybot-adduser.1
@@ -36,7 +36,7 @@ multiple times.
 .IR supybot-plugin-doc (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot-botchk.1 b/docs/man/supybot-botchk.1
index 58f964cc1..d40ad87c0 100644
--- a/docs/man/supybot-botchk.1
+++ b/docs/man/supybot-botchk.1
@@ -48,7 +48,7 @@ when (re)starting the bot.
 .IR supybot-plugin-doc (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot-plugin-create.1 b/docs/man/supybot-plugin-create.1
index 53d90298d..aed4bd24c 100644
--- a/docs/man/supybot-plugin-create.1
+++ b/docs/man/supybot-plugin-create.1
@@ -37,7 +37,7 @@ Specify what real name the copyright is assigned to.
 .IR supybot-adduser (1),
 .IR supybot-plugin-doc (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot-plugin-doc.1 b/docs/man/supybot-plugin-doc.1
index b958d5208..857987d4b 100644
--- a/docs/man/supybot-plugin-doc.1
+++ b/docs/man/supybot-plugin-doc.1
@@ -42,7 +42,7 @@ them.
 .IR supybot-adduser (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot-test.1 b/docs/man/supybot-test.1
index c647985c3..87a9dd6b1 100644
--- a/docs/man/supybot-test.1
+++ b/docs/man/supybot-test.1
@@ -45,7 +45,7 @@ Looks in the given directory for plugins and loads the tests for all of them.
 .IR supybot-plugin-doc (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot-wizard.1 b/docs/man/supybot-wizard.1
index 0352250b3..64cf4e05e 100644
--- a/docs/man/supybot-wizard.1
+++ b/docs/man/supybot-wizard.1
@@ -36,7 +36,7 @@ connection.
 .IR supybot-plugin-doc (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/docs/man/supybot.1 b/docs/man/supybot.1
index 08385010c..3c8e0e1fb 100644
--- a/docs/man/supybot.1
+++ b/docs/man/supybot.1
@@ -60,7 +60,7 @@ script.
 .IR supybot-plugin-doc (1),
 .IR supybot-plugin-create (1)
 .SH AUTHOR
-This manual page was originally written by James Vega
-<jamessan at supybot dot com>.  Permission is granted to copy,
+This manual page was originally written by James McCoy
+<vega dot james at gmail dot com>.  Permission is granted to copy,
 distribute and/or modify this document under the terms of the Supybot
 license, a BSD-style license.
diff --git a/plugins/Alias/plugin.py b/plugins/Alias/plugin.py
index f90eb29cf..f6dfc229a 100644
--- a/plugins/Alias/plugin.py
+++ b/plugins/Alias/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Anonymous/plugin.py b/plugins/Anonymous/plugin.py
index 9eb95260d..7715cfafc 100644
--- a/plugins/Anonymous/plugin.py
+++ b/plugins/Anonymous/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Daniel DiPaolo
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Anonymous/test.py b/plugins/Anonymous/test.py
index 4d2dd1575..96a570853 100644
--- a/plugins/Anonymous/test.py
+++ b/plugins/Anonymous/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Daniel DiPaolo
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/AutoMode/plugin.py b/plugins/AutoMode/plugin.py
index 8100f80a9..56b4a209e 100644
--- a/plugins/AutoMode/plugin.py
+++ b/plugins/AutoMode/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/BadWords/plugin.py b/plugins/BadWords/plugin.py
index e373567a4..224a1e204 100644
--- a/plugins/BadWords/plugin.py
+++ b/plugins/BadWords/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Channel/config.py b/plugins/Channel/config.py
index 023073dde..3d0f0762c 100644
--- a/plugins/Channel/config.py
+++ b/plugins/Channel/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Channel/test.py b/plugins/Channel/test.py
index e33b3b51f..bcc98e431 100644
--- a/plugins/Channel/test.py
+++ b/plugins/Channel/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ChannelLogger/config.py b/plugins/ChannelLogger/config.py
index eae2ac7a4..4d8d99c3a 100644
--- a/plugins/ChannelLogger/config.py
+++ b/plugins/ChannelLogger/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ChannelLogger/plugin.py b/plugins/ChannelLogger/plugin.py
index 93f9b3c06..dbbdfe3ab 100644
--- a/plugins/ChannelLogger/plugin.py
+++ b/plugins/ChannelLogger/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ChannelStats/plugin.py b/plugins/ChannelStats/plugin.py
index d09129bed..4b0f235f0 100644
--- a/plugins/ChannelStats/plugin.py
+++ b/plugins/ChannelStats/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ChannelStats/test.py b/plugins/ChannelStats/test.py
index 40cea6d42..e2ba158ce 100644
--- a/plugins/ChannelStats/test.py
+++ b/plugins/ChannelStats/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Config/plugin.py b/plugins/Config/plugin.py
index 0b2dd6fda..cdb93e82f 100644
--- a/plugins/Config/plugin.py
+++ b/plugins/Config/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Config/test.py b/plugins/Config/test.py
index 49130b08e..e39bf97ae 100644
--- a/plugins/Config/test.py
+++ b/plugins/Config/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Dict/plugin.py b/plugins/Dict/plugin.py
index 989ee687b..57d0ae5d3 100644
--- a/plugins/Dict/plugin.py
+++ b/plugins/Dict/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Factoids/config.py b/plugins/Factoids/config.py
index 79b43b654..791317164 100644
--- a/plugins/Factoids/config.py
+++ b/plugins/Factoids/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Factoids/plugin.py b/plugins/Factoids/plugin.py
index 448a4cd43..cafd0dccb 100644
--- a/plugins/Factoids/plugin.py
+++ b/plugins/Factoids/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Factoids/test.py b/plugins/Factoids/test.py
index fb8fa7e35..59f8878da 100644
--- a/plugins/Factoids/test.py
+++ b/plugins/Factoids/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Games/plugin.py b/plugins/Games/plugin.py
index 203bb9fd5..b020a5b80 100644
--- a/plugins/Games/plugin.py
+++ b/plugins/Games/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Google/config.py b/plugins/Google/config.py
index a309911ab..9f029aecc 100644
--- a/plugins/Google/config.py
+++ b/plugins/Google/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Google/plugin.py b/plugins/Google/plugin.py
index 2adef8ef3..cc2fc4e46 100644
--- a/plugins/Google/plugin.py
+++ b/plugins/Google/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Google/test.py b/plugins/Google/test.py
index fe7affc3d..77bdb41f8 100644
--- a/plugins/Google/test.py
+++ b/plugins/Google/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Internet/plugin.py b/plugins/Internet/plugin.py
index de94afcd9..ce35f0c21 100644
--- a/plugins/Internet/plugin.py
+++ b/plugins/Internet/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Jeremiah Fincher
-# Copyright (c) 2010-2011, James Vega
+# Copyright (c) 2010-2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Internet/test.py b/plugins/Internet/test.py
index e098fdeee..0e819bc9b 100644
--- a/plugins/Internet/test.py
+++ b/plugins/Internet/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Karma/plugin.py b/plugins/Karma/plugin.py
index 392590f78..c52f859e2 100644
--- a/plugins/Karma/plugin.py
+++ b/plugins/Karma/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Later/plugin.py b/plugins/Later/plugin.py
index 3babf6365..31e100efa 100644
--- a/plugins/Later/plugin.py
+++ b/plugins/Later/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Limiter/plugin.py b/plugins/Limiter/plugin.py
index c3e02cc11..d6ffe15be 100644
--- a/plugins/Limiter/plugin.py
+++ b/plugins/Limiter/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Math/plugin.py b/plugins/Math/plugin.py
index 01c9261fc..98bda7726 100644
--- a/plugins/Math/plugin.py
+++ b/plugins/Math/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Math/test.py b/plugins/Math/test.py
index 7dfb921e6..d37aad584 100644
--- a/plugins/Math/test.py
+++ b/plugins/Math/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Misc/plugin.py b/plugins/Misc/plugin.py
index c3ea12695..1fbb94a2d 100644
--- a/plugins/Misc/plugin.py
+++ b/plugins/Misc/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Misc/test.py b/plugins/Misc/test.py
index 1f379263b..41212337e 100644
--- a/plugins/Misc/test.py
+++ b/plugins/Misc/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Network/plugin.py b/plugins/Network/plugin.py
index 2eb405f01..8ab5cdf48 100644
--- a/plugins/Network/plugin.py
+++ b/plugins/Network/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Note/plugin.py b/plugins/Note/plugin.py
index 3fd3cb326..e624e1a3e 100644
--- a/plugins/Note/plugin.py
+++ b/plugins/Note/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004, Brett Kelly
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py
index c0a1ffe4d..ba0696261 100644
--- a/plugins/Owner/plugin.py
+++ b/plugins/Owner/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Owner/test.py b/plugins/Owner/test.py
index 21847ea00..92c28fad8 100644
--- a/plugins/Owner/test.py
+++ b/plugins/Owner/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/QuoteGrabs/plugin.py b/plugins/QuoteGrabs/plugin.py
index 03d3a98d6..6ec8f9718 100644
--- a/plugins/QuoteGrabs/plugin.py
+++ b/plugins/QuoteGrabs/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004, Daniel DiPaolo
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/QuoteGrabs/test.py b/plugins/QuoteGrabs/test.py
index 42d967851..87e759673 100644
--- a/plugins/QuoteGrabs/test.py
+++ b/plugins/QuoteGrabs/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004, Daniel DiPaolo
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py
index d23dabe72..a3b5cebe6 100644
--- a/plugins/RSS/plugin.py
+++ b/plugins/RSS/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/RSS/test.py b/plugins/RSS/test.py
index 9b1b2db3a..5e9dea1c2 100644
--- a/plugins/RSS/test.py
+++ b/plugins/RSS/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Relay/plugin.py b/plugins/Relay/plugin.py
index 203159aa3..203f8ecf3 100644
--- a/plugins/Relay/plugin.py
+++ b/plugins/Relay/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Scheduler/test.py b/plugins/Scheduler/test.py
index e190fa5fa..5db322a84 100644
--- a/plugins/Scheduler/test.py
+++ b/plugins/Scheduler/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Seen/plugin.py b/plugins/Seen/plugin.py
index fba29f59d..8ea6ea9fd 100644
--- a/plugins/Seen/plugin.py
+++ b/plugins/Seen/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010-2011, James Vega
+# Copyright (c) 2010-2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Services/config.py b/plugins/Services/config.py
index aa09131ea..c94fdfc78 100644
--- a/plugins/Services/config.py
+++ b/plugins/Services/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Services/plugin.py b/plugins/Services/plugin.py
index 5ca8484f1..fd0da2370 100644
--- a/plugins/Services/plugin.py
+++ b/plugins/Services/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ShrinkUrl/__init__.py b/plugins/ShrinkUrl/__init__.py
index ac9c61ea0..90310e8bc 100644
--- a/plugins/ShrinkUrl/__init__.py
+++ b/plugins/ShrinkUrl/__init__.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ShrinkUrl/config.py b/plugins/ShrinkUrl/config.py
index fa5429510..0d496da3a 100644
--- a/plugins/ShrinkUrl/config.py
+++ b/plugins/ShrinkUrl/config.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ShrinkUrl/plugin.py b/plugins/ShrinkUrl/plugin.py
index d162c27dc..063e751ec 100644
--- a/plugins/ShrinkUrl/plugin.py
+++ b/plugins/ShrinkUrl/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/ShrinkUrl/test.py b/plugins/ShrinkUrl/test.py
index caf606668..3a0855959 100644
--- a/plugins/ShrinkUrl/test.py
+++ b/plugins/ShrinkUrl/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Status/plugin.py b/plugins/Status/plugin.py
index fccd58336..10ae9d824 100644
--- a/plugins/Status/plugin.py
+++ b/plugins/Status/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/String/plugin.py b/plugins/String/plugin.py
index ce4c2ef06..a2fe1517b 100644
--- a/plugins/String/plugin.py
+++ b/plugins/String/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/String/test.py b/plugins/String/test.py
index f86d9e38b..da11bf1a3 100644
--- a/plugins/String/test.py
+++ b/plugins/String/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Todo/plugin.py b/plugins/Todo/plugin.py
index b995140ba..d30e37feb 100644
--- a/plugins/Todo/plugin.py
+++ b/plugins/Todo/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2003-2005, Daniel DiPaolo
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/URL/plugin.py b/plugins/URL/plugin.py
index 50787ca68..cf8cbdce4 100644
--- a/plugins/URL/plugin.py
+++ b/plugins/URL/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Unix/plugin.py b/plugins/Unix/plugin.py
index 4e05fe12d..606c1d792 100644
--- a/plugins/Unix/plugin.py
+++ b/plugins/Unix/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Utilities/plugin.py b/plugins/Utilities/plugin.py
index 9255b937c..941f9162f 100644
--- a/plugins/Utilities/plugin.py
+++ b/plugins/Utilities/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/Web/plugin.py b/plugins/Web/plugin.py
index 6a332c792..78ba0f0d3 100644
--- a/plugins/Web/plugin.py
+++ b/plugins/Web/plugin.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/plugins/__init__.py b/plugins/__init__.py
index c177eb840..081334842 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot b/scripts/supybot
index c704077f4..01afdccee 100644
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2003-2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot-botchk b/scripts/supybot-botchk
index 468bead4f..d61a96e81 100644
--- a/scripts/supybot-botchk
+++ b/scripts/supybot-botchk
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot-plugin-create b/scripts/supybot-plugin-create
index 78f822fb8..e3c5e8a8a 100644
--- a/scripts/supybot-plugin-create
+++ b/scripts/supybot-plugin-create
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot-plugin-doc b/scripts/supybot-plugin-doc
index c5b2950db..f83c3cbd6 100644
--- a/scripts/supybot-plugin-doc
+++ b/scripts/supybot-plugin-doc
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2005, Ali Afshar
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot-test b/scripts/supybot-test
index c0a500713..e01a5d56c 100644
--- a/scripts/supybot-test
+++ b/scripts/supybot-test
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2011, James Vega
+# Copyright (c) 2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/scripts/supybot-wizard b/scripts/supybot-wizard
index 7d8c0ae4b..3d3144c77 100644
--- a/scripts/supybot-wizard
+++ b/scripts/supybot-wizard
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2003-2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/setup.py b/setup.py
index 513c0a166..a24f8ac8f 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/__init__.py b/src/__init__.py
index 22923e31a..e3ffdf162 100644
--- a/src/__init__.py
+++ b/src/__init__.py
@@ -49,7 +49,7 @@ class Author(object):
 
 class authors(object): # This is basically a bag.
     jemfinch = Author('Jeremy Fincher', 'jemfinch', 'jemfinch@users.sf.net')
-    jamessan = Author('James Vega', 'jamessan', 'jamessan@users.sf.net')
+    jamessan = Author('James McCoy', 'jamessan', 'vega.james@gmail.com')
     strike = Author('Daniel DiPaolo', 'Strike', 'ddipaolo@users.sf.net')
     baggins = Author('William Robinson', 'baggins', 'airbaggins@users.sf.net')
     skorobeus = Author('Kevin Murphy', 'Skorobeus', 'skoro@skoroworld.com')
diff --git a/src/callbacks.py b/src/callbacks.py
index 10edacb04..49222b5f7 100644
--- a/src/callbacks.py
+++ b/src/callbacks.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2010, James Vega
+# Copyright (c) 2008-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/commands.py b/src/commands.py
index 717465a9c..e38908a41 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/conf.py b/src/conf.py
index fcc7f9200..e23efd009 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2009,2011, James Vega
+# Copyright (c) 2008-2009,2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/drivers/Socket.py b/src/drivers/Socket.py
index ff9e59146..a9d98459a 100644
--- a/src/drivers/Socket.py
+++ b/src/drivers/Socket.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/drivers/Twisted.py b/src/drivers/Twisted.py
index b6d72fc90..6429022c4 100644
--- a/src/drivers/Twisted.py
+++ b/src/drivers/Twisted.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/drivers/__init__.py b/src/drivers/__init__.py
index 03cf9e59b..302222ad7 100644
--- a/src/drivers/__init__.py
+++ b/src/drivers/__init__.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2004, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/ircdb.py b/src/ircdb.py
index edd5ad5db..1e51b879e 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2009, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/ircmsgs.py b/src/ircmsgs.py
index 13ead36af..213247787 100644
--- a/src/ircmsgs.py
+++ b/src/ircmsgs.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2010, James Vega
+# Copyright (c) 2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/ircutils.py b/src/ircutils.py
index 2275d3d44..9f07f900e 100644
--- a/src/ircutils.py
+++ b/src/ircutils.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009,2011, James Vega
+# Copyright (c) 2009,2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/registry.py b/src/registry.py
index 6715de5f2..ca9568daa 100644
--- a/src/registry.py
+++ b/src/registry.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2004-2005, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/test.py b/src/test.py
index a9f716264..b7488f0d2 100644
--- a/src/test.py
+++ b/src/test.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2011, James Vega
+# Copyright (c) 2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index 7de7a425d..76e0d6cf1 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/crypt.py b/src/utils/crypt.py
index bfbb9ad4c..dfc19936d 100644
--- a/src/utils/crypt.py
+++ b/src/utils/crypt.py
@@ -1,5 +1,5 @@
 ###
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/file.py b/src/utils/file.py
index 3043079e5..a59b2e3f7 100644
--- a/src/utils/file.py
+++ b/src/utils/file.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/gen.py b/src/utils/gen.py
index 6fd138cd3..e071ff819 100644
--- a/src/utils/gen.py
+++ b/src/utils/gen.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/net.py b/src/utils/net.py
index 17abb3b5b..0e657e9f0 100644
--- a/src/utils/net.py
+++ b/src/utils/net.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2011, James Vega
+# Copyright (c) 2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/python.py b/src/utils/python.py
index f38de2f78..70ca52ba9 100644
--- a/src/utils/python.py
+++ b/src/utils/python.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2005-2009, Jeremiah Fincher
-# Copyright (c) 2009-2010, James Vega
+# Copyright (c) 2009-2010, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/str.py b/src/utils/str.py
index c6d801ce7..9fb4223bc 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008-2009, James Vega
+# Copyright (c) 2008-2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/src/utils/web.py b/src/utils/web.py
index 6a1fa9361..ae3cf38b8 100644
--- a/src/utils/web.py
+++ b/src/utils/web.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009, James Vega
+# Copyright (c) 2009, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/test/test_plugins.py b/test/test_plugins.py
index 54d79df4b..04968b4d6 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2008, James Vega
+# Copyright (c) 2008, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/test/test_utils.py b/test/test_utils.py
index da94678e6..f3b74ce35 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -1,6 +1,6 @@
 ###
 # Copyright (c) 2002-2005, Jeremiah Fincher
-# Copyright (c) 2009,2011, James Vega
+# Copyright (c) 2009,2011, James McCoy
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without