diff --git a/build/bazel/remote/execution/v2/remote_execution.pb.go b/build/bazel/remote/execution/v2/remote_execution.pb.go
index 4c78af19..e8d4282c 100755
--- a/build/bazel/remote/execution/v2/remote_execution.pb.go
+++ b/build/bazel/remote/execution/v2/remote_execution.pb.go
@@ -4393,13 +4393,13 @@ type CacheCapabilities struct {
 	// splitting and a meaningful result can be expected from the
 	// [ContentAddressableStorage.SplitBlob][build.bazel.remote.execution.v2.ContentAddressableStorage.SplitBlob]
 	// operation.
-	BlobSplitSupport bool `protobuf:"varint,9,opt,name=blob_split_support,json=blobSplitSupport,proto3" json:"blob_split_support,omitempty"`
+	SplitBlobSupport bool `protobuf:"varint,9,opt,name=split_blob_support,json=splitBlobSupport,proto3" json:"split_blob_support,omitempty"`
 	// Whether blob splicing is supported for the particular server/instance. If
 	// yes, the server/instance implements the specified behavior for blob
 	// splicing and a meaningful result can be expected from the
 	// [ContentAddressableStorage.SpliceBlob][build.bazel.remote.execution.v2.ContentAddressableStorage.SpliceBlob]
 	// operation.
-	BlobSpliceSupport bool `protobuf:"varint,10,opt,name=blob_splice_support,json=blobSpliceSupport,proto3" json:"blob_splice_support,omitempty"`
+	SpliceBlobSupport bool `protobuf:"varint,10,opt,name=splice_blob_support,json=spliceBlobSupport,proto3" json:"splice_blob_support,omitempty"`
 }
 
 func (x *CacheCapabilities) Reset() {
@@ -4490,16 +4490,16 @@ func (x *CacheCapabilities) GetMaxCasBlobSizeBytes() int64 {
 	return 0
 }
 
-func (x *CacheCapabilities) GetBlobSplitSupport() bool {
+func (x *CacheCapabilities) GetSplitBlobSupport() bool {
 	if x != nil {
-		return x.BlobSplitSupport
+		return x.SplitBlobSupport
 	}
 	return false
 }
 
-func (x *CacheCapabilities) GetBlobSpliceSupport() bool {
+func (x *CacheCapabilities) GetSpliceBlobSupport() bool {
 	if x != nil {
-		return x.BlobSpliceSupport
+		return x.SpliceBlobSupport
 	}
 	return false
 }
@@ -5999,12 +5999,12 @@ var file_build_bazel_remote_execution_v2_remote_execution_proto_rawDesc = []byte
 	0x6d, 0x61, 0x78, 0x5f, 0x63, 0x61, 0x73, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x73, 0x69, 0x7a,
 	0x65, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x13, 0x6d,
 	0x61, 0x78, 0x43, 0x61, 0x73, 0x42, 0x6c, 0x6f, 0x62, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x79, 0x74,
-	0x65, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x73, 0x70, 0x6c, 0x69, 0x74,
+	0x65, 0x73, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, 0x62, 0x6c, 0x6f, 0x62,
 	0x5f, 0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10,
-	0x62, 0x6c, 0x6f, 0x62, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
-	0x12, 0x2e, 0x0a, 0x13, 0x62, 0x6c, 0x6f, 0x62, 0x5f, 0x73, 0x70, 0x6c, 0x69, 0x63, 0x65, 0x5f,
-	0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x62,
-	0x6c, 0x6f, 0x62, 0x53, 0x70, 0x6c, 0x69, 0x63, 0x65, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
+	0x73, 0x70, 0x6c, 0x69, 0x74, 0x42, 0x6c, 0x6f, 0x62, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
+	0x12, 0x2e, 0x0a, 0x13, 0x73, 0x70, 0x6c, 0x69, 0x63, 0x65, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x5f,
+	0x73, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x73,
+	0x70, 0x6c, 0x69, 0x63, 0x65, 0x42, 0x6c, 0x6f, 0x62, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74,
 	0x22, 0xb7, 0x03, 0x0a, 0x15, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x61,
 	0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x69, 0x65, 0x73, 0x12, 0x5e, 0x0a, 0x0f, 0x64, 0x69,
 	0x67, 0x65, 0x73, 0x74, 0x5f, 0x66, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
diff --git a/build/bazel/remote/execution/v2/remote_execution.proto b/build/bazel/remote/execution/v2/remote_execution.proto
index f5ba0c24..40e34917 100644
--- a/build/bazel/remote/execution/v2/remote_execution.proto
+++ b/build/bazel/remote/execution/v2/remote_execution.proto
@@ -462,7 +462,7 @@ service ContentAddressableStorage {
   //
   // Servers which implement this functionality MUST declare that they support
   // it by setting the
-  // [CacheCapabilities.blob_split_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_split_support]
+  // [CacheCapabilities.split_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.split_blob_support]
   // field accordingly.
   //
   // Clients MUST check that the server supports this capability, before using
@@ -514,7 +514,7 @@ service ContentAddressableStorage {
   //
   // Servers which implement this functionality MUST declare that they support
   // it by setting the
-  // [CacheCapabilities.blob_splice_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_splice_support]
+  // [CacheCapabilities.splice_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.splice_blob_support]
   // field accordingly.
   //
   // Clients MUST check that the server supports this capability, before using
@@ -2266,14 +2266,14 @@ message CacheCapabilities {
   // splitting and a meaningful result can be expected from the
   // [ContentAddressableStorage.SplitBlob][build.bazel.remote.execution.v2.ContentAddressableStorage.SplitBlob]
   // operation.
-  bool blob_split_support = 9;
+  bool split_blob_support = 9;
 
   // Whether blob splicing is supported for the particular server/instance. If
   // yes, the server/instance implements the specified behavior for blob
   // splicing and a meaningful result can be expected from the
   // [ContentAddressableStorage.SpliceBlob][build.bazel.remote.execution.v2.ContentAddressableStorage.SpliceBlob]
   // operation.
-  bool blob_splice_support = 10;
+  bool splice_blob_support = 10;
 }
 
 // Capabilities of the remote execution system.
diff --git a/build/bazel/remote/execution/v2/remote_execution_grpc.pb.go b/build/bazel/remote/execution/v2/remote_execution_grpc.pb.go
index 5d7c7969..cdf12d19 100755
--- a/build/bazel/remote/execution/v2/remote_execution_grpc.pb.go
+++ b/build/bazel/remote/execution/v2/remote_execution_grpc.pb.go
@@ -688,7 +688,7 @@ type ContentAddressableStorageClient interface {
 	//
 	// Servers which implement this functionality MUST declare that they support
 	// it by setting the
-	// [CacheCapabilities.blob_split_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_split_support]
+	// [CacheCapabilities.split_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.split_blob_support]
 	// field accordingly.
 	//
 	// Clients MUST check that the server supports this capability, before using
@@ -737,7 +737,7 @@ type ContentAddressableStorageClient interface {
 	//
 	// Servers which implement this functionality MUST declare that they support
 	// it by setting the
-	// [CacheCapabilities.blob_splice_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_splice_support]
+	// [CacheCapabilities.splice_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.splice_blob_support]
 	// field accordingly.
 	//
 	// Clients MUST check that the server supports this capability, before using
@@ -957,7 +957,7 @@ type ContentAddressableStorageServer interface {
 	//
 	// Servers which implement this functionality MUST declare that they support
 	// it by setting the
-	// [CacheCapabilities.blob_split_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_split_support]
+	// [CacheCapabilities.split_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.split_blob_support]
 	// field accordingly.
 	//
 	// Clients MUST check that the server supports this capability, before using
@@ -1006,7 +1006,7 @@ type ContentAddressableStorageServer interface {
 	//
 	// Servers which implement this functionality MUST declare that they support
 	// it by setting the
-	// [CacheCapabilities.blob_splice_support][build.bazel.remote.execution.v2.CacheCapabilities.blob_splice_support]
+	// [CacheCapabilities.splice_blob_support][build.bazel.remote.execution.v2.CacheCapabilities.splice_blob_support]
 	// field accordingly.
 	//
 	// Clients MUST check that the server supports this capability, before using