diff --git a/src/file_d2s.c b/src/file_d2s.c
index 2d2f8749..78320075 100644
--- a/src/file_d2s.c
+++ b/src/file_d2s.c
@@ -31,7 +31,7 @@
 #include "common.h"
 #include "filegen.h"
 
-/*@ requires \valid(file_stat); */
+/*@ requires valid_register_header_check(file_stat); */
 static void register_header_check_d2s(file_stat_t *file_stat);
 
 const file_hint_t file_hint_d2s= {
@@ -52,7 +52,9 @@ struct d2s_header {
 } __attribute__ ((gcc_struct, __packed__));
 
 /*@
-  @ requires valid_file_recovery(file_recovery);
+  @ requires file_recovery->file_rename==&file_rename_d2s;
+  @ requires valid_file_rename_param(file_recovery);
+  @ ensures  valid_file_rename_result(file_recovery);
   @*/
 static void file_rename_d2s(file_recovery_t *file_recovery)
 {
@@ -68,14 +70,10 @@ static void file_rename_d2s(file_recovery_t *file_recovery)
 
 /*@
   @ requires buffer_size >= sizeof(struct d2s_header);
-  @ requires \valid_read(buffer+(0..buffer_size-1));
-  @ requires valid_file_recovery(file_recovery);
-  @ requires \valid(file_recovery_new);
-  @ requires file_recovery_new->blocksize > 0;
   @ requires separation: \separated(&file_hint_d2s, buffer+(..), file_recovery, file_recovery_new);
+  @ requires valid_header_check_param(buffer, buffer_size, safe_header_only, file_recovery, file_recovery_new);
+  @ ensures  valid_header_check_result(\result, file_recovery_new);
   @ assigns  *file_recovery_new;
-  @ ensures \result == 0 || \result == 1;
-  @ ensures  \result!=0 ==> valid_file_recovery(file_recovery_new);
   @*/
 static int header_check_d2s(const unsigned char *buffer, const unsigned int buffer_size, const unsigned int safe_header_only, const file_recovery_t *file_recovery, file_recovery_t *file_recovery_new)
 {