diff --git a/sampleData.go b/sampleData.go
index 30b8600..f45f1dc 100644
--- a/sampleData.go
+++ b/sampleData.go
@@ -12,7 +12,6 @@ func CreateSampleEvent() *Event {
 
 	e := &Event{
 		Id:		1234,
-		Name:		"Somekind of Event1",
 		Email:		"test+protobuf@wit.com",
 		Comment:	"this is a sample event",
 		Type:		Event_MIGRATE,
@@ -40,7 +39,7 @@ func CreateSampleEvents(total int) []Event {
 		e := CreateSampleEvent()
 
 		e.Id += 1000 + int32(i)
-		e.Name = "Sample Event " + string(i)
+		e.Comment = "Sample Event " + string(i)
 
 		all = append(all, *e)
 	}
@@ -60,9 +59,8 @@ func DumpEventData(myevent *Event) {
 func MakeGetEvent() *Event {
 	e := &Event{
 		Id:		1234,
-		Name:		"List all user VMs",
+		Comment:	"List all user VMs",
 		Email:		"test+protobuf@wit.com",
-		Comment:	"this should return a protobuf with all the VM's",
 		Type:		Event_GET,
 	}
 	e.Comment ="this should return a protobuf with all the VM's"
@@ -72,7 +70,7 @@ func MakeGetEvent() *Event {
 func MakeLoginEvent() *Event {
 	e := &Event{
 		Id:		1234,
-		Name:		"Login to get a Token",
+		Comment:	"Login to get a Token",
 		Type:		Event_LOGIN,
 	}
 	e.Comment ="this should return a protobuf with the token"