diff --git a/mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java b/mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
index b5e6ca10..d5f1988a 100644
--- a/mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
+++ b/mock/src/main/java/seng302/RaceEventMessages/BoatLocationMessage.java
@@ -23,20 +23,20 @@ public class BoatLocationMessage
 
     ///Device type of the message (physical source of the message).
     private byte deviceType;
-    public static final int Unknown = 0;
-    public static final int RacingYacht = 1;
-    public static final int CommitteeBoat = 2;
-    public static final int Mark = 3;
-    public static final int Pin = 4;
-    public static final int ChaseBoat = 5;
-    public static final int MedicalBoat = 6;
-    public static final int MarshallBoat = 7;
-    public static final int UmpireBoat = 8;
-    public static final int UmpireSoftwareApplication = 9;
-    public static final int PrincipalRaceOfficerApplication = 10;
-    public static final int WeatherStation = 11;
-    public static final int Helicopter = 12;
-    public static final int DataProcessingApplication = 13;
+    public static final byte Unknown = 0;
+    public static final byte RacingYacht = 1;
+    public static final byte CommitteeBoat = 2;
+    public static final byte Mark = 3;
+    public static final byte Pin = 4;
+    public static final byte ChaseBoat = 5;
+    public static final byte MedicalBoat = 6;
+    public static final byte MarshallBoat = 7;
+    public static final byte UmpireBoat = 8;
+    public static final byte UmpireSoftwareApplication = 9;
+    public static final byte PrincipalRaceOfficerApplication = 10;
+    public static final byte WeatherStation = 11;
+    public static final byte Helicopter = 12;
+    public static final byte DataProcessingApplication = 13;
 
 
     ///Latitude of the boat.