diff --git a/envoy/data/tap/v2alpha/http.proto b/envoy/data/tap/v2alpha/http.proto
index f9c4bb48..92b731c2 100644
--- a/envoy/data/tap/v2alpha/http.proto
+++ b/envoy/data/tap/v2alpha/http.proto
@@ -9,9 +9,18 @@ import "envoy/api/v2/core/base.proto";
 
 // A fully buffered HTTP trace message.
 message HttpBufferedTrace {
-  // Request headers.
-  repeated api.v2.core.HeaderValue request_headers = 2;
+  // HTTP message wrapper.
+  message Message {
+    // Message headers.
+    repeated api.v2.core.HeaderValue headers = 1;
 
-  // Response headers.
-  repeated api.v2.core.HeaderValue response_headers = 3;
+    // Message trailers.
+    repeated api.v2.core.HeaderValue trailers = 2;
+  }
+
+  // Request message.
+  Message request = 1;
+
+  // Response message.
+  Message response = 2;
 }
diff --git a/envoy/service/tap/v2alpha/common.proto b/envoy/service/tap/v2alpha/common.proto
index e4bd6d4a..47f9b53f 100644
--- a/envoy/service/tap/v2alpha/common.proto
+++ b/envoy/service/tap/v2alpha/common.proto
@@ -48,23 +48,23 @@ message MatchPredicate {
     // The match configuration will always match.
     bool any_match = 4 [(validate.rules).bool.const = true];
 
-    // HTTP request match configuration.
-    HttpRequestMatch http_request_match = 5;
+    // HTTP request headers match configuration.
+    HttpHeadersMatch http_request_headers_match = 5;
 
-    // HTTP response match configuration.
-    HttpResponseMatch http_response_match = 6;
-  }
-}
+    // HTTP request trailers match configuration.
+    HttpHeadersMatch http_request_trailers_match = 6;
 
-// HTTP request match configuration.
-message HttpRequestMatch {
-  // HTTP request headers to match.
-  repeated api.v2.route.HeaderMatcher headers = 1;
+    // HTTP response headers match configuration.
+    HttpHeadersMatch http_response_headers_match = 7;
+
+    // HTTP response trailers match configuration.
+    HttpHeadersMatch http_response_trailers_match = 8;
+  }
 }
 
-// HTTP response match configuration.
-message HttpResponseMatch {
-  // HTTP response headers to match.
+// HTTP headers match configuration.
+message HttpHeadersMatch {
+  // HTTP headers to match.
   repeated api.v2.route.HeaderMatcher headers = 1;
 }