diff --git a/repository/objects/solaris/patch54_object/0000/oval_org.cisecurity_obj_444.xml b/repository/objects/solaris/patch54_object/0000/oval_org.cisecurity_obj_444.xml
deleted file mode 100644
index 4c27e78d60e4..000000000000
--- a/repository/objects/solaris/patch54_object/0000/oval_org.cisecurity_obj_444.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<patch54_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris" id="oval:org.cisecurity:obj:444" version="1">
-  <behaviors supersedence="true" />
-  <base datatype="int">126547</base>
-  <version datatype="int">10</version>
-</patch54_object>
diff --git a/repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23230.xml b/repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1796.xml
similarity index 80%
rename from repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23230.xml
rename to repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1796.xml
index d6c59ff42b4a..4e49ae3c827e 100644
--- a/repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23230.xml
+++ b/repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1796.xml
@@ -1,3 +1,3 @@
-<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.mitre.oval:ste:23230" version="1">
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.cisecurity:ste:1796" version="1">
   <value operation="pattern match">^ImageMagick 6.[0-9].[1-3]-[0-9] .*$</value>
 </registry_state>
diff --git a/repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23231.xml b/repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1797.xml
similarity index 79%
rename from repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23231.xml
rename to repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1797.xml
index 433468da7bfc..317380249136 100644
--- a/repository/states/windows/registry_state/23000/oval_org.mitre.oval_ste_23231.xml
+++ b/repository/states/windows/registry_state/1000/oval_org.cisecurity_ste_1797.xml
@@ -1,3 +1,3 @@
-<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.mitre.oval:ste:23231" version="1">
+<registry_state xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" comment="State matches if ImageMagick is installed" id="oval:org.cisecurity:ste:1797" version="1">
   <value operation="pattern match">^ImageMagick 7.0.[0-1]-0 .*$</value>
 </registry_state>
diff --git a/repository/tests/solaris/patch54_test/2000/oval_org.cisecurity_tst_2029.xml b/repository/tests/solaris/patch54_test/2000/oval_org.cisecurity_tst_2029.xml
deleted file mode 100644
index 60b2bec82e5f..000000000000
--- a/repository/tests/solaris/patch54_test/2000/oval_org.cisecurity_tst_2029.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<patch54_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris" check="at least one" check_existence="at_least_one_exists" comment="Patch 126547-10 or later installed" id="oval:org.cisecurity:tst:2029" version="2">
-  <object object_ref="oval:org.cisecurity:obj:444" />
-</patch54_test>
diff --git a/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2242.xml b/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2242.xml
index 4aa8f4be85a5..8e2a51ec71d4 100644
--- a/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2242.xml
+++ b/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2242.xml
@@ -1,4 +1,4 @@
 <registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" check="all" check_existence="at_least_one_exists" comment="Check if the version of ImageMagick is equal 7.0.0-0 or 7.0.1-0" id="oval:org.cisecurity:tst:2242" version="1">
   <object object_ref="oval:org.cisecurity:obj:486" />
-  <state state_ref="oval:org.mitre.oval:ste:23231" />
+  <state state_ref="oval:org.cisecurity:ste:1797" />
 </registry_test>
diff --git a/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2243.xml b/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2243.xml
index 182076e79717..da9eb565c5ff 100644
--- a/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2243.xml
+++ b/repository/tests/windows/registry_test/2000/oval_org.cisecurity_tst_2243.xml
@@ -1,4 +1,4 @@
 <registry_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" check="all" check_existence="at_least_one_exists" comment="Check if the ImageMagick is equal to 6.9.3-9 or previous versions" id="oval:org.cisecurity:tst:2243" version="1">
   <object object_ref="oval:org.cisecurity:obj:486" />
-  <state state_ref="oval:org.mitre.oval:ste:23230" />
+  <state state_ref="oval:org.cisecurity:ste:1796" />
 </registry_test>