diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
new file mode 100644
index 000000000..ca4024a42
--- /dev/null
+++ b/config/initializers/inflections.rb
@@ -0,0 +1,5 @@
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'node_api' => 'NodeAPI'
+  )
+end
diff --git a/lib/foreman_discovery/engine.rb b/lib/foreman_discovery/engine.rb
index 53fc0efce..bc6d9d358 100644
--- a/lib/foreman_discovery/engine.rb
+++ b/lib/foreman_discovery/engine.rb
@@ -9,11 +9,9 @@ class Engine < ::Rails::Engine
     engine_name 'foreman_discovery'
 
     # support pre-4 Rails versions
-    config.autoload_paths += Dir["#{config.root}/app/controllers/foreman_discovery/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/controllers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/helpers/concerns"]
     config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
-    config.autoload_paths += Dir["#{config.root}/app/services"]
 
     initializer "foreman_discovery.add_rabl_view_path" do |app|
       Rabl.configure do |config|