diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index f035d6ed..d63d15c6 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -560,7 +560,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
 		Log.e("VanillaMusic", "MediaPlayer error: " + what + " " + extra);
 		mMediaPlayer.reset();
 		Song song = getSong(+1);
-		if (song != null && !song.populate(true))
+		if (song != null && !song.query(true))
 			setFlag(FLAG_NO_MEDIA);
 		else
 			mHandler.sendEmptyMessage(TRACK_CHANGED);
diff --git a/src/org/kreed/vanilla/Song.java b/src/org/kreed/vanilla/Song.java
index 40385e3c..74032f4d 100644
--- a/src/org/kreed/vanilla/Song.java
+++ b/src/org/kreed/vanilla/Song.java
@@ -135,7 +135,7 @@ public class Song implements Parcelable {
 	 * @param force Query even if fields have already been populated
 	 * @return true if fields have been populated, false otherwise
 	 */
-	public boolean populate(boolean force)
+	public boolean query(boolean force)
 	{
 		if (path != null && !force)
 			return true;
diff --git a/src/org/kreed/vanilla/SongTimeline.java b/src/org/kreed/vanilla/SongTimeline.java
index e28e9a72..713fca7d 100644
--- a/src/org/kreed/vanilla/SongTimeline.java
+++ b/src/org/kreed/vanilla/SongTimeline.java
@@ -318,9 +318,9 @@ public final class SongTimeline {
 			}
 		}
 
-		if (!song.populate(false)) {
+		if (!song.query(false)) {
 			song.randomize();
-			if (!song.populate(false))
+			if (!song.query(false))
 				return null;
 		}