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 6bee3f0929..a2d0f83ee3 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'        => 'Microsoft SQL Server SQLi SUSER_SNAME Domain Account Enumeration',
+      'Name'        => 'Microsoft SQL Server SQLi SUSER_SNAME Windows Domain Account Enumeration',
       'Description' => %q{
         This module can be used to brute force RIDs associated with the domain of the SQL Server
         using the SUSER_SNAME function via Error Based SQL injection. This is similar to the
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
index 5f4e516da2..f691a81169 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server - Escalate Db_Owner',
+      'Name'           => 'Microsoft SQL Server Escalate Db_Owner',
       'Description'    => %q{
         This module can be used to escalate privileges to sysadmin if the user has
         the db_owner role in a trustworthy database owned by a sysadmin user.  Once
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
index e17549a467..83ecfdae4e 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server - SQLi Escalate Db_Owner',
+      'Name'           => 'Microsoft SQL Server SQLi Escalate Db_Owner',
       'Description'    => %q{
         This module can be used to escalate SQL Server user privileges to sysadmin through a web
         SQL Injection. In order to escalate, the database user must to have the db_owner role in
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
index 2a8a11b1ca..bd5d6ade57 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
@@ -12,7 +12,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'        => 'Microsoft SQL Server - Escalate EXECUTE AS',
+      'Name'        => 'Microsoft SQL Server Escalate EXECUTE AS',
       'Description' => %q{
         This module can be used escalate privileges if the IMPERSONATION privilege has been
         assigned to the user. In most cases, this results in additional data access, but in
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
index e2f781eb4f..d281a9607c 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
@@ -13,7 +13,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server - SQLi Escalate Execute As',
+      'Name'           => 'Microsoft SQL Server SQLi Escalate Execute As',
       'Description'    => %q{
         This module can be used escalate privileges if the IMPERSONATION privilege has been
         assigned to the user via error based SQL injection.  In most cases, this results in
diff --git a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
index 3f6de32760..34d3ff1c7b 100644
--- a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
+++ b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
@@ -14,7 +14,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server - Find and Sample Data',
+      'Name'           => 'Microsoft SQL Server Find and Sample Data',
       'Description'    => %q{This script will search through all of the non-default databases
       on the SQL Server for columns that match the keywords defined in the TSQL KEYWORDS
       option. If column names are found that match the defined keywords and data is present
diff --git a/modules/auxiliary/admin/mssql/mssql_idf.rb b/modules/auxiliary/admin/mssql/mssql_idf.rb
index 24c0288ca9..cd0e211136 100644
--- a/modules/auxiliary/admin/mssql/mssql_idf.rb
+++ b/modules/auxiliary/admin/mssql/mssql_idf.rb
@@ -21,7 +21,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server - Interesting Data Finder',
+      'Name'           => 'Microsoft SQL Server Interesting Data Finder',
       'Description'    => %q{
         This module will search the specified MSSQL server for
         'interesting' columns and data.
diff --git a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
index 52e7c927d8..32df469d7f 100644
--- a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
@@ -11,7 +11,7 @@ class Metasploit3 < Msf::Auxiliary
 
   def initialize(info = {})
     super(update_info(info,
-      'Name'           => 'Microsoft SQL Server NTLM Stealer - SQLi',
+      'Name'           => 'Microsoft SQL Server NTLM Stealer via SQLi',
       'Description'    => %q{
         This module can be used to help capture or relay the LM/NTLM credentials of the
         account running the remote SQL Server service. The module will use the SQL