diff --git a/lib/msf/base/sessions/mssql.rb b/lib/msf/base/sessions/mssql.rb
index b2ba06c2d53d2..7576fdda5209b 100644
--- a/lib/msf/base/sessions/mssql.rb
+++ b/lib/msf/base/sessions/mssql.rb
@@ -53,7 +53,7 @@ def type
   # Returns the type of session.
   #
   def self.type
-    'MSSQL'
+    'mssql'
   end
 
   def self.can_cleanup_files
diff --git a/lib/msf/base/sessions/mysql.rb b/lib/msf/base/sessions/mysql.rb
index de042137d73a9..5f9f57b293b38 100644
--- a/lib/msf/base/sessions/mysql.rb
+++ b/lib/msf/base/sessions/mysql.rb
@@ -49,7 +49,7 @@ def type
 
   # @return [String] The type of the session
   def self.type
-    'MySQL'
+    'mysql'
   end
 
   # @return [Boolean] Can the session clean up after itself
diff --git a/lib/msf/base/sessions/postgresql.rb b/lib/msf/base/sessions/postgresql.rb
index 6c386d0f4cf90..0f6e98200dd62 100644
--- a/lib/msf/base/sessions/postgresql.rb
+++ b/lib/msf/base/sessions/postgresql.rb
@@ -57,7 +57,7 @@ def type
   # @return [String] The type of the session
   #
   def self.type
-    'PostgreSQL'
+    'postgresql'
   end
 
   #
diff --git a/lib/msf/base/sessions/smb.rb b/lib/msf/base/sessions/smb.rb
index 2e4297ba4eb05..da1080d77b33d 100644
--- a/lib/msf/base/sessions/smb.rb
+++ b/lib/msf/base/sessions/smb.rb
@@ -57,7 +57,7 @@ def type
   # Returns the type of session.
   #
   def self.type
-    'SMB'
+    'smb'
   end
 
   def self.can_cleanup_files
diff --git a/lib/msf/core/optional_session/mssql.rb b/lib/msf/core/optional_session/mssql.rb
index aee985f45f7ce..e9aade926e373 100644
--- a/lib/msf/core/optional_session/mssql.rb
+++ b/lib/msf/core/optional_session/mssql.rb
@@ -9,7 +9,7 @@ def initialize(info = {})
         super(
           update_info(
             info,
-            'SessionTypes' => %w[MSSQL]
+            'SessionTypes' => %w[mssql]
           )
         )
 
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
index 2c4f09aa5cb9d..60cbccf9ff7ff 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
@@ -18,8 +18,7 @@ def initialize(info = {})
       },
       'Author'      => ['nullbind <scott.sutherland[at]netspi.com>'],
       'License'     => MSF_LICENSE,
-      'References'  => [['URL','http://msdn.microsoft.com/en-us/library/ms178640.aspx']],
-      'SessionTypes' => %w[MSSQL]
+      'References'  => [['URL','http://msdn.microsoft.com/en-us/library/ms178640.aspx']]
     ))
   end
 
diff --git a/modules/auxiliary/admin/mssql/mssql_exec.rb b/modules/auxiliary/admin/mssql/mssql_exec.rb
index 22fc703245418..24ff34a714d81 100644
--- a/modules/auxiliary/admin/mssql/mssql_exec.rb
+++ b/modules/auxiliary/admin/mssql/mssql_exec.rb
@@ -28,7 +28,6 @@ def initialize(info = {})
             [ 'URL', 'http://msdn.microsoft.com/en-us/library/cc448435(PROT.10).aspx'],
             [ 'URL', 'https://docs.microsoft.com/en-us/sql/relational-databases/system-stored-procedures/sp-oacreate-transact-sql'],
           ],
-        'SessionTypes' => %w[MSSQL],
       )
     )
 
diff --git a/modules/auxiliary/admin/mysql/mysql_sql.rb b/modules/auxiliary/admin/mysql/mysql_sql.rb
index 2734ab401f072..8f181e92a3fc7 100644
--- a/modules/auxiliary/admin/mysql/mysql_sql.rb
+++ b/modules/auxiliary/admin/mysql/mysql_sql.rb
@@ -16,7 +16,6 @@ def initialize(info = {})
       },
       'Author'		=> [ 'Bernardo Damele A. G. <bernardo.damele[at]gmail.com>' ],
       'License'		=> MSF_LICENSE,
-      'SessionTypes' => %w[MySQL]
     ))
 
     register_options(
diff --git a/modules/auxiliary/admin/postgres/postgres_readfile.rb b/modules/auxiliary/admin/postgres/postgres_readfile.rb
index 8f468d2253480..ac7222ad7eac9 100644
--- a/modules/auxiliary/admin/postgres/postgres_readfile.rb
+++ b/modules/auxiliary/admin/postgres/postgres_readfile.rb
@@ -18,8 +18,7 @@ def initialize(info = {})
           as well as read privileges to the target file.
       },
       'Author'         => [ 'todb' ],
