diff --git a/include/proto/map.h b/include/proto/map.h
index 9690abb..21ff57c 100644
--- a/include/proto/map.h
+++ b/include/proto/map.h
@@ -25,10 +25,10 @@
 #include <types/map.h>
 
 /* maps output sample parser */
-int map_parse_ip(const char *text, struct sample_storage *smp);
-int map_parse_ip6(const char *text, struct sample_storage *smp);
-int map_parse_str(const char *text, struct sample_storage *smp);
-int map_parse_int(const char *text, struct sample_storage *smp);
+int map_parse_ip(const char *text, struct sample_data *smp);
+int map_parse_ip6(const char *text, struct sample_data *smp);
+int map_parse_str(const char *text, struct sample_data *smp);
+int map_parse_int(const char *text, struct sample_data *smp);
 
 struct map_reference *map_get_reference(const char *reference);
 
diff --git a/include/proto/pattern.h b/include/proto/pattern.h
index 7855474..0a132f2 100644
--- a/include/proto/pattern.h
+++ b/include/proto/pattern.h
@@ -208,7 +208,7 @@
 struct pattern_expr *pattern_lookup_expr(struct pattern_head *head, struct pat_ref *ref);
 struct pattern_expr *pattern_new_expr(struct pattern_head *head, struct pat_ref *ref,
                                       char **err, int *reuse);
-struct sample_storage **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
+struct sample_data **pattern_find_smp(struct pattern_expr *expr, struct pat_ref_elt *elt);
 int pattern_delete(struct pattern_expr *expr, struct pat_ref_elt *ref);