diff --git a/modules/generators/challenges/misc/programming/echo_string/manifests/.no_puppet b/modules/generators/challenges/misc/programming/strings/manifests/.no_puppet
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/manifests/.no_puppet
rename to modules/generators/challenges/misc/programming/strings/manifests/.no_puppet
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/flag b/modules/generators/challenges/misc/programming/strings/secgen_local/flag
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/flag
rename to modules/generators/challenges/misc/programming/strings/secgen_local/flag
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/high.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/high.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/high.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/high.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/local.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/local.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/local.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/local.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/low.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/low.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/low.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/low.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_base64.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_base64.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_base64.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_base64.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_binary_big_endian.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_binary_big_endian.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_binary_big_endian.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_binary_big_endian.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_binary_little_endian.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_binary_little_endian.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_binary_little_endian.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_binary_little_endian.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_decimal.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_decimal.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_decimal.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_decimal.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_hex_big_endian.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_hex_big_endian.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_hex_big_endian.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_hex_big_endian.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_hex_little_endian.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_hex_little_endian.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_hex_little_endian.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_hex_little_endian.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_octal.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_octal.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_octal.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_octal.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_reverse.rb b/modules/generators/challenges/misc/programming/strings/secgen_local/medium_reverse.rb
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_local/medium_reverse.rb
rename to modules/generators/challenges/misc/programming/strings/secgen_local/medium_reverse.rb
diff --git a/modules/generators/challenges/misc/programming/echo_string/secgen_metadata.xml b/modules/generators/challenges/misc/programming/strings/secgen_metadata.xml
similarity index 94%
rename from modules/generators/challenges/misc/programming/echo_string/secgen_metadata.xml
rename to modules/generators/challenges/misc/programming/strings/secgen_metadata.xml
index 506b0271a..7b583e18b 100644
--- a/modules/generators/challenges/misc/programming/echo_string/secgen_metadata.xml
+++ b/modules/generators/challenges/misc/programming/strings/secgen_metadata.xml
@@ -3,7 +3,7 @@
 <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>Echo String Challenge Generator</name>
+  <name>String Challenge Generator</name>
   <author>Thomas Shaw</author>
   <module_license>MIT</module_license>
   <description>TODO</description>
diff --git a/modules/generators/challenges/misc/programming/echo_string/echo_string.pp b/modules/generators/challenges/misc/programming/strings/strings.pp
similarity index 100%
rename from modules/generators/challenges/misc/programming/echo_string/echo_string.pp
rename to modules/generators/challenges/misc/programming/strings/strings.pp