diff --git a/src/main/java/seng302/Constants.java b/src/main/java/seng302/Constants.java
index fc198910..d1182698 100644
--- a/src/main/java/seng302/Constants.java
+++ b/src/main/java/seng302/Constants.java
@@ -22,11 +22,11 @@ public class Constants {
     public static final GPSCoordinate finishLineMarker2 = new GPSCoordinate(32.317257, -64.836260);
 
     public static final BoatInRace[] OFFICIAL_AC35_COMPETITORS = new BoatInRace[]
-            {new BoatInRace("Oracle Team USA", 30.0, Color.BLUEVIOLET, "USA"),
+            {new BoatInRace("Oracle Team USA", 30.0, Color.BLUEVIOLET, "Oracle"),
                     new BoatInRace("Land Rover BAR", 23.0, Color.BLACK, "BAR"),
                     new BoatInRace("SoftBank Team Japan", 27.0, Color.RED, "JAP"),
                     new BoatInRace("Groupama Team France", 25.0, Color.ORANGE, "FRN"),
                     new BoatInRace("Artemis Racing", 22.5, Color.DARKOLIVEGREEN, "ART"),
-                    new BoatInRace("Emirates Team New Zealand", 62, Color.LIMEGREEN, "ENZ")};
+                    new BoatInRace("Emirates Team New Zealand", 62, Color.LIMEGREEN, "ETNZ")};
 
 }
diff --git a/src/main/java/seng302/Model/Boat.java b/src/main/java/seng302/Model/Boat.java
index 2bf835b7..371ba522 100644
--- a/src/main/java/seng302/Model/Boat.java
+++ b/src/main/java/seng302/Model/Boat.java
@@ -54,7 +54,7 @@ public class Boat {
      * @return Name of the boat.
      */
     public String toString() {
-        return getName().toString();
+        return getName().getValue();
     }
 
     /**
diff --git a/src/main/java/seng302/Model/Race.java b/src/main/java/seng302/Model/Race.java
index b9b90ba4..d324d277 100644
--- a/src/main/java/seng302/Model/Race.java
+++ b/src/main/java/seng302/Model/Race.java
@@ -96,7 +96,7 @@ public abstract class Race implements Runnable {
         System.out.println("====================");
         for (int i = 0; i < startingBoats.size(); i++) {
             if (startingBoats.get(i) != null) {
-                System.out.println(i + 1 + ". " + startingBoats.get(i).getName() + ", Speed: "
+                System.out.println(i + 1 + ". " + startingBoats.get(i).toString() + ", Speed: "
                         + Math.round(startingBoats.get(i).getVelocity() * 1.94384) + "kn");
                 startingBoats.get(i).setCurrentLeg(legs.get(0));
             }