diff --git a/app/helpers/cmdb_helper.rb b/app/helpers/cmdb_helper.rb
index ef4614ef8a01bdf9a6baa4e6dccf8a09773802c8..2edcaeb552ca7d6238c553c1d9338ba43c988f40 100644
--- a/app/helpers/cmdb_helper.rb
+++ b/app/helpers/cmdb_helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Helpers for rendering overridable CMDB data
-module CmdbHelper
+module CMDBHelper
   def cmdb_text_f(f, facet, ephemeral_attr, **options)
     unless options.key? :disabled
       options[:disabled] = !facet.ephemeral_attributes.dig(*ephemeral_attr.split(".").map(&:to_sym))&.present?
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 25acb99bf698d47bc0bf014167f367440db37897..57376381661453b1ac0d109a764f8d64a69caa2f 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-Rails.autoloaders.each do |autoloader|
-  autoloader.inflector.inflect(
-    "cmdb_status" => "CMDBStatus",
-    "foreman_liudesk_cmdb" => "ForemanLiudeskCMDB",
-    "liudesk_cmdb" => "LiudeskCMDB",
-    "liudesk_cmdb_facet" => "LiudeskCMDBFacet",
-    "liudesk_cmdb_hostgroup_facet" => "LiudeskCMDBHostgroupFacet"
-  )
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.acronym 'CMDB'
 end