diff --git a/events/events.proto b/events/events.proto
index 03332f2..9297df0 100644
--- a/events/events.proto
+++ b/events/events.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 package robocar.events;
+option go_package = "events";
 
 message FrameRef {
     string name = 1;
diff --git a/go/events/events.pb.go b/go/events/events.pb.go
index 07860d7..e39b386 100644
--- a/go/events/events.pb.go
+++ b/go/events/events.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: events/events.proto
 
-package robocar_events
+package events
 
 import (
 	fmt "fmt"
@@ -394,29 +394,29 @@ func init() {
 func init() { proto.RegisterFile("events/events.proto", fileDescriptor_8ec31f2d2a3db598) }
 
 var fileDescriptor_8ec31f2d2a3db598 = []byte{
-	// 377 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6f, 0xa3, 0x30,
-	0x10, 0x5d, 0xcc, 0x47, 0xc8, 0x24, 0x62, 0x91, 0x77, 0x15, 0xa1, 0x1c, 0x56, 0x51, 0x4e, 0xd1,
-	0x1e, 0xd8, 0x15, 0xab, 0xfd, 0x01, 0x69, 0xa5, 0x9e, 0xf2, 0x25, 0x37, 0x3d, 0xf4, 0x54, 0x01,
-	0x31, 0x09, 0x55, 0x82, 0x91, 0x71, 0x2a, 0xe5, 0xde, 0x9f, 0xd3, 0x1f, 0x59, 0xd9, 0x86, 0x36,
-	0xe1, 0xd2, 0x5e, 0x7a, 0x62, 0xde, 0xe3, 0xcd, 0x9b, 0xe7, 0x01, 0xc3, 0x0f, 0xfa, 0x44, 0x0b,
-	0x51, 0xfd, 0xd1, 0x8f, 0xb0, 0xe4, 0x4c, 0x30, 0xec, 0x71, 0x96, 0xb0, 0x34, 0xe6, 0xa1, 0x66,
-	0xc7, 0x21, 0xb8, 0x37, 0x3c, 0x3e, 0x50, 0x42, 0x33, 0x8c, 0xc1, 0x2a, 0xe2, 0x03, 0x0d, 0x8c,
-	0x91, 0x31, 0xe9, 0x12, 0x55, 0x63, 0x0f, 0x50, 0xbe, 0x09, 0x90, 0x62, 0x50, 0xbe, 0x19, 0x2f,
-	0xa0, 0xaf, 0xf4, 0x73, 0x5a, 0x55, 0xf1, 0x96, 0xe2, 0x89, 0x7a, 0x2f, 0x3b, 0x7a, 0x51, 0x10,
-	0x5e, 0x9a, 0x87, 0x8d, 0xb3, 0xec, 0xc4, 0x3f, 0xc1, 0xce, 0x24, 0x56, 0x66, 0x7d, 0xa2, 0xc1,
-	0xf8, 0xd9, 0x80, 0xef, 0xb7, 0x82, 0x52, 0x9e, 0x17, 0xdb, 0xc6, 0x73, 0x08, 0x6e, 0x55, 0x53,
-	0xca, 0x19, 0x91, 0x37, 0x8c, 0x7f, 0x01, 0xa4, 0xac, 0xc8, 0xf2, 0x0d, 0x2d, 0x52, 0x6d, 0x85,
-	0xc8, 0x19, 0x83, 0xff, 0x43, 0x57, 0x19, 0x3f, 0x70, 0x9a, 0x05, 0xe6, 0x07, 0xb1, 0xdc, 0xac,
-	0xae, 0x54, 0x8c, 0xf5, 0x8e, 0x33, 0x21, 0xf6, 0xf4, 0x2c, 0x86, 0xa8, 0xa9, 0x26, 0x46, 0x83,
-	0xbf, 0x2a, 0xc6, 0x09, 0xbc, 0x65, 0xf2, 0x48, 0x53, 0x51, 0x35, 0x21, 0xfe, 0x42, 0x87, 0x69,
-	0x26, 0x30, 0x46, 0xe6, 0xa4, 0x17, 0x0d, 0xda, 0x36, 0xba, 0x81, 0x34, 0xb2, 0xcb, 0xd1, 0xe8,
-	0xd3, 0xa3, 0x5f, 0x0c, 0x70, 0xb4, 0x15, 0x0e, 0xc1, 0x12, 0xa7, 0x52, 0x1f, 0xda, 0x8b, 0x86,
-	0xed, 0xe6, 0xf5, 0xa9, 0xa4, 0xf5, 0x50, 0xa5, 0x93, 0x5f, 0x76, 0x3f, 0xa3, 0x99, 0x50, 0xd3,
-	0x6c, 0xa2, 0x81, 0xfc, 0x73, 0x8e, 0xa5, 0x3a, 0xbb, 0x4d, 0xd0, 0xb1, 0x94, 0x2a, 0x9e, 0x6f,
-	0x77, 0x22, 0xb0, 0xb4, 0x4a, 0x01, 0x3c, 0x00, 0x27, 0x61, 0x42, 0xb0, 0x43, 0x60, 0x2b, 0xba,
-	0x46, 0xad, 0x05, 0x3b, 0xed, 0x05, 0xff, 0x8e, 0x00, 0xde, 0x73, 0xe0, 0x0e, 0x98, 0xd3, 0xc5,
-	0xbd, 0xff, 0x4d, 0x16, 0xd7, 0x53, 0xe2, 0x1b, 0xd8, 0x05, 0xeb, 0xea, 0x6e, 0xbe, 0xf2, 0x91,
-	0xac, 0x56, 0xb3, 0xe5, 0xda, 0x37, 0x13, 0x47, 0x5d, 0x81, 0x7f, 0xaf, 0x01, 0x00, 0x00, 0xff,
-	0xff, 0x90, 0x6c, 0xcb, 0x88, 0x19, 0x03, 0x00, 0x00,
+	// 383 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4d, 0x6f, 0x9b, 0x40,
+	0x10, 0x2d, 0xcb, 0x87, 0xf1, 0xd8, 0xa2, 0x68, 0x5b, 0x59, 0xc8, 0x87, 0xca, 0xf2, 0xc9, 0xea,
+	0x81, 0x56, 0x54, 0xfd, 0x01, 0x76, 0xa5, 0x9e, 0xfc, 0xa5, 0xad, 0x7b, 0x48, 0x2e, 0x11, 0xe0,
+	0xc5, 0x26, 0xb2, 0x59, 0xb4, 0xac, 0x23, 0xf9, 0x9e, 0x9f, 0x93, 0x1f, 0x19, 0xed, 0x2e, 0x24,
+	0x36, 0x97, 0xe4, 0x92, 0x13, 0xf3, 0x1e, 0x6f, 0xde, 0xbc, 0x59, 0x58, 0xf8, 0x42, 0x1f, 0x68,
+	0x21, 0xaa, 0x1f, 0xfa, 0x11, 0x96, 0x9c, 0x09, 0x86, 0x3d, 0xce, 0x12, 0x96, 0xc6, 0x3c, 0xd4,
+	0xec, 0x38, 0x04, 0xf7, 0x2f, 0x8f, 0x8f, 0x94, 0xd0, 0x0c, 0x63, 0xb0, 0x8a, 0xf8, 0x48, 0x03,
+	0x63, 0x64, 0x4c, 0xba, 0x44, 0xd5, 0xd8, 0x03, 0x94, 0x6f, 0x03, 0xa4, 0x18, 0x94, 0x6f, 0xc7,
+	0x4b, 0xe8, 0x2b, 0xfd, 0x82, 0x56, 0x55, 0xbc, 0xa3, 0x78, 0xa2, 0xde, 0xcb, 0x8e, 0x5e, 0x14,
+	0x84, 0xd7, 0xe6, 0x61, 0xe3, 0x2c, 0x3b, 0xf1, 0x57, 0xb0, 0x33, 0x89, 0x95, 0x59, 0x9f, 0x68,
+	0x30, 0x7e, 0x34, 0xe0, 0xf3, 0x3f, 0x41, 0x29, 0xcf, 0x8b, 0x5d, 0xe3, 0x39, 0x04, 0xb7, 0xaa,
+	0x29, 0xe5, 0x8c, 0xc8, 0x0b, 0xc6, 0xdf, 0x00, 0x52, 0x56, 0x64, 0xf9, 0x96, 0x16, 0xa9, 0xb6,
+	0x42, 0xe4, 0x82, 0xc1, 0xbf, 0xa1, 0xab, 0x8c, 0xef, 0x38, 0xcd, 0x02, 0xf3, 0x8d, 0x58, 0x6e,
+	0x56, 0x57, 0x2a, 0xc6, 0x66, 0xcf, 0x99, 0x10, 0x07, 0x7a, 0x11, 0x43, 0xd4, 0x54, 0x13, 0xa3,
+	0xc1, 0x1f, 0x15, 0xe3, 0x0c, 0xde, 0x2a, 0xb9, 0xa7, 0xa9, 0xa8, 0x9a, 0x10, 0x3f, 0xa1, 0xc3,
+	0x34, 0x13, 0x18, 0x23, 0x73, 0xd2, 0x8b, 0x06, 0x6d, 0x1b, 0xdd, 0x40, 0x1a, 0xd9, 0xf5, 0x68,
+	0xf4, 0xee, 0xd1, 0x4f, 0x06, 0x38, 0xda, 0x0a, 0x87, 0x60, 0x89, 0x73, 0xa9, 0x97, 0xf6, 0xa2,
+	0x61, 0xbb, 0x79, 0x73, 0x2e, 0x69, 0x3d, 0x54, 0xe9, 0xe4, 0x97, 0x3d, 0xcc, 0x69, 0x26, 0xd4,
+	0x34, 0x9b, 0x68, 0x20, 0xff, 0x9c, 0x53, 0xa9, 0x76, 0xb7, 0x09, 0x3a, 0x95, 0x52, 0xc5, 0xf3,
+	0xdd, 0x5e, 0x04, 0x96, 0x56, 0x29, 0x80, 0x07, 0xe0, 0x24, 0x4c, 0x08, 0x76, 0x0c, 0x6c, 0x45,
+	0xd7, 0xa8, 0x75, 0xc0, 0x4e, 0xfb, 0x80, 0xbf, 0x47, 0x00, 0xaf, 0x39, 0x70, 0x07, 0xcc, 0xe9,
+	0xf2, 0xc6, 0xff, 0x24, 0x8b, 0x3f, 0x53, 0xe2, 0x1b, 0xd8, 0x05, 0x6b, 0xf6, 0x7f, 0xb1, 0xf6,
+	0x91, 0xac, 0xd6, 0xf3, 0xd5, 0xc6, 0x37, 0x67, 0xee, 0xad, 0xa3, 0x57, 0x48, 0x1c, 0x75, 0x19,
+	0x7e, 0x3d, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb6, 0x83, 0x51, 0xbe, 0x23, 0x03, 0x00, 0x00,
 }
diff --git a/python/events/events_pb2.py b/python/events/events_pb2.py
index f084b7b..92f15d9 100644
--- a/python/events/events_pb2.py
+++ b/python/events/events_pb2.py
@@ -19,8 +19,8 @@ DESCRIPTOR = _descriptor.FileDescriptor(
   name='events/events.proto',
   package='robocar.events',
   syntax='proto3',
-  serialized_options=None,
-  serialized_pb=_b('\n\x13\x65vents/events.proto\x12\x0erobocar.events\"$\n\x08\x46rameRef\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\"C\n\x0c\x46rameMessage\x12$\n\x02id\x18\x01 \x01(\x0b\x32\x18.robocar.events.FrameRef\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\"d\n\x0fSteeringMessage\x12\x10\n\x08steering\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"d\n\x0fThrottleMessage\x12\x10\n\x08throttle\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"f\n\x0eObjectsMessage\x12\'\n\x07objects\x18\x01 \x03(\x0b\x32\x16.robocar.events.Object\x12+\n\tframe_ref\x18\x02 \x01(\x0b\x32\x18.robocar.events.FrameRef\"\x80\x01\n\x06Object\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.robocar.events.TypeObject\x12\r\n\x05lLeft\x18\x02 \x01(\x05\x12\n\n\x02up\x18\x03 \x01(\x05\x12\r\n\x05right\x18\x04 \x01(\x05\x12\x0e\n\x06\x62ottom\x18\x05 \x01(\x05\x12\x12\n\nconfidence\x18\x06 \x01(\x02*2\n\nTypeObject\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x43\x41R\x10\x01\x12\x08\n\x04\x42UMP\x10\x02\x12\x08\n\x04PLOT\x10\x03\x62\x06proto3')
+  serialized_options=_b('Z\006events'),
+  serialized_pb=_b('\n\x13\x65vents/events.proto\x12\x0erobocar.events\"$\n\x08\x46rameRef\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\n\n\x02id\x18\x02 \x01(\t\"C\n\x0c\x46rameMessage\x12$\n\x02id\x18\x01 \x01(\x0b\x32\x18.robocar.events.FrameRef\x12\r\n\x05\x66rame\x18\x02 \x01(\x0c\"d\n\x0fSteeringMessage\x12\x10\n\x08steering\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"d\n\x0fThrottleMessage\x12\x10\n\x08throttle\x18\x01 \x01(\x02\x12\x12\n\nconfidence\x18\x02 \x01(\x02\x12+\n\tframe_ref\x18\x03 \x01(\x0b\x32\x18.robocar.events.FrameRef\"f\n\x0eObjectsMessage\x12\'\n\x07objects\x18\x01 \x03(\x0b\x32\x16.robocar.events.Object\x12+\n\tframe_ref\x18\x02 \x01(\x0b\x32\x18.robocar.events.FrameRef\"\x80\x01\n\x06Object\x12(\n\x04type\x18\x01 \x01(\x0e\x32\x1a.robocar.events.TypeObject\x12\r\n\x05lLeft\x18\x02 \x01(\x05\x12\n\n\x02up\x18\x03 \x01(\x05\x12\r\n\x05right\x18\x04 \x01(\x05\x12\x0e\n\x06\x62ottom\x18\x05 \x01(\x05\x12\x12\n\nconfidence\x18\x06 \x01(\x02*2\n\nTypeObject\x12\x07\n\x03\x41NY\x10\x00\x12\x07\n\x03\x43\x41R\x10\x01\x12\x08\n\x04\x42UMP\x10\x02\x12\x08\n\x04PLOT\x10\x03\x42\x08Z\x06\x65ventsb\x06proto3')
 )
 
 _TYPEOBJECT = _descriptor.EnumDescriptor(
@@ -388,4 +388,5 @@ Object = _reflection.GeneratedProtocolMessageType('Object', (_message.Message,),
 _sym_db.RegisterMessage(Object)
 
 
+DESCRIPTOR._options = None
 # @@protoc_insertion_point(module_scope)