diff --git a/data/exploits/CVE-2023-32315/changelog.html b/data/exploits/openfire_plugin/changelog.html
similarity index 100%
rename from data/exploits/CVE-2023-32315/changelog.html
rename to data/exploits/openfire_plugin/changelog.html
diff --git a/data/exploits/CVE-2023-32315/lib/plugin-metasploit.jar b/data/exploits/openfire_plugin/lib/plugin-metasploit.jar
similarity index 100%
rename from data/exploits/CVE-2023-32315/lib/plugin-metasploit.jar
rename to data/exploits/openfire_plugin/lib/plugin-metasploit.jar
diff --git a/data/exploits/CVE-2023-32315/logo_large.gif b/data/exploits/openfire_plugin/logo_large.gif
similarity index 100%
rename from data/exploits/CVE-2023-32315/logo_large.gif
rename to data/exploits/openfire_plugin/logo_large.gif
diff --git a/data/exploits/CVE-2023-32315/logo_small.gif b/data/exploits/openfire_plugin/logo_small.gif
similarity index 100%
rename from data/exploits/CVE-2023-32315/logo_small.gif
rename to data/exploits/openfire_plugin/logo_small.gif
diff --git a/data/exploits/CVE-2023-32315/plugin.xml b/data/exploits/openfire_plugin/plugin.xml
similarity index 100%
rename from data/exploits/CVE-2023-32315/plugin.xml
rename to data/exploits/openfire_plugin/plugin.xml
diff --git a/data/exploits/CVE-2023-32315/readme.html b/data/exploits/openfire_plugin/readme.html
similarity index 100%
rename from data/exploits/CVE-2023-32315/readme.html
rename to data/exploits/openfire_plugin/readme.html
diff --git a/external/source/exploits/CVE-2008-6508/Example.java b/external/source/exploits/openfire_plugin/Example.java
similarity index 100%
rename from external/source/exploits/CVE-2008-6508/Example.java
rename to external/source/exploits/openfire_plugin/Example.java
diff --git a/modules/exploits/multi/http/openfire_auth_bypass.rb b/modules/exploits/multi/http/openfire_auth_bypass.rb
index 79e1bc0418..25bd69751a 100644
--- a/modules/exploits/multi/http/openfire_auth_bypass.rb
+++ b/modules/exploits/multi/http/openfire_auth_bypass.rb
@@ -141,12 +141,12 @@ class MetasploitModule < Msf::Exploit::Remote
     ]
 
     jar = Rex::Zip::Jar.new
-    jar.add_files(files, File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508"))
+    jar.add_files(files, File.join(Msf::Config.data_directory, "exploits", "openfire_plugin"))
 
     plugin_author = datastore['PLUGINAUTHOR'] || rand_text_alphanumeric(8+rand(8))
     plugin_desc   = datastore['PLUGINDESC']   || rand_text_alphanumeric(8+rand(8))
 
-    plugin_xml = File.open(File.join(Msf::Config.data_directory, "exploits", "CVE-2008-6508", "plugin.xml"), "rb") {|fd| fd.read() }
+    plugin_xml = File.open(File.join(Msf::Config.data_directory, "exploits", "openfire_plugin", "plugin.xml"), "rb") {|fd| fd.read() }
     plugin_xml.gsub!(/PLUGINNAME/, plugin_name)
     plugin_xml.gsub!(/PLUGINDESCRIPTION/, plugin_desc)
     plugin_xml.gsub!(/PLUGINAUTHOR/, plugin_author)
diff --git a/modules/exploits/multi/http/openfire_auth_bypass_rce_cve_2023_32315.rb b/modules/exploits/multi/http/openfire_auth_bypass_rce_cve_2023_32315.rb
index d0e72f336e..1753193e53 100644
--- a/modules/exploits/multi/http/openfire_auth_bypass_rce_cve_2023_32315.rb
+++ b/modules/exploits/multi/http/openfire_auth_bypass_rce_cve_2023_32315.rb
@@ -179,13 +179,13 @@ class MetasploitModule < Msf::Exploit::Remote
     ]
 
     jar = Rex::Zip::Jar.new
-    jar.add_files(files, File.join(Msf::Config.data_directory, 'exploits', 'CVE-2023-32315'))
+    jar.add_files(files, File.join(Msf::Config.data_directory, 'exploits', 'openfire_plugin'))
 
     @plugin_name = datastore['PLUGINNAME'] || Rex::Text.rand_text_alphanumeric(8..15)
     plugin_author = datastore['PLUGINAUTHOR'] || Rex::Text.rand_text_alphanumeric(8..15)
     plugin_desc = datastore['PLUGINDESC'] || Rex::Text.rand_text_alphanumeric(8..15)
 
-    plugin_xml = File.binread(File.join(Msf::Config.data_directory, 'exploits', 'CVE-2023-32315', 'plugin.xml'))
+    plugin_xml = File.binread(File.join(Msf::Config.data_directory, 'exploits', 'openfire_plugin', 'plugin.xml'))
     plugin_xml.gsub!(/PLUGINNAME/, @plugin_name)
     plugin_xml.gsub!(/PLUGINDESCRIPTION/, plugin_desc)
     plugin_xml.gsub!(/PLUGINAUTHOR/, plugin_author)