diff --git a/events.pb.go b/events.pb.go
index 4de307f..bb4beca 100644
--- a/events.pb.go
+++ b/events.pb.go
@@ -69,11 +69,11 @@ func (Event_EventType) EnumDescriptor() ([]byte, []int) {
 type Event struct {
 	Type                 Event_EventType   `protobuf:"varint,1,opt,name=type,proto3,enum=witProtobuf.Event_EventType" json:"type,omitempty"`
 	Id                   int32             `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
-	Name                 string            `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	Comment              string            `protobuf:"bytes,4,opt,name=comment,proto3" json:"comment,omitempty"`
+	Comment              string            `protobuf:"bytes,3,opt,name=comment,proto3" json:"comment,omitempty"`
+	Username             string            `protobuf:"bytes,4,opt,name=username,proto3" json:"username,omitempty"`
 	Email                string            `protobuf:"bytes,5,opt,name=email,proto3" json:"email,omitempty"`
-	Token                string            `protobuf:"bytes,6,opt,name=token,proto3" json:"token,omitempty"`
-	Password             string            `protobuf:"bytes,7,opt,name=password,proto3" json:"password,omitempty"`
+	Password             string            `protobuf:"bytes,6,opt,name=password,proto3" json:"password,omitempty"`
+	Token                string            `protobuf:"bytes,7,opt,name=token,proto3" json:"token,omitempty"`
 	Results              []*Event_Response `protobuf:"bytes,8,rep,name=results,proto3" json:"results,omitempty"`
 	Networks             []*Event_Network  `protobuf:"bytes,9,rep,name=networks,proto3" json:"networks,omitempty"`
 	Vms                  []*Event_VM       `protobuf:"bytes,10,rep,name=vms,proto3" json:"vms,omitempty"`
@@ -121,16 +121,16 @@ func (m *Event) GetId() int32 {
 	return 0
 }
 
-func (m *Event) GetName() string {
+func (m *Event) GetComment() string {
 	if m != nil {
-		return m.Name
+		return m.Comment
 	}
 	return ""
 }
 
-func (m *Event) GetComment() string {
+func (m *Event) GetUsername() string {
 	if m != nil {
-		return m.Comment
+		return m.Username
 	}
 	return ""
 }
@@ -142,16 +142,16 @@ func (m *Event) GetEmail() string {
 	return ""
 }
 
-func (m *Event) GetToken() string {
+func (m *Event) GetPassword() string {
 	if m != nil {
-		return m.Token
+		return m.Password
 	}
 	return ""
 }
 
-func (m *Event) GetPassword() string {
+func (m *Event) GetToken() string {
 	if m != nil {
-		return m.Password
+		return m.Token
 	}
 	return ""
 }
@@ -433,38 +433,38 @@ func init() {
 func init() { proto.RegisterFile("events.proto", fileDescriptor_8f22242cb04491f9) }
 
 var fileDescriptor_8f22242cb04491f9 = []byte{
-	// 519 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4f, 0x6f, 0xd3, 0x30,
-	0x14, 0x27, 0x49, 0xd3, 0x38, 0x6f, 0x63, 0x8a, 0x2c, 0x40, 0x56, 0xb6, 0x43, 0xb5, 0x0b, 0x3d,
-	0x4d, 0x68, 0x88, 0xdd, 0x07, 0xcd, 0x4a, 0xa5, 0xf5, 0x8f, 0xac, 0x32, 0x8e, 0x53, 0xda, 0x9a,
-	0x11, 0x35, 0x8e, 0x23, 0xdb, 0x69, 0xd5, 0x3b, 0x9f, 0x80, 0x2f, 0xc3, 0x77, 0xe0, 0x53, 0x21,
-	0x3b, 0x49, 0x57, 0x89, 0x72, 0xe4, 0x52, 0xbd, 0xdf, 0x9f, 0xd7, 0xdf, 0xf3, 0xb3, 0x03, 0xa7,
-	0x6c, 0xc3, 0x0a, 0xad, 0xae, 0x4a, 0x29, 0xb4, 0xc0, 0x27, 0xdb, 0x4c, 0xcf, 0x4c, 0xb5, 0xa8,
-	0xbe, 0x5d, 0xfe, 0x0a, 0xc0, 0x4f, 0x8c, 0x8a, 0xdf, 0x41, 0x47, 0xef, 0x4a, 0x46, 0x9c, 0x9e,
-	0xd3, 0x3f, 0xbb, 0xbe, 0xb8, 0x3a, 0x70, 0x5d, 0x59, 0x47, 0xfd, 0x3b, 0xdf, 0x95, 0x8c, 0x5a,
-	0x27, 0x3e, 0x03, 0x37, 0x5b, 0x11, 0xb7, 0xe7, 0xf4, 0x7d, 0xea, 0x66, 0x2b, 0x8c, 0xa1, 0x53,
-	0xa4, 0x9c, 0x11, 0xaf, 0xe7, 0xf4, 0x43, 0x6a, 0x6b, 0x4c, 0x20, 0x58, 0x0a, 0xce, 0x59, 0xa1,
-	0x49, 0xc7, 0xd2, 0x2d, 0xc4, 0xaf, 0xc0, 0x67, 0x3c, 0xcd, 0x72, 0xe2, 0x5b, 0xbe, 0x06, 0x86,
-	0xd5, 0x62, 0xcd, 0x0a, 0xd2, 0xad, 0x59, 0x0b, 0x70, 0x0c, 0xa8, 0x4c, 0x95, 0xda, 0x0a, 0xb9,
-	0x22, 0x81, 0x15, 0xf6, 0x18, 0x7f, 0x80, 0x40, 0x32, 0x55, 0xe5, 0x5a, 0x11, 0xd4, 0xf3, 0xfa,
-	0x27, 0xd7, 0xe7, 0x47, 0x46, 0xa7, 0x4c, 0x95, 0xa2, 0x50, 0x8c, 0xb6, 0x5e, 0x7c, 0x03, 0xa8,
-	0x60, 0x7a, 0x2b, 0xe4, 0x5a, 0x91, 0xd0, 0xf6, 0xc5, 0x47, 0xfa, 0x26, 0xb5, 0x85, 0xee, 0xbd,
-	0xf8, 0x2d, 0x78, 0x1b, 0xae, 0x08, 0xd8, 0x96, 0xd7, 0x47, 0x5a, 0x1e, 0xc6, 0xd4, 0x38, 0xe2,
-	0x9f, 0x0e, 0xa0, 0x36, 0xf6, 0x3f, 0x2d, 0xd7, 0xac, 0x50, 0x4a, 0x21, 0x9b, 0xd5, 0xd6, 0xc0,
-	0x2c, 0x4b, 0x15, 0x59, 0x59, 0x32, 0xad, 0x88, 0xdf, 0xf3, 0xcc, 0xb2, 0x5a, 0x1c, 0xff, 0x70,
-	0x20, 0x68, 0xce, 0xd4, 0x24, 0x38, 0x7f, 0x25, 0xb8, 0x07, 0x09, 0xe7, 0x10, 0x6a, 0xa1, 0xd3,
-	0xfc, 0x71, 0x59, 0x56, 0x36, 0xda, 0xa3, 0xc8, 0x12, 0x9f, 0xca, 0xea, 0x59, 0xe4, 0x8c, 0xdb,
-	0x11, 0x5a, 0x71, 0xcc, 0xb8, 0x11, 0x73, 0xf1, 0x94, 0x15, 0x8f, 0x95, 0x6c, 0xaf, 0x18, 0x59,
-	0xe2, 0x8b, 0xcc, 0xe3, 0xdf, 0x0e, 0xb8, 0x0f, 0xe3, 0x83, 0x09, 0xbc, 0x7f, 0x4e, 0x10, 0x03,
-	0xfa, 0x2e, 0x94, 0x3e, 0x38, 0xfb, 0x1e, 0x1b, 0xff, 0xb2, 0xac, 0x54, 0x93, 0x6d, 0x6b, 0xfc,
-	0x06, 0xba, 0x9c, 0x71, 0x21, 0x77, 0x36, 0xd4, 0xa3, 0x0d, 0x32, 0xde, 0x55, 0xa6, 0xd6, 0xf6,
-	0x5d, 0x79, 0xd4, 0xd6, 0x86, 0x1b, 0xcd, 0x36, 0x37, 0xcd, 0x93, 0xb2, 0xb5, 0xe1, 0xa4, 0xc8,
-	0x19, 0x41, 0x35, 0x67, 0x6a, 0x7c, 0x01, 0xe1, 0x22, 0x55, 0x6c, 0xc4, 0xd3, 0x27, 0x46, 0x42,
-	0x2b, 0x3c, 0x13, 0x97, 0x15, 0x84, 0xfb, 0xcb, 0xc3, 0x01, 0x78, 0xb7, 0x83, 0x41, 0xf4, 0x02,
-	0x03, 0x74, 0x07, 0xc9, 0x7d, 0x32, 0x4f, 0x22, 0x07, 0x9f, 0x40, 0x30, 0x9b, 0x7e, 0x4d, 0xe8,
-	0x74, 0x12, 0xb9, 0xf8, 0x14, 0x50, 0x0d, 0xee, 0xee, 0x22, 0x0f, 0xbf, 0x84, 0xf0, 0xf3, 0xe8,
-	0x63, 0x42, 0x27, 0xb7, 0xf3, 0x24, 0xea, 0x18, 0xe7, 0x78, 0x34, 0xa4, 0x06, 0xf8, 0x18, 0x41,
-	0x67, 0x90, 0x8c, 0xa7, 0x51, 0xd7, 0xfc, 0xeb, 0x30, 0x99, 0x47, 0x01, 0x0e, 0xc1, 0xbf, 0x9f,
-	0x0e, 0x47, 0x93, 0x08, 0x2d, 0xba, 0xf6, 0x6b, 0x7e, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x75,
-	0x88, 0x00, 0xb1, 0xdd, 0x03, 0x00, 0x00,
+	// 528 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcd, 0x6e, 0xd3, 0x40,
+	0x18, 0xc4, 0x7f, 0xb1, 0xfd, 0xa5, 0x54, 0xd6, 0x0a, 0xd0, 0xca, 0xed, 0x21, 0xea, 0x85, 0x9c,
+	0x22, 0x54, 0x44, 0xef, 0x85, 0xb8, 0x21, 0x52, 0xf3, 0xa3, 0x55, 0x28, 0xc7, 0xca, 0x49, 0x96,
+	0x62, 0xc5, 0xeb, 0xb5, 0x76, 0xd7, 0x89, 0x72, 0xe7, 0x09, 0x78, 0x21, 0xee, 0x3c, 0x15, 0xda,
+	0xb5, 0x9d, 0x46, 0x22, 0xdc, 0xb8, 0x44, 0xdf, 0x7c, 0x33, 0x93, 0xd9, 0x1d, 0xdb, 0x70, 0x46,
+	0xb7, 0xb4, 0x50, 0x72, 0x50, 0x0a, 0xae, 0x38, 0xea, 0xee, 0x32, 0x35, 0xd7, 0xd3, 0xb2, 0xfa,
+	0x76, 0xf5, 0xcb, 0x07, 0x2f, 0xd1, 0x2c, 0x7a, 0x07, 0xae, 0xda, 0x97, 0x14, 0x5b, 0x3d, 0xab,
+	0x7f, 0x7e, 0x7d, 0x39, 0x38, 0x52, 0x0d, 0x8c, 0xa2, 0xfe, 0x5d, 0xec, 0x4b, 0x4a, 0x8c, 0x12,
+	0x9d, 0x83, 0x9d, 0xad, 0xb1, 0xdd, 0xb3, 0xfa, 0x1e, 0xb1, 0xb3, 0x35, 0xc2, 0xe0, 0xaf, 0x38,
+	0x63, 0xb4, 0x50, 0xd8, 0xe9, 0x59, 0xfd, 0x90, 0xb4, 0x10, 0xc5, 0x10, 0x54, 0x92, 0x8a, 0x22,
+	0x65, 0x14, 0xbb, 0x86, 0x3a, 0x60, 0xf4, 0x0a, 0x3c, 0xca, 0xd2, 0x2c, 0xc7, 0x9e, 0x21, 0x6a,
+	0xa0, 0x1d, 0x65, 0x2a, 0xe5, 0x8e, 0x8b, 0x35, 0xee, 0xd4, 0x8e, 0x16, 0x6b, 0x87, 0xe2, 0x1b,
+	0x5a, 0x60, 0xbf, 0x76, 0x18, 0x80, 0x3e, 0x80, 0x2f, 0xa8, 0xac, 0x72, 0x25, 0x71, 0xd0, 0x73,
+	0xfa, 0xdd, 0xeb, 0x8b, 0x13, 0x57, 0x20, 0x54, 0x96, 0xbc, 0x90, 0x94, 0xb4, 0x5a, 0x74, 0x03,
+	0x41, 0x41, 0xd5, 0x8e, 0x8b, 0x8d, 0xc4, 0xa1, 0xf1, 0xc5, 0x27, 0x7c, 0xd3, 0x5a, 0x42, 0x0e,
+	0x5a, 0xf4, 0x16, 0x9c, 0x2d, 0x93, 0x18, 0x8c, 0xe5, 0xf5, 0x09, 0xcb, 0xc3, 0x84, 0x68, 0x45,
+	0xfc, 0xd3, 0x82, 0xa0, 0x8d, 0xfd, 0x0f, 0x25, 0x23, 0x70, 0x4d, 0x8d, 0x75, 0xc3, 0xee, 0xa1,
+	0x42, 0x21, 0xb8, 0x68, 0xba, 0xad, 0x81, 0xae, 0x50, 0x16, 0x59, 0x59, 0x52, 0x25, 0xb1, 0xd7,
+	0x73, 0x74, 0x85, 0x2d, 0x8e, 0x7f, 0x58, 0xe0, 0x37, 0x77, 0x6a, 0x12, 0xac, 0xbf, 0x12, 0xec,
+	0xa3, 0x84, 0x0b, 0x08, 0x15, 0x57, 0x69, 0xfe, 0xb8, 0x2a, 0x2b, 0x13, 0xed, 0x90, 0xc0, 0x2c,
+	0x3e, 0x95, 0xd5, 0x33, 0xc9, 0x28, 0x33, 0x47, 0x68, 0xc9, 0x09, 0x65, 0x9a, 0xcc, 0xf9, 0x53,
+	0x56, 0x3c, 0x56, 0xa2, 0x7d, 0xc4, 0x81, 0x59, 0x7c, 0x11, 0x79, 0xfc, 0xdb, 0x02, 0xfb, 0x61,
+	0x72, 0x74, 0x02, 0xe7, 0x9f, 0x27, 0x88, 0x21, 0xf8, 0xce, 0xa5, 0x3a, 0xba, 0xfb, 0x01, 0x6b,
+	0xfd, 0xaa, 0xac, 0x64, 0x93, 0x6d, 0x66, 0xf4, 0x06, 0x3a, 0x8c, 0x32, 0x2e, 0xf6, 0x26, 0xd4,
+	0x21, 0x0d, 0xd2, 0xda, 0x75, 0x26, 0x37, 0xe6, 0xa5, 0x72, 0x88, 0x99, 0xf5, 0x6e, 0x3c, 0xdf,
+	0xde, 0x34, 0xef, 0x93, 0x99, 0xf5, 0x4e, 0xf0, 0x9c, 0xe2, 0xa0, 0xde, 0xe9, 0x19, 0x5d, 0x42,
+	0xb8, 0x4c, 0x25, 0x1d, 0xb3, 0xf4, 0x89, 0xe2, 0xd0, 0x10, 0xcf, 0x8b, 0xab, 0x0a, 0xc2, 0xc3,
+	0xc3, 0x43, 0x3e, 0x38, 0xb7, 0xc3, 0x61, 0xf4, 0x02, 0x01, 0x74, 0x86, 0xc9, 0x7d, 0xb2, 0x48,
+	0x22, 0x0b, 0x75, 0xc1, 0x9f, 0xcf, 0xbe, 0x26, 0x64, 0x36, 0x8d, 0x6c, 0x74, 0x06, 0x41, 0x0d,
+	0xee, 0xee, 0x22, 0x07, 0xbd, 0x84, 0xf0, 0xf3, 0xf8, 0x63, 0x42, 0xa6, 0xb7, 0x8b, 0x24, 0x72,
+	0xb5, 0x72, 0x32, 0x1e, 0x11, 0x0d, 0x3c, 0x14, 0x80, 0x3b, 0x4c, 0x26, 0xb3, 0xa8, 0xa3, 0xff,
+	0x75, 0x94, 0x2c, 0x22, 0x1f, 0x85, 0xe0, 0xdd, 0xcf, 0x46, 0xe3, 0x69, 0x14, 0x2c, 0x3b, 0xe6,
+	0xab, 0x7e, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x1a, 0x0e, 0x0e, 0xe5, 0x03, 0x00, 0x00,
 }
diff --git a/events.proto b/events.proto
index 29f3460..07ce525 100644
--- a/events.proto
+++ b/events.proto
@@ -4,11 +4,11 @@ package witProtobuf;
 message Event {
 	EventType type = 1;
 	int32 id = 2;
-	string name = 3;
-	string comment = 4;
+	string comment = 3;
+	string username = 4;
 	string email = 5;
-	string token = 6;
-	string password = 7;
+	string password = 6;
+	string token = 7;
 
 	repeated Response results = 8;
 	repeated Network networks = 9;