diff --git a/modules/generators/random/random_sanitised_word/manifests/.no_puppet b/modules/generators/random/random_sanitised_word/manifests/.no_puppet
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/generators/random/random_sanitised_word/random_sanitised_word.pp b/modules/generators/random/random_sanitised_word/random_sanitised_word.pp
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/generators/random/random_sanitised_word/secgen_local/local.rb b/modules/generators/random/random_sanitised_word/secgen_local/local.rb
new file mode 100644
index 000000000..59cb6e8df
--- /dev/null
+++ b/modules/generators/random/random_sanitised_word/secgen_local/local.rb
@@ -0,0 +1,67 @@
+#!/usr/bin/ruby
+require_relative '../../../../../lib/objects/local_string_generator.rb'
+require_relative '../../../../../lib/helpers/blacklist.rb'
+
+class SanitisedWordGenerator < StringGenerator
+  attr_accessor :wordlist
+  attr_accessor :min_length
+  attr_accessor :max_length
+
+  def initialize
+    super
+    self.wordlist = []
+    self.min_length = ''
+    self.max_length = ''
+    self.module_name = 'Random Word Generator'
+  end
+
+  def get_options_array
+    super + [['--wordlist', GetoptLong::OPTIONAL_ARGUMENT],
+             ['--min_length', GetoptLong::OPTIONAL_ARGUMENT],
+             ['--max_length', GetoptLong::OPTIONAL_ARGUMENT]]
+  end
+
+  def process_options(opt, arg)
+    super
+    case opt
+      when '--wordlist'
+        self.wordlist << arg;
+      when '--min_length'
+        if arg == ''
+          self.min_length = 0
+        else
+          self.min_length = arg.to_i
+        end
+      when '--max_length'
+        if arg == ''
+          self.max_length = 999
+        else
+          self.max_length = arg.to_i
+        end
+    end
+  end
+
+  def generate
+    blacklist = Blacklist.new
+    flag_word = ''
+
+    until flag_word != ''
+      selected_word = File.readlines("#{WORDLISTS_DIR}/#{self.wordlist.sample.chomp}").sample.chomp
+      if suitable_word_length(selected_word) and !blacklist.is_blacklisted?(selected_word)
+        flag_word = selected_word.gsub(/[^\w]/, '')
+      end
+    end
+
+    self.outputs << flag_word
+  end
+
+  def suitable_word_length(string)
+    if self.min_length.is_a? String or self.max_length.is_a? String
+      true
+    else
+      ((string.length >= self.min_length) and (string.length <= self.max_length))
+    end
+  end
+end
+
+SanitisedWordGenerator.new.run
\ No newline at end of file
diff --git a/modules/generators/random/random_sanitised_word/secgen_metadata.xml b/modules/generators/random/random_sanitised_word/secgen_metadata.xml
new file mode 100644
index 000000000..60c9aebdf
--- /dev/null
+++ b/modules/generators/random/random_sanitised_word/secgen_metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<generator xmlns="http://www.github/cliffe/SecGen/generator"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://www.github/cliffe/SecGen/generator">
+  <name>Random Sanitised Word Generator</name>
+  <author>Z. Cliffe Schreuders</author>
+  <author>Thomas Shaw</author>
+  <module_license>MIT</module_license>
+  <description>Uses a wordlist (Ruby gem + a wordlist) to generate a random (mostly English) dictionary word.
+    Removes most special characters (other than -_, which are valid for usernames)</description>
+
+  <type>string_generator</type>
+  <type>random_sanitised_word</type>
+  <type>random_word_generator</type>
+  <type>local_calculation</type>
+  <platform>linux</platform>
+  <platform>windows</platform>
+
+  <reference>https://github.com/sophsec/wordlist</reference>
+  <reference>http://wordlist.sourceforge.net/</reference>
+
+  <read_fact>wordlist</read_fact>
+  <read_fact>min_length</read_fact>
+  <read_fact>max_length</read_fact>
+
+  <default_input into="wordlist">
+    <value>wordlist</value>
+  </default_input>
+
+  <output_type>generated_strings</output_type>
+  
+</generator>
diff --git a/scenarios/ctf/banner_grab_and_run.xml b/scenarios/ctf/banner_grab_and_run.xml
index b17896c64..385e4d971 100644
--- a/scenarios/ctf/banner_grab_and_run.xml
+++ b/scenarios/ctf/banner_grab_and_run.xml
@@ -35,7 +35,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -56,7 +56,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -77,7 +77,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/ctf/container_escape.xml b/scenarios/ctf/container_escape.xml
index b6dc5621a..dffd40a1b 100644
--- a/scenarios/ctf/container_escape.xml
+++ b/scenarios/ctf/container_escape.xml
@@ -28,7 +28,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -49,7 +49,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -70,7 +70,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/examples/services_utilities_examples/snort.xml b/scenarios/examples/services_utilities_examples/snort.xml
index c6e810df9..330e43bc1 100644
--- a/scenarios/examples/services_utilities_examples/snort.xml
+++ b/scenarios/examples/services_utilities_examples/snort.xml
@@ -15,7 +15,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/examples/services_utilities_examples/users_and_groups.xml b/scenarios/examples/services_utilities_examples/users_and_groups.xml
index efda32efa..10eca29a4 100644
--- a/scenarios/examples/services_utilities_examples/users_and_groups.xml
+++ b/scenarios/examples/services_utilities_examples/users_and_groups.xml
@@ -16,28 +16,28 @@
 	 		<!-- generate some usernames to use -->
 	 		<input into_datastore="usernames">
 	 			<!-- main user -->
