diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java
index bd4de5ef..5d4ce825 100644
--- a/src/main/java/seng302/App.java
+++ b/src/main/java/seng302/App.java
@@ -31,16 +31,16 @@ public class App extends Application
         }
 
         if (args.length > 1){
-            sr = new StreamReceiver("localhost", 8085, "RaceStream");
+            sr = new StreamReceiver("localhost", 8085, "TestThread1");
         }
         else{
-              sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"RaceStream");
-//            sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream");
-//            sr = new StreamReceiver("localhost", 8085, "RaceStream");
+//            sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
+//            sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1");
+            sr = new StreamReceiver("localhost", 8085, "TestThread1");
         }
 
         sr.start();
-        StreamParser streamParser = new StreamParser("StreamParser");
+        StreamParser streamParser = new StreamParser("TestThread2");
         streamParser.start();
 
         launch(args);
diff --git a/src/main/java/seng302/models/Race.java b/src/main/java/seng302/models/Race.java
index 01d1adf8..fc7ae0ef 100644
--- a/src/main/java/seng302/models/Race.java
+++ b/src/main/java/seng302/models/Race.java
@@ -152,7 +152,7 @@ public class Race {
 
     /**
      * Set a boat as finished
-     * @param boat The boat that has finished the race
+     * @param boat The boat that has finished the race/home/cosc/student/wmu16
      */
     public void setBoatFinished(Boat boat){
         this.finishingOrder.add(boat);