-      'License'        => MSF_LICENSE,
-      'SessionTypes' => %w[PostgreSQL]
+      'License'        => MSF_LICENSE
     ))
 
     register_options(
diff --git a/modules/auxiliary/admin/postgres/postgres_sql.rb b/modules/auxiliary/admin/postgres/postgres_sql.rb
index 86cc5d2c3a5d6..67f2c512a1786 100644
--- a/modules/auxiliary/admin/postgres/postgres_sql.rb
+++ b/modules/auxiliary/admin/postgres/postgres_sql.rb
@@ -19,8 +19,7 @@ def initialize(info = {})
       'References'     =>
         [
           [ 'URL', 'www.postgresql.org' ]
-        ],
-      'SessionTypes' => %w[PostgreSQL]
+        ]
     ))
   end
 
diff --git a/modules/auxiliary/scanner/mysql/mysql_version.rb b/modules/auxiliary/scanner/mysql/mysql_version.rb
index 482d7e252d4d7..54f28ec4ee22e 100644
--- a/modules/auxiliary/scanner/mysql/mysql_version.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_version.rb
@@ -16,8 +16,7 @@ def initialize
         Enumerates the version of MySQL servers.
       },
       'Author'      => 'kris katterjohn',
-      'License'     => MSF_LICENSE,
-      'SessionTypes' => %w[MySQL],
+      'License'     => MSF_LICENSE
     )
 
     register_options([
diff --git a/modules/auxiliary/scanner/postgres/postgres_version.rb b/modules/auxiliary/scanner/postgres/postgres_version.rb
index d07e3630e9c4e..cd82f6c3a4f79 100644
--- a/modules/auxiliary/scanner/postgres/postgres_version.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_version.rb
@@ -21,8 +21,7 @@ def initialize(info = {})
       'References'     =>
         [
           [ 'URL', 'https://www.postgresql.org/' ]
-        ],
-        'SessionTypes' => %w[PostgreSQL]
+        ]
     ))
 
     register_options([ ]) # None needed.
diff --git a/modules/exploits/linux/postgres/postgres_payload.rb b/modules/exploits/linux/postgres/postgres_payload.rb
index 0d7424797cc4a..f1ba78a80e5be 100644
--- a/modules/exploits/linux/postgres/postgres_payload.rb
+++ b/modules/exploits/linux/postgres/postgres_payload.rb
@@ -67,8 +67,7 @@ def initialize(info = {})
           ],
         ],
       'DefaultTarget'  => 0,
-      'DisclosureDate' => '2007-06-05',
-      'SessionTypes' => %w[PostgreSQL]
+      'DisclosureDate' => '2007-06-05'
       ))
 
     deregister_options('SQL', 'RETURN_ROWSET')
diff --git a/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb b/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb
index 3dc8c412fe6a2..0fb39e26e473f 100644
--- a/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb
+++ b/modules/exploits/multi/postgres/postgres_copy_from_program_cmd_exec.rb
@@ -73,8 +73,7 @@ def initialize(info = {})
             }
           ],
         ],
-      'DisclosureDate' => '2019-03-20',
-      'SessionTypes' => %w[PostgreSQL]
+      'DisclosureDate' => '2019-03-20'
     ))
 
     register_options([
diff --git a/modules/exploits/multi/postgres/postgres_createlang.rb b/modules/exploits/multi/postgres/postgres_createlang.rb
index 3c2ec63fe42d8..2c51c95ade78d 100644
--- a/modules/exploits/multi/postgres/postgres_createlang.rb
+++ b/modules/exploits/multi/postgres/postgres_createlang.rb
@@ -47,8 +47,7 @@ def initialize(info = {})
         ['Automatic', {}]
       ],
       'DefaultTarget' => 0,
-      'DisclosureDate' => '2016-01-01',
-      'SessionTypes' => %w[PostgreSQL]
+      'DisclosureDate' => '2016-01-01'
     ))
 
     deregister_options('SQL', 'RETURN_ROWSET', 'VERBOSE')
diff --git a/modules/exploits/windows/postgres/postgres_payload.rb b/modules/exploits/windows/postgres/postgres_payload.rb
index 037af50eae7b7..528b62732502e 100644
--- a/modules/exploits/windows/postgres/postgres_payload.rb
+++ b/modules/exploits/windows/postgres/postgres_payload.rb
@@ -60,7 +60,6 @@ def initialize(info = {})
       ],
       'DefaultTarget'  => 0,
       'DisclosureDate' => '2009-04-10', # Date of Bernardo's BH Europe paper.
-      'SessionTypes' => %w[PostgreSQL]
     ))
 
     deregister_options('SQL', 'RETURN_ROWSET')