-	 			<generator type="random_word_generator">
+	 			<generator type="random_sanitised_word">
 	 				<input into="wordlist">
 	 					<value>mythical_creatures</value>
 	 				</input>
 	 			</generator>
 	 			<!-- 4 other users -->
-	 			<generator type="random_word_generator">
+	 			<generator type="random_sanitised_word">
 	 				<input into="wordlist">
 	 					<value>mythical_creatures</value>
 	 				</input>
 	 			</generator>
-	 			<generator type="random_word_generator">
+	 			<generator type="random_sanitised_word">
 	 				<input into="wordlist">
 	 					<value>mythical_creatures</value>
 	 				</input>
 	 			</generator>
-	 			<generator type="random_word_generator">
+	 			<generator type="random_sanitised_word">
 	 				<input into="wordlist">
 	 					<value>mythical_creatures</value>
 	 				</input>
 	 			</generator>
-	 			<generator type="random_word_generator">
+	 			<generator type="random_sanitised_word">
 	 				<input into="wordlist">
 	 					<value>mythical_creatures</value>
 	 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml b/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
index f3dd7902c..55da15298 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_1_authentication.xml
@@ -44,28 +44,28 @@ A Hackerbot lab. Work through the lab instructions, then when prompted interact
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- 4 other users -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml b/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
index fc828e807..454726522 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_2_pam.xml
@@ -40,28 +40,28 @@ A short lab this week, exploring PAM. Work through the labsheet, then when promp
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- 4 other users -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_3_access_controls.xml b/scenarios/labs/authentication_and_access_controls/ads_3_access_controls.xml
index 6843ac37c..e22710883 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_3_access_controls.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_3_access_controls.xml
@@ -40,28 +40,28 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- 4 other users -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_4_suid.xml b/scenarios/labs/authentication_and_access_controls/ads_4_suid.xml
index 61ace312a..58b2f0b76 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_4_suid.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_4_suid.xml
@@ -40,13 +40,13 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- other user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_5_facls.xml b/scenarios/labs/authentication_and_access_controls/ads_5_facls.xml
index d6fd6ea23..ba1df5c84 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_5_facls.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_5_facls.xml
@@ -41,28 +41,28 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- 4 other users -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_6_containers.xml b/scenarios/labs/authentication_and_access_controls/ads_6_containers.xml
index 34f77f8cc..5d2ae7df2 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_6_containers.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_6_containers.xml
@@ -39,7 +39,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
@@ -60,7 +60,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
       </generator>
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
@@ -81,7 +81,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
       </generator>
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_7_apparmor.xml b/scenarios/labs/authentication_and_access_controls/ads_7_apparmor.xml
index 542d373fa..9f4154beb 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_7_apparmor.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_7_apparmor.xml
@@ -44,7 +44,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -75,7 +75,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -96,7 +96,7 @@ A Hackerbot lab. Work through the labsheet, then when prompted interact with Hac
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/authentication_and_access_controls/ads_sec_conf.xml b/scenarios/labs/authentication_and_access_controls/ads_sec_conf.xml
index e8c95a4a2..056fa6f39 100644
--- a/scenarios/labs/authentication_and_access_controls/ads_sec_conf.xml
+++ b/scenarios/labs/authentication_and_access_controls/ads_sec_conf.xml
@@ -38,7 +38,7 @@
 			<!-- main user, sudoer -->
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/introducing_attacks/1_intro_linux.xml b/scenarios/labs/introducing_attacks/1_intro_linux.xml
index 2db455015..a70849caa 100644
--- a/scenarios/labs/introducing_attacks/1_intro_linux.xml
+++ b/scenarios/labs/introducing_attacks/1_intro_linux.xml
@@ -45,7 +45,7 @@ Chapter 1 "An Overview of Computer Security": Bishop, M. (2005), Introduction to
 			<!-- main user, sudoer -->
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/introducing_attacks/2_malware_msf_payloads.xml b/scenarios/labs/introducing_attacks/2_malware_msf_payloads.xml
index c6caa0060..b2cec9e07 100644
--- a/scenarios/labs/introducing_attacks/2_malware_msf_payloads.xml
+++ b/scenarios/labs/introducing_attacks/2_malware_msf_payloads.xml
@@ -44,7 +44,7 @@ Chapter 19 "Malicious Logic": Bishop, M. (2005), Introduction to Computer Securi
 			<input into="accounts" into_datastore="accounts">
 				<generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/introducing_attacks/3_vulnerabilities.xml b/scenarios/labs/introducing_attacks/3_vulnerabilities.xml
