diff --git a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
index 66e058bf..25f09a3b 100644
--- a/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
+++ b/accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/helper/QueryHelper.java
@@ -46,7 +46,7 @@ public class QueryHelper {
     private static final String ROOT_REP_POLICY_NODE = "/rep:policy";
     private static final String ROOT_REPO_POLICY_NODE = "/" + Constants.REPO_POLICY_NODE;
     private static final String HOME_REP_POLICY = "/home/rep:policy";
-    private static final String OAK_INDEX_PATH_REP_ACL = "/oak:index/repACL-custom-1";
+    private static final String OAK_INDEX_PATH_REP_ACL = "/oak:index/actool.repACL-custom-1";
 
     /** Method that returns a set containing all rep:policy nodes from repository excluding those contained in paths which are excluded from
      * search
diff --git a/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml b/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
index 71472b5d..f4e5d8d9 100644
--- a/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
+++ b/accesscontroltool-oakindex-package/src/main/META-INF/vault/filter.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <workspaceFilter version="1.0">
     <filter root="/oak:index/repACL" type="cleanup"/><!-- legacy index node name, used prior version 2.7.2  -->
-    <filter root="/oak:index/repACL-custom-1"/>
+    <filter root="/oak:index/repACL-custom-1" type="cleanup"/><!-- legacy index node name, used prior version 3.0.11 -->
+    <filter root="/oak:index/actool.repACL-custom-1" />
 </workspaceFilter>
diff --git a/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL-custom-1.xml b/accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-custom-1.xml
similarity index 100%
rename from accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/repACL-custom-1.xml
rename to accesscontroltool-oakindex-package/src/main/jcr_root/_oak_index/actool.repACL-custom-1.xml