diff --git a/modules/browser/webcam/command.js b/modules/browser/webcam_flash/command.js
similarity index 100%
rename from modules/browser/webcam/command.js
rename to modules/browser/webcam_flash/command.js
diff --git a/modules/browser/webcam/config.yaml b/modules/browser/webcam_flash/config.yaml
similarity index 93%
rename from modules/browser/webcam/config.yaml
rename to modules/browser/webcam_flash/config.yaml
index 96cca368e..6f6ab2fe5 100644
--- a/modules/browser/webcam/config.yaml
+++ b/modules/browser/webcam_flash/config.yaml
@@ -5,10 +5,10 @@
 #
 beef:
     module:
-        webcam:
+        webcam_flash:
             enable: true
             category: "Browser"
-            name: "Webcam"
+            name: "Webcam (Flash)"
             description: "This module will show the Adobe Flash 'Allow Webcam' dialog to the user. The user has to click the allow button, otherwise this module will not return pictures.<br />The title/text to convince the user can be customised. You can customise how many pictures you want to take and in which interval (default will take 20 pictures, 1 picture per second). The picture is sent as a base64 encoded JPG string."
             authors: ["floyd @floyd_ch"]
             target:
diff --git a/modules/browser/webcam/dev/com/adobe/images/BitString.as b/modules/browser/webcam_flash/dev/com/adobe/images/BitString.as
similarity index 100%
rename from modules/browser/webcam/dev/com/adobe/images/BitString.as
rename to modules/browser/webcam_flash/dev/com/adobe/images/BitString.as
diff --git a/modules/browser/webcam/dev/com/adobe/images/JPGEncoder.as b/modules/browser/webcam_flash/dev/com/adobe/images/JPGEncoder.as
similarity index 100%
rename from modules/browser/webcam/dev/com/adobe/images/JPGEncoder.as
rename to modules/browser/webcam_flash/dev/com/adobe/images/JPGEncoder.as
diff --git a/modules/browser/webcam/dev/com/adobe/images/PNGEncoder.as b/modules/browser/webcam_flash/dev/com/adobe/images/PNGEncoder.as
similarity index 100%
rename from modules/browser/webcam/dev/com/adobe/images/PNGEncoder.as
rename to modules/browser/webcam_flash/dev/com/adobe/images/PNGEncoder.as
diff --git a/modules/browser/webcam/dev/com/foxarc/util/Base64.as b/modules/browser/webcam_flash/dev/com/foxarc/util/Base64.as
similarity index 100%
rename from modules/browser/webcam/dev/com/foxarc/util/Base64.as
rename to modules/browser/webcam_flash/dev/com/foxarc/util/Base64.as
diff --git a/modules/browser/webcam/dev/takeit.fla b/modules/browser/webcam_flash/dev/takeit.fla
similarity index 100%
rename from modules/browser/webcam/dev/takeit.fla
rename to modules/browser/webcam_flash/dev/takeit.fla
diff --git a/modules/browser/webcam/module.rb b/modules/browser/webcam_flash/module.rb
similarity index 92%
rename from modules/browser/webcam/module.rb
rename to modules/browser/webcam_flash/module.rb
index c8c91e348..3cff09a6e 100644
--- a/modules/browser/webcam/module.rb
+++ b/modules/browser/webcam_flash/module.rb
@@ -4,11 +4,12 @@
 # See the file 'doc/COPYING' for copying permission
 #
 require 'base64'
-class Webcam < BeEF::Core::Command
+class Webcam_flash < BeEF::Core::Command
   def pre_send
-      BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/browser/webcam/takeit.swf', '/takeit', 'swf')
-      BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/browser/webcam/swfobject.js', '/swfobject', 'js')
+      BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/browser/webcam_flash/takeit.swf', '/takeit', 'swf')
+      BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/browser/webcam_flash/swfobject.js', '/swfobject', 'js')
   end
+
   def self.options
        configuration = BeEF::Core::Configuration.instance
        social_engineering_title = "This website is using Adobe Flash"
diff --git a/modules/browser/webcam/swfobject.js b/modules/browser/webcam_flash/swfobject.js
similarity index 100%
rename from modules/browser/webcam/swfobject.js
rename to modules/browser/webcam_flash/swfobject.js
diff --git a/modules/browser/webcam/takeit.swf b/modules/browser/webcam_flash/takeit.swf
similarity index 100%
rename from modules/browser/webcam/takeit.swf
rename to modules/browser/webcam_flash/takeit.swf