diff --git a/extensions/demos/html/butcher/index.html b/extensions/demos/html/butcher/index.html
index 9e3903091..abede7df6 100644
--- a/extensions/demos/html/butcher/index.html
+++ b/extensions/demos/html/butcher/index.html
@@ -39,18 +39,26 @@ Welcome to The Butcher, your source of delicious meats. Please feel free to view
 		<div class="normal">
 			<button type="button" onclick="showfriends();">Our Meaty Friends</button> &nbsp; <button type="button" onclick="showHamper();">Order Your BeEF-Hamper</button>
 			<div id="friends">
+				<a href="http://www.beefproject.com">BeEF Project</a><br />
 				<a href="http://www.bindshell.net">Bindshell</a><br />
 				<a href="http://www.slashdot.org">Slashdot</a><br />
 				<a href="http://ha.ckers.org/">ha.ckers.org homepage</a><br />
 			</div>
 			<div id="hamper">
-				Delicious delicious hamper, straight to your door!<br />
-				<form method="GET" action="index.html">Name: <input type="text" name="yourname" /><br />
+				<p>Delicious delicious hamper, straight to your door!</p>
+				<form method="GET" action="index.html">
+					Name: <input type="text" name="yourname" /><br />
 					Phone: <input type="text" name="phone" /><br />
 					Address: <input type="text" name="address" /><br />
 					Credit Card: <input type="text" name="creditcard" /><br />
 					<input type="submit" value="Buy buy!" />
 				</form>
+				<p>Sign up to our mailing list for delicious meats delivered straight to your inbox!</p>
+				<form method="GET" action="index.html">
+				E-mail: <input type="text" name="yourname" /><br />
+				Password: <input type="password" name="password" /><br />
+				<input type="submit" value="Sign Up!">
+				</form>
 			</div>
 		</div>
 		<div class="smaller">
diff --git a/modules/browser/extract_local_storage/command.js b/modules/browser/get_local_storage/command.js
similarity index 100%
rename from modules/browser/extract_local_storage/command.js
rename to modules/browser/get_local_storage/command.js
diff --git a/modules/browser/extract_local_storage/config.yaml b/modules/browser/get_local_storage/config.yaml
similarity index 97%
rename from modules/browser/extract_local_storage/config.yaml
rename to modules/browser/get_local_storage/config.yaml
index 256251c90..d676cf5f6 100644
--- a/modules/browser/extract_local_storage/config.yaml
+++ b/modules/browser/get_local_storage/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        extract_local_storage:
+        get_local_storage:
             enable: true
             category: "Browser"
             name: "Get Local Storage"
diff --git a/modules/browser/extract_local_storage/module.rb b/modules/browser/get_local_storage/module.rb
similarity index 94%
rename from modules/browser/extract_local_storage/module.rb
rename to modules/browser/get_local_storage/module.rb
index 1eaeb5094..afe92baa2 100644
--- a/modules/browser/extract_local_storage/module.rb
+++ b/modules/browser/get_local_storage/module.rb
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-class Extract_local_storage < BeEF::Core::Command
+class Get_local_storage < BeEF::Core::Command
   
   # More info:
   #   http://dev.w3.org/html5/webstorage/
diff --git a/modules/browser/collect_links/command.js b/modules/browser/get_page_links/command.js
similarity index 100%
rename from modules/browser/collect_links/command.js
rename to modules/browser/get_page_links/command.js
diff --git a/modules/browser/collect_links/config.yaml b/modules/browser/get_page_links/config.yaml
similarity index 97%
rename from modules/browser/collect_links/config.yaml
rename to modules/browser/get_page_links/config.yaml
index 54e758394..f1be051f3 100644
--- a/modules/browser/collect_links/config.yaml
+++ b/modules/browser/get_page_links/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        collect_links:
+        get_page_links:
             enable: true
             category: "Browser"
             name: "Get Page HREFs"
diff --git a/modules/browser/collect_links/module.rb b/modules/browser/get_page_links/module.rb
similarity index 94%
rename from modules/browser/collect_links/module.rb
rename to modules/browser/get_page_links/module.rb
index 6b4702a2b..9e1a1b211 100644
--- a/modules/browser/collect_links/module.rb
+++ b/modules/browser/get_page_links/module.rb
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-class Collect_links < BeEF::Core::Command
+class Get_page_links < BeEF::Core::Command
 
   def post_execute
     content = {}
