diff --git a/contrib/hpack/decode.c b/contrib/hpack/decode.c
index 6f575eb..006c909 100644
--- a/contrib/hpack/decode.c
+++ b/contrib/hpack/decode.c
@@ -29,8 +29,8 @@
 char trash_buf[MAX_RQ_SIZE];
 char tmp_buf[MAX_RQ_SIZE];
 
-struct chunk trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
-struct chunk tmp   = { .area = tmp_buf,   .data = 0, .size = sizeof(tmp_buf)   };
+struct buffer trash = { .area = trash_buf, .data = 0, .size = sizeof(trash_buf) };
+struct buffer tmp   = { .area = tmp_buf,   .data = 0, .size = sizeof(tmp_buf)   };
 
 /* displays a <len> long memory block at <buf>, assuming first byte of <buf>
  * has address <baseaddr>. String <pfx> may be placed as a prefix in front of
diff --git a/contrib/mod_defender/defender.c b/contrib/mod_defender/defender.c
index 789db71..03f12a2 100644
--- a/contrib/mod_defender/defender.c
+++ b/contrib/mod_defender/defender.c
@@ -75,7 +75,7 @@
 
 struct apr_bucket_defender {
 	apr_bucket_refcount refcount;
-	struct chunk buf;
+	struct buffer buf;
 };
 
 static apr_status_t defender_bucket_read(apr_bucket *b, const char **str,
@@ -97,7 +97,8 @@
 		apr_bucket_free(d);
 }
 
-static apr_bucket *defender_bucket_make(apr_bucket *b, const struct chunk *buf)
+static apr_bucket *defender_bucket_make(apr_bucket *b,
+					const struct buffer *buf)
 {
 	struct apr_bucket_defender *d;
 
@@ -112,7 +113,7 @@
 	return b;
 }
 
-static apr_bucket *defender_bucket_create(const struct chunk *buf,
+static apr_bucket *defender_bucket_create(const struct buffer *buf,
                                           apr_bucket_alloc_t *list)
 {
 	apr_bucket *b = apr_bucket_alloc(sizeof(*b), list);
@@ -458,11 +459,11 @@
 	struct apr_bucket_brigade *bb = NULL;
 	struct apr_bucket *d = NULL, *e = NULL;
 
-	struct chunk *method;
-	struct chunk *path;
-	struct chunk *query;
-	struct chunk *version;
-	struct chunk *body;
+	struct buffer *method;
+	struct buffer *path;
+	struct buffer *query;
+	struct buffer *version;
+	struct buffer *body;
 
 	struct defender_header hdr;
 	char *hdr_ptr, *hdr_end;