index 71693cfd3..2aca48993 100644
--- a/scenarios/labs/introducing_attacks/3_vulnerabilities.xml
+++ b/scenarios/labs/introducing_attacks/3_vulnerabilities.xml
@@ -42,7 +42,7 @@ This week we will cover one of the major threats in computer security: software
 			<input into="accounts" into_datastore="accounts">
 				<generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/introducing_attacks/6_exploitation.xml b/scenarios/labs/introducing_attacks/6_exploitation.xml
index d6cdecaac..00b356b51 100644
--- a/scenarios/labs/introducing_attacks/6_exploitation.xml
+++ b/scenarios/labs/introducing_attacks/6_exploitation.xml
@@ -39,7 +39,7 @@ This week we learn how we can scan networks to discover vulnerable services, and
 			<input into="accounts" into_datastore="accounts">
 				<generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/introducing_attacks/7_post-exploitation.xml b/scenarios/labs/introducing_attacks/7_post-exploitation.xml
index 341523b6d..20e5f0367 100644
--- a/scenarios/labs/introducing_attacks/7_post-exploitation.xml
+++ b/scenarios/labs/introducing_attacks/7_post-exploitation.xml
@@ -39,7 +39,7 @@ Once an attacker has a foothold in a system, they can misuse the privileges they
 			<input into="accounts" into_datastore="accounts">
 				<generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/lab_environments/containers_lab_env.xml b/scenarios/labs/lab_environments/containers_lab_env.xml
index 80324679c..06b2f4334 100644
--- a/scenarios/labs/lab_environments/containers_lab_env.xml
+++ b/scenarios/labs/lab_environments/containers_lab_env.xml
@@ -22,7 +22,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -43,7 +43,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -64,7 +64,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/lab_environments/labtainers.xml b/scenarios/labs/lab_environments/labtainers.xml
index 036114f65..8d3e3f6b7 100644
--- a/scenarios/labs/lab_environments/labtainers.xml
+++ b/scenarios/labs/lab_environments/labtainers.xml
@@ -25,7 +25,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/lab_environments/services_lab_env.xml b/scenarios/labs/lab_environments/services_lab_env.xml
index 472af8fba..c6123f9ed 100644
--- a/scenarios/labs/lab_environments/services_lab_env.xml
+++ b/scenarios/labs/lab_environments/services_lab_env.xml
@@ -26,7 +26,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -47,7 +47,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -68,7 +68,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/lab_environments/workspace_lab_env.xml b/scenarios/labs/lab_environments/workspace_lab_env.xml
index 8e62cbb3c..b8deb8ed5 100644
--- a/scenarios/labs/lab_environments/workspace_lab_env.xml
+++ b/scenarios/labs/lab_environments/workspace_lab_env.xml
@@ -27,7 +27,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -105,7 +105,7 @@
 			<input into="accounts" into_datastore="accounts">
 				<generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/labtainers/acl-hackerbot-flags.xml b/scenarios/labs/labtainers/acl-hackerbot-flags.xml
