diff --git a/lib/diaspora/federation/receive.rb b/lib/diaspora/federation/receive.rb
index a61566402..697ad4536 100644
--- a/lib/diaspora/federation/receive.rb
+++ b/lib/diaspora/federation/receive.rb
@@ -263,7 +263,7 @@ module Diaspora
       private_class_method def self.build_signature(klass, entity)
         klass.reflect_on_association(:signature).klass.new(
           author_signature: entity.author_signature,
-          additional_data:  entity.additional_xml_elements,
+          additional_data:  entity.additional_data,
           signature_order:  SignatureOrder.find_or_create_by!(order: entity.xml_order.join(" "))
         )
       end
diff --git a/spec/helper_methods.rb b/spec/helper_methods.rb
index c23ee2440..3eb9ff3a3 100644
--- a/spec/helper_methods.rb
+++ b/spec/helper_methods.rb
@@ -51,11 +51,11 @@ module HelperMethods
     }.join(" ")
   end
 
-  def build_relayable_federation_entity(type, data={}, additional_xml_elements={})
+  def build_relayable_federation_entity(type, data={}, additional_data={})
     attributes = Fabricate.attributes_for("#{type}_entity".to_sym, data)
     entity_class = "DiasporaFederation::Entities::#{type.capitalize}".constantize
     signable_fields = attributes.keys - [:author_signature]
 
-    entity_class.new(attributes, [*signable_fields, *additional_xml_elements.keys], additional_xml_elements)
+    entity_class.new(attributes, [*signable_fields, *additional_data.keys], additional_data)
   end
 end
diff --git a/spec/lib/diaspora/federation/entities_spec.rb b/spec/lib/diaspora/federation/entities_spec.rb
index 671cbd562..bce5d7f21 100644
--- a/spec/lib/diaspora/federation/entities_spec.rb
+++ b/spec/lib/diaspora/federation/entities_spec.rb
@@ -19,7 +19,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.text).to eq(diaspora_entity.text)
       expect(federation_entity.author_signature).to be_nil
       expect(federation_entity.xml_order).to be_nil
-      expect(federation_entity.additional_xml_elements).to be_empty
+      expect(federation_entity.additional_data).to be_empty
     end
 
     it "builds a comment with signature" do
@@ -33,7 +33,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.text).to eq(diaspora_entity.text)
       expect(federation_entity.author_signature).to eq(diaspora_entity.signature.author_signature)
       expect(federation_entity.xml_order).to eq(diaspora_entity.signature.signature_order.order.split)
-      expect(federation_entity.additional_xml_elements).to eq(diaspora_entity.signature.additional_data)
+      expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
     end
 
     it "builds a contact (request)" do
@@ -86,7 +86,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.positive).to eq(diaspora_entity.positive)
       expect(federation_entity.author_signature).to be_nil
       expect(federation_entity.xml_order).to be_nil
-      expect(federation_entity.additional_xml_elements).to be_empty
+      expect(federation_entity.additional_data).to be_empty
     end
 
     it "builds a like with signature" do
@@ -100,7 +100,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.positive).to eq(diaspora_entity.positive)
       expect(federation_entity.author_signature).to eq(diaspora_entity.signature.author_signature)
       expect(federation_entity.xml_order).to eq(diaspora_entity.signature.signature_order.order.split)
-      expect(federation_entity.additional_xml_elements).to eq(diaspora_entity.signature.additional_data)
+      expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)
     end
 
     it "builds a message" do
@@ -154,7 +154,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.poll_answer_guid).to eq(diaspora_entity.poll_answer.guid)
       expect(federation_entity.author_signature).to be_nil
       expect(federation_entity.xml_order).to be_nil
-      expect(federation_entity.additional_xml_elements).to be_empty
+      expect(federation_entity.additional_data).to be_empty
     end
 
     it "builds a poll participation with signature" do
@@ -169,7 +169,7 @@ describe Diaspora::Federation::Entities do
       expect(federation_entity.poll_answer_guid).to eq(diaspora_entity.poll_answer.guid)
       expect(federation_entity.author_signature).to eq(signature.author_signature)
       expect(federation_entity.xml_order).to eq(signature.signature_order.order.split)
-      expect(federation_entity.additional_xml_elements).to eq(signature.additional_data)
+      expect(federation_entity.additional_data).to eq(signature.additional_data)
     end
 
     it "builds a profile" do