diff --git a/modules/auxiliary/scanner/db2/db2_auth.rb b/modules/auxiliary/scanner/db2/db2_auth.rb
index 2052f5c851..94295bddbe 100644
--- a/modules/auxiliary/scanner/db2/db2_auth.rb
+++ b/modules/auxiliary/scanner/db2/db2_auth.rb
@@ -76,7 +76,7 @@ class Metasploit3 < Msf::Auxiliary
             origin_type: :service,
             private_data: result.credential.private,
             private_type: :password,
-            realm_key: Metasploit::Credential::Realm::Key::DB2_DATABASE,
+            realm_key: Metasploit::Model::Realm::Key::DB2_DATABASE,
             realm_value: result.credential.realm,
             username: result.credential.public
         }
@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Auxiliary
             protocol: 'tcp',
             public: result.credential.public,
             private: result.credential.private,
-            realm_key: Metasploit::Credential::Realm::Key::DB2_DATABASE,
+            realm_key: Metasploit::Model::Realm::Key::DB2_DATABASE,
             realm_value: result.credential.realm,
             status: result.status)
         print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
index d8af493858..a9e8ac7c3e 100644
--- a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
@@ -52,7 +52,7 @@ class Metasploit3 < Msf::Auxiliary
     }
 
     if datastore['USE_WINDOWS_AUTHENT']
-      credential_data[:realm_key] = Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
+      credential_data[:realm_key] = Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
       credential_data[:realm_value] = datastore['DOMAIN']
     end
     credential_data.merge!(service_data)
diff --git a/modules/auxiliary/scanner/mssql/mssql_login.rb b/modules/auxiliary/scanner/mssql/mssql_login.rb
index 072025c210..0327ac0606 100644
--- a/modules/auxiliary/scanner/mssql/mssql_login.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_login.rb
@@ -72,7 +72,7 @@ class Metasploit3 < Msf::Auxiliary
         }
 
         if datastore['USE_WINDOWS_AUTHENT']
-          credential_data[:realm_key] = Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
+          credential_data[:realm_key] = Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
           credential_data[:realm_value] = result.credential.realm
         end
         credential_data.merge!(service_data)
@@ -100,7 +100,7 @@ class Metasploit3 < Msf::Auxiliary
             status: result.status
         }
         if datastore['USE_WINDOWS_AUTHENT']
-          login_data[:realm_key] = Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
+          login_data[:realm_key] = Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
           login_data[:realm_value] = result.credential.realm
         end
         invalidate_login(login_data)
diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
index c78bf6f57a..c66a5a1dd4 100644
--- a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
@@ -49,7 +49,7 @@ class Metasploit3 < Msf::Auxiliary
         private_data: datastore['PASSWORD'],
         private_type: :password,
         username: datastore['USERNAME'],
-        realm_key:  Metasploit::Credential::Realm::Key::POSTGRESQL_DATABASE,
+        realm_key:  Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
         realm_value: datastore['DATABASE']
     }
 
diff --git a/modules/auxiliary/scanner/postgres/postgres_login.rb b/modules/auxiliary/scanner/postgres/postgres_login.rb
index db837f2fcc..55cc9c7b35 100644
--- a/modules/auxiliary/scanner/postgres/postgres_login.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -84,7 +84,7 @@ class Metasploit3 < Msf::Auxiliary
           origin_type: :service,
           private_data: result.credential.private,
           private_type: :password,
-          realm_key: Metasploit::Credential::Realm::Key::POSTGRESQL_DATABASE,
+          realm_key: Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
           realm_value: result.credential.realm,
           username: result.credential.public
         }
@@ -108,7 +108,7 @@ class Metasploit3 < Msf::Auxiliary
             protocol: 'tcp',
             public: result.credential.public,
             private: result.credential.private,
-            realm_key: Metasploit::Credential::Realm::Key::POSTGRESQL_DATABASE,
+            realm_key: Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
             realm_value: result.credential.realm,
             status: result.status)
         print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/smb/smb_login.rb b/modules/auxiliary/scanner/smb/smb_login.rb