index 365938567..4cdf75ce0 100644
--- a/scenarios/labs/labtainers/acl-hackerbot-flags.xml
+++ b/scenarios/labs/labtainers/acl-hackerbot-flags.xml
@@ -26,7 +26,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/acl.xml b/scenarios/labs/labtainers/acl.xml
index c2a99b8ee..1f7867d28 100644
--- a/scenarios/labs/labtainers/acl.xml
+++ b/scenarios/labs/labtainers/acl.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/arp-spoof.xml b/scenarios/labs/labtainers/arp-spoof.xml
index 03033421d..b87b59861 100644
--- a/scenarios/labs/labtainers/arp-spoof.xml
+++ b/scenarios/labs/labtainers/arp-spoof.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/backups.xml b/scenarios/labs/labtainers/backups.xml
index f23127e9a..a8267f4bb 100644
--- a/scenarios/labs/labtainers/backups.xml
+++ b/scenarios/labs/labtainers/backups.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/backups2.xml b/scenarios/labs/labtainers/backups2.xml
index 0f8a217a1..ef1c81e17 100644
--- a/scenarios/labs/labtainers/backups2.xml
+++ b/scenarios/labs/labtainers/backups2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/bufoverflow.xml b/scenarios/labs/labtainers/bufoverflow.xml
index dd6a39cf4..9c1c3e6e8 100644
--- a/scenarios/labs/labtainers/bufoverflow.xml
+++ b/scenarios/labs/labtainers/bufoverflow.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/capabilities.xml b/scenarios/labs/labtainers/capabilities.xml
index 2cecef063..050e37517 100644
--- a/scenarios/labs/labtainers/capabilities.xml
+++ b/scenarios/labs/labtainers/capabilities.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/centos-log.xml b/scenarios/labs/labtainers/centos-log.xml
index 8fc3278e4..dc6bf4353 100644
--- a/scenarios/labs/labtainers/centos-log.xml
+++ b/scenarios/labs/labtainers/centos-log.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/centos-log2.xml b/scenarios/labs/labtainers/centos-log2.xml
index 82194c618..45ca05acd 100644
--- a/scenarios/labs/labtainers/centos-log2.xml
+++ b/scenarios/labs/labtainers/centos-log2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/cyberciege.xml b/scenarios/labs/labtainers/cyberciege.xml
index 1095c6bc8..23f02e5b0 100644
--- a/scenarios/labs/labtainers/cyberciege.xml
+++ b/scenarios/labs/labtainers/cyberciege.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/denyhost.xml b/scenarios/labs/labtainers/denyhost.xml
index e9a3d5d82..9a990f22b 100644
--- a/scenarios/labs/labtainers/denyhost.xml
+++ b/scenarios/labs/labtainers/denyhost.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/dhcp-test.xml b/scenarios/labs/labtainers/dhcp-test.xml
index 25647b2bf..05b009a14 100644
--- a/scenarios/labs/labtainers/dhcp-test.xml
+++ b/scenarios/labs/labtainers/dhcp-test.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/dmz-example.xml b/scenarios/labs/labtainers/dmz-example.xml
index 426c73c6f..d2f1d4ee1 100644
--- a/scenarios/labs/labtainers/dmz-example.xml
+++ b/scenarios/labs/labtainers/dmz-example.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/dmz-lab.xml b/scenarios/labs/labtainers/dmz-lab.xml
index f53d8af7c..dd0ea5e7b 100644
--- a/scenarios/labs/labtainers/dmz-lab.xml
+++ b/scenarios/labs/labtainers/dmz-lab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/file-deletion.xml b/scenarios/labs/labtainers/file-deletion.xml
index 1e98c750e..2d740f5ec 100644
--- a/scenarios/labs/labtainers/file-deletion.xml
+++ b/scenarios/labs/labtainers/file-deletion.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/file-integrity.xml b/scenarios/labs/labtainers/file-integrity.xml
index 6b9acd4bb..6f536d969 100644
--- a/scenarios/labs/labtainers/file-integrity.xml
+++ b/scenarios/labs/labtainers/file-integrity.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/formatstring.xml b/scenarios/labs/labtainers/formatstring.xml
index 18ad8e993..d875cb644 100644
--- a/scenarios/labs/labtainers/formatstring.xml
+++ b/scenarios/labs/labtainers/formatstring.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/gdblesson.xml b/scenarios/labs/labtainers/gdblesson.xml
index 1d4a640df..9fd3a2188 100644
--- a/scenarios/labs/labtainers/gdblesson.xml
+++ b/scenarios/labs/labtainers/gdblesson.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/grassmarlin.xml b/scenarios/labs/labtainers/grassmarlin.xml
index 9e1f3b533..c140c45ce 100644
--- a/scenarios/labs/labtainers/grassmarlin.xml
+++ b/scenarios/labs/labtainers/grassmarlin.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/grfics.xml b/scenarios/labs/labtainers/grfics.xml
index 8405bd6d9..f6d66ea6a 100644
--- a/scenarios/labs/labtainers/grfics.xml
+++ b/scenarios/labs/labtainers/grfics.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/httplab.xml b/scenarios/labs/labtainers/httplab.xml
index 9ec6abeb5..7a04b0f96 100644
--- a/scenarios/labs/labtainers/httplab.xml
+++ b/scenarios/labs/labtainers/httplab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/ida.xml b/scenarios/labs/labtainers/ida.xml
index 97e9f1d42..bd934f35b 100644
--- a/scenarios/labs/labtainers/ida.xml
+++ b/scenarios/labs/labtainers/ida.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/iptables-ics.xml b/scenarios/labs/labtainers/iptables-ics.xml
index 78f3b8f79..8679b178f 100644
--- a/scenarios/labs/labtainers/iptables-ics.xml
+++ b/scenarios/labs/labtainers/iptables-ics.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/iptables.xml b/scenarios/labs/labtainers/iptables.xml
index 9a873884a..0d426fd86 100644
--- a/scenarios/labs/labtainers/iptables.xml
+++ b/scenarios/labs/labtainers/iptables.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/iptables2.xml b/scenarios/labs/labtainers/iptables2.xml
index 5463123a6..b7a108783 100644
--- a/scenarios/labs/labtainers/iptables2.xml
+++ b/scenarios/labs/labtainers/iptables2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/kali-test.xml b/scenarios/labs/labtainers/kali-test.xml
index aba3162b1..a96639a38 100644
--- a/scenarios/labs/labtainers/kali-test.xml
+++ b/scenarios/labs/labtainers/kali-test.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/ldap.xml b/scenarios/labs/labtainers/ldap.xml
index a8853ed9e..3438e7beb 100644
--- a/scenarios/labs/labtainers/ldap.xml
+++ b/scenarios/labs/labtainers/ldap.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/liveforensics.xml b/scenarios/labs/labtainers/liveforensics.xml
index ce652172a..d45ba1afb 100644
--- a/scenarios/labs/labtainers/liveforensics.xml
+++ b/scenarios/labs/labtainers/liveforensics.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/local-dns.xml b/scenarios/labs/labtainers/local-dns.xml
index 12f9fb09a..f190b282e 100644
--- a/scenarios/labs/labtainers/local-dns.xml
+++ b/scenarios/labs/labtainers/local-dns.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/macs-hash.xml b/scenarios/labs/labtainers/macs-hash.xml
index 5546a2847..da0fb28c2 100644
--- a/scenarios/labs/labtainers/macs-hash.xml
+++ b/scenarios/labs/labtainers/macs-hash.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/metasploit.xml b/scenarios/labs/labtainers/metasploit.xml
index e5cb1de3a..5a0e324a7 100644
--- a/scenarios/labs/labtainers/metasploit.xml
+++ b/scenarios/labs/labtainers/metasploit.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/nix-commands.xml b/scenarios/labs/labtainers/nix-commands.xml
index 2b7c5e5a2..1f67093a0 100644
--- a/scenarios/labs/labtainers/nix-commands.xml
+++ b/scenarios/labs/labtainers/nix-commands.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/nmap-discovery.xml b/scenarios/labs/labtainers/nmap-discovery.xml
index 409acf2cb..8245d2b14 100644
--- a/scenarios/labs/labtainers/nmap-discovery.xml
+++ b/scenarios/labs/labtainers/nmap-discovery.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/nmap-ssh.xml b/scenarios/labs/labtainers/nmap-ssh.xml
index 8dd5089d7..b1de88a4d 100644
--- a/scenarios/labs/labtainers/nmap-ssh.xml
+++ b/scenarios/labs/labtainers/nmap-ssh.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/onewayhash.xml b/scenarios/labs/labtainers/onewayhash.xml
index abdbe59d8..15d413ad2 100644
--- a/scenarios/labs/labtainers/onewayhash.xml
+++ b/scenarios/labs/labtainers/onewayhash.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/packet-introspection.xml b/scenarios/labs/labtainers/packet-introspection.xml
index cab2b2e00..587ff81c8 100644
--- a/scenarios/labs/labtainers/packet-introspection.xml
+++ b/scenarios/labs/labtainers/packet-introspection.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/pass-crack.xml b/scenarios/labs/labtainers/pass-crack.xml
index e522cb7b1..af40104f3 100644
--- a/scenarios/labs/labtainers/pass-crack.xml
+++ b/scenarios/labs/labtainers/pass-crack.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/pcapanalysis.xml b/scenarios/labs/labtainers/pcapanalysis.xml
index e5bf8ece9..da52b3aef 100644
--- a/scenarios/labs/labtainers/pcapanalysis.xml
+++ b/scenarios/labs/labtainers/pcapanalysis.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/plc-app.xml b/scenarios/labs/labtainers/plc-app.xml
index 3c9704297..10e898ea9 100644
--- a/scenarios/labs/labtainers/plc-app.xml
+++ b/scenarios/labs/labtainers/plc-app.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/plc-forensics-adv.xml b/scenarios/labs/labtainers/plc-forensics-adv.xml
index f06441c30..d7d971ee3 100644
--- a/scenarios/labs/labtainers/plc-forensics-adv.xml
+++ b/scenarios/labs/labtainers/plc-forensics-adv.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/plc-forensics.xml b/scenarios/labs/labtainers/plc-forensics.xml
index d5cd752cf..1b204e0ea 100644
--- a/scenarios/labs/labtainers/plc-forensics.xml
+++ b/scenarios/labs/labtainers/plc-forensics.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/plc.xml b/scenarios/labs/labtainers/plc.xml
index 51e21e51f..6b64e8c39 100644
--- a/scenarios/labs/labtainers/plc.xml
+++ b/scenarios/labs/labtainers/plc.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/pubkey.xml b/scenarios/labs/labtainers/pubkey.xml
index 142c90544..bc7ad33de 100644
--- a/scenarios/labs/labtainers/pubkey.xml
+++ b/scenarios/labs/labtainers/pubkey.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/quantum.xml b/scenarios/labs/labtainers/quantum.xml
index 1a270e192..47baa4484 100644
--- a/scenarios/labs/labtainers/quantum.xml
+++ b/scenarios/labs/labtainers/quantum.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/radius.xml b/scenarios/labs/labtainers/radius.xml
index 7ffb686cf..3bee07d30 100644
--- a/scenarios/labs/labtainers/radius.xml
+++ b/scenarios/labs/labtainers/radius.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/remote-dns.xml b/scenarios/labs/labtainers/remote-dns.xml
index c7a3150f1..bfc64cb99 100644
--- a/scenarios/labs/labtainers/remote-dns.xml
+++ b/scenarios/labs/labtainers/remote-dns.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/retlibc.xml b/scenarios/labs/labtainers/retlibc.xml
index 029a446dc..9c2da23c6 100644
--- a/scenarios/labs/labtainers/retlibc.xml
+++ b/scenarios/labs/labtainers/retlibc.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/routing-basics.xml b/scenarios/labs/labtainers/routing-basics.xml
index be620e49e..17ee6f248 100644
--- a/scenarios/labs/labtainers/routing-basics.xml
+++ b/scenarios/labs/labtainers/routing-basics.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/routing-basics2.xml b/scenarios/labs/labtainers/routing-basics2.xml
index d0542c35a..fec74399a 100644
--- a/scenarios/labs/labtainers/routing-basics2.xml
+++ b/scenarios/labs/labtainers/routing-basics2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/setuid-env.xml b/scenarios/labs/labtainers/setuid-env.xml
index 379831f09..2e11d2c4f 100644
--- a/scenarios/labs/labtainers/setuid-env.xml
+++ b/scenarios/labs/labtainers/setuid-env.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/shellbasics.xml b/scenarios/labs/labtainers/shellbasics.xml
index 0a5a75485..22d6a5597 100644
--- a/scenarios/labs/labtainers/shellbasics.xml
+++ b/scenarios/labs/labtainers/shellbasics.xml
@@ -25,7 +25,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/snort.xml b/scenarios/labs/labtainers/snort.xml
index 4bea8ccc2..53edbaff7 100644
--- a/scenarios/labs/labtainers/snort.xml
+++ b/scenarios/labs/labtainers/snort.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/softplc.xml b/scenarios/labs/labtainers/softplc.xml
index c65f28957..16784beac 100644
--- a/scenarios/labs/labtainers/softplc.xml
+++ b/scenarios/labs/labtainers/softplc.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/softplc2.xml b/scenarios/labs/labtainers/softplc2.xml
index 7952c94b9..3d3e51c73 100644
--- a/scenarios/labs/labtainers/softplc2.xml
+++ b/scenarios/labs/labtainers/softplc2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/sql-inject.xml b/scenarios/labs/labtainers/sql-inject.xml
index eb02e48f6..888537f65 100644
--- a/scenarios/labs/labtainers/sql-inject.xml
+++ b/scenarios/labs/labtainers/sql-inject.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/ssh-agent.xml b/scenarios/labs/labtainers/ssh-agent.xml
index f44955853..249c77471 100644
--- a/scenarios/labs/labtainers/ssh-agent.xml
+++ b/scenarios/labs/labtainers/ssh-agent.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/sshlab.xml b/scenarios/labs/labtainers/sshlab.xml
index f8cbcb488..31488d954 100644
--- a/scenarios/labs/labtainers/sshlab.xml
+++ b/scenarios/labs/labtainers/sshlab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/ssl.xml b/scenarios/labs/labtainers/ssl.xml
index c1ca010f8..8dcdf3ab7 100644
--- a/scenarios/labs/labtainers/ssl.xml
+++ b/scenarios/labs/labtainers/ssl.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/symkeylab.xml b/scenarios/labs/labtainers/symkeylab.xml
index 4788c1530..46ab7a66e 100644
--- a/scenarios/labs/labtainers/symkeylab.xml
+++ b/scenarios/labs/labtainers/symkeylab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/sys-log.xml b/scenarios/labs/labtainers/sys-log.xml
index 9e969951d..1c6ff52a3 100644
--- a/scenarios/labs/labtainers/sys-log.xml
+++ b/scenarios/labs/labtainers/sys-log.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/tcpip.xml b/scenarios/labs/labtainers/tcpip.xml
index c7861e8b6..8abf27992 100644
--- a/scenarios/labs/labtainers/tcpip.xml
+++ b/scenarios/labs/labtainers/tcpip.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/telnetlab.xml b/scenarios/labs/labtainers/telnetlab.xml
index a328d9ee1..38281ca6d 100644
--- a/scenarios/labs/labtainers/telnetlab.xml
+++ b/scenarios/labs/labtainers/telnetlab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/vpnlab.xml b/scenarios/labs/labtainers/vpnlab.xml
index 7550d5dd5..388fb0fa9 100644
--- a/scenarios/labs/labtainers/vpnlab.xml
+++ b/scenarios/labs/labtainers/vpnlab.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/vpnlab2.xml b/scenarios/labs/labtainers/vpnlab2.xml
index 7eb80c80c..218de7ed4 100644
--- a/scenarios/labs/labtainers/vpnlab2.xml
+++ b/scenarios/labs/labtainers/vpnlab2.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/webtrack.xml b/scenarios/labs/labtainers/webtrack.xml
index 7a2e486f7..bff8127ae 100644
--- a/scenarios/labs/labtainers/webtrack.xml
+++ b/scenarios/labs/labtainers/webtrack.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/wireshark-intro.xml b/scenarios/labs/labtainers/wireshark-intro.xml
index f30dd1f34..38bf3a20d 100644
--- a/scenarios/labs/labtainers/wireshark-intro.xml
+++ b/scenarios/labs/labtainers/wireshark-intro.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/xforge.xml b/scenarios/labs/labtainers/xforge.xml
index 94a3847f8..b514f4886 100644
--- a/scenarios/labs/labtainers/xforge.xml
+++ b/scenarios/labs/labtainers/xforge.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/labtainers/xsite.xml b/scenarios/labs/labtainers/xsite.xml
index d914b532e..4051cd6e0 100644
--- a/scenarios/labs/labtainers/xsite.xml
+++ b/scenarios/labs/labtainers/xsite.xml
@@ -24,7 +24,7 @@
     <input into_datastore="accounts">
       <generator type="account">
         <input into="username">
