diff --git a/handler.go b/handler.go
index 4586755c2..299343dc5 100644
--- a/handler.go
+++ b/handler.go
@@ -1519,8 +1519,8 @@ func (h *Handler) handlePostDefinition(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// Add the name
 	req.Name = inputDefName
-	fmt.Println(req.String())
 
 	err = h.Broadcaster.SendSync(
 		&internal.CreateInputDefinitionMessage{
diff --git a/handler_test.go b/handler_test.go
index dd1505036..8c7f3a7e2 100644
--- a/handler_test.go
+++ b/handler_test.go
@@ -1087,7 +1087,7 @@ func TestHandler_CreateInputDefinition(t *testing.T) {
 					"cacheType": "ranked"
 				}
 			}],
-			"inputdefinitionfields": [
+			"fields": [
 				{
 					"name": "id",
 					"primaryKey": true
diff --git a/input_definition.go b/input_definition.go
index 2cc5b9ab6..31a354a3b 100644
--- a/input_definition.go
+++ b/input_definition.go
@@ -1,11 +1,12 @@
 package pilosa
 
 import (
-	"github.com/gogo/protobuf/proto"
-	"github.com/pilosa/pilosa/internal"
 	"io/ioutil"
 	"os"
 	"path/filepath"
+
+	"github.com/gogo/protobuf/proto"
+	"github.com/pilosa/pilosa/internal"
 )
 
 type InputDefinition struct {
@@ -88,7 +89,7 @@ func (i *InputDefinition) loadMeta() error {
 		i.frames = append(i.frames, inputFrame)
 	}
 
-	for _, field := range pb.InputDefinitionFields {
+	for _, field := range pb.Fields {
 		var actions []Action
 		for _, action := range field.Actions {
 			actions = append(actions, Action{
@@ -149,9 +150,9 @@ func (i *InputDefinition) saveMeta() error {
 		fields = append(fields, fieldMeta)
 	}
 	buf, err := proto.Marshal(&internal.InputDefinition{
-		Name:                  i.name,
-		Frames:                frames,
-		InputDefinitionFields: fields,
+		Name:   i.name,
+		Frames: frames,
+		Fields: fields,
 	})
 	if err != nil {
 		return err
diff --git a/internal/private.pb.go b/internal/private.pb.go
index a98f25f5b..27ead21f1 100644
--- a/internal/private.pb.go
+++ b/internal/private.pb.go
@@ -247,9 +247,9 @@ func (m *Index) GetInputDefinitions() []*InputDefinition {
 }
 
 type InputDefinition struct {
-	Name                  string                  `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
-	Frames                []*Frame                `protobuf:"bytes,2,rep,name=Frames" json:"Frames,omitempty"`
-	InputDefinitionFields []*InputDefinitionField `protobuf:"bytes,3,rep,name=InputDefinitionFields" json:"InputDefinitionFields,omitempty"`
+	Name   string                  `protobuf:"bytes,1,opt,name=Name,proto3" json:"Name,omitempty"`
+	Frames []*Frame                `protobuf:"bytes,2,rep,name=Frames" json:"Frames,omitempty"`
+	Fields []*InputDefinitionField `protobuf:"bytes,3,rep,name=Fields" json:"Fields,omitempty"`
 }
 
 func (m *InputDefinition) Reset()                    { *m = InputDefinition{} }
@@ -264,9 +264,9 @@ func (m *InputDefinition) GetFrames() []*Frame {
 	return nil
 }
 
-func (m *InputDefinition) GetInputDefinitionFields() []*InputDefinitionField {
+func (m *InputDefinition) GetFields() []*InputDefinitionField {
 	if m != nil {
-		return m.InputDefinitionFields
+		return m.Fields
 	}
 	return nil
 }
@@ -970,8 +970,8 @@ func (m *InputDefinition) MarshalTo(dAtA []byte) (int, error) {
 			i += n
 		}
 	}
-	if len(m.InputDefinitionFields) > 0 {
-		for _, msg := range m.InputDefinitionFields {
+	if len(m.Fields) > 0 {
+		for _, msg := range m.Fields {
 			dAtA[i] = 0x1a
 			i++
 			i = encodeVarintPrivate(dAtA, i, uint64(msg.Size()))
@@ -1475,8 +1475,8 @@ func (m *InputDefinition) Size() (n int) {
 			n += 1 + l + sovPrivate(uint64(l))
 		}
 	}
-	if len(m.InputDefinitionFields) > 0 {
-		for _, e := range m.InputDefinitionFields {
+	if len(m.Fields) > 0 {
+		for _, e := range m.Fields {
 			l = e.Size()
 			n += 1 + l + sovPrivate(uint64(l))
 		}
@@ -3587,7 +3587,7 @@ func (m *InputDefinition) Unmarshal(dAtA []byte) error {
 			iNdEx = postIndex
 		case 3:
 			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field InputDefinitionFields", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field Fields", wireType)
 			}
 			var msglen int
 			for shift := uint(0); ; shift += 7 {
@@ -3611,8 +3611,8 @@ func (m *InputDefinition) Unmarshal(dAtA []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.InputDefinitionFields = append(m.InputDefinitionFields, &InputDefinitionField{})
-			if err := m.InputDefinitionFields[len(m.InputDefinitionFields)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
+			m.Fields = append(m.Fields, &InputDefinitionField{})
+			if err := m.Fields[len(m.Fields)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
 				return err
 			}
 			iNdEx = postIndex
@@ -4469,58 +4469,58 @@ var (
 func init() { proto.RegisterFile("private.proto", fileDescriptorPrivate) }
 
 var fileDescriptorPrivate = []byte{
-	// 835 bytes of a gzipped FileDescriptorProto
+	// 834 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcd, 0x8e, 0x1b, 0x45,
-	0x10, 0x66, 0xec, 0xb1, 0x63, 0xd7, 0x6a, 0x77, 0x9d, 0x66, 0x41, 0x93, 0xd5, 0xca, 0x5a, 0xf5,
-	0x81, 0x2c, 0x3e, 0xec, 0x21, 0x5c, 0x20, 0xe1, 0x00, 0xb1, 0x1d, 0xc5, 0x02, 0x07, 0x68, 0xaf,
-	0x72, 0x44, 0xea, 0xb5, 0x0b, 0x18, 0xed, 0x78, 0xc6, 0x4c, 0xf7, 0x78, 0x63, 0x0e, 0x5c, 0x78,
-	0x09, 0x24, 0xae, 0x5c, 0x79, 0x0f, 0x8e, 0x5c, 0xb9, 0xa1, 0xe5, 0xc2, 0x63, 0xa0, 0xfe, 0x9b,
-	0x19, 0x8f, 0x7f, 0xa2, 0xe4, 0xd6, 0xf5, 0x75, 0xfd, 0x7c, 0xfd, 0x4d, 0x55, 0xd9, 0x70, 0xb8,
-	0x48, 0xc3, 0x25, 0x97, 0x78, 0xb9, 0x48, 0x13, 0x99, 0x90, 0x56, 0x18, 0x4b, 0x4c, 0x63, 0x1e,
-	0xd1, 0xaf, 0xa0, 0x3d, 0x8a, 0x67, 0xf8, 0x6a, 0x8c, 0x92, 0x93, 0x73, 0x38, 0xe8, 0x27, 0x51,
-	0x36, 0x8f, 0xbf, 0xe4, 0xd7, 0x18, 0x05, 0xde, 0xb9, 0x77, 0xd1, 0x66, 0x65, 0x48, 0x79, 0x5c,
-	0x85, 0x73, 0xfc, 0x26, 0xe3, 0xb1, 0xcc, 0xe6, 0x41, 0xcd, 0x78, 0x94, 0x20, 0xfa, 0x87, 0x07,
-	0xed, 0x67, 0x29, 0x9f, 0xa3, 0xce, 0x78, 0x0a, 0x2d, 0x96, 0xdc, 0x96, 0xd3, 0xe5, 0x36, 0xf9,
-	0x00, 0x8e, 0x46, 0xf1, 0x12, 0x53, 0x81, 0xc3, 0x98, 0x5f, 0x47, 0x38, 0xd3, 0xe9, 0x5a, 0xac,
-	0x82, 0x92, 0x33, 0x68, 0xf7, 0xf9, 0xf4, 0x07, 0xbc, 0x5a, 0x2d, 0x30, 0xa8, 0xeb, 0x24, 0x05,
-	0x90, 0xdf, 0x4e, 0xc2, 0x9f, 0x30, 0xf0, 0xcf, 0xbd, 0x8b, 0x43, 0x56, 0x00, 0x55, 0xbe, 0x8d,
-	0x4d, 0xbe, 0x14, 0x8e, 0x46, 0xf3, 0x45, 0x92, 0x4a, 0x86, 0x62, 0x91, 0xc4, 0x02, 0x49, 0x07,
-	0xea, 0xc3, 0x34, 0xb5, 0x74, 0xd5, 0x91, 0xfe, 0x0c, 0x9d, 0xa7, 0x51, 0x32, 0xbd, 0x19, 0x70,
-	0xc9, 0x19, 0xfe, 0x98, 0xa1, 0x90, 0xe4, 0x04, 0x1a, 0x5a, 0x38, 0xeb, 0x67, 0x0c, 0x85, 0xea,
-	0xc7, 0x5b, 0x65, 0x8c, 0xa1, 0x50, 0x1d, 0xaf, 0xd9, 0xfb, 0xcc, 0x18, 0x0a, 0x9d, 0x44, 0xe1,
-	0xd4, 0xb0, 0xf6, 0x99, 0x31, 0x08, 0x01, 0xff, 0x65, 0x88, 0xb7, 0x96, 0xaa, 0x3e, 0xd3, 0x11,
-	0xdc, 0x2f, 0xd5, 0xb7, 0x34, 0xdf, 0x87, 0x26, 0x4b, 0x6e, 0x47, 0x03, 0x11, 0x78, 0xe7, 0xf5,
-	0x0b, 0x9f, 0x59, 0x4b, 0x0b, 0xa2, 0xbf, 0x98, 0xba, 0xaa, 0xe9, 0xab, 0x02, 0xa0, 0x0f, 0xa0,
-	0xa1, 0xd5, 0x51, 0xaf, 0x2c, 0x62, 0xd5, 0x91, 0xfe, 0xe6, 0xc1, 0xfd, 0x31, 0x7f, 0xa5, 0x69,
-	0x88, 0xbc, 0xcc, 0x73, 0x68, 0xe7, 0xa0, 0xf6, 0x3e, 0x78, 0xd4, 0xbb, 0x74, 0xed, 0x73, 0xb9,
-	0xe1, 0x5f, 0x20, 0xc3, 0x58, 0xa6, 0x2b, 0x56, 0x04, 0x9f, 0x7e, 0x0a, 0x47, 0xeb, 0x97, 0x8a,
-	0xc3, 0x0d, 0xae, 0x9c, 0xd2, 0x37, 0xb8, 0x52, 0x9a, 0x2c, 0x79, 0x94, 0x19, 0xfd, 0x7c, 0x66,
-	0x8c, 0xc7, 0xb5, 0x8f, 0x3d, 0xfa, 0x2d, 0x90, 0x7e, 0x8a, 0x5c, 0xa2, 0x4e, 0x30, 0x46, 0x21,
-	0xf8, 0xf7, 0xb8, 0xfb, 0x2b, 0x18, 0x65, 0x6b, 0x65, 0x65, 0xcf, 0xa0, 0x3d, 0x12, 0xb6, 0xb7,
-	0xf4, 0x97, 0x68, 0xb1, 0x02, 0xa0, 0x3d, 0x20, 0x03, 0x8c, 0x50, 0xa2, 0x1d, 0x87, 0x3d, 0xf9,
-	0xe9, 0xc4, 0x71, 0x79, 0xbd, 0x2f, 0x79, 0x08, 0xbe, 0x9a, 0x04, 0x4d, 0xe5, 0xe0, 0xd1, 0xbb,
-	0x85, 0x74, 0xf9, 0xd8, 0x31, 0xed, 0x40, 0x43, 0x97, 0xd4, 0x4e, 0xcf, 0x6b, 0x1e, 0xb8, 0xa5,
-	0xcd, 0x5c, 0xa9, 0x7a, 0xb5, 0x54, 0x3e, 0x8f, 0xb6, 0xd4, 0x67, 0xee, 0xad, 0x6f, 0x5b, 0x8a,
-	0x0e, 0x2c, 0xaa, 0xda, 0xf5, 0x85, 0xba, 0x35, 0x31, 0xfa, 0xbc, 0xfb, 0xc9, 0x55, 0x1e, 0xff,
-	0x79, 0xb6, 0xe4, 0x9b, 0xa5, 0xa9, 0x28, 0xa7, 0x96, 0x8c, 0x6b, 0x2c, 0x3b, 0x61, 0xb9, 0x4d,
-	0x1e, 0x42, 0x53, 0x57, 0x15, 0x81, 0xaf, 0x7b, 0xf7, 0xb8, 0xc2, 0x86, 0xd9, 0x6b, 0x35, 0x4e,
-	0xb6, 0xc9, 0x1b, 0x66, 0x9c, 0x8c, 0x45, 0x86, 0xd0, 0x19, 0xc5, 0x8b, 0x4c, 0x0e, 0xf0, 0xbb,
-	0x30, 0x0e, 0x65, 0x98, 0xc4, 0x22, 0x68, 0xea, 0x54, 0x0f, 0xca, 0x8c, 0xd6, 0x3c, 0xd8, 0x46,
-	0x08, 0xfd, 0xdd, 0x83, 0xe3, 0x0a, 0xb8, 0xe3, 0xd1, 0x8e, 0x6f, 0x6d, 0x3f, 0xdf, 0x2b, 0x78,
-	0xaf, 0x92, 0xef, 0x59, 0x88, 0xd1, 0x4c, 0x04, 0x75, 0x1d, 0xd7, 0xdd, 0x49, 0x4e, 0xbb, 0xb1,
-	0xed, 0xc1, 0x74, 0x09, 0x27, 0xdb, 0x2e, 0xb6, 0x52, 0xed, 0x02, 0x7c, 0x9d, 0x86, 0x73, 0x9e,
-	0xae, 0xbe, 0xc0, 0x95, 0xdd, 0xdd, 0x25, 0x84, 0xf4, 0xe0, 0xde, 0xe7, 0x53, 0x23, 0x98, 0xe1,
-	0xd4, 0x29, 0x38, 0x99, 0x0b, 0xe6, 0x1c, 0xe8, 0xdf, 0x1e, 0x34, 0xcd, 0xb9, 0x68, 0x38, 0xaf,
-	0xdc, 0xdb, 0x3d, 0xe8, 0xbc, 0x54, 0xbb, 0x60, 0x80, 0x42, 0x86, 0x31, 0x57, 0x9e, 0xb6, 0x23,
-	0x37, 0x70, 0xf2, 0x18, 0x5a, 0x1a, 0x1b, 0xf3, 0xc5, 0xa6, 0x1a, 0xa6, 0xca, 0xa5, 0x73, 0x30,
-	0x5b, 0x2a, 0xf7, 0x57, 0xd5, 0xf5, 0x1e, 0x75, 0x4b, 0x59, 0x1b, 0xa7, 0x4f, 0xe0, 0x70, 0x2d,
-	0xe0, 0x8d, 0x36, 0xd7, 0x2f, 0x1e, 0x9c, 0xb9, 0x75, 0xb1, 0x26, 0xed, 0xfe, 0xc1, 0x73, 0x92,
-	0xd7, 0x4a, 0x92, 0x7f, 0x02, 0x50, 0x84, 0xdb, 0x39, 0xdf, 0xd3, 0x86, 0x25, 0x67, 0xca, 0x01,
-	0x5e, 0x24, 0x33, 0x9c, 0x48, 0x2e, 0x33, 0xa1, 0x92, 0x3f, 0x4f, 0x84, 0x74, 0xdf, 0x53, 0x9d,
-	0xf5, 0xd6, 0x94, 0x5c, 0xe6, 0x93, 0xae, 0x0d, 0xf2, 0x21, 0xdc, 0xd3, 0x7c, 0xd0, 0x7d, 0xc5,
-	0xe3, 0xca, 0x20, 0x32, 0x77, 0x4f, 0x9f, 0xc0, 0x61, 0x3f, 0xca, 0x84, 0xc4, 0xd4, 0x56, 0xe9,
-	0x41, 0x43, 0xd5, 0x74, 0xbf, 0x1b, 0x27, 0x45, 0x64, 0x41, 0x85, 0x19, 0x97, 0xa7, 0x9d, 0x3f,
-	0xef, 0xba, 0xde, 0x5f, 0x77, 0x5d, 0xef, 0x9f, 0xbb, 0xae, 0xf7, 0xeb, 0xbf, 0xdd, 0x77, 0xae,
-	0x9b, 0xfa, 0xbf, 0xca, 0x47, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x40, 0x32, 0xbc, 0xbc,
-	0x08, 0x00, 0x00,
+	0x10, 0x66, 0xec, 0xb1, 0x63, 0xd7, 0x6a, 0x77, 0x9d, 0x66, 0x85, 0x26, 0xab, 0x95, 0xb5, 0xea,
+	0x03, 0x59, 0x7c, 0xf0, 0x21, 0x48, 0x08, 0x12, 0x0e, 0x10, 0xdb, 0x51, 0x2c, 0x70, 0x80, 0x76,
+	0x94, 0x23, 0x52, 0xaf, 0x5d, 0xc0, 0x68, 0xc7, 0x33, 0x66, 0xba, 0xc7, 0x1b, 0x73, 0xe0, 0x82,
+	0xc4, 0x33, 0x20, 0xf1, 0x0c, 0xbc, 0x07, 0x47, 0xae, 0xdc, 0xd0, 0x72, 0xe1, 0x31, 0x50, 0xff,
+	0xcd, 0x8c, 0xc7, 0x6b, 0x47, 0x9b, 0x5b, 0xd7, 0x57, 0x5f, 0x57, 0x7d, 0x5d, 0x53, 0x55, 0x36,
+	0x1c, 0x2e, 0xd3, 0x70, 0xc5, 0x25, 0xf6, 0x97, 0x69, 0x22, 0x13, 0xd2, 0x0a, 0x63, 0x89, 0x69,
+	0xcc, 0x23, 0xfa, 0x15, 0xb4, 0xc7, 0xf1, 0x1c, 0x5f, 0x4f, 0x50, 0x72, 0x72, 0x0e, 0x07, 0x83,
+	0x24, 0xca, 0x16, 0xf1, 0x97, 0xfc, 0x12, 0xa3, 0xc0, 0x3b, 0xf7, 0x2e, 0xda, 0xac, 0x0c, 0x29,
+	0xc6, 0xcb, 0x70, 0x81, 0xdf, 0x64, 0x3c, 0x96, 0xd9, 0x22, 0xa8, 0x19, 0x46, 0x09, 0xa2, 0x7f,
+	0x78, 0xd0, 0x7e, 0x96, 0xf2, 0x05, 0xea, 0x88, 0xa7, 0xd0, 0x62, 0xc9, 0x75, 0x39, 0x5c, 0x6e,
+	0x93, 0xf7, 0xe1, 0x68, 0x1c, 0xaf, 0x30, 0x15, 0x38, 0x8a, 0xf9, 0x65, 0x84, 0x73, 0x1d, 0xae,
+	0xc5, 0x2a, 0x28, 0x39, 0x83, 0xf6, 0x80, 0xcf, 0x7e, 0xc0, 0x97, 0xeb, 0x25, 0x06, 0x75, 0x1d,
+	0xa4, 0x00, 0x72, 0xef, 0x34, 0xfc, 0x09, 0x03, 0xff, 0xdc, 0xbb, 0x38, 0x64, 0x05, 0x50, 0xd5,
+	0xdb, 0xd8, 0xd6, 0x4b, 0xe1, 0x68, 0xbc, 0x58, 0x26, 0xa9, 0x64, 0x28, 0x96, 0x49, 0x2c, 0x90,
+	0x74, 0xa0, 0x3e, 0x4a, 0x53, 0x2b, 0x57, 0x1d, 0xe9, 0xcf, 0xd0, 0x79, 0x1a, 0x25, 0xb3, 0xab,
+	0x21, 0x97, 0x9c, 0xe1, 0x8f, 0x19, 0x0a, 0x49, 0x4e, 0xa0, 0xa1, 0x0b, 0x67, 0x79, 0xc6, 0x50,
+	0xa8, 0x7e, 0xbc, 0xad, 0x8c, 0x31, 0x14, 0xaa, 0xef, 0x6b, 0xf5, 0x3e, 0x33, 0x86, 0x42, 0xa7,
+	0x51, 0x38, 0x33, 0xaa, 0x7d, 0x66, 0x0c, 0x42, 0xc0, 0x7f, 0x15, 0xe2, 0xb5, 0x95, 0xaa, 0xcf,
+	0x74, 0x0c, 0xf7, 0x4b, 0xf9, 0xad, 0xcc, 0xf7, 0xa0, 0xc9, 0x92, 0xeb, 0xf1, 0x50, 0x04, 0xde,
+	0x79, 0xfd, 0xc2, 0x67, 0xd6, 0xd2, 0x05, 0xd1, 0x5f, 0x4c, 0xb9, 0x6a, 0xda, 0x55, 0x00, 0xf4,
+	0x01, 0x34, 0x74, 0x75, 0xd4, 0x2b, 0x8b, 0xbb, 0xea, 0x48, 0x7f, 0xf7, 0xe0, 0xfe, 0x84, 0xbf,
+	0xd6, 0x32, 0x44, 0x9e, 0xe6, 0x39, 0xb4, 0x73, 0x50, 0xb3, 0x0f, 0x1e, 0xf5, 0xfa, 0xae, 0x7d,
+	0xfa, 0x5b, 0xfc, 0x02, 0x19, 0xc5, 0x32, 0x5d, 0xb3, 0xe2, 0xf2, 0xe9, 0xa7, 0x70, 0xb4, 0xe9,
+	0x54, 0x1a, 0xae, 0x70, 0xed, 0x2a, 0x7d, 0x85, 0x6b, 0x55, 0x93, 0x15, 0x8f, 0x32, 0x53, 0x3f,
+	0x9f, 0x19, 0xe3, 0x71, 0xed, 0x63, 0x8f, 0x7e, 0x0b, 0x64, 0x90, 0x22, 0x97, 0xa8, 0x03, 0x4c,
+	0x50, 0x08, 0xfe, 0x3d, 0xee, 0xfe, 0x0a, 0xa6, 0xb2, 0xb5, 0x72, 0x65, 0xcf, 0xa0, 0x3d, 0x16,
+	0xb6, 0xb7, 0xf4, 0x97, 0x68, 0xb1, 0x02, 0xa0, 0x3d, 0x20, 0x43, 0x8c, 0x50, 0xa2, 0x1d, 0x87,
+	0x3d, 0xf1, 0xe9, 0xd4, 0x69, 0x79, 0x33, 0x97, 0x3c, 0x04, 0x5f, 0x4d, 0x82, 0x96, 0x72, 0xf0,
+	0xe8, 0xdd, 0xa2, 0x74, 0xf9, 0xd8, 0x31, 0x4d, 0xa0, 0xa1, 0x0b, 0x6a, 0xa7, 0xe7, 0x0d, 0x0f,
+	0xbc, 0xa5, 0xcd, 0x5c, 0xaa, 0x7a, 0x35, 0x55, 0x3e, 0x8f, 0x36, 0xd5, 0x67, 0xee, 0xad, 0x6f,
+	0x9b, 0x8a, 0x0e, 0x2d, 0xaa, 0xda, 0xf5, 0x85, 0xf2, 0x9a, 0x3b, 0xfa, 0xbc, 0xfb, 0xc9, 0x55,
+	0x1d, 0xff, 0x79, 0x36, 0xe5, 0xdd, 0xc2, 0x54, 0x2a, 0xa7, 0x96, 0x8c, 0x6b, 0x2c, 0x3b, 0x61,
+	0xb9, 0x4d, 0x1e, 0x42, 0x53, 0x67, 0x15, 0x81, 0xaf, 0x7b, 0xf7, 0xb8, 0xa2, 0x86, 0x59, 0xb7,
+	0x1a, 0x27, 0xdb, 0xe4, 0x0d, 0x33, 0x4e, 0xc6, 0x22, 0x23, 0xe8, 0x8c, 0xe3, 0x65, 0x26, 0x87,
+	0xf8, 0x5d, 0x18, 0x87, 0x32, 0x4c, 0x62, 0x11, 0x34, 0x75, 0xa8, 0x07, 0x65, 0x45, 0x1b, 0x0c,
+	0xb6, 0x75, 0x85, 0xfe, 0xea, 0xc1, 0x71, 0x05, 0xdc, 0xf1, 0x68, 0xa7, 0xb7, 0xb6, 0x5f, 0xef,
+	0x47, 0xd0, 0x7c, 0x16, 0x62, 0x34, 0x17, 0x41, 0x5d, 0x13, 0xbb, 0x3b, 0xd5, 0x68, 0x1a, 0xb3,
+	0x6c, 0xba, 0x82, 0x93, 0xdb, 0xfc, 0xb7, 0x8a, 0xe9, 0x02, 0x7c, 0x9d, 0x86, 0x0b, 0x9e, 0xae,
+	0xbf, 0xc0, 0xb5, 0xdd, 0xce, 0x25, 0x84, 0xf4, 0xe0, 0xde, 0xe7, 0x33, 0x53, 0x12, 0x23, 0xa2,
+	0x53, 0x88, 0x30, 0x0e, 0xe6, 0x08, 0xf4, 0x6f, 0x0f, 0x9a, 0xe6, 0x5c, 0xb4, 0x94, 0x57, 0xee,
+	0xde, 0x1e, 0x74, 0x5e, 0xa9, 0x69, 0x1f, 0xa2, 0x90, 0x61, 0xcc, 0x15, 0xd3, 0xf6, 0xdc, 0x16,
+	0x4e, 0x1e, 0x43, 0x4b, 0x63, 0x13, 0xbe, 0xdc, 0x7e, 0xbe, 0xc9, 0xd2, 0x77, 0x04, 0xb3, 0x87,
+	0x72, 0xbe, 0xca, 0xae, 0x37, 0xa5, 0x5b, 0xbb, 0xda, 0x38, 0x7d, 0x02, 0x87, 0x1b, 0x17, 0xee,
+	0xb4, 0x9b, 0x7e, 0xf1, 0xe0, 0xcc, 0x2d, 0x84, 0x8d, 0xd2, 0xee, 0x1f, 0x2d, 0x57, 0xf2, 0x5a,
+	0xa9, 0xe4, 0x9f, 0x00, 0x14, 0xd7, 0xed, 0x24, 0xef, 0x69, 0xb4, 0x12, 0x99, 0x72, 0x80, 0x17,
+	0xc9, 0x1c, 0xa7, 0x92, 0xcb, 0x4c, 0xa8, 0xe0, 0xcf, 0x13, 0x21, 0xdd, 0xf7, 0x54, 0x67, 0xbd,
+	0x17, 0x25, 0x97, 0xf9, 0x2c, 0x6b, 0x83, 0x7c, 0x00, 0xf7, 0xb4, 0x1e, 0x74, 0x5f, 0xf1, 0xb8,
+	0x32, 0x6a, 0xcc, 0xf9, 0xe9, 0x13, 0x38, 0x1c, 0x44, 0x99, 0x90, 0x98, 0xda, 0x2c, 0x3d, 0x68,
+	0xa8, 0x9c, 0xee, 0x97, 0xe1, 0xa4, 0xb8, 0x59, 0x48, 0x61, 0x86, 0xf2, 0xb4, 0xf3, 0xe7, 0x4d,
+	0xd7, 0xfb, 0xeb, 0xa6, 0xeb, 0xfd, 0x73, 0xd3, 0xf5, 0x7e, 0xfb, 0xb7, 0xfb, 0xce, 0x65, 0x53,
+	0xff, 0x1b, 0xf9, 0xf0, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xe6, 0xa2, 0xa7, 0x9e, 0x08,
+	0x00, 0x00,
 }
diff --git a/internal/private.proto b/internal/private.proto
index d0b60d366..9697f24ae 100644
--- a/internal/private.proto
+++ b/internal/private.proto
@@ -83,7 +83,7 @@ message Index {
 message InputDefinition {
     string Name = 1;
     repeated Frame Frames = 2;
-    repeated InputDefinitionField InputDefinitionFields = 3;
+    repeated InputDefinitionField Fields = 3;
 }
 
 message InputDefinitionField {