diff --git a/steps/bash_extract_names.yml b/steps/bash_extract_names.yml
index 7b56913..a5686f6 100644
--- a/steps/bash_extract_names.yml
+++ b/steps/bash_extract_names.yml
@@ -33,7 +33,7 @@ trigger:
           params:
             person: keen
             messages:
-            - text: "That's great, ${user.firstName}. We'll take it from here." 
+            - text: "That's great, ${user.nickname}. We'll take it from here." 
               delay: 1300
         - actionId: finish_step
       else:
diff --git a/steps/bash_filter.yml b/steps/bash_filter.yml
index ab738e5..6bbee73 100644
--- a/steps/bash_filter.yml
+++ b/steps/bash_filter.yml
@@ -12,13 +12,13 @@ startFlow:
     params:
       person: keen
       messages:
-      - text: "Hi ${user.firstName}. This is something I used to bug Carl with, but now that you're in his seat, I guess it's your job. Amazon employees are apparently snooping around, looking to steal our innovations.  Here's a [file](https://docs.google.com/spreadsheets/d/1fYT7vLFdgEbPKCNxJ0lY3esgEPSSkRhsajhNHf_rA4I) with today's sign ups, please tell me how many of them have an @amazon.com email."
+      - text: "Hi ${user.nickname}. This is something I used to bug Carl with, but now that you're in his seat, I guess it's your job. Amazon employees are apparently snooping around, looking to steal our innovations.  Here's a [file](https://docs.google.com/spreadsheets/d/1fYT7vLFdgEbPKCNxJ0lY3esgEPSSkRhsajhNHf_rA4I) with today's sign ups, please tell me how many of them have an @amazon.com email."
         delay: 1000
   - actionId: bot_message
     params:
       person: lucca
       messages:
-      - text: "Hi ${user.firstName}, just FYI, you're getting that mole finding job not because Carl had it but because everyone at Product got tired of doing it manually. We have mole hunts, like, every week. Comes with the popularity, I guess. My advice for you is to create some sort of a script, because it aint gonna be a one-time thing. From what I remember, bash can be very effective for these kinds of small tasks." 
+      - text: "Hi ${user.nickname}, just FYI, you're getting that mole finding job not because Carl had it but because everyone at Product got tired of doing it manually. We have mole hunts, like, every week. Comes with the popularity, I guess. My advice for you is to create some sort of a script, because it aint gonna be a one-time thing. From what I remember, bash can be very effective for these kinds of small tasks." 
         delay: 1000
 trigger:
   type: user_message