-          <generator type="random_word_generator">
+          <generator type="random_sanitised_word">
             <input into="wordlist">
               <value>mythical_creatures</value>
             </input>
diff --git a/scenarios/labs/response_and_investigation/1_integrity_protection.xml b/scenarios/labs/response_and_investigation/1_integrity_protection.xml
index 09f05821a..5a6a46508 100644
--- a/scenarios/labs/response_and_investigation/1_integrity_protection.xml
+++ b/scenarios/labs/response_and_investigation/1_integrity_protection.xml
@@ -26,7 +26,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -68,7 +68,7 @@ Diner's Club	3000 0000 0000 04</value>
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -89,7 +89,7 @@ Diner's Club	3000 0000 0000 04</value>
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/2_integrity_detection.xml b/scenarios/labs/response_and_investigation/2_integrity_detection.xml
index 3b131d3e8..d6095ad2d 100644
--- a/scenarios/labs/response_and_investigation/2_integrity_detection.xml
+++ b/scenarios/labs/response_and_investigation/2_integrity_detection.xml
@@ -26,7 +26,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -68,7 +68,7 @@ Diner's Club	3000 0000 0000 04</value>
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -89,7 +89,7 @@ Diner's Club	3000 0000 0000 04</value>
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/3_backups_and_recovery.xml b/scenarios/labs/response_and_investigation/3_backups_and_recovery.xml
index 437ff9f4a..3cfd2ae39 100644
--- a/scenarios/labs/response_and_investigation/3_backups_and_recovery.xml
+++ b/scenarios/labs/response_and_investigation/3_backups_and_recovery.xml
@@ -27,7 +27,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -48,7 +48,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -90,7 +90,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/4_ids.xml b/scenarios/labs/response_and_investigation/4_ids.xml
index 13a03b41d..0e58290ad 100644
--- a/scenarios/labs/response_and_investigation/4_ids.xml
+++ b/scenarios/labs/response_and_investigation/4_ids.xml
@@ -32,7 +32,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -53,7 +53,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -74,7 +74,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/5_ids_rules.xml b/scenarios/labs/response_and_investigation/5_ids_rules.xml
index c396320de..ad48fc4bd 100644
--- a/scenarios/labs/response_and_investigation/5_ids_rules.xml
+++ b/scenarios/labs/response_and_investigation/5_ids_rules.xml
@@ -32,7 +32,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -53,7 +53,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -74,7 +74,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/6_exfiltration_detection.xml b/scenarios/labs/response_and_investigation/6_exfiltration_detection.xml
index 297aeccfe..b80804c9d 100644
--- a/scenarios/labs/response_and_investigation/6_exfiltration_detection.xml
+++ b/scenarios/labs/response_and_investigation/6_exfiltration_detection.xml
@@ -32,7 +32,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -77,7 +77,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -98,7 +98,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/7_live_analysis.xml b/scenarios/labs/response_and_investigation/7_live_analysis.xml
index 69459719e..3eff3bfaf 100644
--- a/scenarios/labs/response_and_investigation/7_live_analysis.xml
+++ b/scenarios/labs/response_and_investigation/7_live_analysis.xml
@@ -18,7 +18,7 @@
 		<base distro="Debian 10" type="desktop" name="KDE"/>
 
 		<input into_datastore="main_username">
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/response_and_investigation/8_dead_analysis.xml b/scenarios/labs/response_and_investigation/8_dead_analysis.xml
index df509bb90..23f5eb361 100644
--- a/scenarios/labs/response_and_investigation/8_dead_analysis.xml
+++ b/scenarios/labs/response_and_investigation/8_dead_analysis.xml
@@ -27,7 +27,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -48,7 +48,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -69,7 +69,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_1.xml b/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_1.xml
index ef76e4604..d7e1c9c14 100644
--- a/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_1.xml
+++ b/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_1.xml
@@ -30,7 +30,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -72,7 +72,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_2.xml b/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_2.xml
index b9717ffb7..5b9d45562 100644
--- a/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_2.xml
+++ b/scenarios/labs/response_and_investigation/hacker_vs_hackerbot_2.xml
@@ -32,7 +32,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username" into_datastore="main_username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -94,7 +94,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/software_and_malware_analysis/1_dynamic_and_static_analysis.xml b/scenarios/labs/software_and_malware_analysis/1_dynamic_and_static_analysis.xml
index 398ab6beb..7ad074aa5 100644
--- a/scenarios/labs/software_and_malware_analysis/1_dynamic_and_static_analysis.xml
+++ b/scenarios/labs/software_and_malware_analysis/1_dynamic_and_static_analysis.xml
@@ -25,7 +25,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/software_and_malware_analysis/2_intro_to_c.xml b/scenarios/labs/software_and_malware_analysis/2_intro_to_c.xml
index 802e4ab3f..41af3e7cb 100644
--- a/scenarios/labs/software_and_malware_analysis/2_intro_to_c.xml
+++ b/scenarios/labs/software_and_malware_analysis/2_intro_to_c.xml
@@ -26,7 +26,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/software_and_malware_analysis/3_c_and_asm.xml b/scenarios/labs/software_and_malware_analysis/3_c_and_asm.xml
index ce644bf60..ebbb3a864 100644
--- a/scenarios/labs/software_and_malware_analysis/3_c_and_asm.xml
+++ b/scenarios/labs/software_and_malware_analysis/3_c_and_asm.xml
@@ -27,7 +27,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/software_and_malware_analysis/psu_metactf_computer_systems_programming.xml b/scenarios/labs/software_and_malware_analysis/psu_metactf_computer_systems_programming.xml
index aba134e9e..b6bced96c 100644
--- a/scenarios/labs/software_and_malware_analysis/psu_metactf_computer_systems_programming.xml
+++ b/scenarios/labs/software_and_malware_analysis/psu_metactf_computer_systems_programming.xml
@@ -15,7 +15,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
           <input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/software_and_malware_analysis/psu_metactf_malware_analysis.xml b/scenarios/labs/software_and_malware_analysis/psu_metactf_malware_analysis.xml
