diff --git a/modules/exploits/windows/backupexec/backupexec_ns.rb b/modules/exploits/windows/backupexec/name_service.rb
similarity index 100%
rename from modules/exploits/windows/backupexec/backupexec_ns.rb
rename to modules/exploits/windows/backupexec/name_service.rb
diff --git a/modules/exploits/windows/backupexec/backupexec_agent.rb b/modules/exploits/windows/backupexec/remote_agent.rb
similarity index 100%
rename from modules/exploits/windows/backupexec/backupexec_agent.rb
rename to modules/exploits/windows/backupexec/remote_agent.rb
diff --git a/modules/exploits/windows/brightstor/brightstor_disco_tcp.rb b/modules/exploits/windows/brightstor/discovery_tcp.rb
similarity index 100%
rename from modules/exploits/windows/brightstor/brightstor_disco_tcp.rb
rename to modules/exploits/windows/brightstor/discovery_tcp.rb
diff --git a/modules/exploits/windows/brightstor/brightstor_disco_udp.rb b/modules/exploits/windows/brightstor/discovery_udp.rb
similarity index 100%
rename from modules/exploits/windows/brightstor/brightstor_disco_udp.rb
rename to modules/exploits/windows/brightstor/discovery_udp.rb
diff --git a/modules/exploits/windows/brightstor/brightstor_sqlagent.rb b/modules/exploits/windows/brightstor/sql_agent.rb
similarity index 100%
rename from modules/exploits/windows/brightstor/brightstor_sqlagent.rb
rename to modules/exploits/windows/brightstor/sql_agent.rb
diff --git a/modules/exploits/windows/brightstor/brightstor_uniagent.rb b/modules/exploits/windows/brightstor/universal_agent.rb
similarity index 100%
rename from modules/exploits/windows/brightstor/brightstor_uniagent.rb
rename to modules/exploits/windows/brightstor/universal_agent.rb