diff --git a/lib/msf/base/serializer/readable_text.rb b/lib/msf/base/serializer/readable_text.rb
index 1d65cc4351..29b6cc4b8a 100644
--- a/lib/msf/base/serializer/readable_text.rb
+++ b/lib/msf/base/serializer/readable_text.rb
@@ -46,7 +46,7 @@ class ReadableText
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_exploit_targets(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -70,7 +70,7 @@ class ReadableText
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_exploit_target(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -92,7 +92,7 @@ class ReadableText
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_module_actions(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -116,7 +116,7 @@ class ReadableText
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_module_action(mod, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -139,7 +139,7 @@ class ReadableText
   # @param h [String] the string to display as the table heading.
   # @return [String] the string form of the table.
   def self.dump_compatible_payloads(exploit, indent = '', h = nil)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Header'  => h,
       'Columns' =>
@@ -390,7 +390,7 @@ class ReadableText
   # @param missing [Boolean] dump only empty required options.
   # @return [String] the string form of the information.
   def self.dump_options(mod, indent = '', missing = false)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -419,7 +419,7 @@ class ReadableText
   # @param indent [String] the indentation to use.
   # @return [String] the string form of the information.
   def self.dump_advanced_options(mod, indent = '')
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -444,7 +444,7 @@ class ReadableText
   # @param indent [String] the indentation to use.
   # @return [String] the string form of the information.
   def self.dump_evasion_options(mod, indent = '')
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent.length,
       'Columns' =>
         [
@@ -490,7 +490,7 @@ class ReadableText
   # @param col [Integer] the column width.
   # @return [String] the formatted DataStore contents.
   def self.dump_datastore(name, ds, indent = DefaultIndent, col = DefaultColumnWrap)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => name,
       'Columns' =>
@@ -529,7 +529,7 @@ class ReadableText
     columns << 'Information'
     columns << 'Connection'
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => "Active sessions",
       'Columns' => columns)
@@ -653,7 +653,7 @@ class ReadableText
       columns += [ "URIPATH", "Start Time", "Handler opts" ]
     end
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Indent'  => indent,
       'Header'  => "Jobs",
       'Columns' => columns
diff --git a/lib/msf/core/exploit/browser_autopwn2.rb b/lib/msf/core/exploit/browser_autopwn2.rb
index f490f39ac3..dcf89e44e7 100644
--- a/lib/msf/core/exploit/browser_autopwn2.rb
+++ b/lib/msf/core/exploit/browser_autopwn2.rb
@@ -517,7 +517,7 @@ module Msf
       # As an user, you shouldn't be using any of these paths anyway.
       columns.delete('Path') if !datastore['VERBOSE']
 
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'  => 'Exploits',
         'Indent'  => 1,
         'Columns' => columns
@@ -625,7 +625,7 @@ module Msf
     # @return [void]
     def show_exploit_list(ip, tag, current_exploit_list)
       order = 1
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'  => '',
         'Indent'  => 1,
         'Columns' => ['Order', 'IP', 'Exploit']
diff --git a/lib/msf/core/exploit/mssql.rb b/lib/msf/core/exploit/mssql.rb
index 77eacf5b4e..3b19e94cdf 100644
--- a/lib/msf/core/exploit/mssql.rb
+++ b/lib/msf/core/exploit/mssql.rb
@@ -702,7 +702,7 @@ module Exploit::Remote::MSSQL
 
     if(info[:rows] and not info[:rows].empty?)
 
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'    => 1,
         'Header'    => "",
         'Columns'   => info[:colnames],
diff --git a/lib/msf/core/exploit/postgres.rb b/lib/msf/core/exploit/postgres.rb
index a076a56efd..aa4856fe69 100644
--- a/lib/msf/core/exploit/postgres.rb
+++ b/lib/msf/core/exploit/postgres.rb
@@ -184,7 +184,7 @@ module Exploit::Remote::Postgres
 
   # If resp is not actually a Connection::Result object, then return
   # :error (but not an actual Exception, that's up to the caller.
-  # Otherwise, create a rowset using Rex::Ui::Text::Table (if there's
+  # Otherwise, create a rowset using Rex::Text::Table (if there's
   # more than 0 rows) and return :complete.
   def postgres_print_reply(resp=nil,sql=nil)
     ip = datastore['RHOST']
@@ -194,7 +194,7 @@ module Exploit::Remote::Postgres
     if resp.rows and resp.fields
       print_status "#{ip}:#{port} Rows Returned: #{resp.rows.size}" if verbose
       if resp.rows.size > 0
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Indent' => 4,
           'Header' => "Query Text: '#{sql}'",
           'Columns' => resp.fields.map {|x| x.name}
diff --git a/lib/msf/core/exploit/winrm.rb b/lib/msf/core/exploit/winrm.rb
index a08ae59be5..a7587c7e3a 100644
--- a/lib/msf/core/exploit/winrm.rb
+++ b/lib/msf/core/exploit/winrm.rb
@@ -164,7 +164,7 @@ module Exploit::Remote::WinRM
       rows << row_data
     end
     columns.uniq!
-    response_data = Rex::Ui::Text::Table.new(
+    response_data = Rex::Text::Table.new(
       'Header'    => "#{datastore['WQL']} (#{rhost})",
       'Indent'    => 1,
       'Columns'   => columns
diff --git a/lib/msf/ui/console/command_dispatcher/db.rb b/lib/msf/ui/console/command_dispatcher/db.rb
index d1a0f769ac..55fc499c07 100644
--- a/lib/msf/ui/console/command_dispatcher/db.rb
+++ b/lib/msf/ui/console/command_dispatcher/db.rb
@@ -423,7 +423,7 @@ class Db
     end
 
     # If we got here, we're searching.  Delete implies search
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       {
         'Header'  => "Hosts",
         'Columns' => col_names,
@@ -650,7 +650,7 @@ class Db
     if col_search
       col_names = col_search
     end
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
         'Header'  => "Services",
         'Columns' => ['host'] + col_names,
       })
@@ -1029,7 +1029,7 @@ class Db
       'Columns' => cred_table_columns
     }
 
-    tbl = Rex::Ui::Text::Table.new(tbl_opts)
+    tbl = Rex::Text::Table.new(tbl_opts)
 
     ::ActiveRecord::Base.connection_pool.with_connection {
       query = Metasploit::Credential::Core.where( workspace_id: framework.db.workspace )
@@ -1341,7 +1341,7 @@ class Db
     end
 
     # Now display them
-    csv_table = Rex::Ui::Text::Table.new(
+    csv_table = Rex::Text::Table.new(
       'Header'  => 'Notes',
       'Indent'  => 1,
       'Columns' => ['Time', 'Host', 'Service', 'Port', 'Protocol', 'Type', 'Data']
@@ -1501,7 +1501,7 @@ class Db
       end
     end
 
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
         'Header'  => "Loot",
         'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
       })
diff --git a/lib/msf/ui/console/table.rb b/lib/msf/ui/console/table.rb
index 1fb75db7eb..d97afb1141 100644
--- a/lib/msf/ui/console/table.rb
+++ b/lib/msf/ui/console/table.rb
@@ -9,7 +9,7 @@ module Console
 # Console table display wrapper that allows for stylized tables
 #
 ###
-class Table < Rex::Ui::Text::Table
+class Table < Rex::Text::Table
 
   #
   # Default table styles.
diff --git a/lib/rex/parser/group_policy_preferences.rb b/lib/rex/parser/group_policy_preferences.rb
index 3e97450b28..76a817968c 100644
--- a/lib/rex/parser/group_policy_preferences.rb
+++ b/lib/rex/parser/group_policy_preferences.rb
@@ -88,7 +88,7 @@ class GPP
   def self.create_tables(results, filetype, domain=nil, dc=nil)
     tables = []
     results.each do |result|
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'     => 'Group Policy Credential Info',
         'Indent'     => 1,
         'SortIndex'  => -1,
diff --git a/lib/rex/parser/unattend.rb b/lib/rex/parser/unattend.rb
index b925dfbee6..61936a7e67 100644
--- a/lib/rex/parser/unattend.rb
+++ b/lib/rex/parser/unattend.rb
@@ -146,7 +146,7 @@ class Unattend
 
   def self.create_table(results)
     return nil if results.nil? or results.empty?
-    table = Rex::Ui::Text::Table.new({
+    table = Rex::Text::Table.new({
       'Header' => 'Unattend Credentials',
       'Indent' => 1,
       'Columns' => ['Type', 'Domain', 'Username', 'Password', 'Groups']
diff --git a/lib/rex/pescan/analyze.rb b/lib/rex/pescan/analyze.rb
index d4ee849c6f..e76903cc4a 100644
--- a/lib/rex/pescan/analyze.rb
+++ b/lib/rex/pescan/analyze.rb
@@ -263,7 +263,7 @@ module Analyze
     end
 
     def table(name, cols)
-      Rex::Ui::Text::Table.new(
+      Rex::Text::Table.new(
         'Header'  => name,
         'Columns' => cols
       )
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
index 9381e068cd..bb7e2a9099 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
@@ -379,15 +379,15 @@ end
 class ProcessList < Array
 
   #
-  # Create a Rex::Ui::Text::Table out of the processes stored in this list
+  # Create a Rex::Text::Table out of the processes stored in this list
   #
-  # +opts+ is passed on to Rex::Ui::Text::Table.new, mostly unmolested
+  # +opts+ is passed on to Rex::Text::Table.new, mostly unmolested
   #
   # Note that this output is affected by Rex::Post::Meterpreter::Client#unicode_filter_encode
   #
   def to_table(opts={})
     if empty?
-      return Rex::Ui::Text::Table.new(opts)
+      return Rex::Text::Table.new(opts)
     end
 
     cols = [ "PID", "PPID", "Name", "Arch", "Session", "User", "Path" ]
@@ -403,7 +403,7 @@ class ProcessList < Array
       'Columns' => cols
     }.merge(opts)
 
-    tbl = Rex::Ui::Text::Table.new(opts)
+    tbl = Rex::Text::Table.new(opts)
     each { |process|
       tbl << cols.map { |c|
         col = c.downcase
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
index c3d0f48aa9..73300af6d5 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
@@ -111,7 +111,7 @@ class Console::CommandDispatcher::Android
           header << " at #{time.strftime('%Y-%m-%d %H:%M:%S')}"
         end
 
-        table = Rex::Ui::Text::Table.new(
+        table = Rex::Text::Table.new(
           'Header'    => header,
           'SortIndex' => 0,
           'Columns'   => result[:headers],
@@ -616,7 +616,7 @@ class Console::CommandDispatcher::Android
     result = client.android.sqlite_query(database, query, writeable)
     unless writeable
       header = "#{query} on database file #{database}"
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'    => header,
         'Columns'   => result[:columns],
         'Indent'    => 0
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
index aa76f2954e..db8e7e685a 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
@@ -182,7 +182,7 @@ class Console::CommandDispatcher::Core
 
     case mode
     when :list
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'  => 4,
         'Columns' =>
           [
@@ -732,7 +732,7 @@ class Console::CommandDispatcher::Core
       end
 
       # next draw up a table of transport entries
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'SortIndex' => 0, # sort by ID
         'Indent'    => 4,
         'Columns'   => columns)
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
index f61e10ed7c..1cb866af3b 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
@@ -294,7 +294,7 @@ class Console::CommandDispatcher::Extapi::Adsi
 
     objects = client.extapi.adsi.domain_query(domain, filter, max_results, page_size, args)
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => "#{domain} Objects",
       'Indent'    => 0,
       'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
index 5b0895fb2c..45df08bd33 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
@@ -86,7 +86,7 @@ class Console::CommandDispatcher::Extapi::Service
 
     services = client.extapi.service.enumerate
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => 'Service List',
       'Indent'    => 0,
       'SortIndex' => 3,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
index 35a38025f8..72c0210fbd 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
@@ -82,7 +82,7 @@ class Console::CommandDispatcher::Extapi::Window
 
     header = parent_window ? "Child windows of #{parent_window}" : "Top-level windows"
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => header,
       'Indent'    => 0,
       'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
index d4670fb42b..68c5612893 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
@@ -75,7 +75,7 @@ class Console::CommandDispatcher::Extapi::Wmi
     objects = client.extapi.wmi.query(query, root)
 
     if objects
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'    => query,
         'Indent'    => 0,
         'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
index 408a895b7c..cdf70ca91c 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
@@ -259,7 +259,7 @@ class Console::CommandDispatcher::Kiwi
     fields = ['Server', 'Client', 'Start', 'End', 'Max Renew', 'Flags']
     fields << 'Export Path' if export
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => 'Kerberos Tickets',
       'Indent'    => 0,
       'SortIndex' => 0,
@@ -335,7 +335,7 @@ class Console::CommandDispatcher::Kiwi
 
     if results.length > 0
       results.each do |r|
-        table = Rex::Ui::Text::Table.new(
+        table = Rex::Text::Table.new(
           'Header'    => "#{r[:desc]} - #{r[:guid]}",
           'Indent'    => 0,
           'SortIndex' => 0,
@@ -471,7 +471,7 @@ protected
     print_status("Retrieving #{provider} credentials")
     accounts = method.call
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => "#{provider} credentials",
       'Indent'    => 0,
       'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
index 8e669098aa..1940a92e9d 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
@@ -228,7 +228,7 @@ class Console::CommandDispatcher::Lanattacks::Dhcp
 
     log = client.lanattacks.dhcp.log
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => 'DHCP Server Log',
       'Indent'    => 0,
       'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
index 65a19c4fe9..5eb2810b9f 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
@@ -95,7 +95,7 @@ class Console::CommandDispatcher::Mimikatz
     print_status("Retrieving #{provider} credentials")
     accounts = method.call
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header' => "#{provider} credentials",
       'Indent' => 0,
       'SortIndex' => 4,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
index 7099bec0e5..f357b62783 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
@@ -184,7 +184,7 @@ class Console::CommandDispatcher::Stdapi::Fs
 
     mounts = client.fs.mount.show_mount
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => 'Mounts / Drives',
       'Indent'    => 0,
       'SortIndex' => 0,
@@ -482,7 +482,7 @@ class Console::CommandDispatcher::Stdapi::Fs
       return
     end
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Listing: #{path}",
       'SortIndex' => columns.index(sort),
       'SortOrder' => order,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
index 71562bcae6..e6d194a3eb 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
@@ -155,7 +155,7 @@ class Console::CommandDispatcher::Stdapi::Net
       end
     }
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
     'Header'  => 'Connection list',
     'Indent'  => 4,
     'Columns' => [
@@ -206,7 +206,7 @@ class Console::CommandDispatcher::Stdapi::Net
       end
     }
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
     'Header'  => 'ARP cache',
     'Indent'  => 4,
     'Columns' => [
@@ -280,7 +280,7 @@ class Console::CommandDispatcher::Stdapi::Net
         routes = client.net.config.routes
 
         # IPv4
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Header'  => 'IPv4 network routes',
           'Indent'  => 4,
           'Columns' => [
@@ -304,7 +304,7 @@ class Console::CommandDispatcher::Stdapi::Net
         end
 
         # IPv6
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Header'  => 'IPv6 network routes',
           'Indent'  => 4,
           'Columns' => [
@@ -412,7 +412,7 @@ class Console::CommandDispatcher::Stdapi::Net
     case args.shift
       when 'list'
 
-        table = Rex::Ui::Text::Table.new(
+        table = Rex::Text::Table.new(
           'Header'    => 'Active Port Forwards',
           'Indent'    => 3,
           'SortIndex' => -1,
@@ -616,7 +616,7 @@ class Console::CommandDispatcher::Stdapi::Net
 
     response = client.net.resolve.resolve_hosts(hostnames, family)
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => 'Host resolutions',
       'Indent'    => 4,
       'SortIndex' => 0,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
index a5ea2029a2..6de08db002 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
@@ -297,7 +297,7 @@ class Console::CommandDispatcher::Stdapi::Sys
     if vars.length == 0
       print_error("None of the specified environment variables were found/set.")
     else
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'    => 'Environment Variables',
         'Indent'    => 0,
         'SortIndex' => 1,
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
index 56c508bf75..5de74d1002 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
@@ -187,7 +187,7 @@ class Console::CommandDispatcher::Stdapi::Ui
 
     desktops = client.ui.enum_desktops
 
-    desktopstable = Rex::Ui::Text::Table.new(
+    desktopstable = Rex::Text::Table.new(
       'Header'  => "Desktops",
       'Indent'  => 4,
       'Columns' => [	"Session",
diff --git a/lib/rex/ropbuilder/rop.rb b/lib/rex/ropbuilder/rop.rb
index 9e5a513399..86d9aa710b 100644
--- a/lib/rex/ropbuilder/rop.rb
+++ b/lib/rex/ropbuilder/rop.rb
@@ -25,7 +25,7 @@ class RopBase
       @gadgets = gadgets
     end
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
     'Header'    => "#{@file} ROP Gadgets",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/lib/rex/sslscan/result.rb b/lib/rex/sslscan/result.rb
index 8c9bb27e74..524558772a 100644
--- a/lib/rex/sslscan/result.rb
+++ b/lib/rex/sslscan/result.rb
@@ -161,7 +161,7 @@ class Result
     unless supports_ssl?
       return "Server does not appear to support SSL on this port!"
     end
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'      => 'SSL Ciphers',
       'Indent'       => 1,
       'Columns'   => ['Status', 'Weak', 'SSL Version', 'Key Length', 'Cipher'],
diff --git a/modules/auxiliary/admin/http/webnms_cred_disclosure.rb b/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
index 34c5df6af3..ba458f6f33 100644
--- a/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
+++ b/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
@@ -80,7 +80,7 @@ Windows and Linux.
     end
 
     if res && res.code == 200 && !res.body.empty?
-      cred_table = Rex::Ui::Text::Table.new(
+      cred_table = Rex::Text::Table.new(
         'Header'  => 'WebNMS Login Credentials',
         'Indent'  => 1,
         'Columns' =>
diff --git a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
index dd4f419e52..b936a389f2 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
@@ -97,7 +97,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     # Create table for report
-    windows_domain_login_table = Rex::Ui::Text::Table.new(
+    windows_domain_login_table = Rex::Text::Table.new(
       'Header'  => 'Windows Domain Accounts',
       'Ident'   => 1,
       'Columns' => ['name']
diff --git a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
index aef9b655ff..5a955a3d3c 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
@@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary
     print_good("#{domain_users.length} user accounts, groups, and computer accounts were found.")
 
     # Create table for report
-    windows_domain_login_table = Rex::Ui::Text::Table.new(
+    windows_domain_login_table = Rex::Text::Table.new(
       'Header'  => 'Windows Domain Accounts',
       'Ident'   => 1,
       'Columns' => ['name']
diff --git a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
index 457af07b52..713a02b007 100644
--- a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
+++ b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
@@ -356,7 +356,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     # CREATE TABLE TO STORE SQL SERVER DATA LOOT
-    sql_data_tbl = Rex::Ui::Text::Table.new(
+    sql_data_tbl = Rex::Text::Table.new(
       'Header'  => 'SQL Server Data',
       'Indent'   => 1,
       'Columns' => ['Server', 'Database', 'Schema', 'Table', 'Column', 'Data Type', 'Sample Data', 'Row Count']
diff --git a/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb b/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
index b3a912e0b1..ae53f79f2d 100644
--- a/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
+++ b/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
@@ -151,7 +151,7 @@ class MetasploitModule < Msf::Auxiliary
       print_good("#{@users.length} users found!")
     end
 
-    users_table = Rex::Ui::Text::Table.new(
+    users_table = Rex::Text::Table.new(
       'Header'  => 'Advantech WebAccess Users',
       'Indent'   => 1,
       'Columns' => ['Username', 'Encrypted Password', 'Key', 'Recovered password', 'Origin']
diff --git a/modules/auxiliary/admin/scada/modicon_password_recovery.rb b/modules/auxiliary/admin/scada/modicon_password_recovery.rb
index 1d91e140a4..120969c2cb 100644
--- a/modules/auxiliary/admin/scada/modicon_password_recovery.rb
+++ b/modules/auxiliary/admin/scada/modicon_password_recovery.rb
@@ -150,7 +150,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def grab
-    logins = Rex::Ui::Text::Table.new(
+    logins = Rex::Text::Table.new(
       'Header'	=>	"Schneider Modicon Quantum services, usernames, and passwords",
       'Indent'	=>	1,
       'Columns'	=>	["Service", "User Name", "Password"]
diff --git a/modules/auxiliary/admin/smb/list_directory.rb b/modules/auxiliary/admin/smb/list_directory.rb
index 011b0d9c60..c756129fa2 100644
--- a/modules/auxiliary/admin/smb/list_directory.rb
+++ b/modules/auxiliary/admin/smb/list_directory.rb
@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary
         print_status("Listing \\\\#{datastore['RHOST']}\\#{datastore['SMBSHARE']}\\#{datastore['RPATH']}'...")
       end
       listing = self.simple.client.find_first("\\#{datastore['RPATH']}\\*")
-      directory = Rex::Ui::Text::Table.new(
+      directory = Rex::Text::Table.new(
             'Header' => "Directory Listing of \\\\#{datastore['RHOST']}\\#{datastore['SMBSHARE']}\\#{datastore['RPATH']}",
             'Indent' => 2,
             'SortIndex' => 2,
diff --git a/modules/auxiliary/gather/chromecast_wifi.rb b/modules/auxiliary/gather/chromecast_wifi.rb
index 9cb0676df5..2863a12629 100644
--- a/modules/auxiliary/gather/chromecast_wifi.rb
+++ b/modules/auxiliary/gather/chromecast_wifi.rb
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Auxiliary
 
     return unless res && res.code == 200
 
-    waps = Rex::Ui::Text::Table.new(
+    waps = Rex::Text::Table.new(
       'Header' => 'Wireless Access Points',
       'Columns' => [
         'BSSID',
diff --git a/modules/auxiliary/gather/d20pass.rb b/modules/auxiliary/gather/d20pass.rb
index cb1313bec2..7c4cdbd11b 100644
--- a/modules/auxiliary/gather/d20pass.rb
+++ b/modules/auxiliary/gather/d20pass.rb
@@ -222,7 +222,7 @@ class MetasploitModule < Msf::Auxiliary
     headerlen = makeword(f.read(2))
     f.seek(userentryptr + 40) # sorry decimal
     entrylen = makeword(f.read(2)) # sorry this is decimal
-    logins = Rex::Ui::Text::Table.new(
+    logins = Rex::Text::Table.new(
       'Header' => "D20 usernames, passwords, and account levels\n(use for TELNET authentication)",
       'Indent' => 1,
       'Columns' => ["Type", "User Name", "Password"])
diff --git a/modules/auxiliary/gather/doliwamp_traversal_creds.rb b/modules/auxiliary/gather/doliwamp_traversal_creds.rb
index 93c6c5367b..946887d7fd 100644
--- a/modules/auxiliary/gather/doliwamp_traversal_creds.rb
+++ b/modules/auxiliary/gather/doliwamp_traversal_creds.rb
@@ -192,7 +192,7 @@ class MetasploitModule < Msf::Auxiliary
       print_warning("No credentials collected.")
       return
     end
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'Dolibarr User Credentials',
       'Indent'  => 1,
       'Columns' => ['Username', 'Password', 'Admin', 'E-mail']
diff --git a/modules/auxiliary/gather/eaton_nsm_creds.rb b/modules/auxiliary/gather/eaton_nsm_creds.rb
index 0cd76869b6..dc8da4fd1c 100644
--- a/modules/auxiliary/gather/eaton_nsm_creds.rb
+++ b/modules/auxiliary/gather/eaton_nsm_creds.rb
@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
 
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'Network Shutdown Module Credentials',
       'Indent'  => 1,
       'Columns' => ['Username', 'Password']
diff --git a/modules/auxiliary/gather/eventlog_cred_disclosure.rb b/modules/auxiliary/gather/eventlog_cred_disclosure.rb
index 3e62e3adac..f70424fb4a 100644
--- a/modules/auxiliary/gather/eventlog_cred_disclosure.rb
+++ b/modules/auxiliary/gather/eventlog_cred_disclosure.rb
@@ -90,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
 
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'ManageEngine EventLog Analyzer Managed Devices Credentials',
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/auxiliary/gather/hp_snac_domain_creds.rb b/modules/auxiliary/gather/hp_snac_domain_creds.rb
index 85453c85de..c84a76db76 100644
--- a/modules/auxiliary/gather/hp_snac_domain_creds.rb
+++ b/modules/auxiliary/gather/hp_snac_domain_creds.rb
@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
 
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'Domain Controllers Credentials',
       'Indent'  => 1,
       'Columns' => ['Domain Controller', 'Username', 'Password']
diff --git a/modules/auxiliary/gather/memcached_extractor.rb b/modules/auxiliary/gather/memcached_extractor.rb
index 90a2a82580..43be2275a3 100644
--- a/modules/auxiliary/gather/memcached_extractor.rb
+++ b/modules/auxiliary/gather/memcached_extractor.rb
@@ -134,7 +134,7 @@ class MetasploitModule < Msf::Auxiliary
       return if keys.size == 0
 
       data = data_for_keys(keys)
-      result_table = Rex::Ui::Text::Table.new(
+      result_table = Rex::Text::Table.new(
         'Header'  => "Keys/Values Found for #{peer}",
         'Indent'  => 1,
         'Columns' => [ 'Key', 'Value' ]
diff --git a/modules/auxiliary/gather/shodan_search.rb b/modules/auxiliary/gather/shodan_search.rb
index 0d9a0e8925..41c542930f 100644
--- a/modules/auxiliary/gather/shodan_search.rb
+++ b/modules/auxiliary/gather/shodan_search.rb
@@ -144,7 +144,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     # Save the results to this table
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'Search Results',
       'Indent'  => 1,
       'Columns' => ['IP:Port', 'City', 'Country', 'Hostname']
diff --git a/modules/auxiliary/gather/vbulletin_vote_sqli.rb b/modules/auxiliary/gather/vbulletin_vote_sqli.rb
index 35aab65f56..0259e3f95c 100644
--- a/modules/auxiliary/gather/vbulletin_vote_sqli.rb
+++ b/modules/auxiliary/gather/vbulletin_vote_sqli.rb
@@ -189,7 +189,7 @@ class MetasploitModule < Msf::Auxiliary
     count_users = data.to_i
     print_good("#{count_users} users found. Collecting credentials...")
 
-    users_table = Rex::Ui::Text::Table.new(
+    users_table = Rex::Text::Table.new(
       'Header'  => 'vBulletin Users',
       'Indent'   => 1,
       'Columns' => ['Username', 'Password Hash', 'Salt']
diff --git a/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb b/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
index 2bbea57cc3..5c0dcdca53 100644
--- a/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
+++ b/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
@@ -91,7 +91,7 @@ class MetasploitModule < Msf::Auxiliary
       :info => "#{WDS_CONST::WDSCP_RPC_UUID} v1.0 Windows Deployment Services"
     )
 
-    table = Rex::Ui::Text::Table.new({
+    table = Rex::Text::Table.new({
       'Header' => 'Windows Deployment Services',
       'Indent' => 1,
       'Columns' => ['Architecture', 'Type', 'Domain', 'Username', 'Password']
diff --git a/modules/auxiliary/scanner/http/jboss_status.rb b/modules/auxiliary/scanner/http/jboss_status.rb
index e4e06b48c5..a50fa71f9f 100644
--- a/modules/auxiliary/scanner/http/jboss_status.rb
+++ b/modules/auxiliary/scanner/http/jboss_status.rb
@@ -88,7 +88,7 @@ class MetasploitModule < Msf::Auxiliary
   def show_results(target_host)
     print_good("#{rhost}:#{rport} JBoss application server found")
 
-    req_table = Rex::Ui::Text::Table.new(
+    req_table = Rex::Text::Table.new(
       'Header'  => 'JBoss application server requests',
         'Indent'  => 1,
         'Columns' => ['Client', 'Vhost target', 'Request']
diff --git a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
index 2dd58d4e3f..bc3a91967b 100644
--- a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
+++ b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Auxiliary
       workspace_id: myworkspace_id
     }
 
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'ManageEngine DeviceExpert User Credentials',
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
index c2a0551cab..e2cf2b7936 100644
--- a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
+++ b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
@@ -128,7 +128,7 @@ class MetasploitModule < Msf::Auxiliary
     sock.put(DDNS)
     return unless (response = sock.get_once)
     data = response.split(/&&[0-1]&&/)
-    ddns_table = Rex::Ui::Text::Table.new(
+    ddns_table = Rex::Text::Table.new(
       'Header' => 'Dahua DDNS Settings',
       'Indent' => 1,
       'Columns' => ['Peer', 'DDNS Service', 'DDNS Server', 'DDNS Port', 'Domain', 'Username', 'Password']
@@ -186,7 +186,7 @@ class MetasploitModule < Msf::Auxiliary
     connect
     sock.put(CHANNELS)
     data = sock.get_once.split('&&')
-    channels_table = Rex::Ui::Text::Table.new(
+    channels_table = Rex::Text::Table.new(
       'Header' => 'Dahua Camera Channels',
       'Indent' => 1,
       'Columns' => ['ID', 'Peer', 'Channels']
@@ -206,7 +206,7 @@ class MetasploitModule < Msf::Auxiliary
     return unless (response = sock.get_once)
     data = response.split('&&')
     usercount = 0
-    users_table = Rex::Ui::Text::Table.new(
+    users_table = Rex::Text::Table.new(
       'Header' => 'Dahua Users Hashes and Rights',
       'Indent' => 1,
       'Columns' => ['Peer', 'Username', 'Password Hash', 'Groups', 'Permissions', 'Description']
@@ -237,7 +237,7 @@ class MetasploitModule < Msf::Auxiliary
     sock.put(GROUPS)
     return unless (response = sock.get_once)
     data = response.split('&&')
-    groups_table = Rex::Ui::Text::Table.new(
+    groups_table = Rex::Text::Table.new(
       'Header' => 'Dahua groups',
       'Indent' => 1,
       'Columns' => ['ID', 'Peer', 'Group']
diff --git a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
index 9e75d30953..0db2dedd06 100644
--- a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
+++ b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
@@ -50,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
       return if maps.empty?
       vprint_good("Found #{maps.size} programs available")
 
-      table = Rex::Ui::Text::Table.new(
+      table = Rex::Text::Table.new(
         'Header'  => "SunRPC Programs for #{ip}",
         'Indent'  => 1,
         'Columns' => %w(Name Number Version Port Protocol)
diff --git a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
index dd9d13985d..5044bbf016 100644
--- a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
@@ -110,7 +110,7 @@ class MetasploitModule < Msf::Auxiliary
           :proto => 'tcp'
           )
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'MS SQL Server Hashes',
       'Indent'   => 1,
       'Columns' => ['Username', 'Hash']
diff --git a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
index 03ae86a4bb..3007ba63a7 100644
--- a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
@@ -177,7 +177,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     # Create a table to store data
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'MysQL Server Hashes',
       'Indent'   => 1,
       'Columns' => ['Username', 'Hash']
diff --git a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
index e06bac1f7b..3735239b95 100644
--- a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
+++ b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
@@ -55,7 +55,7 @@ class MetasploitModule < Msf::Auxiliary
 
 
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'Oracle Server Hashes',
       'Indent'   => 1,
       'Columns' => ['Username', 'Hash']
diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
index ddbf1a926b..2ddb14f259 100644
--- a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'Postgres Server Hashes',
       'Indent'   => 1,
       'Columns' => ['Username', 'Hash']
diff --git a/modules/auxiliary/scanner/smb/smb_enumshares.rb b/modules/auxiliary/scanner/smb/smb_enumshares.rb
index 62ad97dd3a..b16a59787e 100644
--- a/modules/auxiliary/scanner/smb/smb_enumshares.rb
+++ b/modules/auxiliary/scanner/smb/smb_enumshares.rb
@@ -321,7 +321,7 @@ class MetasploitModule < Msf::Auxiliary
     write = false
 
     # Creating a separate file for each IP address's results.
-    detailed_tbl = Rex::Ui::Text::Table.new(
+    detailed_tbl = Rex::Text::Table.new(
       'Header'  => "Spidered results for #{ip}.",
       'Indent'  => 1,
       'Columns' => [ 'IP Address', 'Type', 'Share', 'Path', 'Name', 'Created', 'Accessed', 'Written', 'Changed', 'Size' ]
@@ -368,7 +368,7 @@ class MetasploitModule < Msf::Auxiliary
           header << "\\#{x.sub("C$","C$\\")}" if simple.client.default_name
           header << subdirs[0]
 
-          pretty_tbl = Rex::Ui::Text::Table.new(
+          pretty_tbl = Rex::Text::Table.new(
             'Header'  => header,
             'Indent'  => 1,
             'Columns' => [ 'Type', 'Name', 'Created', 'Accessed', 'Written', 'Changed', 'Size' ]
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
index 39061893e6..2fb1b357e9 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
@@ -67,7 +67,7 @@ class MetasploitModule < Msf::Auxiliary
       when :error
         print_error "An error occured while trying to enumerate the permissions on #{ip}"
       else
-        tmp_perms = Rex::Ui::Text::Table.new(
+        tmp_perms = Rex::Text::Table.new(
             'Header'  => "Permissions for VMWare #{ip}",
             'Indent'  => 1,
             'Columns' => ['Name', 'IsAGroup', 'Role', 'Role Summary']
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_users.rb b/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
index bc937bd926..ea443da12c 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
@@ -40,12 +40,12 @@ class MetasploitModule < Msf::Auxiliary
     if vim_do_login(datastore['USERNAME'], datastore['PASSWORD']) == :success
       # Get local Users and Groups
       user_list = vim_get_user_list(nil)
-      tmp_users = Rex::Ui::Text::Table.new(
+      tmp_users = Rex::Text::Table.new(
         'Header'  => "Users for server #{ip}",
         'Indent'  => 1,
         'Columns' => ['Name', 'Description']
       )
-      tmp_groups = Rex::Ui::Text::Table.new(
+      tmp_groups = Rex::Text::Table.new(
         'Header'  => "Groups for server #{ip}",
         'Indent'  => 1,
         'Columns' => ['Name', 'Description']
@@ -85,13 +85,13 @@ class MetasploitModule < Msf::Auxiliary
       else
         # Enumerate Domain Users and Groups
         esx_domains.each do |domain|
-          tmp_dusers = Rex::Ui::Text::Table.new(
+          tmp_dusers = Rex::Text::Table.new(
             'Header'  => "Users for domain #{domain}",
             'Indent'  => 1,
             'Columns' => ['Name', 'Description']
           )
 
-          tmp_dgroups = Rex::Ui::Text::Table.new(
+          tmp_dgroups = Rex::Text::Table.new(
             'Header'  => "Groups for domain #{domain}",
             'Indent'  => 1,
             'Columns' => ['Name', 'Description']
diff --git a/modules/exploits/windows/mssql/mssql_linkcrawler.rb b/modules/exploits/windows/mssql/mssql_linkcrawler.rb
index f5ad07850b..96eb1c4403 100644
--- a/modules/exploits/windows/mssql/mssql_linkcrawler.rb
+++ b/modules/exploits/windows/mssql/mssql_linkcrawler.rb
@@ -111,7 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
     master..sysservers where dataaccess=1 and srvname!=@@servername and srvproduct = 'SQL Server')as linkcount"
 
     # Create loot table to store configuration information from crawled database server links
-    linked_server_table = Rex::Ui::Text::Table.new(
+    linked_server_table = Rex::Text::Table.new(
       'Header'  => 'Linked Server Table',
       'Indent'   => 1,
       'Columns' => ['db_server', 'db_version', 'db_os', 'link_server', 'link_user', 'link_privilege', 'link_version', 'link_os','link_state']
diff --git a/modules/post/linux/gather/enum_psk.rb b/modules/post/linux/gather/enum_psk.rb
index 1afa0fbff1..6106d81910 100644
--- a/modules/post/linux/gather/enum_psk.rb
+++ b/modules/post/linux/gather/enum_psk.rb
@@ -52,7 +52,7 @@ class MetasploitModule < Msf::Post
   end
 
   def extract_all_creds
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
       'Header'  => '802-11-wireless-security',
       'Columns' => ['AccessPoint-Name', 'PSK'],
       'Indent'  => 1,
diff --git a/modules/post/linux/gather/mount_cifs_creds.rb b/modules/post/linux/gather/mount_cifs_creds.rb
index c7ec0cf23f..7c095ff3b1 100644
--- a/modules/post/linux/gather/mount_cifs_creds.rb
+++ b/modules/post/linux/gather/mount_cifs_creds.rb
@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Post
     # where we'll store hashes of found credentials while parsing.  reporting is done at the end.
     creds = []
     # A table to store the found credentials for loot storage afterward
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
     'Header'    => "mount.cifs credentials",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/modules/post/linux/gather/pptpd_chap_secrets.rb b/modules/post/linux/gather/pptpd_chap_secrets.rb
index ff663ff65f..06641f8603 100644
--- a/modules/post/linux/gather/pptpd_chap_secrets.rb
+++ b/modules/post/linux/gather/pptpd_chap_secrets.rb
@@ -85,7 +85,7 @@ class MetasploitModule < Msf::Post
   # Extracts client, server, secret, and IP addresses
   #
   def extract_secrets(data)
-    tbl = Rex::Ui::Text::Table.new({
+    tbl = Rex::Text::Table.new({
       'Header'  => 'PPTPd chap-secrets',
       'Indent'  => 1,
       'Columns' => ['Client', 'Server', 'Secret', 'IP']
diff --git a/modules/post/multi/gather/check_malware.rb b/modules/post/multi/gather/check_malware.rb
index a82dd47fda..9f2f5863c7 100644
--- a/modules/post/multi/gather/check_malware.rb
+++ b/modules/post/multi/gather/check_malware.rb
@@ -81,7 +81,7 @@ class MetasploitModule < Msf::Post
     print_status("#{rhost} - SHA1: #{sha1}")     unless sha1.blank?
     print_status("#{rhost} - SHA256: #{sha256}") unless sha256.blank?
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Analysis Report: #{filename} (#{res['positives']} / #{res['total']}): #{res['sha256']}",
       'Indent'  => 1,
       'Columns' => ['Antivirus', 'Detected', 'Version', 'Result', 'Update']
diff --git a/modules/post/multi/gather/dbvis_enum.rb b/modules/post/multi/gather/dbvis_enum.rb
index fd2ced019f..a3fb949bf2 100644
--- a/modules/post/multi/gather/dbvis_enum.rb
+++ b/modules/post/multi/gather/dbvis_enum.rb
@@ -112,7 +112,7 @@ class MetasploitModule < Msf::Post
   # New config file parse function
   def parse_new_config_file(raw_xml)
 
-    db_table = Rex::Ui::Text::Table.new(
+    db_table = Rex::Text::Table.new(
     'Header'    => "DbVisualizer Databases",
     'Indent'    => 2,
     'Columns'   =>
@@ -219,7 +219,7 @@ class MetasploitModule < Msf::Post
   # New config file parse function
   def parse_old_config_file(raw_xml)
 
-    db_table = Rex::Ui::Text::Table.new(
+    db_table = Rex::Text::Table.new(
     'Header'    => 'DbVisualizer Databases',
     'Indent'    => 2,
     'Columns'   =>
diff --git a/modules/post/multi/gather/fetchmailrc_creds.rb b/modules/post/multi/gather/fetchmailrc_creds.rb
index 86d97c0462..adc679a47e 100644
--- a/modules/post/multi/gather/fetchmailrc_creds.rb
+++ b/modules/post/multi/gather/fetchmailrc_creds.rb
@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Post
 
   def run
     # A table to store the found credentials.
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
     'Header'    => ".fetchmailrc credentials",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/modules/post/multi/gather/firefox_creds.rb b/modules/post/multi/gather/firefox_creds.rb
index f854f98868..f6dfab98ea 100644
--- a/modules/post/multi/gather/firefox_creds.rb
+++ b/modules/post/multi/gather/firefox_creds.rb
@@ -663,7 +663,7 @@ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
     file_rm(@paths['loot'])
 
     # Create table to store
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header' => 'Firefox Credentials',
       'Indent' => 1,
       'Columns'=>
diff --git a/modules/post/multi/gather/lastpass_creds.rb b/modules/post/multi/gather/lastpass_creds.rb
index 687268b39d..2d68195513 100644
--- a/modules/post/multi/gather/lastpass_creds.rb
+++ b/modules/post/multi/gather/lastpass_creds.rb
@@ -376,7 +376,7 @@ class MetasploitModule < Msf::Post
 
   # Print all extracted LastPass data
   def print_lastpass_data(account_map)
-    lastpass_data_table = Rex::Ui::Text::Table.new(
+    lastpass_data_table = Rex::Text::Table.new(
       'Header' => "LastPass Accounts",
       'Indent' => 1,
       'Columns' => %w(Account LP_Username LP_Password LP_2FA LP_Key)
@@ -662,7 +662,7 @@ class MetasploitModule < Msf::Post
     account_map.each_pair do |account, browser_map|
       browser_map.each_pair do |browser, lp_data|
         lp_data['lp_creds'].each_pair do |username, user_data|
-          lastpass_vault_data_table = Rex::Ui::Text::Table.new(
+          lastpass_vault_data_table = Rex::Text::Table.new(
             'Header' => "Decrypted vault from #{username}",
             'Indent' => 1,
             'Columns' => %w(URL Username Password)
diff --git a/modules/post/multi/gather/netrc_creds.rb b/modules/post/multi/gather/netrc_creds.rb
index 57bda43abc..b6baec584f 100644
--- a/modules/post/multi/gather/netrc_creds.rb
+++ b/modules/post/multi/gather/netrc_creds.rb
@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Post
 
   def run
     # A table to store the found credentials.
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
     'Header'    => ".netrc credentials",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/modules/post/multi/gather/pgpass_creds.rb b/modules/post/multi/gather/pgpass_creds.rb
index 2ad6857412..f0f1cb6f3a 100644
--- a/modules/post/multi/gather/pgpass_creds.rb
+++ b/modules/post/multi/gather/pgpass_creds.rb
@@ -66,7 +66,7 @@ class MetasploitModule < Msf::Post
 
   # Store the creds to
   def parse_creds(f)
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       'Header'  => 'Postgres Data',
       'Indent'  => 1,
       'Columns' => ['Host', 'Port', 'DB', 'User', 'Password']
diff --git a/modules/post/multi/gather/pidgin_cred.rb b/modules/post/multi/gather/pidgin_cred.rb
index 4d2e4a4ef4..7074c68ca2 100644
--- a/modules/post/multi/gather/pidgin_cred.rb
+++ b/modules/post/multi/gather/pidgin_cred.rb
@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Post
     end
 
     data = ""
-    credentials = Rex::Ui::Text::Table.new(
+    credentials = Rex::Text::Table.new(
     'Header'    => "Pidgin Credentials",
     'Indent'    => 1,
     'Columns'   =>
@@ -143,7 +143,7 @@ class MetasploitModule < Msf::Post
       "Port"
     ])
 
-    buddylists = Rex::Ui::Text::Table.new(
+    buddylists = Rex::Text::Table.new(
     'Header'    => "Pidgin Contact List",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/modules/post/multi/gather/remmina_creds.rb b/modules/post/multi/gather/remmina_creds.rb
index b8e72f70a5..8467c193a3 100644
--- a/modules/post/multi/gather/remmina_creds.rb
+++ b/modules/post/multi/gather/remmina_creds.rb
@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Post
       vprint_status('No Reminna credentials collected')
     else
       vprint_good("Collected #{creds.size} sets of Remmina credentials")
-      cred_table = Rex::Ui::Text::Table.new(
+      cred_table = Rex::Text::Table.new(
         'Header'  => 'Remmina Credentials',
         'Indent'  => 1,
         'Columns' => %w(Host Port Service User Password)
diff --git a/modules/post/multi/gather/resolve_hosts.rb b/modules/post/multi/gather/resolve_hosts.rb
index 7eefecdb1b..831dbc8b91 100644
--- a/modules/post/multi/gather/resolve_hosts.rb
+++ b/modules/post/multi/gather/resolve_hosts.rb
@@ -61,7 +61,7 @@ class MetasploitModule < Msf::Post
 
     response = client.net.resolve.resolve_hosts(hosts, family)
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Indent' => 0,
       'SortIndex' => -1,
       'Columns' =>
diff --git a/modules/post/multi/gather/rsyncd_creds.rb b/modules/post/multi/gather/rsyncd_creds.rb
index dafcb3aa48..6a0013b57b 100644
--- a/modules/post/multi/gather/rsyncd_creds.rb
+++ b/modules/post/multi/gather/rsyncd_creds.rb
@@ -42,7 +42,7 @@ class MetasploitModule < Msf::Post
 
   def dump_rsync_secrets(config_file)
     vprint_status("Attempting to get RSYNC creds from #{config_file}")
-    creds_table = Rex::Ui::Text::Table.new(
+    creds_table = Rex::Text::Table.new(
       'Header' => "RSYNC credentials from #{config_file}",
       'Columns' => %w(Username Password Module)
     )
diff --git a/modules/post/multi/gather/thunderbird_creds.rb b/modules/post/multi/gather/thunderbird_creds.rb
index 00c2fb9c20..0141fe9260 100644
--- a/modules/post/multi/gather/thunderbird_creds.rb
+++ b/modules/post/multi/gather/thunderbird_creds.rb
@@ -165,7 +165,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Create a rex table to store our data
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => 'Thunderbird login data',
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/osx/gather/safari_lastsession.rb b/modules/post/osx/gather/safari_lastsession.rb
index 26e48f2357..f3ee160251 100644
--- a/modules/post/osx/gather/safari_lastsession.rb
+++ b/modules/post/osx/gather/safari_lastsession.rb
@@ -157,7 +157,7 @@ class MetasploitModule < Msf::Post
   # Runs the module
   #
   def run
-    cred_tbl = Rex::Ui::Text::Table.new({
+    cred_tbl = Rex::Text::Table.new({
       'Header'  => 'Credentials',
       'Indent'  => 1,
       'Columns' => ['Domain', 'Username', 'Password']
diff --git a/modules/post/windows/gather/cachedump.rb b/modules/post/windows/gather/cachedump.rb
index 601de5d6c2..4e39d98cfb 100644
--- a/modules/post/windows/gather/cachedump.rb
+++ b/modules/post/windows/gather/cachedump.rb
@@ -271,7 +271,7 @@ class MetasploitModule < Msf::Post
 
 
   def run
-    @credentials = Rex::Ui::Text::Table.new(
+    @credentials = Rex::Text::Table.new(
     'Header'    => "MSCACHE Credentials",
     'Indent'    => 1,
     'Columns'   =>
diff --git a/modules/post/windows/gather/credentials/bulletproof_ftp.rb b/modules/post/windows/gather/credentials/bulletproof_ftp.rb
index 4482b6f38a..7164765493 100644
--- a/modules/post/windows/gather/credentials/bulletproof_ftp.rb
+++ b/modules/post/windows/gather/credentials/bulletproof_ftp.rb
@@ -290,7 +290,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Report / Show findings
-    @credentials = Rex::Ui::Text::Table.new(
+    @credentials = Rex::Text::Table.new(
       'Header'    => "BulletProof FTP Client Bookmarks",
       'Indent'    => 1,
       'Columns'   =>
diff --git a/modules/post/windows/gather/credentials/dyndns.rb b/modules/post/windows/gather/credentials/dyndns.rb
index 7b57be4c55..19a0c1c337 100644
--- a/modules/post/windows/gather/credentials/dyndns.rb
+++ b/modules/post/windows/gather/credentials/dyndns.rb
@@ -123,13 +123,13 @@ class MetasploitModule < Msf::Post
   #
   def do_report(data)
 
-    tbl  = Rex::Ui::Text::Table.new(
+    tbl  = Rex::Text::Table.new(
       'Header'  => 'DynDNS Client Data',
       'Indent'  => 1,
       'Columns' => ['Field', 'Value']
     )
 
-    creds  = Rex::Ui::Text::Table.new(
+    creds  = Rex::Text::Table.new(
       'Header'  => 'DynDNS Credentials',
       'Indent'  => 1,
       'Columns' => ['User', 'Password']
diff --git a/modules/post/windows/gather/credentials/enum_laps.rb b/modules/post/windows/gather/credentials/enum_laps.rb
index 339e1d204f..f33149ee5e 100644
--- a/modules/post/windows/gather/credentials/enum_laps.rb
+++ b/modules/post/windows/gather/credentials/enum_laps.rb
@@ -75,11 +75,11 @@ class MetasploitModule < Msf::Post
   # the database if datastore option STORE_DB is true.
   #
   # @param [Array<Array<Hash>>] the LDAP query results to parse
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
+  # @return [Rex::Text::Table] the table containing all the result data
   def parse_results(results)
     laps_results = []
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => 'Local Administrator Password Solution (LAPS) Results',
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/credentials/enum_picasa_pwds.rb b/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
index 68ef4520ac..a7d4f67fe3 100644
--- a/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
+++ b/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
@@ -73,7 +73,7 @@ class MetasploitModule < Msf::Post
       username = registry_getvaldata("HKCU\\Software\\Google\\Picasa\\Picasa2\\Preferences\\", 'GaiaEmail') || ''
       password = registry_getvaldata("HKCU\\Software\\Google\\Picasa\\Picasa2\\Preferences\\", 'GaiaPass')  || ''
 
-      credentials = Rex::Ui::Text::Table.new(
+      credentials = Rex::Text::Table.new(
           'Header'    => "Picasa Credentials",
           'Indent'    => 1,
           'Columns'   =>
diff --git a/modules/post/windows/gather/credentials/filezilla_server.rb b/modules/post/windows/gather/credentials/filezilla_server.rb
index e127602c7c..c991528a91 100644
--- a/modules/post/windows/gather/credentials/filezilla_server.rb
+++ b/modules/post/windows/gather/credentials/filezilla_server.rb
@@ -103,7 +103,7 @@ class MetasploitModule < Msf::Post
   def get_filezilla_creds(paths)
     fs_xml  = ""   # FileZilla Server.xml           - Settings for the local install
     fsi_xml = ""   # FileZilla Server Interface.xml - Last server used with the interface
-    credentials = Rex::Ui::Text::Table.new(
+    credentials = Rex::Text::Table.new(
     'Header'    => "FileZilla FTP Server Credentials",
     'Indent'    => 1,
     'Columns'   =>
@@ -115,7 +115,7 @@ class MetasploitModule < Msf::Post
       "SSL"
     ])
 
-    permissions = Rex::Ui::Text::Table.new(
+    permissions = Rex::Text::Table.new(
     'Header'    => "FileZilla FTP Server Permissions",
     'Indent'    => 1,
     'Columns'   =>
@@ -135,7 +135,7 @@ class MetasploitModule < Msf::Post
       "Home"
     ])
 
-    configuration = Rex::Ui::Text::Table.new(
+    configuration = Rex::Text::Table.new(
     'Header'      => "FileZilla FTP Server Configuration",
     'Indent'      => 1,
     'Columns'     =>
@@ -150,7 +150,7 @@ class MetasploitModule < Msf::Post
       "SSL Key Password"
     ])
 
-    lastserver = Rex::Ui::Text::Table.new(
+    lastserver = Rex::Text::Table.new(
     'Header'   => "FileZilla FTP Last Server",
     'Indent'   => 1,
     'Columns'  =>
diff --git a/modules/post/windows/gather/credentials/idm.rb b/modules/post/windows/gather/credentials/idm.rb
index ed8e72c93e..ac0fcfc28b 100644
--- a/modules/post/windows/gather/credentials/idm.rb
+++ b/modules/post/windows/gather/credentials/idm.rb
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Post
   end
 
   def run
-    creds = Rex::Ui::Text::Table.new(
+    creds = Rex::Text::Table.new(
         'Header'  => 'Internet Downloader Manager Credentials',
         'Indent'   => 1,
         'Columns' =>
diff --git a/modules/post/windows/gather/credentials/imail.rb b/modules/post/windows/gather/credentials/imail.rb
index 28e6aec748..29d77fadac 100644
--- a/modules/post/windows/gather/credentials/imail.rb
+++ b/modules/post/windows/gather/credentials/imail.rb
@@ -140,7 +140,7 @@ class MetasploitModule < Msf::Post
   end
 
   def report(users)
-    credentials = Rex::Ui::Text::Table.new(
+    credentials = Rex::Text::Table.new(
       'Header'  => 'Ipswitch iMail User Credentials',
       'Indent'   => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/credentials/imvu.rb b/modules/post/windows/gather/credentials/imvu.rb
index 01956553e6..06a6785cb3 100644
--- a/modules/post/windows/gather/credentials/imvu.rb
+++ b/modules/post/windows/gather/credentials/imvu.rb
@@ -37,7 +37,7 @@ class MetasploitModule < Msf::Post
 
   def run
 
-    creds = Rex::Ui::Text::Table.new(
+    creds = Rex::Text::Table.new(
       'Header' => 'IMVU Credentials',
       'Indent' => 1,
       'Columns' =>[
diff --git a/modules/post/windows/gather/credentials/meebo.rb b/modules/post/windows/gather/credentials/meebo.rb
index 97714cd53e..39d9a7ea24 100644
--- a/modules/post/windows/gather/credentials/meebo.rb
+++ b/modules/post/windows/gather/credentials/meebo.rb
@@ -42,7 +42,7 @@ class MetasploitModule < Msf::Post
 
   def parse_txt(file)
     begin
-      creds = Rex::Ui::Text::Table.new(
+      creds = Rex::Text::Table.new(
         'Header'  => 'Meebo Instant Messenger Credentials',
         'Indent'	=> 1,
         'Columns' =>
diff --git a/modules/post/windows/gather/credentials/nimbuzz.rb b/modules/post/windows/gather/credentials/nimbuzz.rb
index 61ee3a02e8..470736e4a5 100644
--- a/modules/post/windows/gather/credentials/nimbuzz.rb
+++ b/modules/post/windows/gather/credentials/nimbuzz.rb
@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Post
   end
 
   def run
-    creds = Rex::Ui::Text::Table.new(
+    creds = Rex::Text::Table.new(
       'Header'  => 'Nimbuzz Instant Messenger Credentials',
       'Indent'   => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/credentials/razorsql.rb b/modules/post/windows/gather/credentials/razorsql.rb
index 15904682b1..286b5332ad 100644
--- a/modules/post/windows/gather/credentials/razorsql.rb
+++ b/modules/post/windows/gather/credentials/razorsql.rb
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
 
   def run
     print_status("Checking All Users...")
-    creds_tbl = Rex::Ui::Text::Table.new(
+    creds_tbl = Rex::Text::Table.new(
       'Header'  => 'RazorSQL User Credentials',
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/credentials/sso.rb b/modules/post/windows/gather/credentials/sso.rb
index 0225b853bc..8d92ee0cde 100644
--- a/modules/post/windows/gather/credentials/sso.rb
+++ b/modules/post/windows/gather/credentials/sso.rb
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
       vprint_error("LiveSSP credentials not present")
     end
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header' => "Windows SSO Credentials",
       'Indent' => 0,
       'SortIndex' => 0,
diff --git a/modules/post/windows/gather/credentials/trillian.rb b/modules/post/windows/gather/credentials/trillian.rb
index 1d4b76bfeb..5ef6f52e98 100644
--- a/modules/post/windows/gather/credentials/trillian.rb
+++ b/modules/post/windows/gather/credentials/trillian.rb
@@ -54,7 +54,7 @@ class MetasploitModule < Msf::Post
         return
       end
 
-      creds = Rex::Ui::Text::Table.new(
+      creds = Rex::Text::Table.new(
         'Header'  => 'Trillian versions 4-5 Instant Messenger Credentials',
         'Indent'	=> 1,
         'Columns' =>
diff --git a/modules/post/windows/gather/dnscache_dump.rb b/modules/post/windows/gather/dnscache_dump.rb
index b496b0d2cd..22024d3c25 100644
--- a/modules/post/windows/gather/dnscache_dump.rb
+++ b/modules/post/windows/gather/dnscache_dump.rb
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Post
   end
 
   def run
-    rtable = Rex::Ui::Text::Table.new(
+    rtable = Rex::Text::Table.new(
       'Header' => 'DNS Cached Entries',
       'Indent' =>  3,
       'Columns' => ['TYPE', 'DOMAIN']
diff --git a/modules/post/windows/gather/enum_ad_bitlocker.rb b/modules/post/windows/gather/enum_ad_bitlocker.rb
index 6c005e5342..bce46a3283 100644
--- a/modules/post/windows/gather/enum_ad_bitlocker.rb
+++ b/modules/post/windows/gather/enum_ad_bitlocker.rb
@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => 'BitLocker Recovery Passwords',
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_computers.rb b/modules/post/windows/gather/enum_ad_computers.rb
index 0f395c1e53..e50debd17a 100644
--- a/modules/post/windows/gather/enum_ad_computers.rb
+++ b/modules/post/windows/gather/enum_ad_computers.rb
@@ -71,7 +71,7 @@ class MetasploitModule < Msf::Post
     return if q.nil? or q[:results].empty?
 
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Domain Computers",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_groups.rb b/modules/post/windows/gather/enum_ad_groups.rb
index bf72dad0c7..7c42e12b07 100644
--- a/modules/post/windows/gather/enum_ad_groups.rb
+++ b/modules/post/windows/gather/enum_ad_groups.rb
@@ -69,10 +69,10 @@ class MetasploitModule < Msf::Post
   # the database.
   #
   # @param [Array<Array<Hash>>] the LDAP query results to parse
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
+  # @return [Rex::Text::Table] the table containing all the result data
   def parse_results(results)
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Domain Groups",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_managedby_groups.rb b/modules/post/windows/gather/enum_ad_managedby_groups.rb
index 19644021fb..5aaa418d04 100644
--- a/modules/post/windows/gather/enum_ad_managedby_groups.rb
+++ b/modules/post/windows/gather/enum_ad_managedby_groups.rb
@@ -75,7 +75,7 @@ class MetasploitModule < Msf::Post
 
   # Takes the results of LDAP query, parses them into a table
   def parse_results(results)
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Groups with Managers",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_service_principal_names.rb b/modules/post/windows/gather/enum_ad_service_principal_names.rb
index c6a4badebb..49ac4eeac9 100644
--- a/modules/post/windows/gather/enum_ad_service_principal_names.rb
+++ b/modules/post/windows/gather/enum_ad_service_principal_names.rb
@@ -74,7 +74,7 @@ class MetasploitModule < Msf::Post
     fields << "Host"
 
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Service Principal Names",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_user_comments.rb b/modules/post/windows/gather/enum_ad_user_comments.rb
index d6759fb211..db910276f2 100644
--- a/modules/post/windows/gather/enum_ad_user_comments.rb
+++ b/modules/post/windows/gather/enum_ad_user_comments.rb
@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
         'Header'     => "Domain Users",
         'Indent'     => 1,
         'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_ad_users.rb b/modules/post/windows/gather/enum_ad_users.rb
index 23e17152cc..8db942c04c 100644
--- a/modules/post/windows/gather/enum_ad_users.rb
+++ b/modules/post/windows/gather/enum_ad_users.rb
@@ -105,12 +105,12 @@ class MetasploitModule < Msf::Post
   # the database.
   #
   # @param [Array<Array<Hash>>] the LDAP query results to parse
-  # @return [Rex::Ui::Text::Table] the table containing all the result data
+  # @return [Rex::Text::Table] the table containing all the result data
   def parse_results(results)
     domain = datastore['DOMAIN'] || get_domain
     domain_ip = client.net.resolve.resolve_host(domain)[:ip]
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Domain Users",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_applications.rb b/modules/post/windows/gather/enum_applications.rb
index a368256941..f8569e3c99 100644
--- a/modules/post/windows/gather/enum_applications.rb
+++ b/modules/post/windows/gather/enum_applications.rb
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Post
   end
 
   def app_list
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Installed Applications",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_av_excluded.rb b/modules/post/windows/gather/enum_av_excluded.rb
index 3d04c4fb31..4052f688ba 100644
--- a/modules/post/windows/gather/enum_av_excluded.rb
+++ b/modules/post/windows/gather/enum_av_excluded.rb
@@ -99,7 +99,7 @@ class MetasploitModule < Msf::Post
       print_status("No #{exclusion_type} exclusions for #{product}")
       return
     end
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'    => "#{product} excluded #{exclusion_type.pluralize}",
       'Indent'    => 1,
       'Columns'   => [ exclusion_type.capitalize ]
diff --git a/modules/post/windows/gather/enum_chrome.rb b/modules/post/windows/gather/enum_chrome.rb
index de02d62ef7..dd0d87f054 100644
--- a/modules/post/windows/gather/enum_chrome.rb
+++ b/modules/post/windows/gather/enum_chrome.rb
@@ -131,7 +131,7 @@ class MetasploitModule < Msf::Post
 
   def process_files(username)
     secrets = ""
-    decrypt_table = Rex::Ui::Text::Table.new(
+    decrypt_table = Rex::Text::Table.new(
       "Header"  => "Decrypted data",
       "Indent"  => 1,
       "Columns" => ["Name", "Decrypted Data", "Origin"]
diff --git a/modules/post/windows/gather/enum_computers.rb b/modules/post/windows/gather/enum_computers.rb
index bd66af39ba..5d44cc4014 100644
--- a/modules/post/windows/gather/enum_computers.rb
+++ b/modules/post/windows/gather/enum_computers.rb
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Post
   end
 
   def list_computers(domain,hosts)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "List of Domain Hosts for the primary Domain.",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_db.rb b/modules/post/windows/gather/enum_db.rb
index 9a028e9058..1b764d56b2 100644
--- a/modules/post/windows/gather/enum_db.rb
+++ b/modules/post/windows/gather/enum_db.rb
@@ -56,7 +56,7 @@ class MetasploitModule < Msf::Post
 
     print_status("Done, Databases Found.")
 
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Installed Databases",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_devices.rb b/modules/post/windows/gather/enum_devices.rb
index 218cf88701..94a93d587a 100644
--- a/modules/post/windows/gather/enum_devices.rb
+++ b/modules/post/windows/gather/enum_devices.rb
@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Post
   end
 
   def list
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Device Information",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_domain_tokens.rb b/modules/post/windows/gather/enum_domain_tokens.rb
index a2808ec180..ae73390c4c 100644
--- a/modules/post/windows/gather/enum_domain_tokens.rb
+++ b/modules/post/windows/gather/enum_domain_tokens.rb
@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Post
 
   # List Tokens precent on the domain
   def list_tokens(domain,dom_admins)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Impersonation Tokens with Domain Context",
       'Indent'  => 1,
       'Columns' =>
@@ -161,7 +161,7 @@ class MetasploitModule < Msf::Post
   end
 
   def list_group_members(domain,dom_admins)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Account in Local Groups with Domain Context",
       'Indent'  => 1,
       'Columns' =>
@@ -210,7 +210,7 @@ class MetasploitModule < Msf::Post
   end
 
   def list_processes(domain,dom_admins)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Processes under Domain Context",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_ie.rb b/modules/post/windows/gather/enum_ie.rb
index 4509c9bf96..3842284c8b 100644
--- a/modules/post/windows/gather/enum_ie.rb
+++ b/modules/post/windows/gather/enum_ie.rb
@@ -227,17 +227,17 @@ class MetasploitModule < Msf::Post
     end
 
     #setup tables
-    @hist_table = Rex::Ui::Text::Table.new(
+    @hist_table = Rex::Text::Table.new(
       "Header"  => "History data",
       "Indent"  => 1,
       "Columns" => ["Date Modified", "Date Accessed", "Url"])
 
-    @cook_table = Rex::Ui::Text::Table.new(
+    @cook_table = Rex::Text::Table.new(
       "Header"  => "Cookies data",
       "Indent"  => 1,
       "Columns" => ["Date Modified", "Date Accessed", "Url"])
 
-    cred_table = Rex::Ui::Text::Table.new(
+    cred_table = Rex::Text::Table.new(
       "Header"  => "Credential data",
       "Indent"  => 1,
       "Columns" => ["Type", "Url", "User", "Pass"])
diff --git a/modules/post/windows/gather/enum_logged_on_users.rb b/modules/post/windows/gather/enum_logged_on_users.rb
index 702b5d3e1c..34a547a81b 100644
--- a/modules/post/windows/gather/enum_logged_on_users.rb
+++ b/modules/post/windows/gather/enum_logged_on_users.rb
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Post
   def ls_logged
     sids = []
     sids << registry_enumkeys("HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList")
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Recently Logged Users",
       'Indent'  => 1,
       'Columns' =>
@@ -51,7 +51,7 @@ class MetasploitModule < Msf::Post
 
   def ls_current
     key_base, username = "",""
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Current Logged Users",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_ms_product_keys.rb b/modules/post/windows/gather/enum_ms_product_keys.rb
index f833df4511..29d64aa071 100644
--- a/modules/post/windows/gather/enum_ms_product_keys.rb
+++ b/modules/post/windows/gather/enum_ms_product_keys.rb
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Post
   end
 
   def app_list
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Keys",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_muicache.rb b/modules/post/windows/gather/enum_muicache.rb
index 425095613b..edcfffc8e3 100644
--- a/modules/post/windows/gather/enum_muicache.rb
+++ b/modules/post/windows/gather/enum_muicache.rb
@@ -226,7 +226,7 @@ class MetasploitModule < Msf::Post
       return nil
     end
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'  =>  'MUICache Information',
       'Indent'  =>  1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_prefetch.rb b/modules/post/windows/gather/enum_prefetch.rb
index 328855c968..3a5883b0e3 100644
--- a/modules/post/windows/gather/enum_prefetch.rb
+++ b/modules/post/windows/gather/enum_prefetch.rb
@@ -168,7 +168,7 @@ class MetasploitModule < Msf::Post
       return nil
     end
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header'  => "Prefetch Information",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_putty_saved_sessions.rb b/modules/post/windows/gather/enum_putty_saved_sessions.rb
index 8d06f9d8f2..1fe9123a88 100644
--- a/modules/post/windows/gather/enum_putty_saved_sessions.rb
+++ b/modules/post/windows/gather/enum_putty_saved_sessions.rb
@@ -53,7 +53,7 @@ class MetasploitModule < Msf::Post
 
   def display_saved_sessions_report(info)
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "PuTTY Saved Sessions",
       'Indent'     => 1,
       'SortIndex'  => -1,
@@ -77,7 +77,7 @@ class MetasploitModule < Msf::Post
 
   def display_private_key_analysis(info)
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "PuTTY Private Keys",
       'Indent'     => 1,
       'SortIndex'  => -1,
@@ -138,7 +138,7 @@ class MetasploitModule < Msf::Post
 
   def display_stored_host_keys_report(info)
     # Results table holds raw string data
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Stored SSH host key fingerprints",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/enum_services.rb b/modules/post/windows/gather/enum_services.rb
index 45423beb71..ac61c3737f 100644
--- a/modules/post/windows/gather/enum_services.rb
+++ b/modules/post/windows/gather/enum_services.rb
@@ -65,7 +65,7 @@ class MetasploitModule < Msf::Post
       print_status("Start Type Filter: #{qtype}")
     end
 
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
         'Header'     => 'Services',
         'Indent'     => 1,
         'SortIndex'  => 0,
diff --git a/modules/post/windows/gather/enum_snmp.rb b/modules/post/windows/gather/enum_snmp.rb
index b35a01b0d6..ff06d177f3 100644
--- a/modules/post/windows/gather/enum_snmp.rb
+++ b/modules/post/windows/gather/enum_snmp.rb
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Post
   # Method for enumerating the Community Strings configured
   def community_strings
     comm_str = []
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Community Strings",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/enum_tokens.rb b/modules/post/windows/gather/enum_tokens.rb
index 18ba14ec9d..28272d42cd 100644
--- a/modules/post/windows/gather/enum_tokens.rb
+++ b/modules/post/windows/gather/enum_tokens.rb
@@ -145,7 +145,7 @@ class MetasploitModule < Msf::Post
 
     domain_admins.each do |da_user|
       #Create a table for domain admin PIDs, users, IPs, and SIDs
-      tbl_pids = Rex::Ui::Text::Table.new(
+      tbl_pids = Rex::Text::Table.new(
         'Header'  => 'Domain admin token PIDs',
         'Indent'  => 1,
         'Columns' => ['sid', 'IP', 'User', 'PID']
diff --git a/modules/post/windows/gather/enum_tomcat.rb b/modules/post/windows/gather/enum_tomcat.rb
index 3039d588e9..a5040f31f6 100644
--- a/modules/post/windows/gather/enum_tomcat.rb
+++ b/modules/post/windows/gather/enum_tomcat.rb
@@ -56,7 +56,7 @@ class MetasploitModule < Msf::Post
     end
     print_status("Done, Tomcat Found.")
 
-    tbl_services = Rex::Ui::Text::Table.new(
+    tbl_services = Rex::Text::Table.new(
       'Header'  => "Tomcat Applications ",
       'Indent'  => 1,
       'Columns' =>
@@ -72,7 +72,7 @@ class MetasploitModule < Msf::Post
       tbl_services << r
     }
 
-    tbl_users = Rex::Ui::Text::Table.new(
+    tbl_users = Rex::Text::Table.new(
       'Header'  => "Tomcat Server Users ",
       'Indent'  => 1,
       'Columns' =>
diff --git a/modules/post/windows/gather/make_csv_orgchart.rb b/modules/post/windows/gather/make_csv_orgchart.rb
index 3e7e35e884..f84d9204cb 100644
--- a/modules/post/windows/gather/make_csv_orgchart.rb
+++ b/modules/post/windows/gather/make_csv_orgchart.rb
@@ -70,7 +70,7 @@ class MetasploitModule < Msf::Post
 
   # Takes the results of LDAP query, parses them into a table
   def parse_results(results)
-    results_table = Rex::Ui::Text::Table.new(
+    results_table = Rex::Text::Table.new(
       'Header'     => "Users & Managers",
       'Indent'     => 1,
       'SortIndex'  => -1,
diff --git a/modules/post/windows/gather/tcpnetstat.rb b/modules/post/windows/gather/tcpnetstat.rb
index 613d33ee13..61d9bf710a 100644
--- a/modules/post/windows/gather/tcpnetstat.rb
+++ b/modules/post/windows/gather/tcpnetstat.rb
@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Post
     entries = buffer[0,4].unpack("V*")[0]
     print_status("Total TCP Entries: #{entries}")
 
-    rtable = Rex::Ui::Text::Table.new(
+    rtable = Rex::Text::Table.new(
       'Header' => 'Connection Table',
       'Indent' => 2,
       'Columns' => ['STATE', 'LHOST', 'LPORT', 'RHOST', 'RPORT']
diff --git a/modules/post/windows/gather/win_privs.rb b/modules/post/windows/gather/win_privs.rb
index b84ac29b72..669412245a 100644
--- a/modules/post/windows/gather/win_privs.rb
+++ b/modules/post/windows/gather/win_privs.rb
@@ -26,13 +26,13 @@ class MetasploitModule < Msf::Post
   end
 
   def run
-    usr_tbl = Rex::Ui::Text::Table.new(
+    usr_tbl = Rex::Text::Table.new(
       'Header'  => 'Current User',
       'Indent'  => 1,
       'Columns' => ['Is Admin', 'Is System', 'Is In Local Admin Group', 'UAC Enabled', 'Foreground ID', 'UID']
     )
 
-    privs_tbl = Rex::Ui::Text::Table.new(
+    privs_tbl = Rex::Text::Table.new(
       'Header' =>"Windows Privileges",
       'Indent' => 1,
       'Columns' => ['Name']
diff --git a/modules/post/windows/manage/portproxy.rb b/modules/post/windows/manage/portproxy.rb
index 73d139ba05..4cc6ccd02f 100644
--- a/modules/post/windows/manage/portproxy.rb
+++ b/modules/post/windows/manage/portproxy.rb
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Post
   end
 
   def enable_portproxy
-    rtable = Rex::Ui::Text::Table.new(
+    rtable = Rex::Text::Table.new(
       'Header' => 'Port Forwarding Table',
       'Indent' =>  3,
       'Columns' => ['LOCAL IP', 'LOCAL PORT', 'REMOTE IP', 'REMOTE PORT']
diff --git a/modules/post/windows/manage/vss_list.rb b/modules/post/windows/manage/vss_list.rb
index 3d3d1c5572..c7103c378e 100644
--- a/modules/post/windows/manage/vss_list.rb
+++ b/modules/post/windows/manage/vss_list.rb
@@ -50,7 +50,7 @@ class MetasploitModule < Msf::Post
     shadow_copies = vss_list
     unless shadow_copies.empty?
       shadow_copies.each do |copy|
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Header'  => 'Shadow Copy Data',
           'Indent'  => 1,
           'Columns' => ['Field', 'Value']
diff --git a/modules/post/windows/manage/vss_storage.rb b/modules/post/windows/manage/vss_storage.rb
index e94a6a68e4..355e79b895 100644
--- a/modules/post/windows/manage/vss_storage.rb
+++ b/modules/post/windows/manage/vss_storage.rb
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Post
 
     storage_data = vss_get_storage
     if storage_data
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
           'Header'  => 'Shadow Copy Storage Data',
           'Indent'  => 1,
           'Columns' => ['Field', 'Value']
diff --git a/modules/post/windows/manage/webcam.rb b/modules/post/windows/manage/webcam.rb
index b309721d89..e427675c12 100644
--- a/modules/post/windows/manage/webcam.rb
+++ b/modules/post/windows/manage/webcam.rb
@@ -114,7 +114,7 @@ class MetasploitModule < Msf::Post
     end
 
     if show
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Header'  => 'Webcam List',
         'Indent'  => 1,
         'Columns' => ['Index', 'Name']
diff --git a/modules/post/windows/recon/computer_browser_discovery.rb b/modules/post/windows/recon/computer_browser_discovery.rb
index 0a87c7dc3b..8cbde676c8 100644
--- a/modules/post/windows/recon/computer_browser_discovery.rb
+++ b/modules/post/windows/recon/computer_browser_discovery.rb
@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Post
 
     netview = netview.sort_by {|e| e[:type]}
 
-    results = Rex::Ui::Text::Table.new(
+    results = Rex::Text::Table.new(
       'Header' => 'Netdiscovery Results',
       'Indent' => 2,
       'Columns' => ['TYPE', 'IP', 'COMPUTER NAME', 'VERSION', 'COMMENT']
diff --git a/msfvenom b/msfvenom
index fba3f1c968..0d7dd834f6 100755
--- a/msfvenom
+++ b/msfvenom
@@ -220,7 +220,7 @@ end
 
 def dump_payloads
   init_framework(:module_types => [ ::Msf::MODULE_PAYLOAD ])
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
     'Indent'  => 4,
     'Header'  => "Framework Payloads (#{framework.stats.num_payloads} total)",
     'Columns' =>
@@ -238,7 +238,7 @@ end
 
 def dump_encoders(arch = nil)
   init_framework(:module_types => [ ::Msf::MODULE_ENCODER ])
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
     'Indent'  => 4,
     'Header'  => "Framework Encoders" + ((arch) ? " (architectures: #{arch})" : ""),
     'Columns' =>
@@ -261,7 +261,7 @@ end
 
 def dump_nops
   init_framework(:module_types => [ ::Msf::MODULE_NOP ])
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
     'Indent'  => 4,
     'Header'  => "Framework NOPs (#{framework.stats.num_nops} total)",
     'Columns' =>
diff --git a/plugins/alias.rb b/plugins/alias.rb
index a71b3bf94e..bacd48c394 100644
--- a/plugins/alias.rb
+++ b/plugins/alias.rb
@@ -43,7 +43,7 @@ class Plugin::Alias < Msf::Plugin
         if @aliases.length == 0
           return print_status("No aliases currently defined")
         else
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'Header'  => "Current Aliases",
             'Prefix'  => "\n",
             'Postfix' => "\n",
diff --git a/plugins/lab.rb b/plugins/lab.rb
index dee4a8a2f0..1dd85c106c 100644
--- a/plugins/lab.rb
+++ b/plugins/lab.rb
@@ -487,7 +487,7 @@ class Plugin::Lab < Msf::Plugin
       def hlp_print_lab
         indent = '    '
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Header'  => 'Available Lab VMs',
           'Indent'  => indent.length,
           'Columns' => [ 'Hostname', 'Driver', 'Type' ]
@@ -505,7 +505,7 @@ class Plugin::Lab < Msf::Plugin
       def hlp_print_lab_running
         indent = '    '
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Header'  => 'Running Lab VMs',
           'Indent'  => indent.length,
           'Columns' => [ 'Hostname', 'Driver', 'Type', 'Power?' ]
diff --git a/plugins/nessus.rb b/plugins/nessus.rb
index 7e31a2738c..07f24be884 100644
--- a/plugins/nessus.rb
+++ b/plugins/nessus.rb
@@ -230,7 +230,7 @@ module Msf
       end
 
       def cmd_nessus_help(*args)
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Columns' => [
             "Command",
             "Help Text"
@@ -437,7 +437,7 @@ module Msf
         end
 
         resp = @n.server_properties
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Feed',
@@ -465,7 +465,7 @@ module Msf
           end
         end
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Status',
@@ -539,7 +539,7 @@ module Msf
           print_status("No templates created")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Name',
@@ -567,7 +567,7 @@ module Msf
           return
         end
         list = @n.list_folders
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             "ID",
@@ -601,7 +601,7 @@ module Msf
           return
         end
         list = @n.list_scanners
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             "ID",
@@ -640,7 +640,7 @@ module Msf
           return
         end
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             "Host ID",
@@ -684,7 +684,7 @@ module Msf
           print_status("Use nessus_scan_list to get a list of all the scans. Only completed scans can be reported.")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             "Plugin ID",
@@ -737,7 +737,7 @@ module Msf
           print_status("Use nessus_report_hosts <scan ID> to get a list of all the hosts along with their corresponding host IDs.")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Plugin Name',
@@ -756,7 +756,7 @@ module Msf
         tbl << [ vuln["plugin_name"], vuln["plugin_family"], vuln["severity"] ]
         }
         print_line tbl.to_s
-        tbl2 = Rex::Ui::Text::Table.new(
+        tbl2 = Rex::Text::Table.new(
           'SearchTerm' => search_vuln,
           'Columns' => [
             'Plugin Name',
@@ -826,7 +826,7 @@ module Msf
           print_status("Use nessus_report_list to list all available reports")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Port',
@@ -904,7 +904,7 @@ module Msf
           print_status("No scans performed.")
           return
         else
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Scan ID',
@@ -964,7 +964,7 @@ module Msf
         if valid_policy(uuid)
           print_status("Creating scan from policy number #{uuid}, called #{scan_name} - #{description} and scanning #{targets}")
           scan = @n.scan_create(uuid, scan_name, description, targets)
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'Columns' => [
               "Scan ID",
               "Scanner ID",
@@ -1299,7 +1299,7 @@ module Msf
 
         details = @n.scan_details(scan_id)
         if category == "info"
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'SearchTerm' => search_term,
             'Columns' => [
               "Status",
@@ -1311,7 +1311,7 @@ module Msf
             ])
          tbl << [ details["info"]["status"], details["info"]["policy"], details["info"]["name"], details["info"]["targets"], details["info"]["scan_start"], details["info"]["scan_end"] ]
         elsif category == "hosts"
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'SearchTerm' => search_term,
             'Columns' => [
               "Host ID",
@@ -1325,7 +1325,7 @@ module Msf
           tbl << [ host["host_id"], host["hostname"], host["critical"], host["high"], host["medium"], host["low"] ]
           }
         elsif category == "vulnerabilities"
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'SearchTerm' => search_term,
             'Columns' => [
               "Plugin ID",
@@ -1337,7 +1337,7 @@ module Msf
           tbl << [ vuln["plugin_id"], vuln["plugin_name"], vuln["plugin_family"], vuln["count"] ]
           }
         elsif category == "history"
-          tbl = Rex::Ui::Text::Table.new(
+          tbl = Rex::Text::Table.new(
             'SearchTerm' => search_term,
             'Columns' => [
               "History ID",
@@ -1443,7 +1443,7 @@ module Msf
           print_status("Use nessus_family_list to display all the plugin families along with their corresponding family IDs")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Plugin ID',
@@ -1474,7 +1474,7 @@ module Msf
         end
 
         list = @n.list_families
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Family ID',
@@ -1516,7 +1516,7 @@ module Msf
           print_status("Use nessus_plugin_list to list all plugins and their corresponding plugin IDs belonging to a particular plugin family.")
           return
         end
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'Reference',
@@ -1563,7 +1563,7 @@ module Msf
           print_status("Your Nessus user is not an admin")
         end
         list=@n.list_users
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'SearchTerm' => search_term,
           'Columns' => [
             'ID',
@@ -1723,7 +1723,7 @@ module Msf
           return
         end
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Columns' => [
             'Policy ID',
             'Name',
diff --git a/plugins/openvas.rb b/plugins/openvas.rb
index 91689190ab..86bf29b147 100644
--- a/plugins/openvas.rb
+++ b/plugins/openvas.rb
@@ -254,7 +254,7 @@ class Plugin::OpenVAS < Msf::Plugin
       return unless openvas?
 
       begin
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
               'Columns' => ["ID", "Name", "Hosts", "Max Hosts", "In Use", "Comment"])
         id = 0
         @ov.target_get_all().each do |target|
@@ -320,7 +320,7 @@ class Plugin::OpenVAS < Msf::Plugin
       return unless openvas?
 
       begin
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
               'Columns' => ["ID", "Name", "Comment", "Status", "Progress"])
         id = 0
         @ov.task_get_all().each do |task|
@@ -418,7 +418,7 @@ class Plugin::OpenVAS < Msf::Plugin
       return unless openvas?
 
       begin
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Columns' => [ "ID", "Name" ])
 
         id = 0
@@ -442,7 +442,7 @@ class Plugin::OpenVAS < Msf::Plugin
       return unless openvas?
 
       begin
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
               'Columns' => ["ID", "Name", "Extension", "Summary"])
         id = 0
         @ov.formats.each do |format|
@@ -465,7 +465,7 @@ class Plugin::OpenVAS < Msf::Plugin
       return unless openvas?
 
       begin
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
               'Columns' => ["ID", "Task Name", "Start Time", "Stop Time"])
         id = 0
         @ov.report_get_all().each do |report|
diff --git a/plugins/sqlmap.rb b/plugins/sqlmap.rb
index 117e95e89e..d95f6a93e3 100644
--- a/plugins/sqlmap.rb
+++ b/plugins/sqlmap.rb
@@ -142,7 +142,7 @@ module Msf
 
         res = @manager.get_task_data(@hid_tasks[args[0]])
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Columns' => ['Title', 'Payload'])
 
         res['data'].each do |d|
diff --git a/plugins/wiki.rb b/plugins/wiki.rb
index 80641e46f0..c8131e4cc6 100644
--- a/plugins/wiki.rb
+++ b/plugins/wiki.rb
@@ -9,7 +9,7 @@ module Msf
 
 ###
 #
-# This plugin extends the Rex::Ui::Text::Table class and provides commands
+# This plugin extends the Rex::Text::Table class and provides commands
 # that output database information for the current workspace in a wiki
 # friendly format
 #
@@ -220,10 +220,10 @@ class Plugin::Wiki < Msf::Plugin
     # @option opts [Array<String>] :hosts contains list of hosts used to limit results
     # @option opts [Array<Fixnum>] :ports contains list of ports used to limit results
     # @option opts [String] :search limits results to those containing a provided string
-    # @return [Rex::Ui::Text::Table] table containing credentials
+    # @return [Rex::Text::Table] table containing credentials
     #
     def creds_to_table(opts = {})
-      tbl = Rex::Ui::Text::Table.new({'Columns' => ['host','port','user','pass','type','proof','active?']})
+      tbl = Rex::Text::Table.new({'Columns' => ['host','port','user','pass','type','proof','active?']})
       tbl.header = 'Credentials'
       tbl.headeri = opts[:heading_size]
       framework.db.creds.each do |cred|
@@ -260,10 +260,10 @@ class Plugin::Wiki < Msf::Plugin
     # @option opts [Array<String>] :hosts contains list of hosts used to limit results
     # @option opts [Array<String>] :ports contains list of ports used to limit results
     # @option opts [String] :search limits results to those containing a provided string
-    # @return [Rex::Ui::Text::Table] table containing credentials
+    # @return [Rex::Text::Table] table containing credentials
     #
     def hosts_to_table(opts = {})
-      tbl = Rex::Ui::Text::Table.new({'Columns' => ['address','mac','name','os_name','os_flavor','os_sp','purpose','info','comments']})
+      tbl = Rex::Text::Table.new({'Columns' => ['address','mac','name','os_name','os_flavor','os_sp','purpose','info','comments']})
       tbl.header = 'Hosts'
       tbl.headeri = opts[:heading_size]
       framework.db.hosts.each do |host|
@@ -302,10 +302,10 @@ class Plugin::Wiki < Msf::Plugin
     # @option opts [Array<String>] :hosts contains list of hosts used to limit results
     # @option opts [Array<String>] :ports contains list of ports used to limit results
     # @option opts [String] :search limits results to those containing a provided string
-    # @return [Rex::Ui::Text::Table] table containing credentials
+    # @return [Rex::Text::Table] table containing credentials
     #
     def loot_to_table(opts = {})
-      tbl = Rex::Ui::Text::Table.new({'Columns' => ['host','service','type','name','content','info','path']})
+      tbl = Rex::Text::Table.new({'Columns' => ['host','service','type','name','content','info','path']})
       tbl.header = 'Loot'
       tbl.headeri = opts[:heading_size]
       framework.db.loots.each do |loot|
@@ -345,10 +345,10 @@ class Plugin::Wiki < Msf::Plugin
     # @option opts [Array<String>] :hosts contains list of hosts used to limit results
     # @option opts [Array<String>] :ports contains list of ports used to limit results
     # @option opts [String] :search limits results to those containing a provided string
-    # @return [Rex::Ui::Text::Table] table containing credentials
+    # @return [Rex::Text::Table] table containing credentials
     #
     def services_to_table(opts = {})
-      tbl = Rex::Ui::Text::Table.new({'Columns' => ['host','port','proto','name','state','info']})
+      tbl = Rex::Text::Table.new({'Columns' => ['host','port','proto','name','state','info']})
       tbl.header = 'Services'
       tbl.headeri = opts[:heading_size]
       framework.db.services.each do |service|
@@ -384,10 +384,10 @@ class Plugin::Wiki < Msf::Plugin
     # @option opts [Array<String>] :hosts contains list of hosts used to limit results
     # @option opts [Array<String>] :ports contains list of ports used to limit results
     # @option opts [String] :search limits results to those containing a provided string
-    # @return [Rex::Ui::Text::Table] table containing credentials
+    # @return [Rex::Text::Table] table containing credentials
     #
     def vulns_to_table(opts = {})
-      tbl = Rex::Ui::Text::Table.new({'Columns' => ['Title','Host','Port','Info','Detail Count','Attempt Count','Exploited At','Updated At']})
+      tbl = Rex::Text::Table.new({'Columns' => ['Title','Host','Port','Info','Detail Count','Attempt Count','Exploited At','Updated At']})
       tbl.header = 'Vulns'
       tbl.headeri = opts[:heading_size]
       framework.db.vulns.each do |vuln|
@@ -438,13 +438,13 @@ class Plugin::Wiki < Msf::Plugin
   #
   # Constructs a new instance of the plugin and registers the console
   # dispatcher. It also extends Rex by adding the following methods:
-  #   * Rex::Ui::Text::Table.to_dokuwiki
-  #   * Rex::Ui::Text::Table.to_mediawiki
+  #   * Rex::Text::Table.to_dokuwiki
+  #   * Rex::Text::Table.to_mediawiki
   #
   def initialize(framework, opts)
     super
 
-    # Extend Rex::Ui::Text::Table class so it can output wiki formats
+    # Extend Rex::Text::Table class so it can output wiki formats
     add_dokuwiki_to_rex
     add_mediawiki_to_rex
 
@@ -457,9 +457,9 @@ class Plugin::Wiki < Msf::Plugin
   # initialization and then removes the console dispatcher
   #
   def cleanup
-    # Cleanup methods added to Rex::Ui::Text::Table
-    Rex::Ui::Text::Table.class_eval { undef :to_dokuwiki }
-    Rex::Ui::Text::Table.class_eval { undef :to_mediawiki }
+    # Cleanup methods added to Rex::Text::Table
+    Rex::Text::Table.class_eval { undef :to_dokuwiki }
+    Rex::Text::Table.class_eval { undef :to_mediawiki }
     # Deregister the console dispatcher
     remove_console_dispatcher('Wiki')
   end
@@ -490,7 +490,7 @@ class Plugin::Wiki < Msf::Plugin
   # Extends Rex tables to be able to create Dokuwiki tables
   #
   def add_dokuwiki_to_rex
-    Rex::Ui::Text::Table.class_eval do
+    Rex::Text::Table.class_eval do
       def to_dokuwiki
         str = prefix.dup
         # Print the header if there is one. Use headeri to determine wiki paragraph level
@@ -521,7 +521,7 @@ class Plugin::Wiki < Msf::Plugin
   # Extends Rex tables to be able to create Mediawiki tables
   #
   def add_mediawiki_to_rex
-    Rex::Ui::Text::Table.class_eval do
+    Rex::Text::Table.class_eval do
       def to_mediawiki
         str = prefix.dup
         # Print the header if there is one. Use headeri to determine wiki
diff --git a/plugins/wmap.rb b/plugins/wmap.rb
index 021918878f..863ec252b6 100644
--- a/plugins/wmap.rb
+++ b/plugins/wmap.rb
@@ -1209,7 +1209,7 @@ class Plugin::Wmap < Msf::Plugin
 
       indent = '     '
 
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'  => indent.length,
         'Header'  => 'Defined targets',
         'Columns' =>
@@ -1259,7 +1259,7 @@ class Plugin::Wmap < Msf::Plugin
 
       indent = '     '
 
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'  => indent.length,
         'Header'  => 'Available sites',
         'Columns' =>
@@ -1948,7 +1948,7 @@ class Plugin::Wmap < Msf::Plugin
           begin
             n = rpccon.call('job.list')
 
-            tbl = Rex::Ui::Text::Table.new(
+            tbl = Rex::Text::Table.new(
               'Indent'  => indent.length,
               'Header'  => 'Jobs',
               'Columns' =>
@@ -2069,7 +2069,7 @@ class Plugin::Wmap < Msf::Plugin
     def rpc_list_nodes()
       indent = '     '
 
-      tbl = Rex::Ui::Text::Table.new(
+      tbl = Rex::Text::Table.new(
         'Indent'  => indent.length,
         'Header'  => 'Nodes',
         'Columns' =>
@@ -2148,7 +2148,7 @@ class Plugin::Wmap < Msf::Plugin
 
       wmaptype.each do |modt|
 
-        tbl = Rex::Ui::Text::Table.new(
+        tbl = Rex::Text::Table.new(
           'Indent'  => indent.length,
           'Header'  =>  modt.to_s,
           'Columns' =>
diff --git a/scripts/meterpreter/enum_logged_on_users.rb b/scripts/meterpreter/enum_logged_on_users.rb
index 6814320a77..138f41b704 100644
--- a/scripts/meterpreter/enum_logged_on_users.rb
+++ b/scripts/meterpreter/enum_logged_on_users.rb
@@ -15,7 +15,7 @@
 def ls_logged
   sids = []
   sids << registry_enumkeys("HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList")
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
       'Header'  => "Logged Users",
       'Indent'  => 1,
       'Columns' =>
@@ -32,7 +32,7 @@ end
 
 def ls_current
   key_base, username = "",""
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
       'Header'  => "Current Logged Users",
       'Indent'  => 1,
       'Columns' =>
diff --git a/scripts/meterpreter/event_manager.rb b/scripts/meterpreter/event_manager.rb
index cedccd5155..0a6594b463 100644
--- a/scripts/meterpreter/event_manager.rb
+++ b/scripts/meterpreter/event_manager.rb
@@ -92,7 +92,7 @@ end
 #-------------------------------------------------------------------------------
 def print_log_details
   print_status("Retriving Event Log Configuration")
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
     'Header'  => "Event Logs on System",
     'Indent'  => 1,
     'Columns' => [
diff --git a/scripts/meterpreter/get_application_list.rb b/scripts/meterpreter/get_application_list.rb
index fde54cc126..1186eaf3b6 100644
--- a/scripts/meterpreter/get_application_list.rb
+++ b/scripts/meterpreter/get_application_list.rb
@@ -14,7 +14,7 @@ opts = Rex::Parser::Arguments.new(
 )
 
 def app_list
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
     'Header'  => "Installed Applications",
     'Indent'  => 1,
     'Columns' => [
diff --git a/scripts/meterpreter/get_env.rb b/scripts/meterpreter/get_env.rb
index d93526b998..b33d05be4b 100644
--- a/scripts/meterpreter/get_env.rb
+++ b/scripts/meterpreter/get_env.rb
@@ -17,7 +17,7 @@ var_names << registry_enumvals("HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\C
 
 def list_env_vars(var_names)
   print_status("Getting all System and User Variables")
-  tbl = Rex::Ui::Text::Table.new(
+  tbl = Rex::Text::Table.new(
       'Header'  => "Enviroment Variable list",
       'Indent'  => 1,
       'Columns' =>
diff --git a/test/tests/test_encoders.rb b/test/tests/test_encoders.rb
index c65d46c7bd..2dc857ec3e 100644
--- a/test/tests/test_encoders.rb
+++ b/test/tests/test_encoders.rb
@@ -72,7 +72,7 @@ def run( encoders, payload_name, verbose=false )
 
   payload = generate_payload( payload_name )
 
-  table = Rex::Ui::Text::Table.new(
+  table = Rex::Text::Table.new(
     'Header'  => 'Encoder v Payload Test - ' + ::Time.new.strftime( "%d-%b-%Y %H:%M:%S" ),
     'Indent'  => 4,
     'Columns' => [ 'Encoder Name', 'Success', 'Fail' ]
diff --git a/tools/exploit/reg.rb b/tools/exploit/reg.rb
index 636619828b..242fb48df1 100755
--- a/tools/exploit/reg.rb
+++ b/tools/exploit/reg.rb
@@ -33,7 +33,7 @@ def print_all_keys(nodekey)
   return if !nodekey.lf_record.children
   return if nodekey.lf_record.children.length == 0
 
-table = Rex::Ui::Text::Table.new(
+table = Rex::Text::Table.new(
   'Header'  => "Child Keys for #{nodekey.full_path}",
   'Indent'  => '    '.length,
   'Columns' => [ 'Name', 'Last Edited', 'Subkey Count', 'Value Count' ]
@@ -55,7 +55,7 @@ table = Rex::Ui::Text::Table.new(
     return if !nodekey.lf_record.children
     return if nodekey.lf_record.children.length == 0
 
-    table = Rex::Ui::Text::Table.new(
+    table = Rex::Text::Table.new(
       'Header' => "Values in key #{nodekey.full_path}",
       'Indent' => '    '.length,
       'Columns' => ['Name','Value Type', 'Value']
diff --git a/tools/exploit/virustotal.rb b/tools/exploit/virustotal.rb
index faf19645fd..da7a9b067a 100755
--- a/tools/exploit/virustotal.rb
+++ b/tools/exploit/virustotal.rb
@@ -480,7 +480,7 @@ class Driver
     end
 
     short_filename = File.basename(sample)
-    tbl = Rex::Ui::Text::Table.new(
+    tbl = Rex::Text::Table.new(
       'Header'  => "Analysis Report: #{short_filename} (#{res['positives']} / #{res['total']}): #{res['sha256']}",
       'Indent'  => 1,
       'Columns' => ['Antivirus', 'Detected', 'Version', 'Result', 'Update']
diff --git a/tools/modules/module_author.rb b/tools/modules/module_author.rb
index 3a87b7fb85..0fe02efa9e 100755
--- a/tools/modules/module_author.rb
+++ b/tools/modules/module_author.rb
@@ -79,7 +79,7 @@ end
 $framework = Msf::Simple::Framework.create(framework_opts)
 
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module References',
   'Indent'  => Indent.length,
   'Columns' => [ 'Module', 'Reference' ]
@@ -112,7 +112,7 @@ end
 
 puts tbl.to_s
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module Count by Author',
   'Indent'  => Indent.length,
   'Columns' => [ 'Count', 'Name' ]
diff --git a/tools/modules/module_disclodate.rb b/tools/modules/module_disclodate.rb
index 8de4e68959..eafce24b33 100755
--- a/tools/modules/module_disclodate.rb
+++ b/tools/modules/module_disclodate.rb
@@ -105,7 +105,7 @@ end
 $framework = Msf::Simple::Framework.create(framework_opts)
 
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module References',
   'Indent'  => Indent.length,
   'Columns' => [ 'Module', 'Disclosure Date' ]
diff --git a/tools/modules/module_license.rb b/tools/modules/module_license.rb
index 651cf101e2..71628257b2 100755
--- a/tools/modules/module_license.rb
+++ b/tools/modules/module_license.rb
@@ -102,7 +102,7 @@ end
 $framework = Msf::Simple::Framework.create(framework_opts)
 
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Licensed Modules',
   'Indent'  => Indent.length,
   'Columns' => [ 'License','Type', 'Name' ]
diff --git a/tools/modules/module_rank.rb b/tools/modules/module_rank.rb
index ceffd91400..6c8fa00086 100755
--- a/tools/modules/module_rank.rb
+++ b/tools/modules/module_rank.rb
@@ -104,7 +104,7 @@ end
 $framework = Msf::Simple::Framework.create(framework_opts)
 
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module Ranks',
   'Indent'  => Indent.length,
   'Columns' => [ 'Module', 'Rank' ]
diff --git a/tools/modules/module_reference.rb b/tools/modules/module_reference.rb
index e4bfe88d9a..10aaa40a52 100755
--- a/tools/modules/module_reference.rb
+++ b/tools/modules/module_reference.rb
@@ -198,7 +198,7 @@ else
   columns = [ 'Module', 'Reference' ]
 end
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module References',
   'Indent'  => 2,
   'Columns' => columns
diff --git a/tools/modules/module_targets.rb b/tools/modules/module_targets.rb
index f5ee44cc17..1163da617f 100755
--- a/tools/modules/module_targets.rb
+++ b/tools/modules/module_targets.rb
@@ -57,7 +57,7 @@ Indent = '    '
 # Initialize the simplified framework instance.
 $framework = Msf::Simple::Framework.create('DisableDatabase' => true)
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Module Targets',
   'Indent'  => Indent.length,
   'Columns' => [ 'Module name','Target' ]
diff --git a/tools/modules/payload_lengths.rb b/tools/modules/payload_lengths.rb
index 0e175fac94..a31de48632 100755
--- a/tools/modules/payload_lengths.rb
+++ b/tools/modules/payload_lengths.rb
@@ -34,7 +34,7 @@ Msf::Ui::Common.process_cli_arguments($framework, ARGV)
 
 options = ARGV.join(',')
 
-tbl = Rex::Ui::Text::Table.new(
+tbl = Rex::Text::Table.new(
   'Header'  => 'Payload Lengths',
   'Indent'  => Indent.length,
   'Columns' => [ 'Payload', 'Length' ]