index 98d8a8666..373a6ed07 100644
--- a/scenarios/labs/software_and_malware_analysis/psu_metactf_malware_analysis.xml
+++ b/scenarios/labs/software_and_malware_analysis/psu_metactf_malware_analysis.xml
@@ -15,7 +15,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
           <input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/software_and_malware_analysis/saa_with_ghidra.xml b/scenarios/labs/software_and_malware_analysis/saa_with_ghidra.xml
index 909922539..d2f3f73b3 100644
--- a/scenarios/labs/software_and_malware_analysis/saa_with_ghidra.xml
+++ b/scenarios/labs/software_and_malware_analysis/saa_with_ghidra.xml
@@ -15,7 +15,7 @@
       <input into="accounts" into_datastore="account">
         <generator type="account">
 					<input into="username">
-						<generator type="random_word_generator">
+						<generator type="random_sanitised_word">
 							<input into="wordlist">
 								<value>mythical_creatures</value>
 							</input>
diff --git a/scenarios/labs/workshops/hack_and_crack.xml b/scenarios/labs/workshops/hack_and_crack.xml
index 8b8f5d4ed..4fc53f122 100644
--- a/scenarios/labs/workshops/hack_and_crack.xml
+++ b/scenarios/labs/workshops/hack_and_crack.xml
@@ -29,28 +29,28 @@
 		<!-- generate some usernames to use -->
 		<input into_datastore="usernames">
 			<!-- main user -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
 			<!-- 4 other users -->
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
 			</generator>
