diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java
similarity index 86%
rename from MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java
rename to MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java
index c6ead69bd..10cdebc95 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupPreferencesListenerImpl.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/Api8BackupPreferencesListener.java
@@ -22,16 +22,17 @@ import android.content.SharedPreferences;
 
 /**
  * Implementation of {@link BackupPreferencesListener} that calls the
- * {@link BackupManager}.
+ * {@link BackupManager}. <br>
+ * For API Level 8 or higher.
  *
  * @author Jimmy Shih
  */
 @TargetApi(8)
-public class BackupPreferencesListenerImpl implements BackupPreferencesListener {
+public class Api8BackupPreferencesListener implements BackupPreferencesListener {
 
   private final BackupManager backupManager;
 
-  public BackupPreferencesListenerImpl(Context context) {
+  public Api8BackupPreferencesListener(Context context) {
     this.backupManager = new BackupManager(context);
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java
similarity index 92%
rename from MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java
rename to MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java
index bad1e5fd0..fbc640998 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/tasks/FroyoStatusAnnouncerTask.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/tasks/Api8StatusAnnouncerTask.java
@@ -29,13 +29,14 @@ import java.util.HashMap;
 
 
 /**
- * This class will periodically announce the user's trip statistics for Froyo and future handsets.
- * This class will request and release audio focus.
+ * This class will periodically announce the user's trip statistics. This class
+ * will request and release audio focus. <br>
+ * For API Level 8 or higher.
  *
  * @author Sandor Dornbush
  */
 @TargetApi(8)
-public class FroyoStatusAnnouncerTask extends StatusAnnouncerTask {
+public class Api8StatusAnnouncerTask extends StatusAnnouncerTask {
   private final static HashMap<String, String> SPEECH_PARAMS = new HashMap<String, String>();
   static {
     SPEECH_PARAMS.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "not_used");
@@ -53,7 +54,7 @@ public class FroyoStatusAnnouncerTask extends StatusAnnouncerTask {
         }
       };
 
-  public FroyoStatusAnnouncerTask(Context context) {
+  public Api8StatusAnnouncerTask(Context context) {
     super(context);
 
     audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java
index f8371e081..26ccf5b2c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/Api8Adapter.java
@@ -16,8 +16,8 @@
 package com.google.android.apps.mytracks.util;
 
 import com.google.android.apps.mytracks.io.backup.BackupPreferencesListener;
-import com.google.android.apps.mytracks.io.backup.BackupPreferencesListenerImpl;
-import com.google.android.apps.mytracks.services.tasks.FroyoStatusAnnouncerTask;
+import com.google.android.apps.mytracks.io.backup.Api8BackupPreferencesListener;
+import com.google.android.apps.mytracks.services.tasks.Api8StatusAnnouncerTask;
 import com.google.android.apps.mytracks.services.tasks.PeriodicTask;
 
 import android.content.Context;
@@ -31,11 +31,11 @@ public class Api8Adapter extends Api7Adapter {
   
   @Override
   public PeriodicTask getStatusAnnouncerTask(Context context) {
-    return new FroyoStatusAnnouncerTask(context);
+    return new Api8StatusAnnouncerTask(context);
   }
   
   @Override
   public BackupPreferencesListener getBackupPreferencesListener(Context context) {
-    return new BackupPreferencesListenerImpl(context);
+    return new Api8BackupPreferencesListener(context);
   }
 }