diff --git a/acl/types.proto b/acl/types.proto
index d0f756b..c767b19 100644
--- a/acl/types.proto
+++ b/acl/types.proto
@@ -98,10 +98,9 @@ message EACLRecord {
 
   // Filter to check particular properties of the request or object.
   //
-  // By default `header_name` field refers to the corresponding object's
-  // `Attribute`. Some Object's header fields can also be accessed by adding
-  // `$Object:` prefix to the name. Here is the list of fields available via
-  // this prefix:
+  // By default `key` field refers to the corresponding object's `Attribute`.
+  // Some Object's header fields can also be accessed by adding `$Object:`
+  // prefix to the name. Here is the list of fields available via this prefix:
   //
   // * $Object:version \
   //   version
@@ -128,10 +127,10 @@ message EACLRecord {
     MatchType match_type = 2 [json_name = "matchType"];
 
     // Name of the Header to use
-    string header_name = 3 [json_name="headerName"];
+    string key = 3 [json_name="key"];
 
     // Expected Header Value or pattern to match
-    string header_val = 4 [json_name="value"];
+    string value = 4 [json_name="value"];
   }
 
   // List of filters to match and see if rule is applicable
diff --git a/object/service.proto b/object/service.proto
index 34c024e..4cf2aa2 100644
--- a/object/service.proto
+++ b/object/service.proto
@@ -298,7 +298,7 @@ message SearchRequest {
     // Filter structure checks if object header field or attribute content
     // matches a value.
     //
-    // By default `name` field refers to the corresponding object's `Attribute`.
+    // By default `key` field refers to the corresponding object's `Attribute`.
     // Some Object's header fields can also be accessed by adding `$Object:`
     // prefix to the name. Here is the list of fields available via this prefix:
     //
@@ -338,7 +338,7 @@ message SearchRequest {
       MatchType match_type = 1;
 
       // Attribute or Header fields to match
-      string name = 2;
+      string key = 2;
 
       // Value to match
       string value = 3;