diff --git a/sopel_modules/SpiceBot/Events.py b/sopel_modules/SpiceBot/Events.py
index ac5cfc5..6b8afe4 100644
--- a/sopel_modules/SpiceBot/Events.py
+++ b/sopel_modules/SpiceBot/Events.py
@@ -35,8 +35,9 @@ class BotEvents(object):
     def __init__(self):
         self.lock = threading.Lock()
         self.RPL_WELCOME = '001'  # This is a defined IRC event
-        self.RPL_NAMREPLY = '353'  # This is a defined IRC event
+        self.RPL_ISUPPORT = '005'  # This is a defined IRC event
         self.RPL_WHOREPLY = '352'  # This is a defined IRC event
+        self.RPL_NAMREPLY = '353'  # This is a defined IRC event
         self.BOT_UPTIME = time.time()
         self.BOT_WELCOME = '1001'
         self.BOT_READY = '1002'
diff --git a/sopel_modules/SpiceBot_Core_Processing/Kick.py b/sopel_modules/SpiceBot_Core_Processing/Kick.py
index f0586e9..faa5f92 100644
--- a/sopel_modules/SpiceBot_Core_Processing/Kick.py
+++ b/sopel_modules/SpiceBot_Core_Processing/Kick.py
@@ -5,10 +5,12 @@ This is the SpiceBot OSD system.
 """
 import sopel
 
+import sopel_modules.SpiceBot as SpiceBot
 
-@sopel.module.event('005')
+
+@sopel.module.event(SpiceBot.events.RPL_ISUPPORT)
 @sopel.module.rule('.*')
-def parse_event_005(bot, trigger):
+def parse_event_005_kick(bot, trigger):
     if trigger.args[-1] != 'are supported by this server':
         return
     parameters = trigger.args[1:-1]
diff --git a/sopel_modules/SpiceBot_Core_Processing/osd.py b/sopel_modules/SpiceBot_Core_Processing/osd.py
index 88d2bf5..245aeda 100644
--- a/sopel_modules/SpiceBot_Core_Processing/osd.py
+++ b/sopel_modules/SpiceBot_Core_Processing/osd.py
@@ -6,9 +6,12 @@ This is the SpiceBot OSD system.
 import sopel
 
 
-@sopel.module.event('005')
+import sopel_modules.SpiceBot as SpiceBot
+
+
+@sopel.module.event(SpiceBot.events.RPL_ISUPPORT)
 @sopel.module.rule('.*')
-def parse_event_005(bot, trigger):
+def parse_event_005_osd(bot, trigger):
     if trigger.args[-1] != 'are supported by this server':
         return
     parameters = trigger.args[1:-1]