diff --git a/modules/bcf/lib/open_project/bcf.rb b/modules/bcf/lib/open_project/bcf.rb
index 8e6d8e01b5..b99fc41895 100644
--- a/modules/bcf/lib/open_project/bcf.rb
+++ b/modules/bcf/lib/open_project/bcf.rb
@@ -2,6 +2,5 @@ module OpenProject
   module Bcf
     require "open_project/bcf/engine"
     require "open_project/bcf/bcf_xml"
-    require "open_project/bcf/bcf_issue_associated_filter"
   end
 end
diff --git a/modules/bcf/lib/open_project/bcf/bcf_issue_associated_filter.rb b/modules/bcf/lib/open_project/bcf/bcf_issue_associated_filter.rb
index 0a7f5cfcaf..8d00a6df4e 100644
--- a/modules/bcf/lib/open_project/bcf/bcf_issue_associated_filter.rb
+++ b/modules/bcf/lib/open_project/bcf/bcf_issue_associated_filter.rb
@@ -29,7 +29,7 @@
 #++
 
 module ::OpenProject::Bcf
-  class ::BcfIssueAssociatedFilter < ::Queries::WorkPackages::Filter::WorkPackageFilter
+  class BcfIssueAssociatedFilter < ::Queries::WorkPackages::Filter::WorkPackageFilter
     attr_reader :join_table_suffix
 
     def type
@@ -45,9 +45,9 @@ module ::OpenProject::Bcf
 
     def where
       if associated?
-        Queries::Operators::All.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
+        ::Queries::Operators::All.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
       elsif not_associated?
-        Queries::Operators::None.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
+        ::Queries::Operators::None.sql_for_field(values, ::Bcf::Issue.table_name, 'id')
       else
         raise 'Unsupported operator or value'
       end
diff --git a/modules/bcf/lib/open_project/bcf/engine.rb b/modules/bcf/lib/open_project/bcf/engine.rb
index 1574d0ddf5..b286944849 100644
--- a/modules/bcf/lib/open_project/bcf/engine.rb
+++ b/modules/bcf/lib/open_project/bcf/engine.rb
@@ -110,10 +110,10 @@ module OpenProject::Bcf
     end
 
     config.to_prepare do
-      WorkPackage::Exporter
+      ::WorkPackage::Exporter
         .register_for_list(:bcf, OpenProject::Bcf::BcfXml::Exporter)
 
-      Queries::Register.filter Query, OpenProject::Bcf::BcfIssueAssociatedFilter
+      ::Queries::Register.filter ::Query, OpenProject::Bcf::BcfIssueAssociatedFilter
     end
   end
 end