diff --git a/pkg/proto/v0/settings.pb.go b/pkg/proto/v0/settings.pb.go
index 62c1c25fc4..75978434e1 100644
--- a/pkg/proto/v0/settings.pb.go
+++ b/pkg/proto/v0/settings.pb.go
@@ -24,7 +24,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 // requests and responses
 type CreateSettingsBundleRequest struct {
-	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settingsBundle,proto3" json:"settingsBundle,omitempty"`
+	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settings_bundle,json=settingsBundle,proto3" json:"settings_bundle,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -63,7 +63,7 @@ func (m *CreateSettingsBundleRequest) GetSettingsBundle() *SettingsBundle {
 }
 
 type CreateSettingsBundleResponse struct {
-	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settingsBundle,proto3" json:"settingsBundle,omitempty"`
+	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settings_bundle,json=settingsBundle,proto3" json:"settings_bundle,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -149,7 +149,7 @@ func (m *GetSettingsBundleRequest) GetKey() string {
 }
 
 type GetSettingsBundleResponse struct {
-	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settingsBundle,proto3" json:"settingsBundle,omitempty"`
+	SettingsBundle       *SettingsBundle `protobuf:"bytes,1,opt,name=settings_bundle,json=settingsBundle,proto3" json:"settings_bundle,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
 	XXX_unrecognized     []byte          `json:"-"`
 	XXX_sizecache        int32           `json:"-"`
@@ -227,7 +227,7 @@ func (m *ListSettingsBundlesRequest) GetExtension() string {
 }
 
 type ListSettingsBundlesResponse struct {
-	SettingsBundles      []*SettingsBundle `protobuf:"bytes,1,rep,name=settingsBundles,proto3" json:"settingsBundles,omitempty"`
+	SettingsBundles      []*SettingsBundle `protobuf:"bytes,1,rep,name=settings_bundles,json=settingsBundles,proto3" json:"settings_bundles,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
 	XXX_unrecognized     []byte            `json:"-"`
 	XXX_sizecache        int32             `json:"-"`
@@ -269,7 +269,7 @@ func (m *ListSettingsBundlesResponse) GetSettingsBundles() []*SettingsBundle {
 type SettingsBundle struct {
 	Extension            string     `protobuf:"bytes,1,opt,name=extension,proto3" json:"extension,omitempty"`
 	Key                  string     `protobuf:"bytes,2,opt,name=key,proto3" json:"key,omitempty"`
-	DisplayName          string     `protobuf:"bytes,3,opt,name=displayName,proto3" json:"displayName,omitempty"`
+	DisplayName          string     `protobuf:"bytes,3,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	Settings             []*Setting `protobuf:"bytes,4,rep,name=settings,proto3" json:"settings,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
 	XXX_unrecognized     []byte     `json:"-"`
@@ -331,7 +331,7 @@ func (m *SettingsBundle) GetSettings() []*Setting {
 
 type Setting struct {
 	Key         string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	DisplayName string `protobuf:"bytes,2,opt,name=displayName,proto3" json:"displayName,omitempty"`
+	DisplayName string `protobuf:"bytes,2,opt,name=display_name,json=displayName,proto3" json:"display_name,omitempty"`
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Types that are valid to be assigned to Value:
 	//	*Setting_IntValue
@@ -396,23 +396,23 @@ type isSetting_Value interface {
 }
 
 type Setting_IntValue struct {
-	IntValue *IntSetting `protobuf:"bytes,4,opt,name=intValue,proto3,oneof"`
+	IntValue *IntSetting `protobuf:"bytes,4,opt,name=int_value,json=intValue,proto3,oneof"`
 }
 
 type Setting_StringValue struct {
-	StringValue *StringSetting `protobuf:"bytes,5,opt,name=stringValue,proto3,oneof"`
+	StringValue *StringSetting `protobuf:"bytes,5,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
 
 type Setting_BoolValue struct {
-	BoolValue *BoolSetting `protobuf:"bytes,6,opt,name=boolValue,proto3,oneof"`
+	BoolValue *BoolSetting `protobuf:"bytes,6,opt,name=bool_value,json=boolValue,proto3,oneof"`
 }
 
 type Setting_SingleChoiceValue struct {
-	SingleChoiceValue *SingleChoiceListSetting `protobuf:"bytes,7,opt,name=singleChoiceValue,proto3,oneof"`
+	SingleChoiceValue *SingleChoiceListSetting `protobuf:"bytes,7,opt,name=single_choice_value,json=singleChoiceValue,proto3,oneof"`
 }
 
 type Setting_MultiChoiceValue struct {
-	MultiChoiceValue *MultiChoiceListSetting `protobuf:"bytes,8,opt,name=multiChoiceValue,proto3,oneof"`
+	MultiChoiceValue *MultiChoiceListSetting `protobuf:"bytes,8,opt,name=multi_choice_value,json=multiChoiceValue,proto3,oneof"`
 }
 
 func (*Setting_IntValue) isSetting_Value() {}
@@ -552,8 +552,8 @@ func (m *IntSetting) GetPlaceholder() string {
 type StringSetting struct {
 	Default              string   `protobuf:"bytes,1,opt,name=default,proto3" json:"default,omitempty"`
 	Required             bool     `protobuf:"varint,2,opt,name=required,proto3" json:"required,omitempty"`
-	MinLength            int32    `protobuf:"varint,3,opt,name=minLength,proto3" json:"minLength,omitempty"`
-	MaxLength            int32    `protobuf:"varint,4,opt,name=maxLength,proto3" json:"maxLength,omitempty"`
+	MinLength            int32    `protobuf:"varint,3,opt,name=min_length,json=minLength,proto3" json:"min_length,omitempty"`
+	MaxLength            int32    `protobuf:"varint,4,opt,name=max_length,json=maxLength,proto3" json:"max_length,omitempty"`
 	Placeholder          string   `protobuf:"bytes,5,opt,name=placeholder,proto3" json:"placeholder,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
@@ -743,7 +743,7 @@ type ListOption struct {
 	//	*ListOption_IntValue
 	Option               isListOption_Option `protobuf_oneof:"option"`
 	Selected             bool                `protobuf:"varint,3,opt,name=selected,proto3" json:"selected,omitempty"`
-	DisplayValue         string              `protobuf:"bytes,4,opt,name=displayValue,proto3" json:"displayValue,omitempty"`
+	DisplayValue         string              `protobuf:"bytes,4,opt,name=display_value,json=displayValue,proto3" json:"display_value,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
 	XXX_sizecache        int32               `json:"-"`
@@ -779,11 +779,11 @@ type isListOption_Option interface {
 }
 
 type ListOption_StringValue struct {
-	StringValue string `protobuf:"bytes,1,opt,name=stringValue,proto3,oneof"`
+	StringValue string `protobuf:"bytes,1,opt,name=string_value,json=stringValue,proto3,oneof"`
 }
 
 type ListOption_IntValue struct {
-	IntValue int64 `protobuf:"varint,2,opt,name=intValue,proto3,oneof"`
+	IntValue int64 `protobuf:"varint,2,opt,name=int_value,json=intValue,proto3,oneof"`
 }
 
 func (*ListOption_StringValue) isListOption_Option() {}
@@ -855,65 +855,67 @@ func init() {
 }
 
 var fileDescriptor_6c7cab62fa432213 = []byte{
-	// 947 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x72, 0xe3, 0x44,
-	0x10, 0x5e, 0xd9, 0x49, 0x6c, 0x77, 0x48, 0x36, 0x19, 0x02, 0x6b, 0xb4, 0x01, 0xbc, 0xda, 0x03,
-	0x6c, 0x20, 0x56, 0xf0, 0x5e, 0x28, 0x57, 0x6d, 0xc1, 0x3a, 0x84, 0x64, 0xd9, 0x6c, 0xa0, 0x94,
-	0x2a, 0x0e, 0x5b, 0xfc, 0xd4, 0x58, 0x6e, 0xe4, 0x61, 0xe5, 0x19, 0xad, 0x66, 0x94, 0x9f, 0x4a,
-	0x6d, 0x15, 0x70, 0xe1, 0xc6, 0x01, 0x2e, 0x9c, 0x81, 0x2b, 0xbc, 0x0c, 0xaf, 0xc0, 0x83, 0x50,
-	0x1a, 0xfd, 0xd9, 0xb2, 0x9d, 0x4a, 0x0a, 0x4e, 0x1a, 0x75, 0x7f, 0x5f, 0xf7, 0xa7, 0xe9, 0x99,
-	0x6e, 0xc1, 0xaa, 0x44, 0xa5, 0x18, 0xf7, 0x64, 0x3b, 0x08, 0x85, 0x12, 0x64, 0x51, 0x3f, 0xcc,
-	0x4d, 0x4f, 0x08, 0xcf, 0x47, 0x9b, 0x06, 0xcc, 0xa6, 0x9c, 0x0b, 0x45, 0x15, 0x13, 0x3c, 0x05,
-	0x99, 0xef, 0xea, 0x87, 0xbb, 0xed, 0x21, 0xdf, 0x96, 0xa7, 0xd4, 0xf3, 0x30, 0xb4, 0x45, 0xa0,
-	0x11, 0xd3, 0x68, 0xeb, 0x0b, 0xb8, 0xbd, 0x1b, 0x22, 0x55, 0x78, 0x9c, 0xa6, 0xea, 0x45, 0x7c,
-	0xe0, 0xa3, 0x83, 0xcf, 0x23, 0x94, 0x8a, 0x3c, 0x28, 0x34, 0x24, 0x8e, 0xa6, 0xd1, 0x32, 0xde,
-	0x5e, 0xee, 0xbc, 0x92, 0xd0, 0xdb, 0x25, 0x56, 0x09, 0x6c, 0x7d, 0x09, 0x9b, 0xb3, 0xa3, 0xcb,
-	0x40, 0x70, 0x89, 0xff, 0x35, 0xfc, 0x27, 0xd0, 0xdc, 0x47, 0x35, 0x5b, 0xf9, 0x26, 0x34, 0xf0,
-	0x4c, 0x21, 0x97, 0x4c, 0x70, 0x1d, 0xb5, 0xe1, 0x14, 0x06, 0xb2, 0x06, 0xd5, 0x67, 0x78, 0xde,
-	0xac, 0x68, 0x7b, 0xbc, 0xb4, 0x9e, 0xc2, 0x6b, 0x33, 0x62, 0xfd, 0x3f, 0x3a, 0xbb, 0x60, 0x1e,
-	0x32, 0x59, 0x0a, 0x2e, 0xaf, 0xa4, 0xd4, 0xfa, 0x0a, 0x6e, 0xcf, 0xe4, 0xa6, 0xca, 0x3e, 0x80,
-	0x9b, 0x93, 0xc9, 0x64, 0xd3, 0x68, 0x55, 0xe7, 0x4b, 0x2b, 0xa3, 0xad, 0x9f, 0x0c, 0x58, 0x9d,
-	0xc4, 0x5c, 0x77, 0xeb, 0x48, 0x0b, 0x96, 0x07, 0x4c, 0x06, 0x3e, 0x3d, 0x3f, 0xa2, 0x23, 0x6c,
-	0x56, 0xb5, 0x67, 0xdc, 0x44, 0xb6, 0xa0, 0x9e, 0xe5, 0x6d, 0x2e, 0x68, 0x79, 0xab, 0x93, 0xf2,
-	0x9c, 0xdc, 0x6f, 0xfd, 0x51, 0x85, 0x5a, 0x6a, 0xcd, 0x72, 0x19, 0x73, 0x73, 0x55, 0xa6, 0x73,
-	0xc5, 0x08, 0x94, 0x6e, 0xc8, 0xf4, 0x99, 0xcf, 0xd5, 0x14, 0x26, 0x62, 0x43, 0x9d, 0x71, 0xf5,
-	0x39, 0xf5, 0x23, 0x6c, 0x2e, 0xe8, 0x3a, 0xae, 0xa7, 0x6a, 0x1e, 0xf1, 0x6c, 0xa3, 0x0f, 0x6e,
-	0x38, 0x39, 0x88, 0xbc, 0x0f, 0xcb, 0x52, 0x85, 0x8c, 0x7b, 0x09, 0x67, 0x51, 0x73, 0x36, 0xb2,
-	0x2f, 0xd0, 0x9e, 0x82, 0x36, 0x0e, 0x25, 0x1d, 0x68, 0xf4, 0x85, 0xf0, 0x13, 0xde, 0x92, 0xe6,
-	0x91, 0x94, 0xd7, 0x13, 0xc2, 0x2f, 0x58, 0x05, 0x8c, 0x1c, 0xc1, 0xba, 0x64, 0xdc, 0xf3, 0x71,
-	0x77, 0x28, 0x98, 0x8b, 0x09, 0xb7, 0xa6, 0xb9, 0x6f, 0x64, 0x39, 0xc7, 0xfc, 0x63, 0xa7, 0xe3,
-	0xe0, 0x86, 0x33, 0x4d, 0x25, 0x8f, 0x61, 0x6d, 0x14, 0xf9, 0x8a, 0x8d, 0x87, 0xab, 0xeb, 0x70,
-	0xaf, 0xa7, 0xe1, 0x9e, 0x14, 0xee, 0xc9, 0x68, 0x53, 0xc4, 0x5e, 0x0d, 0x16, 0x4f, 0xe2, 0x85,
-	0xf5, 0x9d, 0x01, 0x50, 0x6c, 0x17, 0x69, 0x42, 0x6d, 0x80, 0xdf, 0xd0, 0xc8, 0x57, 0xba, 0x5a,
-	0x55, 0x27, 0x7b, 0x8d, 0x6b, 0x38, 0x62, 0x5c, 0x57, 0xaa, 0xea, 0xc4, 0x4b, 0x6d, 0xa1, 0x67,
-	0xba, 0x32, 0xb1, 0x85, 0x9e, 0x11, 0x02, 0x0b, 0x52, 0x61, 0xa0, 0xab, 0x51, 0x75, 0xf4, 0x3a,
-	0xae, 0x63, 0xe0, 0x53, 0x17, 0x87, 0xc2, 0x1f, 0x60, 0xa8, 0x37, 0xbd, 0xe1, 0x8c, 0x9b, 0xac,
-	0xdf, 0x0d, 0x58, 0x99, 0xd8, 0xfd, 0xb2, 0x8a, 0x46, 0xa1, 0xc2, 0x84, 0x7a, 0x88, 0xcf, 0x23,
-	0x16, 0xe2, 0x40, 0x4b, 0xa9, 0x3b, 0xf9, 0x7b, 0x7c, 0xde, 0x47, 0x8c, 0x1f, 0x22, 0xf7, 0xd4,
-	0x50, 0xab, 0x5a, 0x74, 0x0a, 0x83, 0xf6, 0xd2, 0xb3, 0xd4, 0xbb, 0x90, 0x7a, 0x33, 0xc3, 0x15,
-	0x54, 0xbe, 0x05, 0xcb, 0x63, 0xa5, 0x2e, 0x4b, 0xac, 0xe7, 0x12, 0xad, 0x8f, 0xe1, 0xd6, 0x9c,
-	0xba, 0x92, 0x77, 0xa0, 0x96, 0xb6, 0xf0, 0xf4, 0x76, 0x67, 0x07, 0x36, 0x06, 0x7d, 0xaa, 0x3d,
-	0x4e, 0x86, 0xb0, 0xf6, 0xe0, 0xd5, 0xd9, 0x05, 0xbd, 0x5e, 0x98, 0x5f, 0x0d, 0x80, 0xc2, 0x4e,
-	0xac, 0xc9, 0x3b, 0xa0, 0xb7, 0xb7, 0x7c, 0xda, 0x37, 0xc7, 0x2e, 0x96, 0xae, 0xf7, 0xc4, 0x2d,
-	0x32, 0xe3, 0x26, 0xe0, 0xa3, 0xab, 0x70, 0xa0, 0x77, 0xb9, 0xee, 0xe4, 0xef, 0xc4, 0x82, 0x97,
-	0xd2, 0x3b, 0x5c, 0x5c, 0xcb, 0x86, 0x33, 0x61, 0xeb, 0xd5, 0x61, 0x29, 0xd1, 0xd6, 0xf9, 0xb1,
-	0x0a, 0x2b, 0x49, 0xaf, 0x3a, 0xc6, 0xf0, 0x84, 0xb9, 0x48, 0x2e, 0x60, 0x63, 0xd6, 0xa0, 0x21,
-	0x56, 0xfa, 0x81, 0x97, 0xcc, 0x38, 0xf3, 0xee, 0xa5, 0x98, 0xa4, 0xcf, 0x5a, 0xe6, 0x0f, 0x7f,
-	0xff, 0xf3, 0x4b, 0x65, 0xc3, 0xba, 0xa9, 0xa7, 0xee, 0xc9, 0x8e, 0xdd, 0x4f, 0xfa, 0x67, 0xd7,
-	0xd8, 0x22, 0xdf, 0x1b, 0xb0, 0x3e, 0x35, 0x3b, 0xc8, 0x9b, 0x69, 0xd8, 0x79, 0x13, 0xca, 0x6c,
-	0xcd, 0x07, 0xa4, 0x49, 0xef, 0xe9, 0xa4, 0x77, 0xc9, 0x9d, 0x52, 0x52, 0xfb, 0x22, 0x6f, 0xc7,
-	0x2f, 0xec, 0x8b, 0x67, 0x78, 0xfe, 0x82, 0x44, 0xf0, 0xf2, 0x8c, 0x31, 0x41, 0xee, 0x8c, 0x15,
-	0x78, 0xf6, 0xf8, 0x31, 0xad, 0xcb, 0x20, 0xa9, 0x90, 0x5b, 0x5a, 0xc8, 0x3a, 0x29, 0x7f, 0x7d,
-	0xef, 0xcf, 0xca, 0xcf, 0x0f, 0x7f, 0xab, 0x90, 0xbf, 0x0c, 0xa8, 0x67, 0x5c, 0xeb, 0x33, 0x58,
-	0x11, 0xa7, 0x7c, 0xd7, 0x17, 0xd1, 0xa0, 0xb5, 0x3f, 0xea, 0x1f, 0x90, 0x7b, 0x43, 0xa5, 0x02,
-	0xd9, 0xb5, 0x6d, 0x8f, 0xa9, 0x61, 0xd4, 0x6f, 0xbb, 0x62, 0x64, 0x8b, 0x53, 0xee, 0xc6, 0x08,
-	0x5b, 0xb8, 0x4c, 0x6e, 0x67, 0xcd, 0xdf, 0xdc, 0x90, 0x51, 0x10, 0x88, 0x50, 0x7d, 0x98, 0xf9,
-	0x63, 0xf0, 0xd6, 0x63, 0x80, 0x87, 0x01, 0x75, 0x87, 0xb8, 0xdd, 0x69, 0xef, 0x90, 0x07, 0x57,
-	0x0e, 0x67, 0xf7, 0x7d, 0xd1, 0xb7, 0x47, 0x54, 0x2a, 0x0c, 0xed, 0xc3, 0x47, 0xbb, 0x7b, 0x47,
-	0xc7, 0x7b, 0x9d, 0xea, 0x7b, 0xed, 0x9d, 0xad, 0x8a, 0x51, 0xe9, 0xac, 0xd1, 0x20, 0xf0, 0x99,
-	0xab, 0x7f, 0x87, 0xec, 0x6f, 0xa5, 0xe0, 0xdd, 0x29, 0x4b, 0xb8, 0x0f, 0x6b, 0x1f, 0xe1, 0x09,
-	0xfa, 0x22, 0xc0, 0xb0, 0xf5, 0x84, 0xf2, 0x88, 0xfa, 0xe4, 0x7e, 0x9c, 0xbf, 0x6b, 0xe7, 0x39,
-	0xdb, 0xa9, 0x0e, 0x26, 0xec, 0xbc, 0x2c, 0x52, 0x0b, 0xf9, 0x3a, 0x17, 0xf2, 0x34, 0xf9, 0x75,
-	0xeb, 0x2f, 0xe9, 0xc7, 0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x08, 0x45, 0x77, 0xf6, 0xda,
-	0x09, 0x00, 0x00,
+	// 983 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x5b, 0x6f, 0xdc, 0x44,
+	0x14, 0xae, 0x77, 0x73, 0xd9, 0x3d, 0x69, 0x6e, 0xd3, 0x40, 0x17, 0x37, 0x81, 0x8d, 0xf3, 0x00,
+	0x0d, 0x64, 0x1d, 0x92, 0x27, 0x22, 0x81, 0xda, 0x84, 0x90, 0x14, 0x92, 0x52, 0x39, 0x12, 0x0f,
+	0x20, 0x58, 0xcd, 0x7a, 0x07, 0xef, 0x50, 0x7b, 0xc6, 0xf5, 0x8c, 0x73, 0x51, 0x54, 0x09, 0x78,
+	0xe1, 0x11, 0x09, 0x1e, 0x79, 0x43, 0xe2, 0x0d, 0xf8, 0x33, 0xfc, 0x05, 0x7e, 0x08, 0xf2, 0xf1,
+	0xd8, 0x7b, 0xc9, 0x26, 0xb4, 0x82, 0x27, 0x7b, 0xce, 0xf9, 0xbe, 0xef, 0x7c, 0x9e, 0x33, 0x17,
+	0xc3, 0x9c, 0x62, 0x5a, 0x73, 0x11, 0xa8, 0x56, 0x9c, 0x48, 0x2d, 0xc9, 0x24, 0x3e, 0xec, 0xe5,
+	0x40, 0xca, 0x20, 0x64, 0x2e, 0x8d, 0xb9, 0x4b, 0x85, 0x90, 0x9a, 0x6a, 0x2e, 0x85, 0x01, 0xd9,
+	0xef, 0xe0, 0xc3, 0xdf, 0x08, 0x98, 0xd8, 0x50, 0x67, 0x34, 0x08, 0x58, 0xe2, 0xca, 0x18, 0x11,
+	0x57, 0xd1, 0xce, 0x97, 0x70, 0x6f, 0x2f, 0x61, 0x54, 0xb3, 0x13, 0x53, 0x6a, 0x37, 0x15, 0xdd,
+	0x90, 0x79, 0xec, 0x59, 0xca, 0x94, 0x26, 0x1f, 0xc0, 0x7c, 0xe1, 0xa1, 0xdd, 0xc1, 0x4c, 0xc3,
+	0x6a, 0x5a, 0x6f, 0xcd, 0x6c, 0xbd, 0x92, 0xf3, 0x5b, 0x23, 0xb4, 0xd2, 0x71, 0x3e, 0x76, 0xbe,
+	0x82, 0xe5, 0xf1, 0xf2, 0x2a, 0x96, 0x42, 0xb1, 0xff, 0xac, 0xff, 0x31, 0x34, 0x0e, 0x98, 0x1e,
+	0xef, 0x7d, 0x19, 0xea, 0xec, 0x5c, 0x33, 0xa1, 0xb8, 0x14, 0xa8, 0x5a, 0xf7, 0xfa, 0x01, 0xb2,
+	0x00, 0xd5, 0xa7, 0xec, 0xa2, 0x51, 0xc1, 0x78, 0xf6, 0xea, 0x7c, 0x01, 0xaf, 0x8d, 0xd1, 0xfa,
+	0x9f, 0x8c, 0xee, 0x80, 0x7d, 0xc4, 0xd5, 0x88, 0xba, 0x7a, 0x21, 0xab, 0x4e, 0x1b, 0xee, 0x8d,
+	0xe5, 0x1a, 0x6b, 0x0f, 0x60, 0x61, 0xc4, 0x9a, 0x6a, 0x58, 0xcd, 0xea, 0xf5, 0xde, 0xe6, 0x87,
+	0xbd, 0x29, 0xe7, 0x47, 0x0b, 0xe6, 0x86, 0x31, 0x2f, 0x3b, 0x79, 0x64, 0x15, 0x6e, 0x77, 0xb9,
+	0x8a, 0x43, 0x7a, 0xd1, 0x16, 0x34, 0x62, 0x8d, 0x2a, 0xa6, 0x66, 0x4c, 0xec, 0x31, 0x8d, 0x18,
+	0x59, 0x87, 0x5a, 0x51, 0xb8, 0x31, 0x81, 0xfe, 0xe6, 0x86, 0xfd, 0x79, 0x65, 0xde, 0xf9, 0xbd,
+	0x0a, 0xd3, 0x26, 0x5a, 0x14, 0xb3, 0xae, 0x2f, 0x56, 0xb9, 0x5a, 0xac, 0x09, 0x33, 0x5d, 0xa6,
+	0xfc, 0x84, 0xe3, 0xca, 0x2f, 0xed, 0xf4, 0x43, 0x64, 0x13, 0xea, 0x5c, 0xe8, 0xf6, 0x29, 0x0d,
+	0x53, 0xd6, 0x98, 0xc0, 0x5e, 0x2e, 0x1a, 0x3f, 0x8f, 0x44, 0x31, 0xd9, 0x87, 0xb7, 0xbc, 0x1a,
+	0x17, 0xfa, 0xb3, 0x0c, 0x44, 0xde, 0x83, 0xdb, 0x4a, 0x27, 0x5c, 0x04, 0x86, 0x34, 0x89, 0xa4,
+	0xa5, 0xe2, 0x23, 0x30, 0xd5, 0xe7, 0xcd, 0xe4, 0xd8, 0x9c, 0xba, 0x0d, 0xd0, 0x91, 0x32, 0x34,
+	0xc4, 0x29, 0x24, 0x12, 0x43, 0xdc, 0x95, 0x32, 0xec, 0xd3, 0xea, 0x19, 0x2e, 0x27, 0x3d, 0x81,
+	0x3b, 0x8a, 0x8b, 0x20, 0x64, 0x6d, 0xbf, 0x27, 0xb9, 0xcf, 0x0c, 0x7b, 0x1a, 0xd9, 0xaf, 0x17,
+	0x65, 0x11, 0xb1, 0x87, 0x80, 0x81, 0x55, 0x72, 0x78, 0xcb, 0x5b, 0x54, 0x03, 0xa9, 0x5c, 0xf1,
+	0x18, 0x48, 0x94, 0x86, 0x9a, 0x0f, 0x0b, 0xd6, 0x50, 0x70, 0xc5, 0x08, 0x1e, 0x67, 0x80, 0x71,
+	0x7a, 0x0b, 0x51, 0x3f, 0x83, 0x72, 0xbb, 0xd3, 0x30, 0x89, 0x0a, 0xce, 0xb7, 0x16, 0x40, 0x7f,
+	0xd2, 0x48, 0x03, 0xa6, 0xbb, 0xec, 0x6b, 0x9a, 0x86, 0x1a, 0xbb, 0x56, 0xf5, 0x8a, 0x61, 0xd6,
+	0xcb, 0x88, 0x0b, 0x6c, 0x58, 0xd5, 0xcb, 0x5e, 0x31, 0x42, 0xcf, 0xb1, 0x41, 0x59, 0x84, 0x9e,
+	0x13, 0x02, 0x13, 0x4a, 0xb3, 0x18, 0x7b, 0x52, 0xf5, 0xf0, 0x3d, 0x6b, 0x67, 0x1c, 0x52, 0x9f,
+	0xf5, 0x64, 0xd8, 0x65, 0x09, 0xce, 0x7c, 0xdd, 0x1b, 0x0c, 0x39, 0xbf, 0x59, 0x30, 0x3b, 0xd4,
+	0x82, 0x51, 0x17, 0xf5, 0xbe, 0x0b, 0x1b, 0x6a, 0x09, 0x7b, 0x96, 0xf2, 0x84, 0x75, 0xd1, 0x4a,
+	0xcd, 0x2b, 0xc7, 0x64, 0x05, 0x20, 0xe2, 0xa2, 0x1d, 0x32, 0x11, 0xe8, 0x1e, 0xda, 0x9a, 0xf4,
+	0xea, 0x11, 0x17, 0x47, 0x18, 0xc0, 0x34, 0x3d, 0x2f, 0xd2, 0x13, 0x26, 0x4d, 0xcf, 0x4d, 0xfa,
+	0xdf, 0x7d, 0xbe, 0x09, 0x33, 0x03, 0x0d, 0x1f, 0x35, 0x59, 0x2b, 0x4d, 0x3a, 0x1f, 0xc1, 0xdd,
+	0x6b, 0x7a, 0x4b, 0xde, 0x86, 0x69, 0x73, 0xa2, 0x9b, 0x8d, 0x5e, 0x2c, 0xdc, 0x0c, 0xf4, 0x29,
+	0x66, 0xbc, 0x02, 0xe1, 0xec, 0xc3, 0xab, 0xe3, 0x5b, 0xfa, 0x72, 0x32, 0xbf, 0x58, 0x00, 0xfd,
+	0x38, 0x59, 0x1b, 0xd9, 0x0b, 0x38, 0xc3, 0xa3, 0xab, 0x7e, 0x65, 0x70, 0x8b, 0x61, 0xcf, 0x87,
+	0xf6, 0x93, 0x9d, 0x1d, 0x08, 0x21, 0xf3, 0x35, 0xeb, 0xe2, 0x44, 0xd7, 0xbc, 0x72, 0x4c, 0xd6,
+	0x60, 0xb6, 0xd8, 0xe2, 0xfd, 0x1d, 0x5a, 0xf7, 0x8a, 0x7d, 0x9f, 0xaf, 0xbf, 0x1a, 0x4c, 0xe5,
+	0xf6, 0xb6, 0x7e, 0xa8, 0xc2, 0x6c, 0x7e, 0x72, 0x9d, 0xb0, 0xe4, 0x94, 0xfb, 0x8c, 0x5c, 0xc2,
+	0xd2, 0xb8, 0x9b, 0x87, 0x38, 0xe6, 0x1b, 0x6f, 0xb8, 0xf5, 0xec, 0xb5, 0x1b, 0x31, 0xf9, 0xb1,
+	0xeb, 0xd8, 0xdf, 0xff, 0xf5, 0xf7, 0xcf, 0x95, 0x25, 0x67, 0x1e, 0xef, 0xe1, 0xd3, 0x4d, 0xd7,
+	0x9c, 0xbd, 0x3b, 0xd6, 0x3a, 0xf9, 0xce, 0x82, 0xc5, 0x2b, 0x77, 0x09, 0x79, 0xc3, 0xc8, 0x5e,
+	0x77, 0x63, 0xd9, 0xcd, 0xeb, 0x01, 0xa6, 0xe8, 0x7d, 0x2c, 0xba, 0x46, 0x56, 0x47, 0x8a, 0xba,
+	0x97, 0xe5, 0xe1, 0xfc, 0xdc, 0xbd, 0x7c, 0xca, 0x2e, 0x9e, 0x93, 0x14, 0xee, 0x8c, 0xb9, 0x35,
+	0xc8, 0xea, 0x40, 0x8f, 0xc7, 0xdf, 0x46, 0xb6, 0x73, 0x13, 0xc4, 0x18, 0xb9, 0x8b, 0x46, 0x16,
+	0xc9, 0xe8, 0xd7, 0xef, 0xfe, 0x51, 0xf9, 0xe9, 0xe1, 0xaf, 0x15, 0xf2, 0xa7, 0x05, 0xb5, 0x82,
+	0xeb, 0x3c, 0x81, 0x59, 0x79, 0x26, 0xf6, 0x42, 0x99, 0x76, 0x9b, 0x07, 0x51, 0xe7, 0x90, 0xdc,
+	0xef, 0x69, 0x1d, 0xab, 0x1d, 0xd7, 0x0d, 0xb8, 0xee, 0xa5, 0x9d, 0x96, 0x2f, 0x23, 0x57, 0x9e,
+	0x09, 0x3f, 0x43, 0xb8, 0xd2, 0xe7, 0x6a, 0xa3, 0xb8, 0x09, 0xec, 0x25, 0x95, 0xc6, 0xb1, 0x4c,
+	0xf4, 0x83, 0x22, 0x9f, 0x81, 0xd7, 0x3f, 0x01, 0x78, 0x18, 0x53, 0xbf, 0xc7, 0x36, 0xb6, 0x5a,
+	0x9b, 0xe4, 0xfd, 0x17, 0x96, 0x73, 0x3b, 0xa1, 0xec, 0xb8, 0x11, 0x55, 0x9a, 0x25, 0xee, 0xd1,
+	0xa3, 0xbd, 0xfd, 0xc7, 0x27, 0xfb, 0x5b, 0xd5, 0x77, 0x5b, 0x9b, 0xeb, 0x15, 0xab, 0xb2, 0xb5,
+	0x40, 0xe3, 0x38, 0xe4, 0x3e, 0xfe, 0x20, 0xb9, 0xdf, 0x28, 0x29, 0x76, 0xae, 0x44, 0x92, 0x03,
+	0x58, 0xf8, 0x90, 0x9d, 0xb2, 0x50, 0xc6, 0x2c, 0x69, 0x1e, 0x53, 0x91, 0xd2, 0x90, 0x6c, 0x67,
+	0xf5, 0x77, 0xdc, 0xb2, 0x66, 0xcb, 0xf8, 0xe0, 0xd2, 0x2d, 0xdb, 0xa2, 0xd0, 0x48, 0xbb, 0x34,
+	0xf2, 0x79, 0xfe, 0x33, 0xd7, 0x99, 0xc2, 0xc7, 0xf6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x26,
+	0x84, 0x87, 0xe6, 0xec, 0x09, 0x00, 0x00,
 }
diff --git a/pkg/proto/v0/settings.pb.web.go b/pkg/proto/v0/settings.pb.web.go
index 89c2264b6c..508433d0d7 100644
--- a/pkg/proto/v0/settings.pb.web.go
+++ b/pkg/proto/v0/settings.pb.web.go
@@ -77,11 +77,10 @@ func (h *webBundleServiceHandler) ListSettingsBundles(w http.ResponseWriter, r *
 
 	resp := &ListSettingsBundlesResponse{}
 
-	// TODO no need to parse any body on a get request. This code shoud be removed from GET endpoints, ergo updating the generator.
-	// if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-	// 	http.Error(w, err.Error(), http.StatusPreconditionFailed)
-	// 	return
-	// }
+	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+		http.Error(w, err.Error(), http.StatusPreconditionFailed)
+		return
+	}
 
 	if err := h.h.ListSettingsBundles(
 		context.Background(),
diff --git a/pkg/proto/v0/settings.proto b/pkg/proto/v0/settings.proto
index 960b169446..28989cfe16 100644
--- a/pkg/proto/v0/settings.proto
+++ b/pkg/proto/v0/settings.proto
@@ -51,11 +51,11 @@ service BundleService {
 
 // requests and responses
 message CreateSettingsBundleRequest {
-  SettingsBundle settingsBundle = 1;
+  SettingsBundle settings_bundle = 1;
 }
 
 message CreateSettingsBundleResponse {
-  SettingsBundle settingsBundle = 1;
+  SettingsBundle settings_bundle = 1;
 }
 
 message GetSettingsBundleRequest {
@@ -64,7 +64,7 @@ message GetSettingsBundleRequest {
 }
 
 message GetSettingsBundleResponse {
-  SettingsBundle settingsBundle = 1;
+  SettingsBundle settings_bundle = 1;
 }
 
 message ListSettingsBundlesRequest {
@@ -72,27 +72,27 @@ message ListSettingsBundlesRequest {
 }
 
 message ListSettingsBundlesResponse {
-  repeated SettingsBundle settingsBundles = 1;
+  repeated SettingsBundle settings_bundles = 1;
 }
 
 // payloads
 message SettingsBundle {
   string extension = 1;
   string key = 2;
-  string displayName = 3;
+  string display_name = 3;
   repeated Setting settings = 4;
 }
 
 message Setting {
   string key = 1;
-  string displayName = 2;
+  string display_name = 2;
   string description = 3;
   oneof value {
-    IntSetting intValue = 4;
-    StringSetting stringValue = 5;
-    BoolSetting boolValue = 6;
-    SingleChoiceListSetting singleChoiceValue = 7;
-    MultiChoiceListSetting multiChoiceValue = 8;
+    IntSetting int_value = 4;
+    StringSetting string_value = 5;
+    BoolSetting bool_value = 6;
+    SingleChoiceListSetting single_choice_value = 7;
+    MultiChoiceListSetting multi_choice_value = 8;
   }
 }
 
@@ -107,8 +107,8 @@ message IntSetting {
 message StringSetting {
   string default = 1;
   bool required = 2;
-  int32 minLength = 3;
-  int32 maxLength = 4;
+  int32 min_length = 3;
+  int32 max_length = 4;
   string placeholder = 5;
 }
 
@@ -126,9 +126,9 @@ message MultiChoiceListSetting {
 
 message ListOption {
   oneof option {
-    string stringValue = 1;
-    int64 intValue = 2;
+    string string_value = 1;
+    int64 int_value = 2;
   }
   bool selected = 3;
-  string displayValue = 4;
+  string display_value = 4;
 }
diff --git a/pkg/proto/v0/settings.swagger.json b/pkg/proto/v0/settings.swagger.json
index 105d977640..41c42436d0 100644
--- a/pkg/proto/v0/settings.swagger.json
+++ b/pkg/proto/v0/settings.swagger.json
@@ -134,7 +134,7 @@
     "protoCreateSettingsBundleRequest": {
       "type": "object",
       "properties": {
-        "settingsBundle": {
+        "settings_bundle": {
           "$ref": "#/definitions/protoSettingsBundle"
         }
       },
@@ -143,7 +143,7 @@
     "protoCreateSettingsBundleResponse": {
       "type": "object",
       "properties": {
-        "settingsBundle": {
+        "settings_bundle": {
           "$ref": "#/definitions/protoSettingsBundle"
         }
       }
@@ -151,7 +151,7 @@
     "protoGetSettingsBundleResponse": {
       "type": "object",
       "properties": {
-        "settingsBundle": {
+        "settings_bundle": {
           "$ref": "#/definitions/protoSettingsBundle"
         }
       }
@@ -183,10 +183,10 @@
     "protoListOption": {
       "type": "object",
       "properties": {
-        "stringValue": {
+        "string_value": {
           "type": "string"
         },
-        "intValue": {
+        "int_value": {
           "type": "string",
           "format": "int64"
         },
@@ -194,7 +194,7 @@
           "type": "boolean",
           "format": "boolean"
         },
-        "displayValue": {
+        "display_value": {
           "type": "string"
         }
       }
@@ -202,7 +202,7 @@
     "protoListSettingsBundlesResponse": {
       "type": "object",
       "properties": {
-        "settingsBundles": {
+        "settings_bundles": {
           "type": "array",
           "items": {
             "$ref": "#/definitions/protoSettingsBundle"
@@ -227,25 +227,25 @@
         "key": {
           "type": "string"
         },
-        "displayName": {
+        "display_name": {
           "type": "string"
         },
         "description": {
           "type": "string"
         },
-        "intValue": {
+        "int_value": {
           "$ref": "#/definitions/protoIntSetting"
         },
-        "stringValue": {
+        "string_value": {
           "$ref": "#/definitions/protoStringSetting"
         },
-        "boolValue": {
+        "bool_value": {
           "$ref": "#/definitions/protoBoolSetting"
         },
-        "singleChoiceValue": {
+        "single_choice_value": {
           "$ref": "#/definitions/protoSingleChoiceListSetting"
         },
-        "multiChoiceValue": {
+        "multi_choice_value": {
           "$ref": "#/definitions/protoMultiChoiceListSetting"
         }
       }
@@ -259,7 +259,7 @@
         "key": {
           "type": "string"
         },
-        "displayName": {
+        "display_name": {
           "type": "string"
         },
         "settings": {
@@ -292,11 +292,11 @@
           "type": "boolean",
           "format": "boolean"
         },
-        "minLength": {
+        "min_length": {
           "type": "integer",
           "format": "int32"
         },
-        "maxLength": {
+        "max_length": {
           "type": "integer",
           "format": "int32"
         },