diff --git a/arerules/lan_cors_scan.json b/arerules/lan_cors_scan.json
index 0acc9b607..d0e9a0147 100644
--- a/arerules/lan_cors_scan.json
+++ b/arerules/lan_cors_scan.json
@@ -10,7 +10,7 @@
       "code": null,
       "options": {}
     },
-    {"name": "cross_origin_scanner",
+    {"name": "cross_origin_scanner_cors",
       "condition": "status==1",
       "code": "var s=get_internal_ip_webrtc_mod_output.split('.');var start = s[0]+'.'+s[1]+'.'+s[2]+'.1'; var end = s[0]+'.'+s[1]+'.'+s[2]+'.255'; var mod_input = start+'-'+end",
       "options": {
diff --git a/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabNetwork.js b/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabNetwork.js
index 34b717249..98904eb12 100644
--- a/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabNetwork.js
+++ b/extensions/admin_ui/media/javascript/ui/panel/tabs/ZombieTabNetwork.js
@@ -409,7 +409,7 @@ ZombieTab_Network = function(zombie) {
                                                         text: 'Common LAN IPs',
                                                         iconCls: 'network-host-ctxMenu-network',
                                                         handler: function() {
-                                                                var mod_name = "cross_origin_scanner";
+                                                                var mod_name = "cross_origin_scanner_cors";
                                                                 var mod_id = get_module_id(mod_name);
                                                                 var ports = prompt("Enter ports to scan:", '80,8080');
                                                                 if (!ports) {
@@ -447,7 +447,7 @@ ZombieTab_Network = function(zombie) {
                                                                         commands_statusbar.update_fail('Cancelled');
                                                                         return;
                                                                 }
-                                                                var mod_name = "cross_origin_scanner";
+                                                                var mod_name = "cross_origin_scanner_cors";
                                                                 var mod_id = get_module_id(mod_name);
                                                                 commands_statusbar.update_sending('CORS scanning ' + ip_range + ' [ports: ' + ports + '] ...');
                                                                 $jwterm.ajax({
@@ -539,7 +539,7 @@ ZombieTab_Network = function(zombie) {
                                           text: 'CORS Scan',
                                           iconCls: 'network-host-ctxMenu-cors',
                                           handler: function() {
-                                            var mod_id = get_module_id("cross_origin_scanner");
+                                            var mod_id = get_module_id("cross_origin_scanner_cors");
                                             var ports = prompt("Enter ports to scan:", '80,8080');
                                             if (!ports) {
                                               commands_statusbar.update_fail('Cancelled');
@@ -746,7 +746,7 @@ ZombieTab_Network = function(zombie) {
                                                         text: 'Host ('+ip+')',
 							iconCls: 'network-host-ctxMenu-host',
                                                         handler: function() {
-								var mod_id = get_module_id("cross_origin_scanner");
+								var mod_id = get_module_id("cross_origin_scanner_cors");
                                                                 var ports = prompt("Enter ports to scan:", '80,8080');
                                                                 if (!ports) {
                                                                         commands_statusbar.update_fail('Cancelled');
@@ -773,7 +773,7 @@ ZombieTab_Network = function(zombie) {
                                                         text: 'Network ('+class_c+'.0/24)',
 							iconCls: 'network-host-ctxMenu-network',
                                                         handler: function() {
-	                                                        var mod_id = get_module_id("cross_origin_scanner");
+	                                                        var mod_id = get_module_id("cross_origin_scanner_cors");
                                                                 var ports = prompt("Enter ports to scan:", '80,8080');
                                                                 if (!ports) {
                                                                         commands_statusbar.update_fail('Cancelled');
@@ -1013,7 +1013,7 @@ ZombieTab_Network = function(zombie) {
                                             text: 'CORS Scan',
                                             iconCls: 'network-host-ctxMenu-cors',
                                             handler: function () {
-                                                var mod_id = get_module_id("cross_origin_scanner");
+                                                var mod_id = get_module_id("cross_origin_scanner_cors");
                                                 commands_statusbar.update_sending('CORS scanning ' + ip + ' [port: '+port+'] ...');
                                                 $jwterm.ajax({
                                                     contentType: 'application/json',
diff --git a/modules/network/cross_origin_scanner/command.js b/modules/network/cross_origin_scanner_cors/command.js
similarity index 100%
rename from modules/network/cross_origin_scanner/command.js
rename to modules/network/cross_origin_scanner_cors/command.js
diff --git a/modules/network/cross_origin_scanner/config.yaml b/modules/network/cross_origin_scanner_cors/config.yaml
similarity index 93%
rename from modules/network/cross_origin_scanner/config.yaml
rename to modules/network/cross_origin_scanner_cors/config.yaml
index f1997d9c1..710422a2d 100644
--- a/modules/network/cross_origin_scanner/config.yaml
+++ b/modules/network/cross_origin_scanner_cors/config.yaml
@@ -5,10 +5,10 @@
 #
 beef:
     module:
-        cross_origin_scanner:
+        cross_origin_scanner_cors:
             enable: true
             category: "Network"
-            name: "Cross-Origin Scanner"
+            name: "Cross-Origin Scanner (CORS)"
             description: "Scan an IP range for web servers which allow cross-origin requests using CORS. The HTTP response is returned to BeEF.<br/><br/>Note: set the IP address range to 'common' to scan a list of common LAN addresses."
             authors: ["bcoles"]
             # http://caniuse.com/cors
diff --git a/modules/network/cross_origin_scanner/module.rb b/modules/network/cross_origin_scanner_cors/module.rb
similarity index 95%
rename from modules/network/cross_origin_scanner/module.rb
rename to modules/network/cross_origin_scanner_cors/module.rb
index 4c8c4e40d..932f97e0c 100644
--- a/modules/network/cross_origin_scanner/module.rb
+++ b/modules/network/cross_origin_scanner_cors/module.rb
@@ -3,7 +3,7 @@
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-class Cross_origin_scanner < BeEF::Core::Command
+class Cross_origin_scanner_cors < BeEF::Core::Command
 
   def post_execute
     content = {}