diff --git a/app/controllers/concerns/foreman_concrete/api/base_controller_extensions.rb b/app/controllers/concerns/foreman_cement/api/base_controller_extensions.rb
similarity index 100%
rename from app/controllers/concerns/foreman_concrete/api/base_controller_extensions.rb
rename to app/controllers/concerns/foreman_cement/api/base_controller_extensions.rb
diff --git a/app/controllers/concerns/foreman_concrete/application_controller_extensions.rb b/app/controllers/concerns/foreman_cement/application_controller_extensions.rb
similarity index 87%
rename from app/controllers/concerns/foreman_concrete/application_controller_extensions.rb
rename to app/controllers/concerns/foreman_cement/application_controller_extensions.rb
index 03f935f16c82243ba055886eda51caef683db042..3fd4ba16137ef29466a1087dd0e32d2e0889d8a2 100644
--- a/app/controllers/concerns/foreman_concrete/application_controller_extensions.rb
+++ b/app/controllers/concerns/foreman_cement/application_controller_extensions.rb
@@ -10,7 +10,7 @@ module ForemanCement
           if User.current&.admin? && exception.try(:cause).is_a?(ActiveRecord::SubclassNotFound)
 
         ex_message = exception.message
-        Foreman::Logging.exception("[Reported to Sentry as #{Sentry.last_event_id}] #{ex_message}", exception)
+        Foreman::Logging.exception("[Reported to Sentry] #{ex_message}", exception)
 
         render template: 'foreman_cement/500',
                layout: !request.xhr?,
diff --git a/app/controllers/concerns/foreman_concrete/set_sentry_context.rb b/app/controllers/concerns/foreman_cement/set_sentry_context.rb
similarity index 100%
rename from app/controllers/concerns/foreman_concrete/set_sentry_context.rb
rename to app/controllers/concerns/foreman_cement/set_sentry_context.rb
diff --git a/app/lib/foreman_concrete/extensions/foreman/exception.rb b/app/lib/foreman_cement/extensions/foreman/exception.rb
similarity index 100%
rename from app/lib/foreman_concrete/extensions/foreman/exception.rb
rename to app/lib/foreman_cement/extensions/foreman/exception.rb
diff --git a/app/lib/foreman_concrete/extensions/foreman/logging.rb b/app/lib/foreman_cement/extensions/foreman/logging.rb
similarity index 90%
rename from app/lib/foreman_concrete/extensions/foreman/logging.rb
rename to app/lib/foreman_cement/extensions/foreman/logging.rb
index 7a4606df8d5e03f9fc832b8e31e6dfe2104983a0..9a214346ab033cafe4b288fc835614483ee1d165 100644
--- a/app/lib/foreman_concrete/extensions/foreman/logging.rb
+++ b/app/lib/foreman_cement/extensions/foreman/logging.rb
@@ -7,7 +7,7 @@ module ForemanCement
         extend ActiveSupport::Concern
 
         module Overrides
-          def exception(context_message, exception, **options)
+          def exception(context_message, exception, options = {})
             super
 
             sentry_context = {
diff --git a/lib/foreman_cement/configure_sentry.rb b/lib/foreman_cement/configure_sentry.rb
index 88f9ad4aec832b78644c466e6cffea7ffc4481ab..f0b9d8228e75ce61a6e95b33f9a87e06980fe284 100644
--- a/lib/foreman_cement/configure_sentry.rb
+++ b/lib/foreman_cement/configure_sentry.rb
@@ -18,8 +18,9 @@ Sentry.init do |config|
                                 end
   end
 
-  filter = ActiveSupport::ParameterFilter.new(Rails.application.config.filter_parameters)
-  config.before_send = lambda do |event, _hint|
-    filter.filter(event.to_hash)
-  end
+  ## FIXME: Filters out required Sentry data if enabled
+  # filter = ActiveSupport::ParameterFilter.new(Rails.application.config.filter_parameters)
+  # config.before_send = lambda do |event, _hint|
+  #   filter.filter(event.to_hash)
+  # end
 end