diff --git a/modules/host/get_system_info/config.yaml b/modules/host/get_system_info/config.yaml
index f30448272..802db1695 100644
--- a/modules/host/get_system_info/config.yaml
+++ b/modules/host/get_system_info/config.yaml
@@ -24,6 +24,6 @@ beef:
             target:
                 not_working:
                     ALL:
-                        os: ["iPhone"]
+                        os: ["iPhone", "Macintosh"]
                 working: ["O", "FF", "S", "IE"]
                 user_notify: ["C"]
diff --git a/modules/network/internal_network_fingerprinting/config.yaml b/modules/network/internal_network_fingerprinting/config.yaml
index 91786965a..2b87ff7c9 100644
--- a/modules/network/internal_network_fingerprinting/config.yaml
+++ b/modules/network/internal_network_fingerprinting/config.yaml
@@ -15,7 +15,7 @@
 #
 beef:
     module:
-        fingerprint_network:
+        internal_network_fingerprinting:
             enable: true
             category: "Network"
             name: "Fingerprint Network"
diff --git a/modules/network/internal_network_fingerprinting/module.rb b/modules/network/internal_network_fingerprinting/module.rb
index d8fe1c132..b4eff3e26 100644
--- a/modules/network/internal_network_fingerprinting/module.rb
+++ b/modules/network/internal_network_fingerprinting/module.rb
@@ -33,7 +33,7 @@
 #    - Local IP theft with Java is slow and may fail
 
 
