diff --git a/sopel_SpiceBot_Core_Prerun/__init__.py b/sopel_SpiceBot_Core_Prerun/__init__.py
index 202dc34..03f2b14 100644
--- a/sopel_SpiceBot_Core_Prerun/__init__.py
+++ b/sopel_SpiceBot_Core_Prerun/__init__.py
@@ -12,11 +12,12 @@ def prerun_command():
         @functools.wraps(function)
         def internal_prerun(bot, trigger, *args, **kwargs):
 
-            bot.say(str(id(trigger)))
+            trigger_command_type = str("command")
 
-            sb.osd("test", trigger.sender)
+            # Primary command used for trigger, and a list of all words
+            trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type)
 
-            return function(bot, trigger, *args, **kwargs)
+            function(bot, trigger, *args, **kwargs)
 
         return internal_prerun
     return actual_decorator
@@ -29,12 +30,12 @@ def prerun_nickname_command():
         @functools.wraps(function)
         def internal_prerun(bot, trigger, *args, **kwargs):
 
-            trigger_command_type = str("nickname")
+            trigger_command_type = str("nickname_command")
 
             # Primary command used for trigger, and a list of all words
             trigger_args, trigger_command, trigger_prefix = make_trigger_args(trigger.args[1], trigger_command_type)
 
-            return function(bot, trigger, *args, **kwargs)
+            function(bot, trigger, *args, **kwargs)
 
         return internal_prerun
     return actual_decorator
@@ -42,13 +43,13 @@ def prerun_nickname_command():
 
 def make_trigger_args(triggerargs_one, trigger_command_type='module'):
     trigger_args = spicemanip(triggerargs_one, 'create')
-    if trigger_command_type in ['nickname']:
+    if trigger_command_type in ['nickname_command']:
         trigger_prefix = None
         # if trigger_prefix.isupper() or trigger_prefix.islower():
         #    trigger_prefix = None
         trigger_command = spicemanip(trigger_args, 2).lower()
         trigger_args = spicemanip(trigger_args, '3+', 'list')
-    elif trigger_command_type in ['action']:
+    elif trigger_command_type in ['action_command']:
         trigger_prefix = None
         trigger_command = spicemanip(trigger_args, 1).lower()
         trigger_args = spicemanip(trigger_args, '2+', 'list')