diff --git a/README.md b/README.md
index 73b5f5b..5fde76e 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ DiasporaFederation.configure do |config|
   config.server_uri = AppConfig.pod_uri
 
   config.define_callbacks do
-    on :person_webfinger_fetch do |diaspora_id|
+    on :fetch_person_for_webfinger do |diaspora_id|
       person = Person.find_local_by_diaspora_id(diaspora_id)
       if person
         DiasporaFederation::Discovery::WebFinger.new(
@@ -52,7 +52,7 @@ DiasporaFederation.configure do |config|
       end
     end
 
-    on :person_hcard_fetch do |guid|
+    on :fetch_person_for_hcard do |guid|
       # ...
     end
   end
diff --git a/app/controllers/diaspora_federation/h_card_controller.rb b/app/controllers/diaspora_federation/h_card_controller.rb
index e0804c8..7f39a71 100644
--- a/app/controllers/diaspora_federation/h_card_controller.rb
+++ b/app/controllers/diaspora_federation/h_card_controller.rb
@@ -7,7 +7,7 @@ module DiasporaFederation
     #
     # GET /hcard/users/:guid
     def hcard
-      person_hcard = DiasporaFederation.callbacks.trigger(:person_hcard_fetch, params[:guid])
+      person_hcard = DiasporaFederation.callbacks.trigger(:fetch_person_for_hcard, params[:guid])
 
       if person_hcard.nil?
         render nothing: true, status: 404
diff --git a/app/controllers/diaspora_federation/webfinger_controller.rb b/app/controllers/diaspora_federation/webfinger_controller.rb
index ac9fd5a..0c5a8b1 100644
--- a/app/controllers/diaspora_federation/webfinger_controller.rb
+++ b/app/controllers/diaspora_federation/webfinger_controller.rb
@@ -54,7 +54,7 @@ module DiasporaFederation
     end
 
     def find_person_webfinger(query)
-      DiasporaFederation.callbacks.trigger(:person_webfinger_fetch, query.strip.downcase.sub("acct:", ""))
+      DiasporaFederation.callbacks.trigger(:fetch_person_for_webfinger, query.strip.downcase.sub("acct:", ""))
     end
   end
 end
diff --git a/lib/diaspora_federation.rb b/lib/diaspora_federation.rb
index ebbb1ef..0ded47c 100644
--- a/lib/diaspora_federation.rb
+++ b/lib/diaspora_federation.rb
@@ -16,8 +16,8 @@ module DiasporaFederation
   extend Logging
 
   @callbacks = Callbacks.new %i(
-    person_webfinger_fetch
-    person_hcard_fetch
+    fetch_person_for_webfinger
+    fetch_person_for_hcard
   )
 
   class << self
diff --git a/spec/controllers/diaspora_federation/h_card_controller_spec.rb b/spec/controllers/diaspora_federation/h_card_controller_spec.rb
index 0be9afb..e109d8c 100644
--- a/spec/controllers/diaspora_federation/h_card_controller_spec.rb
+++ b/spec/controllers/diaspora_federation/h_card_controller_spec.rb
@@ -24,9 +24,9 @@ module DiasporaFederation
         expect(response).to be_not_found
       end
 
-      it "calls the person_hcard_fetch callback" do
+      it "calls the fetch_person_for_hcard callback" do
         expect(DiasporaFederation.callbacks).to receive(:trigger)
-                                                  .with(:person_hcard_fetch, alice.guid)
+                                                  .with(:fetch_person_for_hcard, alice.guid)
                                                   .and_call_original
         get :hcard, "guid" => alice.guid
       end
diff --git a/spec/controllers/diaspora_federation/webfinger_controller_spec.rb b/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
index 98d5949..72888a0 100644
--- a/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
+++ b/spec/controllers/diaspora_federation/webfinger_controller_spec.rb
@@ -58,9 +58,9 @@ module DiasporaFederation
         expect(response).to be_not_found
       end
 
-      it "calls the person_webfinger_fetch callback" do
+      it "calls the fetch_person_for_webfinger callback" do
         expect(DiasporaFederation.callbacks).to receive(:trigger)
-                                                  .with(:person_webfinger_fetch, "alice@localhost:3000")
+                                                  .with(:fetch_person_for_webfinger, "alice@localhost:3000")
                                                   .and_call_original
         get :legacy_webfinger, "q" => "acct:alice@localhost:3000"
       end
diff --git a/test/dummy/config/initializers/diaspora_federation.rb b/test/dummy/config/initializers/diaspora_federation.rb
index d7883f1..8a42580 100644
--- a/test/dummy/config/initializers/diaspora_federation.rb
+++ b/test/dummy/config/initializers/diaspora_federation.rb
@@ -16,7 +16,7 @@ DiasporaFederation.configure do |config|
   config.certificate_authorities = ca_file
 
   config.define_callbacks do
-    on :person_webfinger_fetch do |diaspora_id|
+    on :fetch_person_for_webfinger do |diaspora_id|
       person = Person.find_by(diaspora_id: diaspora_id)
       if person
         DiasporaFederation::Discovery::WebFinger.new(
@@ -33,7 +33,7 @@ DiasporaFederation.configure do |config|
       end
     end
 
-    on :person_hcard_fetch do |guid|
+    on :fetch_person_for_hcard do |guid|
       person = Person.find_by(guid: guid)
       if person
         DiasporaFederation::Discovery::HCard.new(