diff --git a/lib/diaspora_federation/entities/relayable_retraction.rb b/lib/diaspora_federation/entities/relayable_retraction.rb
index cfc4ad8..388ef04 100644
--- a/lib/diaspora_federation/entities/relayable_retraction.rb
+++ b/lib/diaspora_federation/entities/relayable_retraction.rb
@@ -34,11 +34,11 @@ module DiasporaFederation
       #   @return [String] target type
       property :target_type
 
-      # @!attribute [r] sender_id
+      # @!attribute [r] diaspora_id
       #   The diaspora ID of the person who deletes a post
       #   @see Person#diaspora_id
       #   @return [String] diaspora ID
-      property :sender_id, xml_name: :sender_handle
+      property :diaspora_id, xml_name: :sender_handle
 
       # @!attribute [r] target_author_signature
       #   Contains a signature of the entity using the private key of the
diff --git a/lib/diaspora_federation/entities/retraction.rb b/lib/diaspora_federation/entities/retraction.rb
index aa8be5d..96ff477 100644
--- a/lib/diaspora_federation/entities/retraction.rb
+++ b/lib/diaspora_federation/entities/retraction.rb
@@ -5,11 +5,11 @@ module DiasporaFederation
     #
     # @see Validators::RetractionValidator
     class Retraction < Entity
-      # @!attribute [r] post_guid
-      #   guid of a post to be deleted
+      # @!attribute [r] target_guid
+      #   guid of the entity to be deleted
       #   @see HCard#guid
-      #   @return [String] post guid
-      property :post_guid
+      #   @return [String] target guid
+      property :target_guid, xml_name: :post_guid
 
       # @!attribute [r] diaspora_id
       #   The diaspora ID of the person who deletes a post
@@ -17,9 +17,9 @@ module DiasporaFederation
       #   @return [String] diaspora ID
       property :diaspora_id, xml_name: :diaspora_handle
 
-      # @!attribute [r] type
-      #   @return [String] type
-      property :type
+      # @!attribute [r] target_type
+      #   @return [String] target type
+      property :target_type, xml_name: :type
     end
   end
 end
diff --git a/lib/diaspora_federation/entities/signed_retraction.rb b/lib/diaspora_federation/entities/signed_retraction.rb
index fcee64b..e42f6a2 100644
--- a/lib/diaspora_federation/entities/signed_retraction.rb
+++ b/lib/diaspora_federation/entities/signed_retraction.rb
@@ -15,11 +15,11 @@ module DiasporaFederation
       #   @return [String] target type
       property :target_type
 
-      # @!attribute [r] sender_id
+      # @!attribute [r] diaspora_id
       #   The diaspora ID of the person who deletes a post
       #   @see Person#diaspora_id
       #   @return [String] diaspora ID
-      property :sender_id, xml_name: :sender_handle
+      property :diaspora_id, xml_name: :sender_handle
 
       # @!attribute [r] author_signature
       #   Contains a signature of the entity using the private key of the author of a post
diff --git a/lib/diaspora_federation/test/factories.rb b/lib/diaspora_federation/test/factories.rb
index 3f42efc..9b3b89a 100644
--- a/lib/diaspora_federation/test/factories.rb
+++ b/lib/diaspora_federation/test/factories.rb
@@ -143,7 +143,7 @@ FactoryGirl.define do
     parent_author_signature { generate(:signature) }
     target_guid { generate(:guid) }
     target_type "Post"
-    sender_id { generate(:diaspora_id) }
+    diaspora_id
     target_author_signature { generate(:signature) }
   end
 
@@ -158,15 +158,15 @@ FactoryGirl.define do
   end
 
   factory :retraction_entity, class: DiasporaFederation::Entities::Retraction do
-    post_guid { generate(:guid) }
+    target_guid { generate(:guid) }
     diaspora_id
-    type "Post"
+    target_type "Post"
   end
 
   factory :signed_retraction_entity, class: DiasporaFederation::Entities::SignedRetraction do
     target_guid { generate(:guid) }
     target_type "Post"
-    sender_id { generate(:diaspora_id) }
+    diaspora_id
     target_author_signature { generate(:signature) }
   end
 
diff --git a/lib/diaspora_federation/validators/relayable_retraction_validator.rb b/lib/diaspora_federation/validators/relayable_retraction_validator.rb
index 57946d6..5552e1f 100644
--- a/lib/diaspora_federation/validators/relayable_retraction_validator.rb
+++ b/lib/diaspora_federation/validators/relayable_retraction_validator.rb
@@ -10,7 +10,7 @@ module DiasporaFederation
 
       rule :target_type, :not_empty
 
