diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.result b/testing/tests/regression-suite/0099-REPORT-sync-initial.result
index 2e600cc0..895d012f 100644
--- a/testing/tests/regression-suite/0099-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.result
@@ -2,13 +2,13 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "d668266633188d6d2690a2eb491bba0c"
-Content-Length: 404
+ETag: "05d48e0978c42e1d03570d56c3df863b"
+Content-Length: 394
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <sync-response>
+ <response>
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -17,6 +17,6 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
+ </response>
  <sync-token>1</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result
index 678b1e27..53083761 100644
--- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.result
@@ -2,13 +2,13 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "54f965132f0412ce06e6841180923c1a"
-Content-Length: 4824
+ETag: "c72a8fa833f87631d9ce53697c27605d"
+Content-Length: 4664
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <sync-response>
+ <response>
   <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -17,8 +17,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -27,8 +27,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -37,8 +37,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -47,8 +47,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -57,8 +57,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -67,8 +67,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -77,8 +77,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -87,8 +87,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -97,8 +97,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -107,8 +107,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -117,8 +117,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -127,8 +127,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -137,8 +137,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -147,8 +147,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -157,8 +157,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -167,6 +167,6 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
+ </response>
  <sync-token>2</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result
index 24a912a5..a5aed744 100644
--- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.result
@@ -2,13 +2,13 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "a3009bc4863f7b991b1fa62e8e2816e4"
-Content-Length: 4530
+ETag: "1b7dd9c79c768b1d1be83a3b1d0fc2ba"
+Content-Length: 4380
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <sync-response>
+ <response>
   <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -17,8 +17,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -27,8 +27,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -37,8 +37,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -47,8 +47,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -57,8 +57,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -67,8 +67,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -77,8 +77,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -87,8 +87,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -97,8 +97,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -107,8 +107,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -117,8 +117,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -127,8 +127,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -137,8 +137,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -147,8 +147,8 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
- <sync-response>
+ </response>
+ <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <status>HTTP/1.1 201 Created</status>
   <propstat>
@@ -157,6 +157,6 @@ Content-Type: text/xml; charset="utf-8"
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
- </sync-response>
+ </response>
  <sync-token>3</sync-token>
 </multistatus>