diff --git a/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
index 71527f4..d30a8d1 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/MainActivity.java
@@ -53,6 +53,7 @@ public class MainActivity extends Activity {
 		/*End Test Code*/
 		
 		// And kick off contacting to server to see if there are any new ones
+		locationList = (ListView)findViewById(R.id.listLocations);
 		new LocationClient.LocationsDownloader(this) {
 			@Override
 			protected void onPostExecute(List<RestLocation> result) {
diff --git a/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java b/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
index 7796e99..c154019 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/SearchActivity.java
@@ -138,7 +138,7 @@ public class SearchActivity extends Activity {
 		}
 		else
 		{
-			new ImageDownloader().execute(restLocation.getRiddleImageURL());
+			new ImageDownloader().execute(restLocation.getRiddleImageUrl());
 		}
 	}
 
diff --git a/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java b/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
index 30823bf..39e85e4 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/rest/LocationClient.java
@@ -11,7 +11,12 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import retrofit.RestAdapter;
+import retrofit.converter.GsonConverter;
 import android.content.Context;
 import android.os.AsyncTask;
 import edu.uncc.scavenger.R;
@@ -20,7 +25,10 @@ public class LocationClient {
 
 	private static LocationService getAdapter(Context ctx) {
 		String endpoint = ctx.getString(R.string.endpoint);
+		Gson gson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
+				.create();
 		RestAdapter ra = new RestAdapter.Builder().setEndpoint(endpoint)
+				.setConverter(new GsonConverter(gson))
 				.build();
 		return ra.create(LocationService.class);
 	}
diff --git a/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java b/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
index cea4050..86c60f5 100644
--- a/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
+++ b/UNCCScavenger/src/edu/uncc/scavenger/rest/RestLocation.java
@@ -18,7 +18,7 @@ public class RestLocation implements Serializable{
 	private String riddle;
 	private double locationLong;
 	private double locationLat;
-	private String riddleImageURL;
+	private String riddleImageUrl;
 	private String key;
 	
 	public int getId() {
@@ -57,11 +57,11 @@ public class RestLocation implements Serializable{
 	public void setKey(String key) {
 		this.key = key;
 	}
-	public String getRiddleImageURL() {
-		return riddleImageURL;
+	public String getRiddleImageUrl() {
+		return riddleImageUrl;
 	}
-	public void setRiddleImageURL(String riddleImageURL) {
-		this.riddleImageURL = riddleImageURL;
+	public void setRiddleImageUrl(String riddleImageUrl) {
+		this.riddleImageUrl = riddleImageUrl;
 	}
 	
 	public Location getLocation() {