-			<generator type="random_word_generator">
+			<generator type="random_sanitised_word">
 				<input into="wordlist">
 					<value>mythical_creatures</value>
 				</input>
diff --git a/scenarios/labs/workshops/induction.xml b/scenarios/labs/workshops/induction.xml
index 72d4d5092..563783c6b 100644
--- a/scenarios/labs/workshops/induction.xml
+++ b/scenarios/labs/workshops/induction.xml
@@ -24,7 +24,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -176,7 +176,7 @@ Iain Wright,iain.wright@democrats.com,28013651
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -197,7 +197,7 @@ Iain Wright,iain.wright@democrats.com,28013651
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
diff --git a/scenarios/labs/workshops/lab_workshop.xml b/scenarios/labs/workshops/lab_workshop.xml
index 3704b7b98..046a0863f 100644
--- a/scenarios/labs/workshops/lab_workshop.xml
+++ b/scenarios/labs/workshops/lab_workshop.xml
@@ -38,7 +38,7 @@
 		<input into_datastore="accounts">
 			<generator type="account">
 				<input into="username" into_datastore="desktop_username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -72,7 +72,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>
@@ -102,7 +102,7 @@
 			</generator>
 			<generator type="account">
 				<input into="username">
-					<generator type="random_word_generator">
+					<generator type="random_sanitised_word">
 						<input into="wordlist">
 							<value>mythical_creatures</value>
 						</input>