diff --git a/modules/browser/extract_session_storage/command.js b/modules/browser/get_session_storage/command.js
similarity index 100%
rename from modules/browser/extract_session_storage/command.js
rename to modules/browser/get_session_storage/command.js
diff --git a/modules/browser/extract_session_storage/config.yaml b/modules/browser/get_session_storage/config.yaml
similarity index 97%
rename from modules/browser/extract_session_storage/config.yaml
rename to modules/browser/get_session_storage/config.yaml
index 59ca427f2..f893ee06c 100644
--- a/modules/browser/extract_session_storage/config.yaml
+++ b/modules/browser/get_session_storage/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        extract_session_storage:
+        get_session_storage:
             enable: true
             category: "Browser"
             name: "Get Session Storage"
diff --git a/modules/browser/extract_session_storage/module.rb b/modules/browser/get_session_storage/module.rb
similarity index 94%
rename from modules/browser/extract_session_storage/module.rb
rename to modules/browser/get_session_storage/module.rb
index 2f67ad369..91d03614d 100644
--- a/modules/browser/extract_session_storage/module.rb
+++ b/modules/browser/get_session_storage/module.rb
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-class Extract_session_storage < BeEF::Core::Command
+class Get_session_storage < BeEF::Core::Command
   
   # More info:
   #   http://dev.w3.org/html5/webstorage/
diff --git a/modules/browser/detect_visited_urls/command.js b/modules/browser/get_visited_urls/command.js
similarity index 100%
rename from modules/browser/detect_visited_urls/command.js
rename to modules/browser/get_visited_urls/command.js
diff --git a/modules/browser/detect_visited_urls/config.yaml b/modules/browser/get_visited_urls/config.yaml
similarity index 98%
rename from modules/browser/detect_visited_urls/config.yaml
rename to modules/browser/get_visited_urls/config.yaml
index 5cd2e027d..6bc80d4ad 100644
--- a/modules/browser/detect_visited_urls/config.yaml
+++ b/modules/browser/get_visited_urls/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        detect_visited_urls:
+        get_visited_urls:
             enable: true
             category: "Browser"
             name: "Get Visited URLs"
diff --git a/modules/browser/detect_visited_urls/module.rb b/modules/browser/get_visited_urls/module.rb
similarity index 95%
rename from modules/browser/detect_visited_urls/module.rb
rename to modules/browser/get_visited_urls/module.rb
index 580853692..fb10fe401 100644
--- a/modules/browser/detect_visited_urls/module.rb
+++ b/modules/browser/get_visited_urls/module.rb
@@ -13,7 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-class Detect_visited_urls < BeEF::Core::Command
+class Get_visited_urls < BeEF::Core::Command
   
   def self.options
     return [
diff --git a/modules/host/hook_default/bounce_to_ie.pdf b/modules/host/hook_default_browser/bounce_to_ie.pdf
similarity index 100%
rename from modules/host/hook_default/bounce_to_ie.pdf
rename to modules/host/hook_default_browser/bounce_to_ie.pdf
diff --git a/modules/host/hook_default/command.js b/modules/host/hook_default_browser/command.js
similarity index 100%
rename from modules/host/hook_default/command.js
rename to modules/host/hook_default_browser/command.js
diff --git a/modules/host/hook_default/config.yaml b/modules/host/hook_default_browser/config.yaml
similarity index 97%
rename from modules/host/hook_default/config.yaml
rename to modules/host/hook_default_browser/config.yaml
index 6bb2bdc04..62317767e 100644
--- a/modules/host/hook_default/config.yaml
+++ b/modules/host/hook_default_browser/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        hook_ie:
+        hook_default_browser:
             enable: true
             category: "Host"
             name: "Hook Default Browser"
diff --git a/modules/host/hook_default/module.rb b/modules/host/hook_default_browser/module.rb
similarity index 97%
rename from modules/host/hook_default/module.rb
rename to modules/host/hook_default_browser/module.rb
index 80bc111a4..00e3318cf 100644
--- a/modules/host/hook_default/module.rb
+++ b/modules/host/hook_default_browser/module.rb
@@ -14,7 +14,7 @@
 #   limitations under the License.
 #
 
-class Hook_ie < BeEF::Core::Command
+class Hook_default_browser < BeEF::Core::Command
 
   def self.options
     configuration = BeEF::Core::Configuration.instance