diff --git a/pkg/api/queue.pb.go b/pkg/api/queue.pb.go
index d4920bfa852..2bac328b841 100644
--- a/pkg/api/queue.pb.go
+++ b/pkg/api/queue.pb.go
@@ -172,8 +172,8 @@ func (m *Job) GetCreated() time.Time {
 }
 
 type LeaseRequest struct {
-	ClusterId           string                       `protobuf:"bytes,1,opt,name=ClusterId,proto3" json:"ClusterId,omitempty"`
-	Pool                string                       `protobuf:"bytes,8,opt,name=Pool,proto3" json:"Pool,omitempty"`
+	ClusterId           string                       `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"clusterId,omitempty"`
+	Pool                string                       `protobuf:"bytes,8,opt,name=pool,proto3" json:"pool,omitempty"`
 	Resources           map[string]resource.Quantity `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	ClusterLeasedReport ClusterLeasedReport          `protobuf:"bytes,4,opt,name=cluster_leased_report,json=clusterLeasedReport,proto3" json:"cluster_leased_report"`
 	MinimumJobSize      map[string]resource.Quantity `protobuf:"bytes,6,rep,name=minimum_job_size,json=minimumJobSize,proto3" json:"minimumJobSize,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -391,7 +391,7 @@ func (m *NodeType) GetAllocatableResources() map[string]resource.Quantity {
 // Used to store last info in Redis
 type ClusterSchedulingInfoReport struct {
 	ClusterId      string                       `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"clusterId,omitempty"`
-	Pool           string                       `protobuf:"bytes,7,opt,name=Pool,proto3" json:"Pool,omitempty"`
+	Pool           string                       `protobuf:"bytes,7,opt,name=pool,proto3" json:"pool,omitempty"`
 	ReportTime     time.Time                    `protobuf:"bytes,2,opt,name=report_time,json=reportTime,proto3,stdtime" json:"report_time"`
 	NodeTypes      []*NodeType                  `protobuf:"bytes,5,rep,name=node_types,json=nodeTypes,proto3" json:"nodeTypes,omitempty"`
 	MinimumJobSize map[string]resource.Quantity `protobuf:"bytes,6,rep,name=minimum_job_size,json=minimumJobSize,proto3" json:"minimumJobSize,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
@@ -881,87 +881,87 @@ func init() {
 func init() { proto.RegisterFile("pkg/api/queue.proto", fileDescriptor_d92c0c680df9617a) }
 
 var fileDescriptor_d92c0c680df9617a = []byte{
-	// 1279 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xdb, 0x6e, 0x14, 0x47,
-	0x13, 0xf6, 0xec, 0xc9, 0xbb, 0xb5, 0x1c, 0x4c, 0xdb, 0xc0, 0x30, 0xc0, 0xb2, 0xda, 0x5f, 0x3f,
-	0x71, 0x14, 0x98, 0x95, 0x1d, 0xa2, 0x10, 0x22, 0x21, 0x01, 0xb6, 0x22, 0xaf, 0x48, 0x04, 0x63,
-	0x92, 0x2b, 0xa4, 0xd5, 0x1c, 0x9a, 0xa1, 0xed, 0xd9, 0xe9, 0x61, 0xa6, 0xc7, 0x68, 0xb9, 0xe2,
-	0x09, 0x22, 0x9e, 0x20, 0x2f, 0x90, 0x67, 0xc8, 0xbd, 0x2f, 0xb9, 0xc8, 0x05, 0x52, 0xa4, 0x1c,
-	0xec, 0x87, 0x88, 0x72, 0x17, 0x75, 0x4f, 0xcf, 0x61, 0x77, 0xc7, 0x31, 0x86, 0x38, 0x51, 0xee,
-	0xa6, 0xbb, 0xaa, 0xbe, 0xea, 0xaa, 0xfe, 0xba, 0xaa, 0x06, 0x16, 0x83, 0x6d, 0xb7, 0x6f, 0x06,
-	0xa4, 0xff, 0x2c, 0xc6, 0x31, 0xd6, 0x83, 0x90, 0x32, 0x8a, 0xaa, 0x66, 0x40, 0xb4, 0x2b, 0x2e,
-	0xa5, 0xae, 0x87, 0xfb, 0x62, 0xcb, 0x8a, 0x9f, 0xf4, 0x19, 0x19, 0xe1, 0x88, 0x99, 0xa3, 0x20,
-	0xd1, 0xd2, 0x7a, 0xdb, 0x37, 0x23, 0x9d, 0x50, 0x61, 0x6d, 0xd3, 0x10, 0xf7, 0x77, 0x56, 0xfa,
-	0x2e, 0xf6, 0x71, 0x68, 0x32, 0xec, 0x48, 0x9d, 0x1b, 0xb9, 0xce, 0xc8, 0xb4, 0x9f, 0x12, 0x1f,
-	0x87, 0xe3, 0x7e, 0xea, 0x32, 0xc4, 0x11, 0x8d, 0x43, 0x1b, 0xcf, 0x58, 0x5d, 0x77, 0x09, 0x7b,
-	0x1a, 0x5b, 0xba, 0x4d, 0x47, 0x7d, 0x97, 0xba, 0x34, 0x3f, 0x03, 0x5f, 0x89, 0x85, 0xf8, 0x92,
-	0xea, 0x17, 0xa7, 0x4f, 0x8a, 0x47, 0x01, 0x1b, 0x27, 0xc2, 0xde, 0x8f, 0x75, 0xa8, 0x0e, 0xa8,
-	0x85, 0x4e, 0x41, 0x85, 0x38, 0xaa, 0xd2, 0x55, 0x96, 0x5b, 0x46, 0x85, 0x38, 0xe8, 0x12, 0xc0,
-	0x16, 0xb5, 0x86, 0x11, 0x66, 0x43, 0xe2, 0xa8, 0x15, 0xb1, 0xdf, 0xdc, 0xa2, 0xd6, 0x26, 0x66,
-	0x1b, 0x0e, 0x5a, 0x82, 0xba, 0x48, 0x88, 0x5a, 0x15, 0x82, 0x64, 0x81, 0x2e, 0x41, 0xcb, 0x37,
-	0x47, 0x38, 0x0a, 0x4c, 0x1b, 0xab, 0xf3, 0x42, 0x92, 0x6f, 0xa0, 0x6b, 0xd0, 0xf0, 0x4c, 0x0b,
-	0x7b, 0x91, 0xda, 0xea, 0x56, 0x97, 0xdb, 0xab, 0x4b, 0xba, 0x19, 0x10, 0x7d, 0x40, 0x2d, 0xfd,
-	0xbe, 0xd8, 0x5e, 0xf7, 0x59, 0x38, 0x36, 0xa4, 0x0e, 0xfa, 0x1c, 0xda, 0xa6, 0xef, 0x53, 0x66,
-	0x32, 0x42, 0xfd, 0x48, 0x05, 0x61, 0x72, 0x21, 0x33, 0xb9, 0x93, 0xcb, 0x12, 0xbb, 0xa2, 0x36,
-	0xfa, 0x06, 0x96, 0x42, 0xfc, 0x2c, 0x26, 0x21, 0x76, 0x86, 0x3e, 0x75, 0xf0, 0x50, 0x3a, 0x6e,
-	0x0b, 0x94, 0x6e, 0x86, 0x62, 0x48, 0xa5, 0xaf, 0xa8, 0x83, 0x0b, 0x87, 0xb8, 0x5b, 0x51, 0x15,
-	0x03, 0x85, 0x33, 0x42, 0x1e, 0x36, 0x7d, 0xee, 0xe3, 0x50, 0x6d, 0x26, 0x61, 0x8b, 0x05, 0xd2,
-	0xa0, 0x19, 0x84, 0x84, 0x86, 0x84, 0x8d, 0xd5, 0x5a, 0x57, 0x59, 0x56, 0x8c, 0x6c, 0x8d, 0x6e,
-	0x41, 0x33, 0xa0, 0xce, 0x30, 0x0a, 0xb0, 0xad, 0xd6, 0xbb, 0xca, 0x72, 0x7b, 0xf5, 0xa2, 0x9e,
-	0xdc, 0xb9, 0x38, 0x04, 0xe7, 0x85, 0xbe, 0xb3, 0xa2, 0x3f, 0xa0, 0xce, 0x66, 0x80, 0x6d, 0xe1,
-	0x78, 0x3e, 0x48, 0x16, 0xe8, 0x26, 0xb4, 0x52, 0xdb, 0x48, 0x3d, 0x21, 0x8e, 0xfe, 0x57, 0xc6,
-	0x46, 0x53, 0x1a, 0x46, 0xe8, 0x36, 0xcc, 0xdb, 0x21, 0xe6, 0x8c, 0x51, 0x1b, 0xc2, 0xa9, 0xa6,
-	0x27, 0x1c, 0xd0, 0x53, 0x0e, 0xe8, 0x8f, 0x52, 0xb6, 0xde, 0x6d, 0xee, 0xfe, 0x7c, 0x65, 0xee,
-	0xd5, 0x2f, 0x57, 0x14, 0x23, 0x35, 0xd2, 0x3e, 0x83, 0x76, 0x21, 0x1d, 0x68, 0x01, 0xaa, 0xdb,
-	0x78, 0x2c, 0xc9, 0xc1, 0x3f, 0x79, 0x22, 0x76, 0x4c, 0x2f, 0xc6, 0x92, 0x18, 0xc9, 0xe2, 0x56,
-	0xe5, 0xa6, 0xa2, 0xdd, 0x86, 0x85, 0xe9, 0xbb, 0x39, 0x92, 0xfd, 0x3a, 0x9c, 0x3f, 0xe0, 0x56,
-	0x8e, 0x02, 0xd3, 0xfb, 0xa1, 0x06, 0x27, 0xee, 0x63, 0x33, 0xc2, 0x1c, 0x0c, 0x47, 0x8c, 0x73,
-	0xf3, 0x9e, 0x17, 0x47, 0x0c, 0x87, 0x1b, 0x29, 0xcd, 0xf3, 0x0d, 0x84, 0xa0, 0xf6, 0x80, 0x52,
-	0x4f, 0xde, 0xab, 0xf8, 0x46, 0x6b, 0xd0, 0x4a, 0x5f, 0x60, 0xa4, 0x56, 0x0a, 0xcc, 0x29, 0xe2,
-	0xea, 0x46, 0xaa, 0x92, 0x30, 0xa7, 0xc6, 0x93, 0x69, 0xe4, 0x86, 0xc8, 0x80, 0xb3, 0x76, 0xe2,
-	0x66, 0xe8, 0x71, 0x3b, 0x67, 0x18, 0xe2, 0x80, 0x86, 0x4c, 0x30, 0xa5, 0xbd, 0xaa, 0x0a, 0x44,
-	0x79, 0x10, 0x01, 0xec, 0x18, 0x42, 0x2e, 0x91, 0x16, 0xed, 0x59, 0x11, 0xfa, 0x1a, 0x16, 0x46,
-	0xc4, 0x27, 0xa3, 0x78, 0x34, 0x14, 0x6f, 0x94, 0xbc, 0xc0, 0x6a, 0x43, 0x1c, 0xf0, 0xff, 0xb3,
-	0x07, 0xfc, 0x32, 0xd1, 0x1c, 0x50, 0x6b, 0x93, 0xbc, 0xc0, 0xc5, 0x53, 0x9e, 0x1a, 0x4d, 0x88,
-	0xd0, 0x87, 0x50, 0xe7, 0x8f, 0x25, 0x52, 0xe7, 0x05, 0xd6, 0x49, 0x81, 0xc5, 0x2f, 0x61, 0xc3,
-	0x7f, 0x42, 0xa5, 0x4d, 0xa2, 0xa1, 0x79, 0x70, 0x6a, 0x32, 0xf0, 0x92, 0xcb, 0x59, 0x2b, 0x5e,
-	0x4e, 0x7b, 0x55, 0x2f, 0x50, 0x37, 0xab, 0x75, 0x7a, 0xb0, 0xed, 0x0a, 0x37, 0x69, 0xc2, 0xf4,
-	0x87, 0xb1, 0xe9, 0x33, 0xc2, 0xc6, 0x45, 0x4e, 0x3c, 0x83, 0xc5, 0x92, 0x28, 0x8e, 0xd3, 0x65,
-	0xef, 0xf7, 0x1a, 0x34, 0xd3, 0xd0, 0x39, 0x3b, 0x78, 0x19, 0x93, 0x9e, 0xc4, 0x37, 0xfa, 0x14,
-	0x1a, 0xcc, 0x24, 0x3e, 0x4b, 0xa9, 0x71, 0xa1, 0xec, 0x65, 0x3e, 0xe2, 0x1a, 0x32, 0x73, 0x52,
-	0x1d, 0xad, 0x64, 0x65, 0xb0, 0x5a, 0xa8, 0x69, 0xa9, 0xaf, 0xd2, 0x5a, 0x68, 0xc1, 0x59, 0xd3,
-	0xf3, 0xa8, 0x6d, 0x32, 0xd3, 0xf2, 0xf0, 0x30, 0x67, 0x65, 0x4d, 0x20, 0x7c, 0x30, 0x89, 0x70,
-	0x27, 0x57, 0x2d, 0x25, 0xe7, 0x92, 0x59, 0xa2, 0x80, 0x1e, 0xc3, 0xa2, 0xb9, 0x63, 0x12, 0x6f,
-	0xca, 0x43, 0xbd, 0x40, 0xab, 0xdc, 0x43, 0xaa, 0x58, 0x8a, 0x8f, 0xcc, 0x19, 0xf1, 0xfb, 0x14,
-	0x94, 0xe7, 0x70, 0xe1, 0xc0, 0x88, 0x8e, 0x95, 0x75, 0x31, 0x9c, 0x3f, 0x20, 0xd0, 0x63, 0x65,
-	0xde, 0xb7, 0xd5, 0x84, 0x79, 0x8f, 0xc6, 0x41, 0x91, 0x65, 0xca, 0xbb, 0xb2, 0xac, 0x32, 0xc5,
-	0x32, 0x8e, 0x7b, 0x34, 0x96, 0x55, 0xa7, 0x58, 0x26, 0x10, 0xde, 0x89, 0x65, 0xff, 0x45, 0x1e,
-	0xf4, 0xbe, 0xab, 0xc2, 0x45, 0x59, 0xa0, 0x37, 0xed, 0xa7, 0xd8, 0x89, 0x3d, 0xe2, 0xbb, 0xfc,
-	0x1d, 0xc8, 0x6a, 0x7c, 0x19, 0x20, 0xad, 0xf0, 0xd9, 0x04, 0xd5, 0xb2, 0x67, 0x5a, 0xcb, 0x7c,
-	0xa1, 0xb5, 0xac, 0x43, 0x3b, 0xe9, 0x02, 0x43, 0x3e, 0x34, 0xca, 0x23, 0xbe, 0x5d, 0x8f, 0x86,
-	0xc4, 0x90, 0x8b, 0xd0, 0x35, 0x00, 0x31, 0xdd, 0xb0, 0x71, 0x90, 0x3d, 0xd5, 0x93, 0x13, 0xd7,
-	0x64, 0xb4, 0x7c, 0xf9, 0x15, 0x21, 0xe7, 0xc0, 0xae, 0x71, 0xa3, 0xd8, 0x84, 0xca, 0x62, 0x7c,
-	0xfb, 0x26, 0xf2, 0x6f, 0xd4, 0xea, 0x3f, 0x14, 0x38, 0xf3, 0x90, 0x0f, 0xa0, 0x13, 0x4d, 0xb2,
-	0xac, 0x68, 0x3f, 0x86, 0x85, 0x8c, 0xd6, 0xb2, 0x1d, 0xcb, 0xf7, 0xf1, 0x91, 0x70, 0x33, 0x83,
-	0x92, 0xb7, 0xf7, 0x64, 0xb7, 0x18, 0xf9, 0xe9, 0x70, 0x52, 0xa6, 0x85, 0xb0, 0x54, 0xa6, 0x7e,
-	0xac, 0xb1, 0x7f, 0xaf, 0xc0, 0x62, 0xc9, 0xf4, 0x70, 0x18, 0x29, 0xff, 0x26, 0x02, 0xea, 0xd0,
-	0x10, 0x93, 0x7f, 0x5a, 0x23, 0xce, 0x95, 0x67, 0xd1, 0x90, 0x5a, 0xbd, 0x5d, 0x05, 0x4e, 0xdf,
-	0xa3, 0xa3, 0x20, 0x66, 0xd9, 0x03, 0x46, 0x5f, 0x14, 0xc7, 0xac, 0xa4, 0xca, 0xfd, 0x2f, 0xe1,
-	0xe3, 0xa4, 0xe2, 0x61, 0x93, 0xd6, 0x3f, 0x3b, 0x93, 0xf4, 0x5e, 0x2a, 0x70, 0x22, 0x1b, 0x50,
-	0x89, 0xef, 0xa2, 0x4f, 0xa6, 0xfa, 0xfa, 0xe5, 0xec, 0x21, 0xa6, 0x2a, 0x65, 0x55, 0xf7, 0x3d,
-	0x2a, 0x62, 0xef, 0x2a, 0x34, 0x07, 0xd4, 0x12, 0x89, 0x46, 0x1a, 0x54, 0xb7, 0xa8, 0x25, 0xf3,
-	0xd7, 0x4c, 0x7f, 0x70, 0x0c, 0xbe, 0xd9, 0xd3, 0xa0, 0xb1, 0xe1, 0xdc, 0x27, 0x11, 0xe3, 0xe8,
-	0xc4, 0x49, 0xb2, 0xdc, 0x32, 0xf8, 0x67, 0x6f, 0x0d, 0xce, 0x18, 0xd8, 0xc7, 0xcf, 0x27, 0x66,
-	0xe5, 0x43, 0xc8, 0x23, 0x51, 0x2a, 0x39, 0xca, 0x00, 0x90, 0x81, 0x59, 0x1c, 0xfa, 0x47, 0x81,
-	0x39, 0x0b, 0x0d, 0x5e, 0x87, 0xb2, 0xbf, 0xcb, 0xfa, 0x16, 0xb5, 0x36, 0x9c, 0xd5, 0x9f, 0x14,
-	0x38, 0x7d, 0xc7, 0x75, 0x43, 0xec, 0xf2, 0x5f, 0x11, 0xc1, 0x25, 0x74, 0x1d, 0x5a, 0x02, 0x79,
-	0x40, 0xad, 0x08, 0x9d, 0x99, 0x99, 0x71, 0xb5, 0x93, 0x69, 0xc0, 0x49, 0x32, 0x56, 0x00, 0xf2,
-	0xa0, 0x50, 0x42, 0xca, 0x99, 0x28, 0xb5, 0xb6, 0xd8, 0x97, 0x99, 0xb9, 0x0d, 0xed, 0x42, 0x04,
-	0xe8, 0xbc, 0xb4, 0x99, 0x8e, 0x49, 0x3b, 0x37, 0xf3, 0x46, 0xd6, 0xf9, 0xcf, 0x34, 0xba, 0xca,
-	0x5d, 0x72, 0xae, 0xaf, 0x51, 0x1f, 0xa3, 0x22, 0xf4, 0x84, 0x9f, 0xbb, 0xdd, 0x37, 0xbf, 0x75,
-	0xe6, 0x5e, 0xee, 0x75, 0x94, 0xdd, 0xbd, 0x8e, 0xf2, 0x7a, 0xaf, 0xa3, 0xfc, 0xba, 0xd7, 0x51,
-	0x5e, 0xed, 0x77, 0xe6, 0x5e, 0xef, 0x77, 0xe6, 0xde, 0xec, 0x77, 0xe6, 0xac, 0x86, 0x40, 0xfe,
-	0xf8, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xcd, 0x8d, 0x1f, 0x7a, 0x10, 0x00, 0x00,
+	// 1269 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcd, 0x6e, 0xdb, 0x46,
+	0x10, 0x36, 0xf5, 0x67, 0x69, 0x94, 0x1f, 0x67, 0xed, 0x24, 0x0c, 0x93, 0x28, 0x82, 0x8a, 0xa6,
+	0x2e, 0x9a, 0x50, 0xb0, 0x9b, 0xa2, 0x69, 0x0a, 0x04, 0x48, 0x62, 0xa3, 0xb0, 0x90, 0x16, 0x0d,
+	0xed, 0xf6, 0x14, 0x40, 0xe0, 0xcf, 0x86, 0x5e, 0x9b, 0xe2, 0xd2, 0xe4, 0xd2, 0x86, 0x72, 0xca,
+	0x13, 0x14, 0x79, 0x82, 0xbe, 0x40, 0xdf, 0xa1, 0x67, 0x1f, 0x73, 0xe8, 0x21, 0x40, 0x81, 0xfe,
+	0xd8, 0x0f, 0x51, 0xf4, 0x56, 0xec, 0x72, 0x49, 0x51, 0x12, 0xdd, 0xd8, 0x49, 0xdd, 0xa2, 0x37,
+	0xee, 0xce, 0xcc, 0x37, 0x3b, 0xb3, 0xdf, 0xce, 0x0c, 0x61, 0x3e, 0xd8, 0x76, 0xbb, 0x66, 0x40,
+	0xba, 0x3b, 0x31, 0x8e, 0xb1, 0x1e, 0x84, 0x94, 0x51, 0x54, 0x36, 0x03, 0xa2, 0xdd, 0x70, 0x29,
+	0x75, 0x3d, 0xdc, 0x15, 0x5b, 0x56, 0xfc, 0xac, 0xcb, 0xc8, 0x00, 0x47, 0xcc, 0x1c, 0x04, 0x89,
+	0x96, 0xd6, 0xd9, 0xbe, 0x1b, 0xe9, 0x84, 0x0a, 0x6b, 0x9b, 0x86, 0xb8, 0xbb, 0xbb, 0xd4, 0x75,
+	0xb1, 0x8f, 0x43, 0x93, 0x61, 0x47, 0xea, 0xdc, 0x19, 0xe9, 0x0c, 0x4c, 0x7b, 0x93, 0xf8, 0x38,
+	0x1c, 0x76, 0x53, 0x97, 0x21, 0x8e, 0x68, 0x1c, 0xda, 0x78, 0xca, 0xea, 0xb6, 0x4b, 0xd8, 0x66,
+	0x6c, 0xe9, 0x36, 0x1d, 0x74, 0x5d, 0xea, 0xd2, 0xd1, 0x19, 0xf8, 0x4a, 0x2c, 0xc4, 0x97, 0x54,
+	0xbf, 0x3a, 0x79, 0x52, 0x3c, 0x08, 0xd8, 0x30, 0x11, 0x76, 0x7e, 0xaa, 0x42, 0xb9, 0x47, 0x2d,
+	0x74, 0x0e, 0x4a, 0xc4, 0x51, 0x95, 0xb6, 0xb2, 0xd8, 0x30, 0x4a, 0xc4, 0x41, 0xd7, 0x00, 0xb6,
+	0xa8, 0xd5, 0x8f, 0x30, 0xeb, 0x13, 0x47, 0x2d, 0x89, 0xfd, 0xfa, 0x16, 0xb5, 0xd6, 0x31, 0x5b,
+	0x73, 0xd0, 0x02, 0x54, 0x45, 0x42, 0xd4, 0xb2, 0x10, 0x24, 0x0b, 0x74, 0x0d, 0x1a, 0xbe, 0x39,
+	0xc0, 0x51, 0x60, 0xda, 0x58, 0x9d, 0x15, 0x92, 0xd1, 0x06, 0xba, 0x05, 0x35, 0xcf, 0xb4, 0xb0,
+	0x17, 0xa9, 0x8d, 0x76, 0x79, 0xb1, 0xb9, 0xbc, 0xa0, 0x9b, 0x01, 0xd1, 0x7b, 0xd4, 0xd2, 0x1f,
+	0x8b, 0xed, 0x55, 0x9f, 0x85, 0x43, 0x43, 0xea, 0xa0, 0xcf, 0xa1, 0x69, 0xfa, 0x3e, 0x65, 0x26,
+	0x23, 0xd4, 0x8f, 0x54, 0x10, 0x26, 0x57, 0x32, 0x93, 0x07, 0x23, 0x59, 0x62, 0x97, 0xd7, 0x46,
+	0xdf, 0xc2, 0x42, 0x88, 0x77, 0x62, 0x12, 0x62, 0xa7, 0xef, 0x53, 0x07, 0xf7, 0xa5, 0xe3, 0xa6,
+	0x40, 0x69, 0x67, 0x28, 0x86, 0x54, 0xfa, 0x8a, 0x3a, 0x38, 0x77, 0x88, 0x87, 0x25, 0x55, 0x31,
+	0x50, 0x38, 0x25, 0xe4, 0x61, 0xd3, 0x3d, 0x1f, 0x87, 0x6a, 0x3d, 0x09, 0x5b, 0x2c, 0x90, 0x06,
+	0xf5, 0x20, 0x24, 0x34, 0x24, 0x6c, 0xa8, 0x56, 0xda, 0xca, 0xa2, 0x62, 0x64, 0x6b, 0x74, 0x0f,
+	0xea, 0x01, 0x75, 0xfa, 0x51, 0x80, 0x6d, 0xb5, 0xda, 0x56, 0x16, 0x9b, 0xcb, 0x57, 0xf5, 0xe4,
+	0xce, 0xc5, 0x21, 0x38, 0x2f, 0xf4, 0xdd, 0x25, 0xfd, 0x6b, 0xea, 0xac, 0x07, 0xd8, 0x16, 0x8e,
+	0x67, 0x83, 0x64, 0x81, 0xee, 0x42, 0x23, 0xb5, 0x8d, 0xd4, 0x33, 0xe2, 0xe8, 0x7f, 0x67, 0x6c,
+	0xd4, 0xa5, 0x61, 0x84, 0xee, 0xc3, 0xac, 0x1d, 0x62, 0xce, 0x18, 0xb5, 0x26, 0x9c, 0x6a, 0x7a,
+	0xc2, 0x01, 0x3d, 0xe5, 0x80, 0xbe, 0x91, 0xb2, 0xf5, 0x61, 0x7d, 0xff, 0x97, 0x1b, 0x33, 0x2f,
+	0x7f, 0xbd, 0xa1, 0x18, 0xa9, 0x91, 0xf6, 0x19, 0x34, 0x73, 0xe9, 0x40, 0x73, 0x50, 0xde, 0xc6,
+	0x43, 0x49, 0x0e, 0xfe, 0xc9, 0x13, 0xb1, 0x6b, 0x7a, 0x31, 0x96, 0xc4, 0x48, 0x16, 0xf7, 0x4a,
+	0x77, 0x15, 0xed, 0x3e, 0xcc, 0x4d, 0xde, 0xcd, 0x89, 0xec, 0x57, 0xe1, 0xf2, 0x11, 0xb7, 0x72,
+	0x12, 0x98, 0xce, 0x8f, 0x15, 0x38, 0xf3, 0x18, 0x9b, 0x11, 0xe6, 0x60, 0x38, 0x62, 0xe8, 0x3a,
+	0x80, 0xed, 0xc5, 0x11, 0xc3, 0x61, 0x3f, 0xe3, 0x79, 0x43, 0xee, 0xac, 0x39, 0x08, 0x41, 0x25,
+	0xa0, 0xd4, 0x93, 0x17, 0x2b, 0xbe, 0xd1, 0x0a, 0x34, 0xd2, 0x27, 0x18, 0xa9, 0xa5, 0x1c, 0x75,
+	0xf2, 0xc0, 0xba, 0x91, 0xaa, 0x24, 0xd4, 0xa9, 0xf0, 0x6c, 0x1a, 0x23, 0x43, 0x64, 0xc0, 0xc5,
+	0xd4, 0xb1, 0xc7, 0xed, 0x9c, 0x7e, 0x88, 0x03, 0x1a, 0x32, 0x41, 0x95, 0xe6, 0xb2, 0x2a, 0x10,
+	0x1f, 0x25, 0x1a, 0x02, 0xd8, 0x31, 0x84, 0x5c, 0x22, 0xcd, 0xdb, 0xd3, 0x22, 0xf4, 0x0d, 0xcc,
+	0x0d, 0x88, 0x4f, 0x06, 0xf1, 0xa0, 0x2f, 0x1e, 0x29, 0x79, 0x8e, 0xd5, 0x9a, 0x38, 0xe0, 0xfb,
+	0xd3, 0x07, 0xfc, 0x32, 0xd1, 0xec, 0x51, 0x6b, 0x9d, 0x3c, 0xc7, 0xf9, 0x53, 0x9e, 0x1b, 0x8c,
+	0x89, 0xd0, 0x87, 0x50, 0xe5, 0xaf, 0x25, 0x52, 0x67, 0x05, 0xd6, 0x59, 0x81, 0xc5, 0x6f, 0x61,
+	0xcd, 0x7f, 0x46, 0xa5, 0x4d, 0xa2, 0xa1, 0x79, 0x70, 0x6e, 0x3c, 0xf0, 0x82, 0xdb, 0x59, 0xc9,
+	0xdf, 0x4e, 0x73, 0x59, 0xcf, 0x71, 0x37, 0x2b, 0x76, 0x7a, 0xb0, 0xed, 0x0a, 0x37, 0x69, 0xc2,
+	0xf4, 0x27, 0xb1, 0xe9, 0x33, 0xc2, 0x86, 0x79, 0x52, 0xec, 0xc0, 0x7c, 0x41, 0x14, 0xa7, 0xe9,
+	0xb2, 0xf3, 0x47, 0x05, 0xea, 0x69, 0xe8, 0x9c, 0x1d, 0xbc, 0x8e, 0x49, 0x4f, 0xe2, 0x1b, 0x7d,
+	0x0a, 0x35, 0x66, 0x12, 0x9f, 0xa5, 0xd4, 0xb8, 0x52, 0xf4, 0x34, 0x37, 0xb8, 0x86, 0xcc, 0x9c,
+	0x54, 0x47, 0x4b, 0x59, 0x1d, 0x2c, 0xe7, 0x8a, 0x5a, 0xea, 0xab, 0xb0, 0x18, 0x5a, 0x70, 0xd1,
+	0xf4, 0x3c, 0x6a, 0x9b, 0xcc, 0xb4, 0x3c, 0xdc, 0x1f, 0xb1, 0xb2, 0x22, 0x10, 0x3e, 0x18, 0x47,
+	0x78, 0x30, 0x52, 0x2d, 0x24, 0xe7, 0x82, 0x59, 0xa0, 0x80, 0x9e, 0xc2, 0xbc, 0xb9, 0x6b, 0x12,
+	0x6f, 0xc2, 0x43, 0x35, 0x47, 0xab, 0x91, 0x87, 0x54, 0xb1, 0x10, 0x1f, 0x99, 0x53, 0xe2, 0x77,
+	0xa9, 0x28, 0x7b, 0x70, 0xe5, 0xc8, 0x88, 0x4e, 0x95, 0x75, 0x31, 0x5c, 0x3e, 0x22, 0xd0, 0x53,
+	0x65, 0xde, 0x77, 0xe5, 0x84, 0x79, 0x1b, 0xc3, 0x20, 0xcf, 0x32, 0xe5, 0x6d, 0x59, 0x56, 0x9a,
+	0x60, 0x19, 0xc7, 0x3d, 0x19, 0xcb, 0xca, 0x13, 0x2c, 0x13, 0x08, 0x6f, 0xc5, 0xb2, 0xff, 0x23,
+	0x0f, 0x3a, 0xdf, 0x97, 0xe1, 0xaa, 0x2c, 0xd0, 0xeb, 0xf6, 0x26, 0x76, 0x62, 0x8f, 0xf8, 0x2e,
+	0x7f, 0x07, 0xb2, 0x1a, 0x1f, 0xb3, 0xb5, 0xcc, 0xe6, 0x5a, 0xcb, 0x2a, 0x34, 0x93, 0x2e, 0xd0,
+	0xe7, 0x53, 0xa3, 0x3c, 0xe2, 0xf1, 0x9a, 0x34, 0x24, 0x86, 0x5c, 0x84, 0x6e, 0x01, 0x88, 0xf1,
+	0x86, 0x0d, 0x83, 0xec, 0xa9, 0x9e, 0x1d, 0xbb, 0x26, 0xa3, 0xe1, 0xcb, 0xaf, 0x08, 0x39, 0x47,
+	0x76, 0x8d, 0x3b, 0xf9, 0x26, 0x54, 0x14, 0xe3, 0xf1, 0x9b, 0xc8, 0x7f, 0x51, 0xab, 0xff, 0x54,
+	0xe0, 0xc2, 0x13, 0x3e, 0x81, 0x8e, 0x35, 0xc9, 0xa2, 0xa2, 0xfd, 0x14, 0xe6, 0x32, 0x5a, 0xcb,
+	0x76, 0x2c, 0xdf, 0xc7, 0x47, 0xc2, 0xcd, 0x14, 0xca, 0xa8, 0xbd, 0x27, 0xbb, 0xf9, 0xc8, 0xcf,
+	0x87, 0xe3, 0x32, 0x2d, 0x84, 0x85, 0x22, 0xf5, 0x53, 0x8d, 0xfd, 0x07, 0x05, 0xe6, 0x0b, 0xa6,
+	0x87, 0x37, 0x91, 0xf2, 0x1f, 0x22, 0xa0, 0x0e, 0x35, 0x31, 0xfa, 0xa7, 0x35, 0xe2, 0x52, 0x71,
+	0x16, 0x0d, 0xa9, 0xd5, 0xd9, 0x57, 0xe0, 0xfc, 0x23, 0x3a, 0x08, 0x62, 0x96, 0x3d, 0x60, 0xf4,
+	0x45, 0x7e, 0xcc, 0x4a, 0xaa, 0xdc, 0x7b, 0x09, 0x1f, 0xc7, 0x15, 0xdf, 0x34, 0x69, 0xfd, 0xbb,
+	0x33, 0x49, 0xe7, 0x85, 0x02, 0x67, 0xb2, 0x09, 0x95, 0xf8, 0x2e, 0xfa, 0x64, 0xa2, 0xaf, 0x5f,
+	0xcf, 0x1e, 0x62, 0xaa, 0x52, 0x54, 0x75, 0xdf, 0xa1, 0x22, 0x76, 0x6e, 0x42, 0xbd, 0x47, 0x2d,
+	0x91, 0x68, 0xa4, 0x41, 0x79, 0x8b, 0x5a, 0x32, 0x7f, 0xf5, 0xf4, 0x0f, 0xc7, 0xe0, 0x9b, 0x1d,
+	0x0d, 0x6a, 0x6b, 0xce, 0x63, 0x12, 0x31, 0x8e, 0x4e, 0x9c, 0x24, 0xcb, 0x0d, 0x83, 0x7f, 0x76,
+	0x56, 0xe0, 0x82, 0x81, 0x7d, 0xbc, 0x77, 0x92, 0x61, 0x59, 0xa2, 0x94, 0x46, 0x28, 0x3d, 0x40,
+	0x06, 0x66, 0x71, 0xe8, 0x9f, 0x04, 0xe6, 0x22, 0xd4, 0x78, 0x1d, 0xca, 0x7e, 0x2f, 0xab, 0x5b,
+	0xd4, 0x5a, 0x73, 0x96, 0x7f, 0x56, 0xe0, 0xfc, 0x03, 0xd7, 0x0d, 0xb1, 0xcb, 0xff, 0x45, 0x04,
+	0x97, 0xd0, 0x6d, 0x68, 0x08, 0xe4, 0x1e, 0xb5, 0x22, 0x74, 0x61, 0x6a, 0xc6, 0xd5, 0xce, 0xa6,
+	0x01, 0x27, 0xc9, 0x58, 0x02, 0x18, 0x05, 0x85, 0x12, 0x52, 0x4e, 0x45, 0xa9, 0x35, 0xc5, 0xbe,
+	0xcc, 0xcc, 0x7d, 0x68, 0xe6, 0x22, 0x40, 0x97, 0xa5, 0xcd, 0x64, 0x4c, 0xda, 0xa5, 0xa9, 0x37,
+	0xb2, 0xca, 0xff, 0xa6, 0xd1, 0x4d, 0xee, 0x92, 0x73, 0x7d, 0x85, 0xfa, 0x18, 0xe5, 0xa1, 0xc7,
+	0xfc, 0x3c, 0x6c, 0xbf, 0xfe, 0xbd, 0x35, 0xf3, 0xe2, 0xa0, 0xa5, 0xec, 0x1f, 0xb4, 0x94, 0x57,
+	0x07, 0x2d, 0xe5, 0xb7, 0x83, 0x96, 0xf2, 0xf2, 0xb0, 0x35, 0xf3, 0xea, 0xb0, 0x35, 0xf3, 0xfa,
+	0xb0, 0x35, 0x63, 0xd5, 0x04, 0xf2, 0xc7, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xf5, 0x20,
+	0x37, 0x7b, 0x10, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/api/queue.proto b/pkg/api/queue.proto
index e72d1e7431d..5b398c31885 100644
--- a/pkg/api/queue.proto
+++ b/pkg/api/queue.proto
@@ -27,8 +27,8 @@ message Job {
 }
 
 message LeaseRequest {
-    string ClusterId = 1;
-    string Pool = 8;
+    string cluster_id = 1;
+    string pool = 8;
     map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> resources = 2 [(gogoproto.nullable) = false];
     ClusterLeasedReport cluster_leased_report  = 4 [(gogoproto.nullable) = false];
     map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> minimum_job_size = 6 [(gogoproto.nullable) = false];
@@ -52,7 +52,7 @@ message NodeType {
 // Used to store last info in Redis
 message ClusterSchedulingInfoReport {
     string cluster_id = 1;
-    string Pool = 7;
+    string pool = 7;
     google.protobuf.Timestamp report_time = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
     repeated NodeType node_types = 5;
     map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> minimum_job_size = 6 [(gogoproto.nullable) = false];
diff --git a/pkg/api/usage.pb.go b/pkg/api/usage.pb.go
index 8fafa2e7523..4958abe3c7c 100644
--- a/pkg/api/usage.pb.go
+++ b/pkg/api/usage.pb.go
@@ -37,9 +37,9 @@ var _ = time.Kitchen
 const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type QueueReport struct {
-	Name          string                       `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Resources     map[string]resource.Quantity `protobuf:"bytes,2,rep,name=Resources,proto3" json:"Resources" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ResourcesUsed map[string]resource.Quantity `protobuf:"bytes,3,rep,name=ResourcesUsed,proto3" json:"ResourcesUsed" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	Name          string                       `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Resources     map[string]resource.Quantity `protobuf:"bytes,2,rep,name=resources,proto3" json:"resources" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ResourcesUsed map[string]resource.Quantity `protobuf:"bytes,3,rep,name=resources_used,json=resourcesUsed,proto3" json:"resourcesUsed,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (m *QueueReport) Reset()      { *m = QueueReport{} }
@@ -96,12 +96,12 @@ func (m *QueueReport) GetResourcesUsed() map[string]resource.Quantity {
 }
 
 type ClusterUsageReport struct {
-	ClusterId                string                       `protobuf:"bytes,1,opt,name=ClusterId,proto3" json:"ClusterId,omitempty"`
-	Pool                     string                       `protobuf:"bytes,6,opt,name=Pool,proto3" json:"Pool,omitempty"`
-	ReportTime               time.Time                    `protobuf:"bytes,2,opt,name=ReportTime,proto3,stdtime" json:"ReportTime"`
-	Queues                   []*QueueReport               `protobuf:"bytes,3,rep,name=Queues,proto3" json:"Queues,omitempty"`
-	ClusterCapacity          map[string]resource.Quantity `protobuf:"bytes,4,rep,name=ClusterCapacity,proto3" json:"ClusterCapacity" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	ClusterAvailableCapacity map[string]resource.Quantity `protobuf:"bytes,5,rep,name=ClusterAvailableCapacity,proto3" json:"ClusterAvailableCapacity" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ClusterId                string                       `protobuf:"bytes,1,opt,name=cluster_id,json=clusterId,proto3" json:"clusterId,omitempty"`
+	Pool                     string                       `protobuf:"bytes,6,opt,name=pool,proto3" json:"pool,omitempty"`
+	ReportTime               time.Time                    `protobuf:"bytes,2,opt,name=report_time,json=reportTime,proto3,stdtime" json:"report_time"`
+	Queues                   []*QueueReport               `protobuf:"bytes,3,rep,name=queues,proto3" json:"queues,omitempty"`
+	ClusterCapacity          map[string]resource.Quantity `protobuf:"bytes,4,rep,name=cluster_capacity,json=clusterCapacity,proto3" json:"clusterCapacity,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	ClusterAvailableCapacity map[string]resource.Quantity `protobuf:"bytes,5,rep,name=cluster_available_capacity,json=clusterAvailableCapacity,proto3" json:"clusterAvailableCapacity,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 }
 
 func (m *ClusterUsageReport) Reset()      { *m = ClusterUsageReport{} }
@@ -190,41 +190,42 @@ func init() {
 func init() { proto.RegisterFile("pkg/api/usage.proto", fileDescriptor_5643ccb387d55d48) }
 
 var fileDescriptor_5643ccb387d55d48 = []byte{
-	// 536 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x4d, 0x6f, 0xd3, 0x40,
-	0x10, 0xb5, 0xeb, 0x24, 0x22, 0x13, 0x01, 0xd5, 0x82, 0xc0, 0x32, 0xe0, 0x44, 0xe5, 0x92, 0x03,
-	0xac, 0xa5, 0x00, 0x52, 0xc5, 0x01, 0x89, 0xa4, 0x15, 0xe2, 0x02, 0xd4, 0x6a, 0x6f, 0x5c, 0x36,
-	0xc9, 0xe2, 0xae, 0x62, 0x67, 0x57, 0xf6, 0xba, 0xc8, 0xe2, 0xc2, 0x4f, 0xe8, 0x8d, 0xbf, 0xd4,
-	0x63, 0x8f, 0x3d, 0xf1, 0x91, 0xfc, 0x0f, 0x84, 0xbc, 0x5e, 0x27, 0x6e, 0x42, 0xe0, 0x94, 0xdb,
-	0xcc, 0xec, 0xbc, 0x79, 0xe3, 0xf7, 0x46, 0x86, 0x3b, 0x62, 0x12, 0x78, 0x44, 0x30, 0x2f, 0x4d,
-	0x48, 0x40, 0xb1, 0x88, 0xb9, 0xe4, 0xc8, 0x22, 0x82, 0x39, 0xed, 0x80, 0xf3, 0x20, 0xa4, 0x9e,
-	0x2a, 0x0d, 0xd3, 0x4f, 0x9e, 0x64, 0x11, 0x4d, 0x24, 0x89, 0x44, 0xd1, 0xe5, 0x3c, 0x58, 0x6d,
-	0xa0, 0x91, 0x90, 0x99, 0x7e, 0x7c, 0x3e, 0xd9, 0x4f, 0x30, 0xe3, 0xf9, 0xe8, 0x88, 0x8c, 0x4e,
-	0xd9, 0x94, 0xc6, 0x99, 0x57, 0x72, 0xc5, 0x34, 0xe1, 0x69, 0x3c, 0xa2, 0x5e, 0x40, 0xa7, 0x34,
-	0x26, 0x92, 0x8e, 0x35, 0xea, 0x69, 0xc0, 0xe4, 0x69, 0x3a, 0xc4, 0x23, 0x1e, 0x79, 0x01, 0x0f,
-	0xf8, 0x72, 0x76, 0x9e, 0xa9, 0x44, 0x45, 0x45, 0xfb, 0xde, 0x37, 0x0b, 0x5a, 0x47, 0x29, 0x4d,
-	0xa9, 0x4f, 0x05, 0x8f, 0x25, 0x42, 0x50, 0x7b, 0x47, 0x22, 0x6a, 0x9b, 0x1d, 0xb3, 0xdb, 0xf4,
-	0x55, 0x8c, 0x06, 0xd0, 0xf4, 0x35, 0x5d, 0x62, 0xef, 0x74, 0xac, 0x6e, 0xab, 0xd7, 0xc6, 0x44,
-	0x30, 0x5c, 0x01, 0xe2, 0x45, 0xc7, 0xe1, 0x54, 0xc6, 0x59, 0xbf, 0x76, 0xf1, 0xbd, 0x6d, 0xf8,
-	0x4b, 0x1c, 0x7a, 0x0f, 0x37, 0x17, 0xc9, 0x49, 0x42, 0xc7, 0xb6, 0xa5, 0x06, 0x3d, 0xde, 0x3c,
-	0x28, 0xef, 0xaa, 0x0e, 0xbb, 0x8e, 0x77, 0x42, 0xb8, 0x75, 0x9d, 0x13, 0xed, 0x82, 0x35, 0xa1,
-	0x99, 0x5e, 0x3d, 0x0f, 0xd1, 0x01, 0xd4, 0xcf, 0x48, 0x98, 0x52, 0x7b, 0xa7, 0x63, 0x76, 0x5b,
-	0x3d, 0x8c, 0x0b, 0x49, 0x71, 0x55, 0x52, 0x2c, 0x26, 0x81, 0x5a, 0xa2, 0x94, 0x14, 0x1f, 0xa5,
-	0x64, 0x2a, 0x99, 0xcc, 0xfc, 0x02, 0xfc, 0x72, 0x67, 0xdf, 0x74, 0x04, 0xa0, 0xf5, 0xc5, 0xb6,
-	0xc9, 0xb8, 0xf7, 0xbb, 0x06, 0x68, 0x10, 0xa6, 0x89, 0xa4, 0xf1, 0x49, 0x7e, 0x58, 0xda, 0xa0,
-	0x87, 0xd0, 0xd4, 0xd5, 0xb7, 0x63, 0x4d, 0xbc, 0x2c, 0xe4, 0xf6, 0x7d, 0xe0, 0x3c, 0xb4, 0x1b,
-	0x85, 0x7d, 0x79, 0x8c, 0x0e, 0x00, 0x0a, 0xec, 0x31, 0x8b, 0xca, 0xbd, 0x1c, 0x5c, 0x5c, 0x1e,
-	0x2e, 0xaf, 0x03, 0x1f, 0x97, 0xa7, 0xd9, 0xbf, 0x91, 0xab, 0x7d, 0xfe, 0xa3, 0x6d, 0xfa, 0x15,
-	0x1c, 0xea, 0x42, 0x43, 0xb9, 0x94, 0x68, 0xe3, 0x76, 0x57, 0x8d, 0xf3, 0xf5, 0x3b, 0xfa, 0x08,
-	0xb7, 0xf5, 0x42, 0x03, 0x22, 0xc8, 0x88, 0xc9, 0xcc, 0xae, 0x29, 0xc8, 0x13, 0x05, 0x59, 0xff,
-	0x26, 0xbc, 0xd2, 0x5e, 0x35, 0x7d, 0x75, 0x14, 0xfa, 0x0c, 0xb6, 0x2e, 0xbd, 0x3e, 0x23, 0x2c,
-	0x24, 0xc3, 0x90, 0x2e, 0x68, 0xea, 0x8a, 0xe6, 0xc5, 0x7f, 0x68, 0xd6, 0x70, 0x55, 0xbe, 0x8d,
-	0xc3, 0x9d, 0x18, 0xee, 0xfe, 0x6d, 0xcf, 0xad, 0x5e, 0xdd, 0x17, 0x78, 0xf4, 0xcf, 0xa5, 0xb7,
-	0x49, 0xde, 0x7b, 0x03, 0x75, 0xa5, 0x1e, 0x7a, 0x05, 0xad, 0x42, 0xc1, 0x22, 0xbd, 0xbf, 0x41,
-	0x5f, 0xe7, 0xde, 0xda, 0x51, 0x1d, 0xe6, 0xbf, 0xb3, 0x7e, 0xe7, 0xea, 0x97, 0x6b, 0x7c, 0x9d,
-	0xb9, 0xe6, 0xc5, 0xcc, 0x35, 0x2f, 0x67, 0xae, 0xf9, 0x73, 0xe6, 0x9a, 0xe7, 0x73, 0xd7, 0xb8,
-	0x9c, 0xbb, 0xc6, 0xd5, 0xdc, 0x35, 0x86, 0x0d, 0x85, 0x78, 0xf6, 0x27, 0x00, 0x00, 0xff, 0xff,
-	0x02, 0xfd, 0x3d, 0x67, 0x4b, 0x05, 0x00, 0x00,
+	// 554 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x6e, 0xd3, 0x4c,
+	0x14, 0x8d, 0x9b, 0x1f, 0x7d, 0xb9, 0xd1, 0x57, 0xa2, 0x01, 0x81, 0x65, 0x54, 0x27, 0x2a, 0x9b,
+	0x2c, 0x60, 0x2c, 0x05, 0x90, 0x2a, 0x16, 0x48, 0x24, 0x44, 0x88, 0x1d, 0xb5, 0xe8, 0x12, 0x45,
+	0x13, 0x67, 0x70, 0x47, 0xb1, 0x33, 0xc3, 0x78, 0x5c, 0xc9, 0x62, 0x83, 0xc4, 0x0b, 0x74, 0xc9,
+	0x23, 0x75, 0xd9, 0x65, 0x57, 0xfc, 0x24, 0x2f, 0x82, 0x66, 0x6c, 0x93, 0xb4, 0x69, 0x60, 0x95,
+	0xdd, 0xdc, 0x9f, 0x73, 0xcf, 0xf5, 0x3d, 0x47, 0x86, 0xbb, 0x62, 0x16, 0x7a, 0x44, 0x30, 0x2f,
+	0x4d, 0x48, 0x48, 0xb1, 0x90, 0x5c, 0x71, 0x54, 0x25, 0x82, 0x39, 0x9d, 0x90, 0xf3, 0x30, 0xa2,
+	0x9e, 0x49, 0x4d, 0xd2, 0x8f, 0x9e, 0x62, 0x31, 0x4d, 0x14, 0x89, 0x45, 0xde, 0xe5, 0x3c, 0xbc,
+	0xd9, 0x40, 0x63, 0xa1, 0xb2, 0xa2, 0xf8, 0x6c, 0x76, 0x94, 0x60, 0xc6, 0xf5, 0xe8, 0x98, 0x04,
+	0xa7, 0x6c, 0x4e, 0x65, 0xe6, 0x95, 0x5c, 0x92, 0x26, 0x3c, 0x95, 0x01, 0xf5, 0x42, 0x3a, 0xa7,
+	0x92, 0x28, 0x3a, 0x2d, 0x50, 0x4f, 0x42, 0xa6, 0x4e, 0xd3, 0x09, 0x0e, 0x78, 0xec, 0x85, 0x3c,
+	0xe4, 0xab, 0xd9, 0x3a, 0x32, 0x81, 0x79, 0xe5, 0xed, 0x87, 0xdf, 0xaa, 0xd0, 0x3a, 0x4e, 0x69,
+	0x4a, 0x7d, 0x2a, 0xb8, 0x54, 0x08, 0x41, 0x6d, 0x4e, 0x62, 0x6a, 0x5b, 0x5d, 0xab, 0xd7, 0xf4,
+	0xcd, 0x1b, 0x0d, 0xa1, 0x59, 0xd2, 0x25, 0xf6, 0x5e, 0xb7, 0xda, 0x6b, 0xf5, 0x3b, 0x98, 0x08,
+	0x86, 0xd7, 0x80, 0xd8, 0x2f, 0x3b, 0x46, 0x73, 0x25, 0xb3, 0x41, 0xed, 0xe2, 0x7b, 0xa7, 0xe2,
+	0xaf, 0x70, 0xe8, 0x1d, 0xec, 0xff, 0x09, 0xc6, 0x69, 0x42, 0xa7, 0x76, 0xd5, 0x4c, 0x7a, 0xb4,
+	0x7d, 0xd2, 0x49, 0x42, 0xa7, 0xeb, 0xd3, 0xfe, 0x97, 0xeb, 0x15, 0x27, 0x82, 0xfd, 0xeb, 0xa4,
+	0xa8, 0x0d, 0xd5, 0x19, 0xcd, 0x8a, 0xdd, 0xf5, 0x13, 0xbd, 0x86, 0xfa, 0x19, 0x89, 0x52, 0x6a,
+	0xef, 0x75, 0xad, 0x5e, 0xab, 0x8f, 0x71, 0x7e, 0x53, 0xbc, 0x7e, 0x53, 0x2c, 0x66, 0xa1, 0x59,
+	0xa2, 0x1c, 0x8f, 0x8f, 0x53, 0x32, 0x57, 0x4c, 0x65, 0x7e, 0x0e, 0x7e, 0xb1, 0x77, 0x64, 0x39,
+	0x02, 0xd0, 0xe6, 0x62, 0xbb, 0x64, 0x3c, 0xfc, 0x5a, 0x07, 0x34, 0x8c, 0xd2, 0x44, 0x51, 0x79,
+	0xa2, 0x9d, 0x55, 0x28, 0x74, 0x00, 0x10, 0xe4, 0xd9, 0x31, 0x9b, 0x16, 0xcc, 0xcd, 0x22, 0xf3,
+	0x76, 0xaa, 0x05, 0x14, 0x9c, 0x47, 0x76, 0x23, 0x17, 0x50, 0xbf, 0xd1, 0x08, 0x5a, 0xd2, 0x80,
+	0xc7, 0xda, 0x80, 0xc5, 0x66, 0x0e, 0xce, 0xcd, 0x87, 0x4b, 0x83, 0xe0, 0xf7, 0xa5, 0x3b, 0x07,
+	0xff, 0xe9, 0x7b, 0x9f, 0xff, 0xe8, 0x58, 0x3e, 0xe4, 0x40, 0x5d, 0x42, 0x3d, 0x68, 0x7c, 0xd2,
+	0x3a, 0x25, 0x85, 0x74, 0xed, 0x9b, 0xd2, 0xf9, 0x45, 0x1d, 0x7d, 0x80, 0x76, 0xb9, 0x63, 0x40,
+	0x04, 0x09, 0x98, 0xca, 0xec, 0x9a, 0xc1, 0x3c, 0x36, 0x98, 0xcd, 0xcf, 0x2a, 0x53, 0xc3, 0xa2,
+	0x7d, 0x5d, 0xf7, 0x3b, 0xc1, 0xf5, 0x1a, 0xca, 0xc0, 0x29, 0xc7, 0x93, 0x33, 0xc2, 0x22, 0x32,
+	0x89, 0xe8, 0x8a, 0xa8, 0x6e, 0x88, 0x9e, 0xff, 0x83, 0xe8, 0x55, 0x09, 0xbc, 0x8d, 0xd1, 0x0e,
+	0xb6, 0x34, 0x39, 0x12, 0xee, 0xdd, 0xb6, 0xe9, 0x4e, 0xad, 0xf7, 0x19, 0x0e, 0xfe, 0xba, 0xf4,
+	0x2e, 0xc9, 0xfb, 0x6f, 0xa0, 0x6e, 0xae, 0x87, 0x5e, 0x42, 0x2b, 0xbf, 0x60, 0x1e, 0x3e, 0xd8,
+	0x72, 0x5f, 0xe7, 0xfe, 0x86, 0xaf, 0x46, 0xfa, 0xa7, 0x36, 0xe8, 0x5e, 0xfd, 0x72, 0x2b, 0x5f,
+	0x16, 0xae, 0x75, 0xb1, 0x70, 0xad, 0xcb, 0x85, 0x6b, 0xfd, 0x5c, 0xb8, 0xd6, 0xf9, 0xd2, 0xad,
+	0x5c, 0x2e, 0xdd, 0xca, 0xd5, 0xd2, 0xad, 0x4c, 0x1a, 0x06, 0xf1, 0xf4, 0x77, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x72, 0xe2, 0xef, 0x6a, 0x51, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/pkg/api/usage.proto b/pkg/api/usage.proto
index 204ca52b129..1319546a1b8 100644
--- a/pkg/api/usage.proto
+++ b/pkg/api/usage.proto
@@ -11,18 +11,18 @@ option (gogoproto.goproto_stringer_all) = false;
 option (gogoproto.stringer_all) = true;
 
 message QueueReport {
-    string Name = 1;
-    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> Resources = 2 [(gogoproto.nullable) = false];
-    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> ResourcesUsed = 3 [(gogoproto.nullable) = false];
+    string name = 1;
+    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> resources = 2 [(gogoproto.nullable) = false];
+    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> resources_used = 3 [(gogoproto.nullable) = false];
 }
 
 message ClusterUsageReport {
-    string ClusterId = 1;
-    string Pool = 6;
-    google.protobuf.Timestamp ReportTime = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
-    repeated QueueReport Queues = 3;
-    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> ClusterCapacity = 4 [(gogoproto.nullable) = false];
-    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> ClusterAvailableCapacity = 5 [(gogoproto.nullable) = false];
+    string cluster_id = 1;
+    string pool = 6;
+    google.protobuf.Timestamp report_time = 2 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
+    repeated QueueReport queues = 3;
+    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> cluster_capacity = 4 [(gogoproto.nullable) = false];
+    map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> cluster_available_capacity = 5 [(gogoproto.nullable) = false];
 }
 
 service Usage {