-class Fingerprint_network < BeEF::Core::Command
+class Internal_network_fingerprinting < BeEF::Core::Command
   
   def self.options
     return [
diff --git a/modules/phonegap/beep/command.js b/modules/phonegap/phonegap_beep/command.js
similarity index 100%
rename from modules/phonegap/beep/command.js
rename to modules/phonegap/phonegap_beep/command.js
diff --git a/modules/phonegap/beep/config.yaml b/modules/phonegap/phonegap_beep/config.yaml
similarity index 91%
rename from modules/phonegap/beep/config.yaml
rename to modules/phonegap/phonegap_beep/config.yaml
index c542368c0..969c5defe 100644
--- a/modules/phonegap/beep/config.yaml
+++ b/modules/phonegap/phonegap_beep/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Beep:
+        phonegap_beep:
             enable: true
             category: "Phonegap"
             name: "Beep"
diff --git a/modules/phonegap/beep/module.rb b/modules/phonegap/phonegap_beep/module.rb
similarity index 75%
rename from modules/phonegap/beep/module.rb
rename to modules/phonegap/phonegap_beep/module.rb
index 22a0165b7..2ac42a91e 100644
--- a/modules/phonegap/beep/module.rb
+++ b/modules/phonegap/phonegap_beep/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class Beep < BeEF::Core::Command
+class Phonegap_beep < BeEF::Core::Command
 
    def post_execute
     content = {}
diff --git a/modules/phonegap/detect/command.js b/modules/phonegap/phonegap_detect/command.js
similarity index 100%
rename from modules/phonegap/detect/command.js
rename to modules/phonegap/phonegap_detect/command.js
diff --git a/modules/phonegap/detect/config.yaml b/modules/phonegap/phonegap_detect/config.yaml
similarity index 91%
rename from modules/phonegap/detect/config.yaml
rename to modules/phonegap/phonegap_detect/config.yaml
index 77a240b2c..c5989de7f 100644
--- a/modules/phonegap/detect/config.yaml
+++ b/modules/phonegap/phonegap_detect/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Detect:
+        phonegap_detect:
             enable: true
             category: "Phonegap"
             name: "Detect PhoneGap"
diff --git a/modules/phonegap/detect/module.rb b/modules/phonegap/phonegap_detect/module.rb
similarity index 75%
rename from modules/phonegap/detect/module.rb
rename to modules/phonegap/phonegap_detect/module.rb
index 3e92132b9..fe5585875 100644
--- a/modules/phonegap/detect/module.rb
+++ b/modules/phonegap/phonegap_detect/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class Detect < BeEF::Core::Command
+class Phonegap_detect < BeEF::Core::Command
   
   def post_execute
     content = {}
diff --git a/modules/phonegap/file_upload/command.js b/modules/phonegap/phonegap_file_upload/command.js
similarity index 100%
rename from modules/phonegap/file_upload/command.js
rename to modules/phonegap/phonegap_file_upload/command.js
diff --git a/modules/phonegap/file_upload/config.yaml b/modules/phonegap/phonegap_file_upload/config.yaml
similarity index 90%
rename from modules/phonegap/file_upload/config.yaml
rename to modules/phonegap/phonegap_file_upload/config.yaml
index c2df24bce..4656cd310 100644
--- a/modules/phonegap/file_upload/config.yaml
+++ b/modules/phonegap/phonegap_file_upload/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        File_upload:
+        phonegap_file_upload:
             enable: true
             category: "Phonegap"
             name: "Upload File"
diff --git a/modules/phonegap/file_upload/module.rb b/modules/phonegap/phonegap_file_upload/module.rb
similarity index 93%
rename from modules/phonegap/file_upload/module.rb
rename to modules/phonegap/phonegap_file_upload/module.rb
index a2fc797fe..91db85510 100644
--- a/modules/phonegap/file_upload/module.rb
+++ b/modules/phonegap/phonegap_file_upload/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class File_upload < BeEF::Core::Command
+class Phonegap_file_upload < BeEF::Core::Command
   
     def self.options
         return [{
diff --git a/modules/phonegap/geo_locate/command.js b/modules/phonegap/phonegap_geo_locate/command.js
similarity index 100%
rename from modules/phonegap/geo_locate/command.js
rename to modules/phonegap/phonegap_geo_locate/command.js
diff --git a/modules/phonegap/geo_locate/config.yaml b/modules/phonegap/phonegap_geo_locate/config.yaml
similarity index 89%
rename from modules/phonegap/geo_locate/config.yaml
rename to modules/phonegap/phonegap_geo_locate/config.yaml
index f46a3746d..a4451aef5 100644
--- a/modules/phonegap/geo_locate/config.yaml
+++ b/modules/phonegap/phonegap_geo_locate/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Geo_locate:
+        phonegap_geo_locate:
             enable: true
             category: "Phonegap"
             name: "Geolocation"
diff --git a/modules/phonegap/geo_locate/module.rb b/modules/phonegap/phonegap_geo_locate/module.rb
similarity index 72%
rename from modules/phonegap/geo_locate/module.rb
rename to modules/phonegap/phonegap_geo_locate/module.rb
index e39b349cd..1431d4c38 100644
--- a/modules/phonegap/geo_locate/module.rb
+++ b/modules/phonegap/phonegap_geo_locate/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class Geo_locate < BeEF::Core::Command
+class Phonegap_geo_locate < BeEF::Core::Command
 
    def post_execute
     content = {}
diff --git a/modules/phonegap/list_files/command.js b/modules/phonegap/phonegap_list_files/command.js
similarity index 100%
rename from modules/phonegap/list_files/command.js
rename to modules/phonegap/phonegap_list_files/command.js
diff --git a/modules/phonegap/list_files/config.yaml b/modules/phonegap/phonegap_list_files/config.yaml
similarity index 89%
rename from modules/phonegap/list_files/config.yaml
rename to modules/phonegap/phonegap_list_files/config.yaml
index 57fff5272..bfa3e1ff1 100644
--- a/modules/phonegap/list_files/config.yaml
+++ b/modules/phonegap/phonegap_list_files/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        List_files:
+        phonegap_list_files:
             enable: true
             category: "Phonegap"
             name: "List Files"
diff --git a/modules/phonegap/list_files/module.rb b/modules/phonegap/phonegap_list_files/module.rb
similarity index 88%
rename from modules/phonegap/list_files/module.rb
rename to modules/phonegap/phonegap_list_files/module.rb
index 3151d260f..9d6ea48a0 100644
--- a/modules/phonegap/list_files/module.rb
+++ b/modules/phonegap/phonegap_list_files/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class List_files < BeEF::Core::Command
+class Phonegap_list_files < BeEF::Core::Command
   
     def self.options
         return [{
diff --git a/modules/phonegap/persistence/command.js b/modules/phonegap/phonegap_persistence/command.js
similarity index 100%
rename from modules/phonegap/persistence/command.js
rename to modules/phonegap/phonegap_persistence/command.js
diff --git a/modules/phonegap/persistence/config.yaml b/modules/phonegap/phonegap_persistence/config.yaml
similarity index 91%
rename from modules/phonegap/persistence/config.yaml
rename to modules/phonegap/phonegap_persistence/config.yaml
index e7385b61f..743a01206 100644
--- a/modules/phonegap/persistence/config.yaml
+++ b/modules/phonegap/phonegap_persistence/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Persistence:
+        phonegap_persistence:
             enable: true
             category: "Phonegap"
             name: "Persistence"
diff --git a/modules/phonegap/persistence/module.rb b/modules/phonegap/phonegap_persistence/module.rb
similarity index 92%
rename from modules/phonegap/persistence/module.rb
rename to modules/phonegap/phonegap_persistence/module.rb
index 5534614a1..46176f36a 100644
--- a/modules/phonegap/persistence/module.rb
+++ b/modules/phonegap/phonegap_persistence/module.rb
@@ -1,7 +1,7 @@
 # phonegap persistenece
 #
 
-class Persistence < BeEF::Core::Command
+class Phonegap_persistence < BeEF::Core::Command
 
   def self.options
 
diff --git a/modules/phonegap/start_record_audio/command.js b/modules/phonegap/phonegap_start_record_audio/command.js
similarity index 100%
rename from modules/phonegap/start_record_audio/command.js
rename to modules/phonegap/phonegap_start_record_audio/command.js
diff --git a/modules/phonegap/start_record_audio/config.yaml b/modules/phonegap/phonegap_start_record_audio/config.yaml
similarity index 87%
rename from modules/phonegap/start_record_audio/config.yaml
rename to modules/phonegap/phonegap_start_record_audio/config.yaml
index 4f60a89df..a047493ae 100644
--- a/modules/phonegap/start_record_audio/config.yaml
+++ b/modules/phonegap/phonegap_start_record_audio/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Start_record_audio:
+        phonegap_start_record_audio:
             enable: true
             category: "Phonegap"
             name: "Start Recording Audio"
diff --git a/modules/phonegap/start_record_audio/module.rb b/modules/phonegap/phonegap_start_record_audio/module.rb
similarity index 86%
rename from modules/phonegap/start_record_audio/module.rb
rename to modules/phonegap/phonegap_start_record_audio/module.rb
index fb850b6b4..6be1683e9 100644
--- a/modules/phonegap/start_record_audio/module.rb
+++ b/modules/phonegap/phonegap_start_record_audio/module.rb
@@ -1,7 +1,7 @@
 # phonegap
 #
 
-class Start_record_audio < BeEF::Core::Command
+class Phonegap_start_record_audio < BeEF::Core::Command
     
   def self.options
     return [
diff --git a/modules/phonegap/stop_record_audio/command.js b/modules/phonegap/phonegap_stop_record_audio/command.js
similarity index 100%
rename from modules/phonegap/stop_record_audio/command.js
rename to modules/phonegap/phonegap_stop_record_audio/command.js
diff --git a/modules/phonegap/stop_record_audio/config.yaml b/modules/phonegap/phonegap_stop_record_audio/config.yaml
similarity index 87%
rename from modules/phonegap/stop_record_audio/config.yaml
rename to modules/phonegap/phonegap_stop_record_audio/config.yaml
index d0523409a..5707abe00 100644
--- a/modules/phonegap/stop_record_audio/config.yaml
+++ b/modules/phonegap/phonegap_stop_record_audio/config.yaml
@@ -2,7 +2,7 @@
 #
 beef:
     module:
-        Stop_record_audio:
+        phonegap_stop_record_audio:
             enable: true
             category: "Phonegap"
             name: "Stop Recording Audio"
diff --git a/modules/phonegap/phonegap_stop_record_audio/module.rb b/modules/phonegap/phonegap_stop_record_audio/module.rb
new file mode 100644
index 000000000..39ce1ef61
--- /dev/null
+++ b/modules/phonegap/phonegap_stop_record_audio/module.rb
@@ -0,0 +1,7 @@
+# phonegap
+#
+
+class Phonegap_stop_record_audio < BeEF::Core::Command
+    
+  
+end
diff --git a/modules/phonegap/stop_record_audio/module.rb b/modules/phonegap/stop_record_audio/module.rb
deleted file mode 100644
index 58df67a6f..000000000
--- a/modules/phonegap/stop_record_audio/module.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# phonegap
-#
-
-class Stop_record_audio < BeEF::Core::Command
-    
-  
-end