-      rule :sender_id, %i(not_empty diaspora_id)
+      rule :diaspora_id, %i(not_empty diaspora_id)
 
       rule :target_author_signature, :not_empty
     end
diff --git a/lib/diaspora_federation/validators/retraction_validator.rb b/lib/diaspora_federation/validators/retraction_validator.rb
index 0b47807..08d7d51 100644
--- a/lib/diaspora_federation/validators/retraction_validator.rb
+++ b/lib/diaspora_federation/validators/retraction_validator.rb
@@ -4,11 +4,11 @@ module DiasporaFederation
     class RetractionValidator < Validation::Validator
       include Validation
 
-      rule :post_guid, :guid
+      rule :target_guid, :guid
 
       rule :diaspora_id, %i(not_empty diaspora_id)
 
-      rule :type, :not_empty
+      rule :target_type, :not_empty
     end
   end
 end
diff --git a/lib/diaspora_federation/validators/signed_retraction_validator.rb b/lib/diaspora_federation/validators/signed_retraction_validator.rb
index 88b388f..54f3fdc 100644
--- a/lib/diaspora_federation/validators/signed_retraction_validator.rb
+++ b/lib/diaspora_federation/validators/signed_retraction_validator.rb
@@ -8,7 +8,7 @@ module DiasporaFederation
 
       rule :target_type, :not_empty
 
-      rule :sender_id, %i(not_empty diaspora_id)
+      rule :diaspora_id, %i(not_empty diaspora_id)
 
       rule :target_author_signature, :not_empty
     end
diff --git a/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb b/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
index afb4cf1..d7a0b94 100644
--- a/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
@@ -8,7 +8,7 @@ module DiasporaFederation
   <parent_author_signature>#{data[:parent_author_signature]}</parent_author_signature>
   <target_guid>#{data[:target_guid]}</target_guid>
   <target_type>#{data[:target_type]}</target_type>
-  <sender_handle>#{data[:sender_id]}</sender_handle>
+  <sender_handle>#{data[:diaspora_id]}</sender_handle>
   <target_author_signature>#{data[:target_author_signature]}</target_author_signature>
 </relayable_retraction>
 XML
diff --git a/spec/lib/diaspora_federation/entities/retraction_spec.rb b/spec/lib/diaspora_federation/entities/retraction_spec.rb
index fb67be3..e7b0617 100644
--- a/spec/lib/diaspora_federation/entities/retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/retraction_spec.rb
@@ -5,9 +5,9 @@ module DiasporaFederation
     let(:xml) {
       <<-XML
 <retraction>
-  <post_guid>#{data[:post_guid]}</post_guid>
+  <post_guid>#{data[:target_guid]}</post_guid>
   <diaspora_handle>#{data[:diaspora_id]}</diaspora_handle>
-  <type>#{data[:type]}</type>
+  <type>#{data[:target_type]}</type>
 </retraction>
 XML
     }
diff --git a/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb b/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
index 494592e..79a1d3f 100644
--- a/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
@@ -7,7 +7,7 @@ module DiasporaFederation
 <signed_retraction>
   <target_guid>#{data[:target_guid]}</target_guid>
   <target_type>#{data[:target_type]}</target_type>
-  <sender_handle>#{data[:sender_id]}</sender_handle>
+  <sender_handle>#{data[:diaspora_id]}</sender_handle>
   <target_author_signature>#{data[:target_author_signature]}</target_author_signature>
 </signed_retraction>
 XML
diff --git a/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
index 2e1e88e..a21d9dd 100644
--- a/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
@@ -4,7 +4,7 @@ module DiasporaFederation
     it_behaves_like "a common validator"
 
     it_behaves_like "a diaspora id validator" do
-      let(:property) { :sender_id }
+      let(:property) { :diaspora_id }
       let(:mandatory) { true }
     end
 
diff --git a/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
index ac14653..53a0729 100644
--- a/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
@@ -4,7 +4,7 @@ module DiasporaFederation
     it_behaves_like "a common validator"
 
     it_behaves_like "a guid validator" do
-      let(:property) { :post_guid }
+      let(:property) { :target_guid }
     end
 
     it_behaves_like "a diaspora id validator" do
@@ -14,7 +14,7 @@ module DiasporaFederation
 
     describe "#type" do
       it_behaves_like "a property that mustn't be empty" do
-        let(:property) { :type }
+        let(:property) { :target_type }
       end
     end
   end
diff --git a/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
index 6c59445..9cebde0 100644
--- a/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
@@ -4,7 +4,7 @@ module DiasporaFederation
     it_behaves_like "a common validator"
 
     it_behaves_like "a diaspora id validator" do
-      let(:property) { :sender_id }
+      let(:property) { :diaspora_id }
       let(:mandatory) { true }
     end