diff --git a/rails_event_store/spec/client_spec.rb b/rails_event_store/spec/client_spec.rb
index 4e969cdcc6..127280fa83 100644
--- a/rails_event_store/spec/client_spec.rb
+++ b/rails_event_store/spec/client_spec.rb
@@ -49,7 +49,7 @@ module RailsEventStore
     specify "wraps mapper into instrumentation" do
       client = Client.new(repository: RubyEventStore::InMemoryRepository.new, mapper: RubyEventStore::Mappers::Default.new)
       received_notifications = 0
-      ActiveSupport::Notifications.subscribe("serialize.mapper.ruby_event_store") { received_notifications += 1 }
+      ActiveSupport::Notifications.subscribe("event_to_record.mapper.ruby_event_store") { received_notifications += 1 }
 
       client.publish(TestEvent.new)
 
diff --git a/ruby_event_store/lib/ruby_event_store/mappers/instrumented_mapper.rb b/ruby_event_store/lib/ruby_event_store/mappers/instrumented_mapper.rb
index 21ce7e9650..3e5f42dc8f 100644
--- a/ruby_event_store/lib/ruby_event_store/mappers/instrumented_mapper.rb
+++ b/ruby_event_store/lib/ruby_event_store/mappers/instrumented_mapper.rb
@@ -9,13 +9,13 @@ def initialize(mapper, instrumentation)
       end
 
       def event_to_record(event)
-        instrumentation.instrument("serialize.mapper.ruby_event_store", domain_event: event) do
+        instrumentation.instrument("event_to_record.mapper.ruby_event_store", event: event) do
           mapper.event_to_record(event)
         end
       end
 
       def record_to_event(record)
-        instrumentation.instrument("deserialize.mapper.ruby_event_store", record: record) do
+        instrumentation.instrument("record_to_event.mapper.ruby_event_store", record: record) do
           mapper.record_to_event(record)
         end
       end
diff --git a/ruby_event_store/spec/mappers/instrumented_mapper_spec.rb b/ruby_event_store/spec/mappers/instrumented_mapper_spec.rb
index de0e21a096..6f91908d67 100644
--- a/ruby_event_store/spec/mappers/instrumented_mapper_spec.rb
+++ b/ruby_event_store/spec/mappers/instrumented_mapper_spec.rb
@@ -20,9 +20,9 @@ module Mappers
 
         specify "instruments" do
           instrumented_mapper = InstrumentedMapper.new(spy, ActiveSupport::Notifications)
-          subscribe_to("serialize.mapper.ruby_event_store") do |notification_calls|
+          subscribe_to("event_to_record.mapper.ruby_event_store") do |notification_calls|
             instrumented_mapper.event_to_record(event)
-            expect(notification_calls).to eq([{ domain_event: event }])
+            expect(notification_calls).to eq([{ event: event }])
           end
         end
       end
@@ -38,7 +38,7 @@ module Mappers
 
         specify "instruments" do
           instrumented_mapper = InstrumentedMapper.new(spy, ActiveSupport::Notifications)
-          subscribe_to("deserialize.mapper.ruby_event_store") do |notification_calls|
+          subscribe_to("record_to_event.mapper.ruby_event_store") do |notification_calls|
             instrumented_mapper.record_to_event(record)
             expect(notification_calls).to eq([{ record: record }])
           end