diff --git a/core/main/client/browser.js b/core/main/client/browser.js
index 13ab2814b..124b5c911 100644
--- a/core/main/client/browser.js
+++ b/core/main/client/browser.js
@@ -977,7 +977,7 @@ return !!window.devicePixelRatio && !!window.history.replaceState && window.navi
 		var os_name = beef.os.getName();
 		var hw_name = beef.hardware.getName();
 		var cpu_type = beef.hardware.cpuType();
-		var system_platform = (typeof(navigator.platform) != "undefined" && navigator.platform != "") ? navigator.platform : null;
+		var browser_platform = (typeof(navigator.platform) != "undefined" && navigator.platform != "") ? navigator.platform : null;
 		var browser_type = JSON.stringify(beef.browser.type(), function (key, value) {if (value == true) return value; else if (typeof value == 'object') return value; else return;});
 		var screen_size = beef.browser.getScreenSize();
 		var window_size = beef.browser.getWindowSize();
@@ -1006,7 +1006,7 @@ return !!window.devicePixelRatio && !!window.history.replaceState && window.navi
 		if(hw_name) details['Hardware'] = hw_name;
 		if(cpu_type) details['CPU'] = cpu_type;
 		if(date_stamp) details['DateStamp'] = date_stamp;
-		if(system_platform) details['SystemPlatform'] = system_platform;
+		if(browser_platform) details['BrowserPlatform'] = browser_platform;
 		if(browser_type) details['BrowserType'] = browser_type;
 		if(screen_size) details['ScreenSize'] = screen_size;
 		if(window_size) details['WindowSize'] = window_size;
diff --git a/core/main/handlers/browserdetails.rb b/core/main/handlers/browserdetails.rb
index 743587b3a..dbce1ad87 100644
--- a/core/main/handlers/browserdetails.rb
+++ b/core/main/handlers/browserdetails.rb
@@ -168,11 +168,11 @@ module BeEF
           end
 
           # get and store the system platform
-          system_platform = get_param(@data['results'], 'SystemPlatform')
+          system_platform = get_param(@data['results'], 'BrowserPlatform')
           if BeEF::Filters.is_valid_system_platform?(system_platform)
-            BD.set(session_id, 'SystemPlatform', system_platform)
+            BD.set(session_id, 'BrowserPlatform', system_platform)
           else
-            self.err_msg "Invalid system platform returned from the hook browser's initial connection."
+            self.err_msg "Invalid browser platform returned from the hook browser's initial connection."
           end
 
           # get and store the hooked browser type
diff --git a/core/main/rest/handlers/hookedbrowsers.rb b/core/main/rest/handlers/hookedbrowsers.rb
index d465c5031..8007ae35a 100644
--- a/core/main/rest/handlers/hookedbrowsers.rb
+++ b/core/main/rest/handlers/hookedbrowsers.rb
@@ -72,15 +72,15 @@ module BeEF
            details = BeEF::Core::Models::BrowserDetails
 
            {
-               'id' => hb.id,
-               'session' => hb.session,
-               'name' => details.get(hb.session, 'BrowserName'),
-               'version' => details.get(hb.session, 'BrowserVersion'),
-               'os' => details.get(hb.session, 'OsName'),
-               'platform' => details.get(hb.session, 'SystemPlatform'),
-               'ip' => hb.ip,
-               'domain' => details.get(hb.session, 'HostName'),
-               'port' => hb.port.to_s,
+               'id'       => hb.id,
+               'session'  => hb.session,
+               'name'     => details.get(hb.session, 'BrowserName'),
+               'version'  => details.get(hb.session, 'BrowserVersion'),
+               'os'       => details.get(hb.session, 'OsName'),
+               'platform' => details.get(hb.session, 'BrowserPlatform'),
+               'ip'       => hb.ip,
+               'domain'   => details.get(hb.session, 'HostName'),
+               'port'     => hb.port.to_s,
                'page_uri' => details.get(hb.session, 'PageURI')
            }
         end
@@ -88,4 +88,4 @@ module BeEF
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/extensions/admin_ui/controllers/modules/modules.rb b/extensions/admin_ui/controllers/modules/modules.rb
index 932128f62..073866149 100644
--- a/extensions/admin_ui/controllers/modules/modules.rb
+++ b/extensions/admin_ui/controllers/modules/modules.rb
@@ -240,14 +240,14 @@ class Modules < BeEF::Extension::AdminUI::HttpController
       summary_grid_hash['results'].push(page_name_row) # add the row
     end
     
-    # set and add the System Platform
-    system_platform = BD.get(zombie_session, 'SystemPlatform')
+    # set and add the Browser Platform
+    system_platform = BD.get(zombie_session, 'BrowserPlatform')
     if not system_platform.nil?
       encoded_system_platform = CGI.escapeHTML(system_platform)
       encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
 
       page_name_row = {
-        'category' => 'Host',
+        'category' => 'Browser',
         'data' => encoded_system_platform_hash,
         'from' => 'Initialization'
       }
diff --git a/extensions/console/lib/shellinterface.rb b/extensions/console/lib/shellinterface.rb
index 7f2442ecd..7bece695b 100644
--- a/extensions/console/lib/shellinterface.rb
+++ b/extensions/console/lib/shellinterface.rb
@@ -455,13 +455,13 @@ class ShellInterface
     end
     
     # set and add the System Platform
-    system_platform = BD.get(self.targetsession, 'SystemPlatform')
+    system_platform = BD.get(self.targetsession, 'BrowserPlatform')
     if not system_platform.nil?
       encoded_system_platform = CGI.escapeHTML(system_platform)
-      encoded_system_platform_hash = { 'System Platform' => encoded_system_platform }
+      encoded_system_platform_hash = { 'Browser Platform' => encoded_system_platform }
 
       page_name_row = {
-        'category' => 'Host',
+        'category' => 'Browser',
         'data' => encoded_system_platform_hash,
         'from' => 'Initialization'
       }