diff --git a/protocols/clientbot.py b/protocols/clientbot.py
index 56d9033..f809d4d 100644
--- a/protocols/clientbot.py
+++ b/protocols/clientbot.py
@@ -87,7 +87,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
         self._cap_timer.start()
 
         # This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS.
-        # But this connection stuff is done before any of the spawnClient stuff in
+        # But this connection stuff is done before any of the spawn_client stuff in
         # services_support fires.
         self.conf_nick = self.serverdata.get('pylink_nick') or conf.conf["bot"].get("nick", "PyLink")
         f('NICK %s' % (self.conf_nick))
@@ -96,7 +96,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
                               conf.conf["bot"].get("realname", "PyLink Clientbot")))
 
     # Note: clientbot clients are initialized with umode +i by default
-    def spawnClient(self, nick, ident='unknown', host='unknown.host', realhost=None, modes={('i', None)},
+    def spawn_client(self, nick, ident='unknown', host='unknown.host', realhost=None, modes={('i', None)},
             server=None, ip='0.0.0.0', realname='', ts=None, opertype=None,
             manipulatable=False):
         """
@@ -108,7 +108,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
 
         ts = ts or int(time.time())
 
-        log.debug('(%s) spawnClient stub called, saving nick %s as PUID %s', self.name, nick, uid)
+        log.debug('(%s) spawn_client stub called, saving nick %s as PUID %s', self.name, nick, uid)
         u = self.users[uid] = IrcUser(nick, ts, uid, server, ident=ident, host=host, realname=realname,
                                           manipulatable=manipulatable, realhost=realhost, ip=ip)
         self.servers[server].users.add(uid)
@@ -351,7 +351,7 @@ class ClientbotWrapperProtocol(IRCCommonProtocol):
                 log.debug('(%s) Nick-colliding virtual client %s/%s', self.name, idsource, nick)
                 self.call_hooks([self.sid, 'CLIENTBOT_NICKCOLLIDE', {'target': idsource, 'parse_as': 'SAVE'}])
 
-            idsource = self.spawnClient(nick, ident or 'unknown', host or 'unknown',
+            idsource = self.spawn_client(nick, ident or 'unknown', host or 'unknown',
                                         server=self.uplink, realname=FALLBACK_REALNAME).uid
 
         return idsource
diff --git a/protocols/hybrid.py b/protocols/hybrid.py
index 07fdb95..66a0a64 100644
--- a/protocols/hybrid.py
+++ b/protocols/hybrid.py
@@ -85,7 +85,7 @@ class HybridProtocol(TS6Protocol):
         # send endburst now
         self.send(':%s EOB' % (self.sid,))
 
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None,
             manipulatable=False):
         """
diff --git a/protocols/inspircd.py b/protocols/inspircd.py
index 3d14eb4..80e01ce 100644
--- a/protocols/inspircd.py
+++ b/protocols/inspircd.py
@@ -33,7 +33,7 @@ class InspIRCdProtocol(TS6BaseProtocol):
 
     ### Outgoing commands
 
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype='IRC Operator',
             manipulatable=False):
         """
diff --git a/protocols/p10.py b/protocols/p10.py
index f6aa738..6619a74 100644
--- a/protocols/p10.py
+++ b/protocols/p10.py
@@ -240,7 +240,7 @@ class P10Protocol(IRCS2SProtocol):
 
     ### COMMANDS
 
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype='IRC Operator',
             manipulatable=False):
         """
diff --git a/protocols/ratbox.py b/protocols/ratbox.py
index 8a8b851..7d596fd 100644
--- a/protocols/ratbox.py
+++ b/protocols/ratbox.py
@@ -40,7 +40,7 @@ class RatboxProtocol(TS6Protocol):
             '*A': '', '*B': '', '*C': '', '*D': 'igoabcCdfklrsuwxyzZD'
         }
 
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None,
             manipulatable=False):
         """
diff --git a/protocols/ts6.py b/protocols/ts6.py
index 6f4511d..4d29305 100644
--- a/protocols/ts6.py
+++ b/protocols/ts6.py
@@ -27,7 +27,7 @@ class TS6Protocol(TS6BaseProtocol):
 
     ### OUTGOING COMMANDS
 
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype='IRC Operator',
             manipulatable=False):
         """
diff --git a/protocols/unreal.py b/protocols/unreal.py
index 5208821..196a62d 100644
--- a/protocols/unreal.py
+++ b/protocols/unreal.py
@@ -56,7 +56,7 @@ class UnrealProtocol(TS6BaseProtocol):
         return uid
 
     ### OUTGOING COMMAND FUNCTIONS
-    def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
+    def spawn_client(self, nick, ident='null', host='null', realhost=None, modes=set(),
             server=None, ip='0.0.0.0', realname=None, ts=None, opertype='IRC Operator',
             manipulatable=False):
         """