[master] 7913217 Follow up on discussion some weeks back, and rename vcl_fetch{} to vcl_backend_fetch{}, and vcl_response{} to vcl_backend_response{}.

Poul-Henning Kamp phk at varnish-cache.org
Mon Apr 22 10:30:13 CEST 2013 

commit 791321739fccc7fe5bfaabbad99b0d81b792c1f8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 22 08:28:44 2013 +0000

    Follow up on discussion some weeks back, and rename vcl_fetch{}
    to vcl_backend_fetch{}, and vcl_response{} to vcl_backend_response{}.

diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 8d2b40c..240d166 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -416,7 +416,7 @@ cnt_fetch(struct worker *wrk, struct req *req)
 		AZ(bo->do_esi);
 		AZ(bo->do_pass);
 
-		VCL_response_method(wrk, req, req->http->ws);
+		VCL_backend_response_method(wrk, req, req->http->ws);
 
 		if (bo->do_pass)
 			req->objcore->flags |= OC_F_PASS;
@@ -923,7 +923,7 @@ cnt_miss(struct worker *wrk, struct req *req)
 		http_SetHeader(bo->bereq, "Accept-Encoding: gzip");
 	}
 
-	VCL_fetch_method(wrk, req, req->http->ws);
+	VCL_backend_fetch_method(wrk, req, req->http->ws);
 	VCL_miss_method(wrk, req, req->http->ws);
 
 	if (wrk->handling == VCL_RET_FETCH) {
@@ -988,7 +988,7 @@ cnt_pass(struct worker *wrk, struct req *req)
 	HTTP_Setup(bo->bereq, bo->ws, bo->vsl, HTTP_Bereq);
 	http_FilterReq(req, HTTPH_R_PASS);
 
-	VCL_fetch_method(wrk, req, req->http->ws);
+	VCL_backend_fetch_method(wrk, req, req->http->ws);
 	VCL_pass_method(wrk, req, req->http->ws);
 
 	if (wrk->handling == VCL_RET_ERROR) {
diff --git a/bin/varnishd/default.vcl b/bin/varnishd/default.vcl
index f6c7833..f4137b4 100644
--- a/bin/varnishd/default.vcl
+++ b/bin/varnishd/default.vcl
@@ -116,11 +116,11 @@ sub vcl_miss {
 }
 
 
-sub vcl_fetch {
+sub vcl_backend_fetch {
     return (fetch);
 }
 
-sub vcl_response {
+sub vcl_backend_response {
     if (beresp.ttl <= 0s ||
         beresp.http.Set-Cookie ||
         beresp.http.Surrogate-control ~ "no-store" ||
diff --git a/bin/varnishtest/tests.disabled/r00929.vtc b/bin/varnishtest/tests.disabled/r00929.vtc
index 996465a..6f7729d 100644
--- a/bin/varnishtest/tests.disabled/r00929.vtc
+++ b/bin/varnishtest/tests.disabled/r00929.vtc
@@ -8,7 +8,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = true;
 	}
 
diff --git a/bin/varnishtest/tests.disabled/r00978.vtc b/bin/varnishtest/tests.disabled/r00978.vtc
index e14402d..8d52e60 100644
--- a/bin/varnishtest/tests.disabled/r00978.vtc
+++ b/bin/varnishtest/tests.disabled/r00978.vtc
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 			set req.url = req.url + req.esi_level;
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests.disabled/r00979.vtc b/bin/varnishtest/tests.disabled/r00979.vtc
index 0857981..216f7cb 100644
--- a/bin/varnishtest/tests.disabled/r00979.vtc
+++ b/bin/varnishtest/tests.disabled/r00979.vtc
@@ -11,7 +11,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = true;
 	}
 	sub vcl_deliver {
diff --git a/bin/varnishtest/tests.disabled/r00980.vtc b/bin/varnishtest/tests.disabled/r00980.vtc
index da4d83c..f14113f 100644
--- a/bin/varnishtest/tests.disabled/r00980.vtc
+++ b/bin/varnishtest/tests.disabled/r00980.vtc
@@ -9,7 +9,7 @@ server s1 {
 
 varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_gzip = true;
 		set beresp.do_stream = true;
 	}
diff --git a/bin/varnishtest/tests.disabled/t00000.vtc b/bin/varnishtest/tests.disabled/t00000.vtc
index b4fcc5b..cc47769 100644
--- a/bin/varnishtest/tests.disabled/t00000.vtc
+++ b/bin/varnishtest/tests.disabled/t00000.vtc
@@ -15,7 +15,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests.disabled/t00001.vtc b/bin/varnishtest/tests.disabled/t00001.vtc
index 84aa647..f6a3944 100644
--- a/bin/varnishtest/tests.disabled/t00001.vtc
+++ b/bin/varnishtest/tests.disabled/t00001.vtc
@@ -22,7 +22,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/foo") {
 			set beresp.do_gzip = true;
 		}
diff --git a/bin/varnishtest/tests/b00015.vtc b/bin/varnishtest/tests/b00015.vtc
index 7cb1b97..ff39f42 100644
--- a/bin/varnishtest/tests/b00015.vtc
+++ b/bin/varnishtest/tests/b00015.vtc
@@ -53,7 +53,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status == 502) {
 			set beresp.ttl = 10m;
 		}
diff --git a/bin/varnishtest/tests/b00018.vtc b/bin/varnishtest/tests/b00018.vtc
index 6197511..06f4ed1 100644
--- a/bin/varnishtest/tests/b00018.vtc
+++ b/bin/varnishtest/tests/b00018.vtc
@@ -1,4 +1,4 @@
-varnishtest "Check that error in vcl_response works"
+varnishtest "Check that error in vcl_backend_response works"
 
 server s1 {
 	rxreq 
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 	    set beresp.http.Foo = "bar";
 	    error 523 "not ok";
 	}
diff --git a/bin/varnishtest/tests/b00019.vtc b/bin/varnishtest/tests/b00019.vtc
index 542e32d..d393ab1 100644
--- a/bin/varnishtest/tests/b00019.vtc
+++ b/bin/varnishtest/tests/b00019.vtc
@@ -21,7 +21,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 	       return (restart);
 	}
 
diff --git a/bin/varnishtest/tests/b00020.vtc b/bin/varnishtest/tests/b00020.vtc
index a6baaed..6b6943d 100644
--- a/bin/varnishtest/tests/b00020.vtc
+++ b/bin/varnishtest/tests/b00020.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00021.vtc b/bin/varnishtest/tests/b00021.vtc
index 331635b..5646183 100644
--- a/bin/varnishtest/tests/b00021.vtc
+++ b/bin/varnishtest/tests/b00021.vtc
@@ -10,10 +10,10 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		set bereq.between_bytes_timeout = 2s;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00022.vtc b/bin/varnishtest/tests/b00022.vtc
index 9f4dd1e..2201586 100644
--- a/bin/varnishtest/tests/b00022.vtc
+++ b/bin/varnishtest/tests/b00022.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl {
 		.port = "${s1_port}";
 		.between_bytes_timeout = 1s;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00024.vtc b/bin/varnishtest/tests/b00024.vtc
index 421ed0d..30f0466 100644
--- a/bin/varnishtest/tests/b00024.vtc
+++ b/bin/varnishtest/tests/b00024.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		set bereq.first_byte_timeout = 1s;	
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00026.vtc b/bin/varnishtest/tests/b00026.vtc
index 048c58e..14293cc 100644
--- a/bin/varnishtest/tests/b00026.vtc
+++ b/bin/varnishtest/tests/b00026.vtc
@@ -34,7 +34,7 @@ varnish v1 -vcl {
 		}
 		set req.backend = b2;
 	}
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		set bereq.first_byte_timeout = 2s;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00027.vtc b/bin/varnishtest/tests/b00027.vtc
index 941dc9c..f1907c0 100644
--- a/bin/varnishtest/tests/b00027.vtc
+++ b/bin/varnishtest/tests/b00027.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/b00028.vtc b/bin/varnishtest/tests/b00028.vtc
index 6316fde..b91c274 100644
--- a/bin/varnishtest/tests/b00028.vtc
+++ b/bin/varnishtest/tests/b00028.vtc
@@ -7,7 +7,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.foo ~ "bar") {
 			set beresp.http.foo1 = "1";
 		} else {
diff --git a/bin/varnishtest/tests/c00001.vtc b/bin/varnishtest/tests/c00001.vtc
index bfc9d08..860e827 100644
--- a/bin/varnishtest/tests/c00001.vtc
+++ b/bin/varnishtest/tests/c00001.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.Snafu1 = regsub(beresp.http.Foobar, "ar", "\0\0");
 		set beresp.http.Snafu2 =
 		    regsub(beresp.http.Foobar, "(b)(a)(r)(f)", "\4\3\2p");
diff --git a/bin/varnishtest/tests/c00009.vtc b/bin/varnishtest/tests/c00009.vtc
index 9d5f1a0..e4705bb 100644
--- a/bin/varnishtest/tests/c00009.vtc
+++ b/bin/varnishtest/tests/c00009.vtc
@@ -21,7 +21,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status != 200) {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/c00011.vtc b/bin/varnishtest/tests/c00011.vtc
index 4a1391d..fc0af3d 100644
--- a/bin/varnishtest/tests/c00011.vtc
+++ b/bin/varnishtest/tests/c00011.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00014.vtc b/bin/varnishtest/tests/c00014.vtc
index c995511..61654e1 100644
--- a/bin/varnishtest/tests/c00014.vtc
+++ b/bin/varnishtest/tests/c00014.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00027.vtc b/bin/varnishtest/tests/c00027.vtc
index 9e842de..88b4217 100644
--- a/bin/varnishtest/tests/c00027.vtc
+++ b/bin/varnishtest/tests/c00027.vtc
@@ -19,7 +19,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-s malloc,1M" -vcl+backend {
-	sub vcl_response { 
+	sub vcl_backend_response { 
 		set beresp.ttl = 10m; 
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00029.vtc b/bin/varnishtest/tests/c00029.vtc
index 2eb685b..07111ba 100644
--- a/bin/varnishtest/tests/c00029.vtc
+++ b/bin/varnishtest/tests/c00029.vtc
@@ -37,7 +37,7 @@ varnish v1 -arg "-p saintmode_threshold=2" -vcl+backend {
 		set req.grace = 1h;
 	}
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
 			return(restart);
diff --git a/bin/varnishtest/tests/c00030.vtc b/bin/varnishtest/tests/c00030.vtc
index 8941a45..9cfec57 100644
--- a/bin/varnishtest/tests/c00030.vtc
+++ b/bin/varnishtest/tests/c00030.vtc
@@ -44,7 +44,7 @@ varnish v1 -arg "-p saintmode_threshold=10" -vcl {
 		set req.grace = 1h;
 	}
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.X-Saint == "yes") {
 			set beresp.saintmode = 20s;
 			return (restart);
diff --git a/bin/varnishtest/tests/c00032.vtc b/bin/varnishtest/tests/c00032.vtc
index eb7e57c..a3b5c92 100644
--- a/bin/varnishtest/tests/c00032.vtc
+++ b/bin/varnishtest/tests/c00032.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status == 400) {
 			rollback;
 			set req.url = "/bar";
diff --git a/bin/varnishtest/tests/c00044.vtc b/bin/varnishtest/tests/c00044.vtc
index ad6d3c6..d75ecbb 100644
--- a/bin/varnishtest/tests/c00044.vtc
+++ b/bin/varnishtest/tests/c00044.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "invalid";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00045.vtc b/bin/varnishtest/tests/c00045.vtc
index a480fe1..b150770 100644
--- a/bin/varnishtest/tests/c00045.vtc
+++ b/bin/varnishtest/tests/c00045.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "s0";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00046.vtc b/bin/varnishtest/tests/c00046.vtc
index 17fb33b..ad2b701 100644
--- a/bin/varnishtest/tests/c00046.vtc
+++ b/bin/varnishtest/tests/c00046.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,1m -smalloc,1m, -smalloc,1m" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "s0";
 	}
 } -start
diff --git a/bin/varnishtest/tests/c00047.vtc b/bin/varnishtest/tests/c00047.vtc
index d9e4ee2..e2ec54e 100644
--- a/bin/varnishtest/tests/c00047.vtc
+++ b/bin/varnishtest/tests/c00047.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.baz1 = regsuball(beresp.http.foo, "barb", "zz");
 		set beresp.http.baz2 = regsuball(beresp.http.foo, "ar", "zz");
 		set beresp.http.baz3 = regsuball(beresp.http.foo, "^", "baz");
diff --git a/bin/varnishtest/tests/c00055.vtc b/bin/varnishtest/tests/c00055.vtc
index 15590d3..b7c93a4 100644
--- a/bin/varnishtest/tests/c00055.vtc
+++ b/bin/varnishtest/tests/c00055.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend {
 		C{ VRT_CacheReqBody(req, 1000); }C
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.foo == "BAR") {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/e00000.vtc b/bin/varnishtest/tests/e00000.vtc
index 2de8f23..157dea5 100644
--- a/bin/varnishtest/tests/e00000.vtc
+++ b/bin/varnishtest/tests/e00000.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00001.vtc b/bin/varnishtest/tests/e00001.vtc
index 13312d3..e988fb5 100644
--- a/bin/varnishtest/tests/e00001.vtc
+++ b/bin/varnishtest/tests/e00001.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start -cliok "param.set esi_syntax 4"
diff --git a/bin/varnishtest/tests/e00002.vtc b/bin/varnishtest/tests/e00002.vtc
index 8aa223f..ebebf62 100644
--- a/bin/varnishtest/tests/e00002.vtc
+++ b/bin/varnishtest/tests/e00002.vtc
@@ -13,7 +13,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00003.vtc b/bin/varnishtest/tests/e00003.vtc
index 6a8ea92..a79ac57 100644
--- a/bin/varnishtest/tests/e00003.vtc
+++ b/bin/varnishtest/tests/e00003.vtc
@@ -22,7 +22,7 @@ varnish v1 -vcl+backend {
 			set req.url = req.url + req.esi_level;
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00004.vtc b/bin/varnishtest/tests/e00004.vtc
index 9a95dac..e6ae26f 100644
--- a/bin/varnishtest/tests/e00004.vtc
+++ b/bin/varnishtest/tests/e00004.vtc
@@ -17,7 +17,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00005.vtc b/bin/varnishtest/tests/e00005.vtc
index 7f5c333..441362c 100644
--- a/bin/varnishtest/tests/e00005.vtc
+++ b/bin/varnishtest/tests/e00005.vtc
@@ -18,7 +18,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00006.vtc b/bin/varnishtest/tests/e00006.vtc
index 3b9c6db..1bd6cf3 100644
--- a/bin/varnishtest/tests/e00006.vtc
+++ b/bin/varnishtest/tests/e00006.vtc
@@ -29,7 +29,7 @@ varnish v1 -vcl+backend {
 			set req.backend = s1;
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00007.vtc b/bin/varnishtest/tests/e00007.vtc
index 225ec3c..729ff84 100644
--- a/bin/varnishtest/tests/e00007.vtc
+++ b/bin/varnishtest/tests/e00007.vtc
@@ -32,7 +32,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-smalloc,2m" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00008.vtc b/bin/varnishtest/tests/e00008.vtc
index 4af581f..53545d6 100644
--- a/bin/varnishtest/tests/e00008.vtc
+++ b/bin/varnishtest/tests/e00008.vtc
@@ -56,7 +56,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00009.vtc b/bin/varnishtest/tests/e00009.vtc
index 099d1b9..e2ef6b3 100644
--- a/bin/varnishtest/tests/e00009.vtc
+++ b/bin/varnishtest/tests/e00009.vtc
@@ -18,7 +18,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00010.vtc b/bin/varnishtest/tests/e00010.vtc
index 1a0b33d..513a99a 100644
--- a/bin/varnishtest/tests/e00010.vtc
+++ b/bin/varnishtest/tests/e00010.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start -cli "param.set esi_syntax 2"
diff --git a/bin/varnishtest/tests/e00011.vtc b/bin/varnishtest/tests/e00011.vtc
index 6c0a8ef..7dd2d14 100644
--- a/bin/varnishtest/tests/e00011.vtc
+++ b/bin/varnishtest/tests/e00011.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 		set beresp.do_esi = true;
 	}
diff --git a/bin/varnishtest/tests/e00012.vtc b/bin/varnishtest/tests/e00012.vtc
index 60cc4d1..3cd8db6 100644
--- a/bin/varnishtest/tests/e00012.vtc
+++ b/bin/varnishtest/tests/e00012.vtc
@@ -17,7 +17,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_response {
+        sub vcl_backend_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00013.vtc b/bin/varnishtest/tests/e00013.vtc
index b659e53..a8a6028 100644
--- a/bin/varnishtest/tests/e00013.vtc
+++ b/bin/varnishtest/tests/e00013.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_response {
+        sub vcl_backend_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00014.vtc b/bin/varnishtest/tests/e00014.vtc
index d174650..7021c95 100644
--- a/bin/varnishtest/tests/e00014.vtc
+++ b/bin/varnishtest/tests/e00014.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-        sub vcl_response {
+        sub vcl_backend_response {
                 set beresp.do_esi = true;
         }
 } -start
diff --git a/bin/varnishtest/tests/e00015.vtc b/bin/varnishtest/tests/e00015.vtc
index 5acf6bc..3d3e146 100644
--- a/bin/varnishtest/tests/e00015.vtc
+++ b/bin/varnishtest/tests/e00015.vtc
@@ -23,7 +23,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 	    	if(req.url == "/") {
  	    	   set req.esi = false;
 		}
diff --git a/bin/varnishtest/tests/e00016.vtc b/bin/varnishtest/tests/e00016.vtc
index 718c690..44f7d6a 100644
--- a/bin/varnishtest/tests/e00016.vtc
+++ b/bin/varnishtest/tests/e00016.vtc
@@ -27,7 +27,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
  	    	set req.esi = true;	
 	    	if(req.url == "/body") {
 		   set req.esi = false;
diff --git a/bin/varnishtest/tests/e00017.vtc b/bin/varnishtest/tests/e00017.vtc
index 0eedd1d..121662e 100644
--- a/bin/varnishtest/tests/e00017.vtc
+++ b/bin/varnishtest/tests/e00017.vtc
@@ -71,7 +71,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00018.vtc b/bin/varnishtest/tests/e00018.vtc
index 6b709db..4a410cd 100644
--- a/bin/varnishtest/tests/e00018.vtc
+++ b/bin/varnishtest/tests/e00018.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/e00019.vtc b/bin/varnishtest/tests/e00019.vtc
index a45ed76..5731647 100644
--- a/bin/varnishtest/tests/e00019.vtc
+++ b/bin/varnishtest/tests/e00019.vtc
@@ -29,7 +29,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "bar") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00020.vtc b/bin/varnishtest/tests/e00020.vtc
index 5a20356..55d6923 100644
--- a/bin/varnishtest/tests/e00020.vtc
+++ b/bin/varnishtest/tests/e00020.vtc
@@ -14,7 +14,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.do_gunzip = true;
 	}
diff --git a/bin/varnishtest/tests/e00021.vtc b/bin/varnishtest/tests/e00021.vtc
index 02bd4e8..26acd2c 100644
--- a/bin/varnishtest/tests/e00021.vtc
+++ b/bin/varnishtest/tests/e00021.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/e00022.vtc b/bin/varnishtest/tests/e00022.vtc
index fc45ed3..be980c5 100644
--- a/bin/varnishtest/tests/e00022.vtc
+++ b/bin/varnishtest/tests/e00022.vtc
@@ -18,7 +18,7 @@ varnish v1 -arg "-p thread_pool_stack=262144" -vcl+backend {
 	sub vcl_recv {
 		set req.esi = true;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00023.vtc b/bin/varnishtest/tests/e00023.vtc
index 47dec0f..2508c9c 100644
--- a/bin/varnishtest/tests/e00023.vtc
+++ b/bin/varnishtest/tests/e00023.vtc
@@ -36,7 +36,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/e00024.vtc b/bin/varnishtest/tests/e00024.vtc
index b99d296..ea9f6c4 100644
--- a/bin/varnishtest/tests/e00024.vtc
+++ b/bin/varnishtest/tests/e00024.vtc
@@ -60,7 +60,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00026.vtc b/bin/varnishtest/tests/e00026.vtc
index 39c3de0..6d2e50c 100644
--- a/bin/varnishtest/tests/e00026.vtc
+++ b/bin/varnishtest/tests/e00026.vtc
@@ -28,7 +28,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url != "/foo") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/e00027.vtc b/bin/varnishtest/tests/e00027.vtc
index b977004..eac20d3 100644
--- a/bin/varnishtest/tests/e00027.vtc
+++ b/bin/varnishtest/tests/e00027.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/g00002.vtc b/bin/varnishtest/tests/g00002.vtc
index 1ddd9ec..5605b25 100644
--- a/bin/varnishtest/tests/g00002.vtc
+++ b/bin/varnishtest/tests/g00002.vtc
@@ -17,7 +17,7 @@ varnish v1 \
 	-cliok "param.set gzip_memlevel 1" \
 	-vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/g00003.vtc b/bin/varnishtest/tests/g00003.vtc
index 0721dc4..a4dfa7e 100644
--- a/bin/varnishtest/tests/g00003.vtc
+++ b/bin/varnishtest/tests/g00003.vtc
@@ -19,7 +19,7 @@ server s1 {
 
 varnish v1 -cliok "param.set http_gzip_support true" -vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_gunzip = true;
 		if (req.url == "/foobar") {
 			set beresp.do_gzip = true;
diff --git a/bin/varnishtest/tests/g00004.vtc b/bin/varnishtest/tests/g00004.vtc
index d70e146..286fc98 100644
--- a/bin/varnishtest/tests/g00004.vtc
+++ b/bin/varnishtest/tests/g00004.vtc
@@ -19,7 +19,7 @@ server s1 -repeat 2 {
 
 varnish v1 \
 	-vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 
 		if (req.url == "/gunzip") {
diff --git a/bin/varnishtest/tests/m00002.vtc b/bin/varnishtest/tests/m00002.vtc
index 414bbdb..f95bee8 100644
--- a/bin/varnishtest/tests/m00002.vtc
+++ b/bin/varnishtest/tests/m00002.vtc
@@ -11,7 +11,7 @@ server s1 {
 varnish v1 -vcl+backend {
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.rnd1 = std.random(0,1);
 		set beresp.http.rnd2 = std.random(0,10);
 		set beresp.http.rnd3 = std.random(8,10);
diff --git a/bin/varnishtest/tests/m00006.vtc b/bin/varnishtest/tests/m00006.vtc
index b1a57a8..740ba38 100644
--- a/bin/varnishtest/tests/m00006.vtc
+++ b/bin/varnishtest/tests/m00006.vtc
@@ -18,10 +18,10 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		std.collect(req.http.foo);
 	}
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		std.collect(bereq.http.baz);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		std.collect(beresp.http.bar);
 	}
 	sub vcl_deliver {
diff --git a/bin/varnishtest/tests/p00005.vtc b/bin/varnishtest/tests/p00005.vtc
index ef2b5a1..a3d7051 100644
--- a/bin/varnishtest/tests/p00005.vtc
+++ b/bin/varnishtest/tests/p00005.vtc
@@ -11,7 +11,7 @@ varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-arg "-pban_lurker_sleep=0" \
 	-vcl+backend { 
-		sub vcl_response {
+		sub vcl_backend_response {
 			set beresp.ttl = 3s;
 		}
 	} -start 
@@ -37,7 +37,7 @@ server s1 -wait {
 } -start
 
 varnish v1 -vcl+backend {
-		sub vcl_response {
+		sub vcl_backend_response {
 			set beresp.ttl = 3s;
 		}
 	} -start
diff --git a/bin/varnishtest/tests/p00008.vtc b/bin/varnishtest/tests/p00008.vtc
index 395f9c6..07d6c2c 100644
--- a/bin/varnishtest/tests/p00008.vtc
+++ b/bin/varnishtest/tests/p00008.vtc
@@ -18,7 +18,7 @@ varnish v1 \
 	-arg "-pban_lurker_sleep=0" \
 	-storage "-sper1=persistent,${tmpdir}/_.per1,10m -sper2=persistent,${tmpdir}/_.per2,10m" \
 	-vcl+backend {
-		sub vcl_response {
+		sub vcl_backend_response {
 			set beresp.storage = "per1";
 			if (req.url ~ "silo2") {
 				set beresp.storage = "per2";
diff --git a/bin/varnishtest/tests/r00251.vtc b/bin/varnishtest/tests/r00251.vtc
index 6794c24..a337cce 100644
--- a/bin/varnishtest/tests/r00251.vtc
+++ b/bin/varnishtest/tests/r00251.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.Snafu1 =
 		    "zoom" +
 		    regsub(beresp.http.Foomble, "ar", "\0\0") +
diff --git a/bin/varnishtest/tests/r00318.vtc b/bin/varnishtest/tests/r00318.vtc
index 86b7672..a30bdab 100644
--- a/bin/varnishtest/tests/r00318.vtc
+++ b/bin/varnishtest/tests/r00318.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.uncacheable = true;
 	}
diff --git a/bin/varnishtest/tests/r00326.vtc b/bin/varnishtest/tests/r00326.vtc
index f37d656..09cd013 100644
--- a/bin/varnishtest/tests/r00326.vtc
+++ b/bin/varnishtest/tests/r00326.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00345.vtc b/bin/varnishtest/tests/r00345.vtc
index 6cdfe1d..772c60f 100644
--- a/bin/varnishtest/tests/r00345.vtc
+++ b/bin/varnishtest/tests/r00345.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p debug=+workspace" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r00386.vtc b/bin/varnishtest/tests/r00386.vtc
index 21d944a..3edcb35 100644
--- a/bin/varnishtest/tests/r00386.vtc
+++ b/bin/varnishtest/tests/r00386.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p debug=+workspace" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r00387.vtc b/bin/varnishtest/tests/r00387.vtc
index eb6a366..879657c 100644
--- a/bin/varnishtest/tests/r00387.vtc
+++ b/bin/varnishtest/tests/r00387.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00411.vtc b/bin/varnishtest/tests/r00411.vtc
index bab8eef..3d1e832 100644
--- a/bin/varnishtest/tests/r00411.vtc
+++ b/bin/varnishtest/tests/r00411.vtc
@@ -17,7 +17,7 @@ varnish v1 -vcl+backend {
 			return (restart);
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status == 303) {
 			set beresp.ttl = 3m;
 			set beresp.http.X-Magic-Redirect = "1";
diff --git a/bin/varnishtest/tests/r00412.vtc b/bin/varnishtest/tests/r00412.vtc
index 2d3c69a..0e49607 100644
--- a/bin/varnishtest/tests/r00412.vtc
+++ b/bin/varnishtest/tests/r00412.vtc
@@ -11,7 +11,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status == 303) {
 			set beresp.ttl = 60 s;
 			set beresp.http.X-Magic-Redirect = "1";
diff --git a/bin/varnishtest/tests/r00427.vtc b/bin/varnishtest/tests/r00427.vtc
index 3d8c9ce..aa7d6ae 100644
--- a/bin/varnishtest/tests/r00427.vtc
+++ b/bin/varnishtest/tests/r00427.vtc
@@ -24,7 +24,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00433.vtc b/bin/varnishtest/tests/r00433.vtc
index d0e6ba8..2ccbd3f 100644
--- a/bin/varnishtest/tests/r00433.vtc
+++ b/bin/varnishtest/tests/r00433.vtc
@@ -31,7 +31,7 @@ varnish v1 -vcl+backend {
 		}
 	}
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00445.vtc b/bin/varnishtest/tests/r00445.vtc
index 535107d..137ab15 100644
--- a/bin/varnishtest/tests/r00445.vtc
+++ b/bin/varnishtest/tests/r00445.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00476.vtc b/bin/varnishtest/tests/r00476.vtc
index d9e1c9e..976d434 100644
--- a/bin/varnishtest/tests/r00476.vtc
+++ b/bin/varnishtest/tests/r00476.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00494.vtc b/bin/varnishtest/tests/r00494.vtc
index 23c5695..31a9d6e 100644
--- a/bin/varnishtest/tests/r00494.vtc
+++ b/bin/varnishtest/tests/r00494.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.bar = beresp.http.foo;
 		remove beresp.http.foo;
 	}
diff --git a/bin/varnishtest/tests/r00524.vtc b/bin/varnishtest/tests/r00524.vtc
index d52e331..46445a8 100644
--- a/bin/varnishtest/tests/r00524.vtc
+++ b/bin/varnishtest/tests/r00524.vtc
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		// return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -cliok "param.set timeout_idle 60" -start
diff --git a/bin/varnishtest/tests/r00590.vtc b/bin/varnishtest/tests/r00590.vtc
index 74d77bc..960ebd1 100644
--- a/bin/varnishtest/tests/r00590.vtc
+++ b/bin/varnishtest/tests/r00590.vtc
@@ -60,7 +60,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00612.vtc b/bin/varnishtest/tests/r00612.vtc
index 189b720..d36e5a0 100644
--- a/bin/varnishtest/tests/r00612.vtc
+++ b/bin/varnishtest/tests/r00612.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00641.vtc b/bin/varnishtest/tests/r00641.vtc
index 94a15b9..7fefc8e 100644
--- a/bin/varnishtest/tests/r00641.vtc
+++ b/bin/varnishtest/tests/r00641.vtc
@@ -15,7 +15,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		// return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -cliok "param.set timeout_idle 60" -start
diff --git a/bin/varnishtest/tests/r00667.vtc b/bin/varnishtest/tests/r00667.vtc
index f428e6a..1c1da1f 100644
--- a/bin/varnishtest/tests/r00667.vtc
+++ b/bin/varnishtest/tests/r00667.vtc
@@ -16,7 +16,7 @@ server s1 {
 
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl = 0s;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00702.vtc b/bin/varnishtest/tests/r00702.vtc
index 9ac03cf..3a8b320 100644
--- a/bin/varnishtest/tests/r00702.vtc
+++ b/bin/varnishtest/tests/r00702.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00704.vtc b/bin/varnishtest/tests/r00704.vtc
index 5d0585c..d4e44be 100644
--- a/bin/varnishtest/tests/r00704.vtc
+++ b/bin/varnishtest/tests/r00704.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00769.vtc b/bin/varnishtest/tests/r00769.vtc
index 1f75ad9..2306346 100644
--- a/bin/varnishtest/tests/r00769.vtc
+++ b/bin/varnishtest/tests/r00769.vtc
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
 			error 700;
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.status = 404;
 		set beresp.http.X-status = beresp.status;
 		return (deliver);
diff --git a/bin/varnishtest/tests/r00781.vtc b/bin/varnishtest/tests/r00781.vtc
index 52738e5..d58bf29 100644
--- a/bin/varnishtest/tests/r00781.vtc
+++ b/bin/varnishtest/tests/r00781.vtc
@@ -9,7 +9,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.url = req.http.foo;
 	}
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		set bereq.url = req.http.foo;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00801.vtc b/bin/varnishtest/tests/r00801.vtc
index d7b293f..5800662 100644
--- a/bin/varnishtest/tests/r00801.vtc
+++ b/bin/varnishtest/tests/r00801.vtc
@@ -11,7 +11,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv { return (pass); }
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00861.vtc b/bin/varnishtest/tests/r00861.vtc
index cfdaca0..ff6b042 100644
--- a/bin/varnishtest/tests/r00861.vtc
+++ b/bin/varnishtest/tests/r00861.vtc
@@ -23,7 +23,7 @@ server s1 {
 
 varnish v1 \
 	-vcl+backend {
-		sub vcl_response {
+		sub vcl_backend_response {
 			if (req.url == "/1" || req.url == "/2") {
 				set beresp.do_esi = true;
 				set beresp.do_gzip = true;
diff --git a/bin/varnishtest/tests/r00873.vtc b/bin/varnishtest/tests/r00873.vtc
index 00e1413..7612ad4 100644
--- a/bin/varnishtest/tests/r00873.vtc
+++ b/bin/varnishtest/tests/r00873.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r00894.vtc b/bin/varnishtest/tests/r00894.vtc
index 23f0cb4..39b8fba 100644
--- a/bin/varnishtest/tests/r00894.vtc
+++ b/bin/varnishtest/tests/r00894.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00913.vtc b/bin/varnishtest/tests/r00913.vtc
index 6d5a54c..3e8672d 100644
--- a/bin/varnishtest/tests/r00913.vtc
+++ b/bin/varnishtest/tests/r00913.vtc
@@ -7,7 +7,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.bar ~ "$") {
 			set beresp.http.foo = regsub(beresp.http.bar, "$", "XXX");
 		}
diff --git a/bin/varnishtest/tests/r00915.vtc b/bin/varnishtest/tests/r00915.vtc
index 1c0c21c..c7aacc8 100644
--- a/bin/varnishtest/tests/r00915.vtc
+++ b/bin/varnishtest/tests/r00915.vtc
@@ -12,7 +12,7 @@ varnish v1 \
 	-storage "-spersistent,${tmpdir}/_.per,10m" \
 	-vcl+backend { 
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		error(751);
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00916.vtc b/bin/varnishtest/tests/r00916.vtc
index 51339b4..2b3a9e0 100644
--- a/bin/varnishtest/tests/r00916.vtc
+++ b/bin/varnishtest/tests/r00916.vtc
@@ -9,7 +9,7 @@ varnish v1 -errvcl {Symbol not found: 's-1' (expected type BACKEND)} {
 	backend b { .host = "127.0.0.1"; }
 	sub s1 {
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 	    if (req.backend == s-1){
 		set req.backend = s-1;
 	    }
diff --git a/bin/varnishtest/tests/r00941.vtc b/bin/varnishtest/tests/r00941.vtc
index f6ee1a6..127336e 100644
--- a/bin/varnishtest/tests/r00941.vtc
+++ b/bin/varnishtest/tests/r00941.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl = 1000s;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00942.vtc b/bin/varnishtest/tests/r00942.vtc
index ffde262..e6c45b0 100644
--- a/bin/varnishtest/tests/r00942.vtc
+++ b/bin/varnishtest/tests/r00942.vtc
@@ -26,7 +26,7 @@ server s1 {
 
 varnish v1 \
 	-vcl+backend {
-		sub vcl_response {
+		sub vcl_backend_response {
 			set beresp.do_stream = false;
 		}
 } 
diff --git a/bin/varnishtest/tests/r00956.vtc b/bin/varnishtest/tests/r00956.vtc
index 33e5198..6c53905 100644
--- a/bin/varnishtest/tests/r00956.vtc
+++ b/bin/varnishtest/tests/r00956.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl = 10s;
 		set req.http.foo = beresp.ttl;
 		set req.http.bar = "xxx";
diff --git a/bin/varnishtest/tests/r00961.vtc b/bin/varnishtest/tests/r00961.vtc
index 7f7c4f7..c6e9209 100644
--- a/bin/varnishtest/tests/r00961.vtc
+++ b/bin/varnishtest/tests/r00961.vtc
@@ -36,7 +36,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r00962.vtc b/bin/varnishtest/tests/r00962.vtc
index 77ea57e..21f01a8 100644
--- a/bin/varnishtest/tests/r00962.vtc
+++ b/bin/varnishtest/tests/r00962.vtc
@@ -14,7 +14,7 @@ varnish v1 \
 	-arg "-pfeature=+wait_silo" \
 	-storage "-spersistent,${tmpdir}/_.per1,10m -spersistent,${tmpdir}/_.per2,10m" \
 	-vcl+backend { 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "s0";
 	}
 } -start 
diff --git a/bin/varnishtest/tests/r00972.vtc b/bin/varnishtest/tests/r00972.vtc
index f6d071c..da23127 100644
--- a/bin/varnishtest/tests/r00972.vtc
+++ b/bin/varnishtest/tests/r00972.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01029.vtc b/bin/varnishtest/tests/r01029.vtc
index 8e3064c..e388043 100644
--- a/bin/varnishtest/tests/r01029.vtc
+++ b/bin/varnishtest/tests/r01029.vtc
@@ -12,7 +12,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		if (req.url == "/foo") {
 			set beresp.ttl = 0s;
diff --git a/bin/varnishtest/tests/r01030.vtc b/bin/varnishtest/tests/r01030.vtc
index db58d32..7ebd036 100644
--- a/bin/varnishtest/tests/r01030.vtc
+++ b/bin/varnishtest/tests/r01030.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 		}
 		return (lookup);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.url = req.url;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01036.vtc b/bin/varnishtest/tests/r01036.vtc
index dfd4402..10f6920 100644
--- a/bin/varnishtest/tests/r01036.vtc
+++ b/bin/varnishtest/tests/r01036.vtc
@@ -8,7 +8,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-smalloc,1M" -arg "-pgzip_level=0" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_stream = false;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01037.vtc b/bin/varnishtest/tests/r01037.vtc
index 46ec9d4..3d1518f 100644
--- a/bin/varnishtest/tests/r01037.vtc
+++ b/bin/varnishtest/tests/r01037.vtc
@@ -15,7 +15,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-smalloc,1M" -arg "-pgzip_level=0" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.do_gzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01038.vtc b/bin/varnishtest/tests/r01038.vtc
index d7d438c..ea04142 100644
--- a/bin/varnishtest/tests/r01038.vtc
+++ b/bin/varnishtest/tests/r01038.vtc
@@ -46,7 +46,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p workspace_backend=8k" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01091.vtc b/bin/varnishtest/tests/r01091.vtc
index 2b1fff3..dbf3820 100644
--- a/bin/varnishtest/tests/r01091.vtc
+++ b/bin/varnishtest/tests/r01091.vtc
@@ -25,7 +25,7 @@ varnish v1 -vcl+backend {
         sub vcl_recv {
                 set req.backend = f1.backend();
         }
-        sub vcl_response {
+        sub vcl_backend_response {
                 if(req.restarts < 1) {
                         set beresp.saintmode = 1h;
                         return(restart);
diff --git a/bin/varnishtest/tests/r01092.vtc b/bin/varnishtest/tests/r01092.vtc
index 4311b73..59aacf3 100644
--- a/bin/varnishtest/tests/r01092.vtc
+++ b/bin/varnishtest/tests/r01092.vtc
@@ -19,7 +19,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start -cliok "param.set esi_syntax 4"
diff --git a/bin/varnishtest/tests/r01109.vtc b/bin/varnishtest/tests/r01109.vtc
index 479786c..3b0fd23 100644
--- a/bin/varnishtest/tests/r01109.vtc
+++ b/bin/varnishtest/tests/r01109.vtc
@@ -22,7 +22,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-pfetch_chunksize=4k" -arg "-pgzip_level=0" -arg "-pthread_pool_stack=131072" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url ~ "/test") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r01113.vtc b/bin/varnishtest/tests/r01113.vtc
index 5bf31c1..dc71417 100644
--- a/bin/varnishtest/tests/r01113.vtc
+++ b/bin/varnishtest/tests/r01113.vtc
@@ -20,7 +20,7 @@ varnish v1 -vcl+backend {
 			return(restart);
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/fetch") {
 			return(restart);
 		}
diff --git a/bin/varnishtest/tests/r01123.vtc b/bin/varnishtest/tests/r01123.vtc
index 6881d60..a979fe6 100644
--- a/bin/varnishtest/tests/r01123.vtc
+++ b/bin/varnishtest/tests/r01123.vtc
@@ -9,7 +9,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url == "/") {
 			set beresp.do_esi = true;
 		}
diff --git a/bin/varnishtest/tests/r01157.vtc b/bin/varnishtest/tests/r01157.vtc
index ae30994..5815afe 100644
--- a/bin/varnishtest/tests/r01157.vtc
+++ b/bin/varnishtest/tests/r01157.vtc
@@ -12,7 +12,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 	sub vcl_recv { return (pass); }
-	sub vcl_response {	set beresp.do_stream = true; }
+	sub vcl_backend_response {	set beresp.do_stream = true; }
 } -start
 
 client c1 {
diff --git a/bin/varnishtest/tests/r01168.vtc b/bin/varnishtest/tests/r01168.vtc
index 52a8827..e26b2ce 100644
--- a/bin/varnishtest/tests/r01168.vtc
+++ b/bin/varnishtest/tests/r01168.vtc
@@ -14,7 +14,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		rollback;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01175.vtc b/bin/varnishtest/tests/r01175.vtc
index a286de6..afb5642 100644
--- a/bin/varnishtest/tests/r01175.vtc
+++ b/bin/varnishtest/tests/r01175.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -storage "-s test=malloc,1M" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "test";
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01184.vtc b/bin/varnishtest/tests/r01184.vtc
index 5c9de55..6eb07ed 100644
--- a/bin/varnishtest/tests/r01184.vtc
+++ b/bin/varnishtest/tests/r01184.vtc
@@ -32,7 +32,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 } -start
@@ -64,7 +64,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 	}
 }
@@ -95,7 +95,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.do_esi = true;
 		set beresp.do_gunzip = true;
 	}
diff --git a/bin/varnishtest/tests/r01206.vtc b/bin/varnishtest/tests/r01206.vtc
index 35aa8af..78e00b4 100644
--- a/bin/varnishtest/tests/r01206.vtc
+++ b/bin/varnishtest/tests/r01206.vtc
@@ -39,7 +39,7 @@ client c1 {
 server s1 -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.uncacheable = true;
 	}
 }
diff --git a/bin/varnishtest/tests/r01253.vtc b/bin/varnishtest/tests/r01253.vtc
index 869f0a6..ce348ae 100644
--- a/bin/varnishtest/tests/r01253.vtc
+++ b/bin/varnishtest/tests/r01253.vtc
@@ -1,4 +1,4 @@
-varnishtest "restarting a pass in vcl_response should not panic"
+varnishtest "restarting a pass in vcl_backend_response should not panic"
 
 server s1 {
 	rxreq
@@ -12,7 +12,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		return (pass);
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.status != 200) {
 			return (restart);
 		}
diff --git a/bin/varnishtest/tests/r01283.vtc b/bin/varnishtest/tests/r01283.vtc
index 3b1bd83..eaa7b81 100644
--- a/bin/varnishtest/tests/r01283.vtc
+++ b/bin/varnishtest/tests/r01283.vtc
@@ -11,7 +11,7 @@ varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend
 			error 500;
 		}
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "Transient";
 	}
 } -start
diff --git a/bin/varnishtest/tests/r01284.vtc b/bin/varnishtest/tests/r01284.vtc
index c48ea44..7035536 100644
--- a/bin/varnishtest/tests/r01284.vtc
+++ b/bin/varnishtest/tests/r01284.vtc
@@ -10,7 +10,7 @@ server s1 {
 } -start
 
 varnish v1 -arg "-p nuke_limit=0" -storage "-sTransient=malloc,1m" -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.storage = "Transient";
 	}
 } -start
diff --git a/bin/varnishtest/tests/s00002.vtc b/bin/varnishtest/tests/s00002.vtc
index 4759635..f4cca57 100644
--- a/bin/varnishtest/tests/s00002.vtc
+++ b/bin/varnishtest/tests/s00002.vtc
@@ -47,7 +47,7 @@ varnish v1 -vcl {
 			.initial = 0;
 			} 
 		}
-	sub vcl_response { 
+	sub vcl_backend_response { 
 		set beresp.ttl = 1s; 
 		set beresp.grace = 1m; 
 	}
diff --git a/bin/varnishtest/tests/s00003.vtc b/bin/varnishtest/tests/s00003.vtc
index 09f8572..35fc3d2 100644
--- a/bin/varnishtest/tests/s00003.vtc
+++ b/bin/varnishtest/tests/s00003.vtc
@@ -16,7 +16,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl = 1s;
 		set beresp.grace = 10m;
 		if (beresp.http.foo == "2")
diff --git a/bin/varnishtest/tests/v00000.vtc b/bin/varnishtest/tests/v00000.vtc
index a9a02b1..4041d61 100644
--- a/bin/varnishtest/tests/v00000.vtc
+++ b/bin/varnishtest/tests/v00000.vtc
@@ -12,7 +12,7 @@ varnish v1 -vcl+backend {
 	sub vcl_recv {
 		set req.grace += 1 s;
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl += 1 m;
 		set beresp.grace += 1 h;
 	}
diff --git a/bin/varnishtest/tests/v00001.vtc b/bin/varnishtest/tests/v00001.vtc
index 2f0d47c..ebe802b 100644
--- a/bin/varnishtest/tests/v00001.vtc
+++ b/bin/varnishtest/tests/v00001.vtc
@@ -18,7 +18,7 @@ varnish v1 -vcl+backend {
 		set req.proto = "HTTP/1.2";
 		set req.method = "GET";
 	}
-	sub vcl_fetch {
+	sub vcl_backend_fetch {
 		set bereq.http.foobar =
 		    bereq.url +
 		    bereq.proto;
@@ -26,7 +26,7 @@ varnish v1 -vcl+backend {
 		set bereq.proto = "HTTP/1.2";
 		set bereq.method = "GET";
 	}
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.foobar =
 		    beresp.proto + beresp.response + beresp.status;
 		set beresp.proto = "HTTP/1.2";
diff --git a/bin/varnishtest/tests/v00010.vtc b/bin/varnishtest/tests/v00010.vtc
index d08dcc1..c5f8fa5 100644
--- a/bin/varnishtest/tests/v00010.vtc
+++ b/bin/varnishtest/tests/v00010.vtc
@@ -25,7 +25,7 @@ varnish v1 -storage "-smalloc,1m" -vcl+backend {
 
 	import debug from "${topbuild}/lib/libvmod_debug/.libs/libvmod_debug.so";
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.http.panic == "fetch") {
 			debug.panic("Had Panic header: " + beresp.http.panic);
 		}
diff --git a/bin/varnishtest/tests/v00016.vtc b/bin/varnishtest/tests/v00016.vtc
index 50f82d2..eb5f3d5 100644
--- a/bin/varnishtest/tests/v00016.vtc
+++ b/bin/varnishtest/tests/v00016.vtc
@@ -60,7 +60,7 @@ varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 
 	/* test time and backend comparison */
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.ttl > 1d) {
 			set beresp.ttl = 1d;
 		}
@@ -75,12 +75,12 @@ varnish v1 -vcl {
 
 varnish v1 -errvcl {Unknown time unit 'k'.  Legal are 's', 'm', 'h' and 'd'} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set obj.ttl = 1. k; }
+	sub vcl_backend_response { set obj.ttl = 1. k; }
 }
 
 varnish v1 -errvcl {Expression has type DURATION, expected BOOL} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { if (obj.ttl *= 2) { } }
+	sub vcl_backend_response { if (obj.ttl *= 2) { } }
 }
 
 varnish v1 -errvcl {Operator > not possible on BACKEND} {
diff --git a/bin/varnishtest/tests/v00017.vtc b/bin/varnishtest/tests/v00017.vtc
index 71d9dd5..29b1bfb 100644
--- a/bin/varnishtest/tests/v00017.vtc
+++ b/bin/varnishtest/tests/v00017.vtc
@@ -67,7 +67,7 @@ varnish v1 -vcl {
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 	sub vcl_recv { if (client.ip == "127.0.0.1") { return(pass); } }
-	sub vcl_fetch { if (client.ip != "127.0.0.1") { return(pass); } }
+	sub vcl_backend_fetch { if (client.ip != "127.0.0.1") { return(pass); } }
 }
 
 varnish v1 -errvcl {Operator > not possible on IP} {
diff --git a/bin/varnishtest/tests/v00018.vtc b/bin/varnishtest/tests/v00018.vtc
index 181e823..2553638 100644
--- a/bin/varnishtest/tests/v00018.vtc
+++ b/bin/varnishtest/tests/v00018.vtc
@@ -8,14 +8,14 @@ varnish v1 -vcl {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { error beresp.status ; }
+	sub vcl_backend_response { error beresp.status ; }
 }
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
 	sub vcl_miss { error 100 req.url ; }
 	sub vcl_pass { error 100 "the butter please" ; }
-	sub vcl_response { error beresp.status req.url; }
+	sub vcl_backend_response { error beresp.status req.url; }
 }
 
 varnish v1 -errvcl {Variable 'server.port' is read only.} {
@@ -25,12 +25,12 @@ varnish v1 -errvcl {Variable 'server.port' is read only.} {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.ttl /= 2; }
+	sub vcl_backend_response { set beresp.ttl /= 2; }
 }
 
 varnish v1 -errvcl {Expected '=' got '>>'} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.ttl >>= 2; }
+	sub vcl_backend_response { set beresp.ttl >>= 2; }
 }
 
 varnish v1 -errvcl {Expected '=' got '+='} {
@@ -61,27 +61,27 @@ varnish v1 -vcl {
 
 varnish v1 -errvcl {Expected '=' got '+='} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.do_gzip += 1; }
+	sub vcl_backend_response { set beresp.do_gzip += 1; }
 }
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.do_gzip = true; }
+	sub vcl_backend_response { set beresp.do_gzip = true; }
 }
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.do_gzip = false; }
+	sub vcl_backend_response { set beresp.do_gzip = false; }
 }
 
 varnish v1 -errvcl {Symbol not found: 'mu' (expected type BOOL):} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { set beresp.do_gzip = mu; }
+	sub vcl_backend_response { set beresp.do_gzip = mu; }
 }
 
 varnish v1 -errvcl {Only http header variables can be unset.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response { unset beresp.do_gzip; }
+	sub vcl_backend_response { unset beresp.do_gzip; }
 }
 
 varnish v1 -errvcl {Unknown token '<<' when looking for STRING} {
diff --git a/bin/varnishtest/tests/v00020.vtc b/bin/varnishtest/tests/v00020.vtc
index 87227d3..2977c85 100644
--- a/bin/varnishtest/tests/v00020.vtc
+++ b/bin/varnishtest/tests/v00020.vtc
@@ -24,7 +24,7 @@ varnish v1 -errvcl {Expected an action, 'if', } " sub vcl_recv { { } { "
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.ttl = 1w;
 		set beresp.ttl *= 1.5;
 		set beresp.ttl = 1.5 s * 2.5;
@@ -73,20 +73,20 @@ varnish v1 -errvcl {Operator * not possible on type STRING.} {
 }
 
 varnish v1 -errvcl {DURATION + INT not possible.} {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set req.http.foo = req.grace + beresp.status;
 	}
 }
 
 varnish v1 -errvcl {'!' must be followed by BOOL, found DURATION.} {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (! req.grace) {
 		}
 	}
 }
 
 varnish v1 -errvcl {Operator + not possible on type BOOL.} {
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (beresp.do_gzip + beresp.do_gunzip) {
 		}
 	}
@@ -226,7 +226,7 @@ varnish v1 -errvcl {DURATION + STRING not possible.} {
 
 varnish v1 -errvcl {'||' must be followed by BOOL, found DURATION.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url || beresp.ttl) {
 		}
 	}
@@ -234,7 +234,7 @@ varnish v1 -errvcl {'||' must be followed by BOOL, found DURATION.} {
 
 varnish v1 -errvcl {'&&' must be followed by BOOL, found DURATION.} {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (req.url && beresp.ttl) {
 		}
 	}
@@ -242,7 +242,7 @@ varnish v1 -errvcl {'&&' must be followed by BOOL, found DURATION.} {
 
 varnish v1 -vcl {
 	backend b { .host = "127.0.0.1"; }
-	sub vcl_response {
+	sub vcl_backend_response {
 		if (!req.url) {
 		}
 	}
diff --git a/bin/varnishtest/tests/v00025.vtc b/bin/varnishtest/tests/v00025.vtc
index a90c3a2..dd3a303 100644
--- a/bin/varnishtest/tests/v00025.vtc
+++ b/bin/varnishtest/tests/v00025.vtc
@@ -16,7 +16,7 @@ sub vcl_deliver {
 	set resp.http.server_port = server.port;
 }
 
-sub vcl_response {
+sub vcl_backend_response {
 	if (req.esi) {
 		set beresp.http.esi = "yes";
 	}
@@ -41,7 +41,7 @@ sub vcl_lookup {
 	}
 }
 
-sub vcl_fetch {
+sub vcl_backend_fetch {
 	if (bereq.between_bytes_timeout < 10s) {
 		set bereq.http.quick = "please";
 	}
diff --git a/bin/varnishtest/tests/v00032.vtc b/bin/varnishtest/tests/v00032.vtc
index f18adaa..f9adb77 100644
--- a/bin/varnishtest/tests/v00032.vtc
+++ b/bin/varnishtest/tests/v00032.vtc
@@ -6,7 +6,7 @@ server s1 {
 } -start
 
 varnish v1 -vcl+backend {
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.has_s0 = storage.s0;
 		set beresp.http.has_foo = storage.foo;
 		set beresp.http.has_Transient = storage.Transient;
diff --git a/bin/varnishtest/tests/v00033.vtc b/bin/varnishtest/tests/v00033.vtc
index 504ad5a..4494c32 100644
--- a/bin/varnishtest/tests/v00033.vtc
+++ b/bin/varnishtest/tests/v00033.vtc
@@ -10,7 +10,7 @@ server s1 {
 
 varnish v1 -vcl+backend {
 
-	sub vcl_response {
+	sub vcl_backend_response {
 		set beresp.http.foo =
 		    storage.nowhere.free_space +
 		    1 B + 1 KB + 1 MB + 1GB + 1TB;
diff --git a/lib/libvcl/generate.py b/lib/libvcl/generate.py
index f8c506b..5df3fd8 100755
--- a/lib/libvcl/generate.py
+++ b/lib/libvcl/generate.py
@@ -78,18 +78,18 @@ tokens = {
 # Our methods and actions
 
 returns =(
-	('recv',	('error', 'pass', 'pipe', 'lookup',)),
-	('pipe',	('error', 'pipe',)),
-	('pass',	('error', 'restart', 'pass',)),
-	('hash',	('hash',)),
-	('miss',	('error', 'restart', 'pass', 'fetch',)),
-	('lookup',	('error', 'restart', 'pass', 'deliver',)),
-	('fetch',	('error', 'fetch', 'pass',)),
-	('response',	('error', 'restart', 'deliver',)),
-	('deliver',	('restart', 'deliver',)),
-	('error',	('restart', 'deliver',)),
-	('init',	('ok',)),
-	('fini',	('ok',)),
+	('recv',		('error', 'pass', 'pipe', 'lookup',)),
+	('pipe',		('error', 'pipe',)),
+	('pass',		('error', 'restart', 'pass',)),
+	('hash',		('hash',)),
+	('miss',		('error', 'restart', 'pass', 'fetch',)),
+	('lookup',		('error', 'restart', 'pass', 'deliver',)),
+	('backend_fetch',	('error', 'fetch', 'pass',)),
+	('backend_response',	('error', 'restart', 'deliver',)),
+	('deliver',		('restart', 'deliver',)),
+	('error',		('restart', 'deliver',)),
+	('init',		('ok',)),
+	('fini',		('ok',)),
 )
 
 #######################################################################
@@ -209,8 +209,8 @@ sp_variables = (
 	),
 	('req.esi',
 		'BOOL',
-		( 'recv', 'response', 'deliver', 'error',),
-		( 'recv', 'response', 'deliver', 'error',),
+		( 'recv', 'backend_response', 'deliver', 'error',),
+		( 'recv', 'backend_response', 'deliver', 'error',),
 		'R'
 	),
 	('req.can_gzip',
@@ -239,158 +239,158 @@ sp_variables = (
 	),
 	('bereq.method',
 		'STRING',
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
 		'cR'
 	),
 	('bereq.request',
 		'STRING',
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
 		'cR'
 	),
 	('bereq.url',
 		'STRING',
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
 		'cR'
 	),
 	('bereq.proto',
 		'STRING',
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
 		'cR'
 	),
 	('bereq.http.',
 		'HEADER',
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
-		( 'pipe', 'fetch', 'pass', 'miss', 'response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss', 'backend_response',),
 		'cR'
 	),
 	('bereq.connect_timeout',
 		'DURATION',
-		( 'pipe', 'fetch', 'pass', 'miss',),
-		( 'pipe', 'fetch', 'pass', 'miss',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss',),
+		( 'pipe', 'backend_fetch', 'pass', 'miss',),
 		'cR'
 	),
 	('bereq.first_byte_timeout',
 		'DURATION',
-		( 'fetch', 'pass', 'miss',),
-		( 'fetch', 'pass', 'miss',),
+		( 'backend_fetch', 'pass', 'miss',),
+		( 'backend_fetch', 'pass', 'miss',),
 		'cR'
 	),
 	('bereq.between_bytes_timeout',
 		'DURATION',
-		( 'fetch', 'pass', 'miss',),
-		( 'fetch', 'pass', 'miss',),
+		( 'backend_fetch', 'pass', 'miss',),
+		( 'backend_fetch', 'pass', 'miss',),
 		'cR'
 	),
 	('beresp.proto',
 		'STRING',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.saintmode',
 		'DURATION',
 		( ),
-		( 'response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.status',
 		'INT',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.response',
 		'STRING',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.http.',
 		'HEADER',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.do_esi',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.do_stream',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.do_gzip',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.do_gunzip',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.do_pass',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.uncacheable',
 		'BOOL',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'cR'
 	),
 	('beresp.ttl',
 		'DURATION',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'R'
 	),
 	('beresp.grace',
 		'DURATION',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'R'
 	),
 	('beresp.keep',
 		'DURATION',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'R'
 	),
 	('beresp.backend.name',
 		'STRING',
-		( 'response',),
+		( 'backend_response',),
 		( ),
 		'cR'
 	),
 	('beresp.backend.ip',
 		'IP',
-		( 'response',),
+		( 'backend_response',),
 		( ),
 		'cR'
 	),
 	('beresp.backend.port',
 		'INT',
-		( 'response',),
+		( 'backend_response',),
 		( ),
 		'cR'
 	),
 	('beresp.storage',
 		'STRING',
-		( 'response',),
-		( 'response',),
+		( 'backend_response',),
+		( 'backend_response',),
 		'R'
 	),
 	('obj.proto',
diff --git a/lib/libvcl/vcc_action.c b/lib/libvcl/vcc_action.c
index bb42e35..feea593 100644
--- a/lib/libvcl/vcc_action.c
+++ b/lib/libvcl/vcc_action.c
@@ -374,7 +374,7 @@ static struct action_table {
 } action_table[] = {
 	{ "error",		parse_error,
 	    VCL_MET_RECV | VCL_MET_PIPE | VCL_MET_PASS | VCL_MET_HASH |
-            VCL_MET_MISS | VCL_MET_LOOKUP | VCL_MET_RESPONSE
+            VCL_MET_MISS | VCL_MET_LOOKUP | VCL_MET_BACKEND_RESPONSE
 	},
 
 #define VCL_RET_MAC(l, U, B)						\

More information about the varnish-commit mailing list