diff --git a/modules/host/get_system_info/command.js b/modules/host/get_system_info_java/command.js
similarity index 100%
rename from modules/host/get_system_info/command.js
rename to modules/host/get_system_info_java/command.js
diff --git a/modules/host/get_system_info/config.yaml b/modules/host/get_system_info_java/config.yaml
similarity index 92%
rename from modules/host/get_system_info/config.yaml
rename to modules/host/get_system_info_java/config.yaml
index 7fa7ff895..586a19b51 100644
--- a/modules/host/get_system_info/config.yaml
+++ b/modules/host/get_system_info_java/config.yaml
@@ -5,10 +5,10 @@
 #
 beef:
     module:
-        get_system_info:
+        get_system_info_java:
             enable: true
             category: "Host"
-            name: "Get System Info"
+            name: "Get System Info (Java)"
             description: "This module will retrieve basic information about the host system using an unsigned Java Applet. <br/><br/>The details will include:<br/> <ul><li> - Operating system details</li><li> - Java VM details</li><li> - NIC names and IP</li><li> - Number of processors</li><li> - Amount of memory</li><li> - Screen display modes</li></ul>"
             authors: ["bcoles", "antisnatchor"]
             target:
diff --git a/modules/host/get_system_info/getSystemInfo.class b/modules/host/get_system_info_java/getSystemInfo.class
similarity index 100%
rename from modules/host/get_system_info/getSystemInfo.class
rename to modules/host/get_system_info_java/getSystemInfo.class
diff --git a/modules/host/get_system_info/getSystemInfo.java b/modules/host/get_system_info_java/getSystemInfo.java
similarity index 100%
rename from modules/host/get_system_info/getSystemInfo.java
rename to modules/host/get_system_info_java/getSystemInfo.java
diff --git a/modules/host/get_system_info/module.rb b/modules/host/get_system_info_java/module.rb
similarity index 92%
rename from modules/host/get_system_info/module.rb
rename to modules/host/get_system_info_java/module.rb
index 89b8e4b4c..1ce996fef 100644
--- a/modules/host/get_system_info/module.rb
+++ b/modules/host/get_system_info_java/module.rb
@@ -3,7 +3,7 @@
 # Browser Exploitation Framework (BeEF) - http://beefproject.com
 # See the file 'doc/COPYING' for copying permission
 #
-class Get_system_info < BeEF::Core::Command
+class Get_system_info_java < BeEF::Core::Command
   
 	def pre_send
 		BeEF::Core::NetworkStack::Handlers::AssetHandler.instance.bind('/modules/host/get_system_info/getSystemInfo.class','/getSystemInfo','class')