diff --git a/java/ql/src/Security/CWE/CWE-016/SpringBootActuators.java b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.java
similarity index 100%
rename from java/ql/src/Security/CWE/CWE-016/SpringBootActuators.java
rename to java/ql/src/Security/CWE/CWE-200/SpringBootActuators.java
diff --git a/java/ql/src/Security/CWE/CWE-016/SpringBootActuators.qhelp b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.qhelp
similarity index 100%
rename from java/ql/src/Security/CWE/CWE-016/SpringBootActuators.qhelp
rename to java/ql/src/Security/CWE/CWE-200/SpringBootActuators.qhelp
diff --git a/java/ql/src/Security/CWE/CWE-016/SpringBootActuators.ql b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
similarity index 91%
rename from java/ql/src/Security/CWE/CWE-016/SpringBootActuators.ql
rename to java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
index bac0a72e144..97d9b506f78 100644
--- a/java/ql/src/Security/CWE/CWE-016/SpringBootActuators.ql
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
@@ -4,11 +4,11 @@
  *              or even to remote code execution.
  * @kind problem
  * @problem.severity error
+ * @security-severity 6.5
  * @precision high
  * @id java/spring-boot-exposed-actuators
  * @tags security
- *       experimental
- *       external/cwe/cwe-16
+ *       external/cwe/cwe-200
  */
 
 import java
diff --git a/java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.expected
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.expected
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.expected
diff --git a/java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.java b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.java
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.java
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.java
diff --git a/java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.ql b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.ql
similarity index 100%
rename from java/ql/test/query-tests/security/CWE-016/SpringBootActuatorsTest.ql
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/SpringBootActuatorsTest.ql
diff --git a/java/ql/test/query-tests/security/CWE-016/options b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
similarity index 62%
rename from java/ql/test/query-tests/security/CWE-016/options
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
index 38d1d754b69..161a6ddf23d 100644
--- a/java/ql/test/query-tests/security/CWE-016/options
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuators/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/springframework-5.3.8
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.3.8