diff --git a/sopel_modules/SpiceBot/AI.py b/sopel_modules/SpiceBot/AI.py
index 3165188..ebe7642 100644
--- a/sopel_modules/SpiceBot/AI.py
+++ b/sopel_modules/SpiceBot/AI.py
@@ -89,6 +89,9 @@ class SpiceBot_AI():
         return aiml_response
 
     def bot_message_precipher(self, bot, trigger, message):
+        puct_dict = {"!": "exclamationmark", ".": "period", "?": "questionmark", ",": "comma"}
+        for puctuation in puct_dict.keys():
+            message = message.replace(puctuation, puct_dict[puctuation])
         for botitem in ["nick"]:
             message = message.replace(str(eval("bot." + botitem)), "bot" + botitem)
         for triggeritem in ["nick", "sender"]:
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_acknowledge.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_acknowledge.aiml
index 427e675..318d059 100644
--- a/sopel_modules/SpiceBot_Configs/aiml/nickname_acknowledge.aiml
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_acknowledge.aiml
@@ -2,18 +2,18 @@
 <aiml version="1.0">
 
 <category>
-  <pattern>BOTNICK!</pattern>
+  <pattern>BOTNICKexclamationmark</pattern>
   <template>triggernick!</template>
 </category>
 
+<category>
+  <pattern>BOTNICKquestionmark</pattern>
+      <template>That's my name, don't wear it out!</template>
+</category>
+
 <category>
   <pattern>BOTNICK</pattern>
-      <template>
-        <random>
-          <li>That's my name, don't wear it out!</li>
-          <li>I'm here, triggernick</li>
-        </random>
-      </template>
+      <template>I'm here, triggernick</template>
 </category>
 
 </aiml>