index 0de92e8f70..bf0ac873ef 100644
--- a/modules/auxiliary/scanner/smb/smb_login.rb
+++ b/modules/auxiliary/scanner/smb/smb_login.rb
@@ -119,7 +119,7 @@ class Metasploit3 < Msf::Auxiliary
           protocol: 'tcp',
           public: result.credential.public,
           private: result.credential.private,
-          realm_key: Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+          realm_key: Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
           realm_value: result.credential.realm,
           status: :failed
         )
@@ -171,7 +171,7 @@ class Metasploit3 < Msf::Auxiliary
         print_brute(:level => :vstatus, :ip => ip, :msg => "Domain is ignored for user #{result.credential.public}")
       else
         credential_data.merge!(
-          realm_key: Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+          realm_key: Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
           realm_value: result.credential.realm
         )
       end
diff --git a/modules/auxiliary/scanner/winrm/winrm_login.rb b/modules/auxiliary/scanner/winrm/winrm_login.rb
index cc6551cf4b..a1ee011995 100644
--- a/modules/auxiliary/scanner/winrm/winrm_login.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_login.rb
@@ -75,7 +75,7 @@ class Metasploit3 < Msf::Auxiliary
           private_data: result.credential.private,
           private_type: :password,
           username: result.credential.public,
-          realm_key: Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+          realm_key: Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
           realm_value: result.credential.realm,
         }.merge(service_data)
 
diff --git a/modules/exploits/windows/smb/psexec.rb b/modules/exploits/windows/smb/psexec.rb
index 1829d2338f..5c0bb22af3 100644
--- a/modules/exploits/windows/smb/psexec.rb
+++ b/modules/exploits/windows/smb/psexec.rb
@@ -127,7 +127,7 @@ class Metasploit3 < Msf::Exploit::Remote
 
       if datastore['SMBDomain'] and datastore['SMBDomain'] != 'WORKGROUP'
         credential_data.merge!({
-          realm_key: Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+          realm_key: Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
           realm_value: datastore['SMBDomain']
          })
       end
diff --git a/modules/post/multi/gather/pgpass_creds.rb b/modules/post/multi/gather/pgpass_creds.rb
index 8fcd7cdb13..04919ed48e 100644
--- a/modules/post/multi/gather/pgpass_creds.rb
+++ b/modules/post/multi/gather/pgpass_creds.rb
@@ -121,7 +121,7 @@ class Metasploit3 < Msf::Post
         private_data: pass,
         private_type: :password,
         realm_value: db,
-        realm_key: Metasploit::Credential::Realm::Key::POSTGRESQL_DATABASE,
+        realm_key: Metasploit::Model::Realm::Key::POSTGRESQL_DATABASE,
         workspace_id: myworkspace_id
       }
 
diff --git a/modules/post/windows/gather/credentials/mremote.rb b/modules/post/windows/gather/credentials/mremote.rb
index 1c55f8912e..4cc79c0f89 100644
--- a/modules/post/windows/gather/credentials/mremote.rb
+++ b/modules/post/windows/gather/credentials/mremote.rb
@@ -105,7 +105,7 @@ class Metasploit3 < Msf::Post
       }
 
       unless domain.blank?
-        credential_data[:realm_key]   = Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
+        credential_data[:realm_key]   = Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN
         credential_data[:realm_value] = domain
       end
 
diff --git a/modules/post/windows/gather/credentials/windows_autologin.rb b/modules/post/windows/gather/credentials/windows_autologin.rb
index b7652bed46..61a4ab36d5 100644
--- a/modules/post/windows/gather/credentials/windows_autologin.rb
+++ b/modules/post/windows/gather/credentials/windows_autologin.rb
@@ -93,7 +93,7 @@ class Metasploit3 < Msf::Post
         username: cred[0],
         private_data: cred[1],
         private_type: :password,
-        realm_key: Metasploit::Credential::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
+        realm_key: Metasploit::Model::Realm::Key::ACTIVE_DIRECTORY_DOMAIN,
         realm_value: cred[2]
       )
     end