diff --git a/modules/browser/get_visited_urls/config.yaml b/modules/browser/get_visited_urls/config.yaml
index 981dfaa73..ded7ce7c1 100644
--- a/modules/browser/get_visited_urls/config.yaml
+++ b/modules/browser/get_visited_urls/config.yaml
@@ -8,7 +8,7 @@ beef:
         get_visited_urls:
             enable: true
             category: "Browser"
-            name: "Get Visited URLs"
+            name: "Get Visited URLs (Old Browsers)"
             description: "This module will detect whether or not the hooked browser has visited the specified URL(s)"
             authors: ["passbe"]
             target:
diff --git a/modules/browser/hooked_domain/site_redirect/config.yaml b/modules/browser/hooked_domain/site_redirect/config.yaml
index 8a70d713c..f8e769503 100644
--- a/modules/browser/hooked_domain/site_redirect/config.yaml
+++ b/modules/browser/hooked_domain/site_redirect/config.yaml
@@ -8,7 +8,7 @@ beef:
         site_redirect:
             enable: true
             category: ["Browser", "Hooked Domain"]
-            name: "Redirect Browser"
+            name: "Redirect Browser (Standard)"
             description: "This module will redirect the selected hooked browser to the address specified in the 'Redirect URL' input."
             authors: ["wade", "vo"]
             target:
diff --git a/modules/exploits/shell_shocked/config.yaml b/modules/exploits/shell_shocked/config.yaml
index eb5b7fae3..b827a5e7c 100644
--- a/modules/exploits/shell_shocked/config.yaml
+++ b/modules/exploits/shell_shocked/config.yaml
@@ -8,7 +8,7 @@ beef:
         Shell_shocked:
             enable: true
             category: "Exploits"
-            name: "Shell Shock"
+            name: "Shell Shock (CVE-2014-6271)"
             description: "Attempt to use vulnerability CVE-2014-627 to execute arbitrary code. The default command attempts to get a reverse shell.<br/>Note: Set the LHOST and LPORT."
             authors: ["Stephane Chazelas", "mz", "radoen"]
             target:
diff --git a/modules/host/physical_location/config.yaml b/modules/host/physical_location/config.yaml
index 92c489412..462cd4140 100644
--- a/modules/host/physical_location/config.yaml
+++ b/modules/host/physical_location/config.yaml
@@ -8,7 +8,7 @@ beef:
         physical_location:
             enable: true
             category: "Host"
-            name: "Get Geolocation"
+            name: "Get Geolocation (API)"
             description: "This module will retrieve the physical location of the hooked browser using the geolocation API."
             authors: ["antisnatchor"]
             target:
diff --git a/modules/network/fetch_port_scanner/config.yaml b/modules/network/fetch_port_scanner/config.yaml
index 638af2b64..0cbcc29a1 100644
--- a/modules/network/fetch_port_scanner/config.yaml
+++ b/modules/network/fetch_port_scanner/config.yaml
@@ -9,7 +9,7 @@ beef:
             enable: true
             category: "Network"
             name: "Fetch Port Scanner"
-            description: " Uses fetch to test the response in order to determine if a port is open or not"
+            description: "Uses fetch to test the response in order to determine if a port is open or not"
             authors: ["Crimes by Will", "jcrew99", "salmong1t"]
             # http://caniuse.com/cors
             target:
diff --git a/modules/network/ping_sweep/config.yaml b/modules/network/ping_sweep/config.yaml
index 3db356641..d825e91bf 100644
--- a/modules/network/ping_sweep/config.yaml
+++ b/modules/network/ping_sweep/config.yaml
@@ -8,7 +8,7 @@ beef:
         ping_sweep:
             enable: true
             category: "Network"
-            name: "Ping Sweep"
+            name: "Ping Sweep (JS XHR)"
             description: "Discover active hosts in the internal network of the hooked browser using JavaScript XHR.<br/><br/>Note: set the IP address range to 'common' to scan a list of common LAN addresses."
             authors: ["bcoles"]
             target:
diff --git a/modules/network/ping_sweep_java/config.yaml b/modules/network/ping_sweep_java/config.yaml
index 315ef2ab6..90ca26377 100644
--- a/modules/network/ping_sweep_java/config.yaml
+++ b/modules/network/ping_sweep_java/config.yaml
@@ -6,7 +6,7 @@
 beef:
     module:
         ping_sweep_java:
-            enable: true
+            enable: false
             category: "Network"
             name: "Ping Sweep (Java)"
             description: "Discover active hosts in the internal network of the hooked browser. Same logic of the Ping Sweep module, but using an unsigned Java applet to work in browsers other than Firefox.<br> For Firefox, use the normal PingSweep module."
diff --git a/modules/network/port_scanner/config.yaml b/modules/network/port_scanner/config.yaml
index 2c509bb99..16c7ef500 100644
--- a/modules/network/port_scanner/config.yaml
+++ b/modules/network/port_scanner/config.yaml
@@ -8,7 +8,7 @@ beef:
         port_scanner:
             enable: true
             category: "Network"
-            name: "Port Scanner"
+            name: "Port Scanner (Multiple Methods)"
             description: "Scan ports in a given hostname, using WebSockets, CORS and img tags. It uses the three methods to avoid blocked ports or Same Origin Policy.<br/><br/>Note: The user may see authentication popups in the event any of the target ports are web servers using HTTP authentication."
             authors: ["javier.marcos"]
             target:
diff --git a/modules/phonegap/phonegap_persistence/config.yaml b/modules/phonegap/phonegap_persistence/config.yaml
index 14de8e71a..513c3f5b3 100644
--- a/modules/phonegap/phonegap_persistence/config.yaml
+++ b/modules/phonegap/phonegap_persistence/config.yaml
@@ -10,7 +10,7 @@ beef:
         phonegap_persistence:
             enable: true
             category: "Phonegap"
-            name: "Persistence"
+            name: "Persistence (PhoneGap)"
             description: "Insert the BeEF hook into PhoneGap's index.html (iPhone only). This module requires the PhoneGap API."
             authors: ["mh"]
             target: