diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f7b88121f..e98c12d4a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -273,7 +273,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.setup.AccountSettings"
+            android:name=".activity.setup.EmailPreferenceActivity"
             android:label="@string/settings_activity_title"
             android:exported="false" >
             <intent-filter>
diff --git a/src/com/android/email/EmailApplication.java b/src/com/android/email/EmailApplication.java
index 1b1ecd3da..4692d583f 100644
--- a/src/com/android/email/EmailApplication.java
+++ b/src/com/android/email/EmailApplication.java
@@ -20,7 +20,7 @@ import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
 
-import com.android.email.activity.setup.AccountSettings;
+import com.android.email.activity.setup.EmailPreferenceActivity;
 import com.android.email.preferences.EmailPreferenceMigrator;
 import com.android.mail.browse.ConversationMessage;
 import com.android.mail.browse.InlineAttachmentViewIntentBuilder;
@@ -60,6 +60,6 @@ public class EmailApplication extends Application {
                     }
                 });
 
-        PublicPreferenceActivity.sPreferenceActivityClass = AccountSettings.class;
+        PublicPreferenceActivity.sPreferenceActivityClass = EmailPreferenceActivity.class;
     }
 }
diff --git a/src/com/android/email/activity/setup/AccountSettings.java b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
similarity index 99%
rename from src/com/android/email/activity/setup/AccountSettings.java
rename to src/com/android/email/activity/setup/EmailPreferenceActivity.java
index 771d3c723..dd29b8fd1 100644
--- a/src/com/android/email/activity/setup/AccountSettings.java
+++ b/src/com/android/email/activity/setup/EmailPreferenceActivity.java
@@ -43,7 +43,7 @@ import java.util.List;
  *   DebugFragment
  *
  */
-public class AccountSettings extends MailPreferenceActivity {
+public class EmailPreferenceActivity extends MailPreferenceActivity {
     /*
      * Intent to open account settings for account=1
         adb shell am start -a android.intent.action.EDIT \
diff --git a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java b/tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
similarity index 95%
rename from tests/src/com/android/email/activity/setup/AccountSettingsTests.java
rename to tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
index 6fe4b3968..ff11383da 100644
--- a/tests/src/com/android/email/activity/setup/AccountSettingsTests.java
+++ b/tests/src/com/android/email/activity/setup/EmailPreferenceActivityTests.java
@@ -40,7 +40,8 @@ import java.net.URISyntaxException;
  */
 @Suppress
 @MediumTest
-public class AccountSettingsTests extends ActivityInstrumentationTestCase2<AccountSettings> {
+public class EmailPreferenceActivityTests
+        extends ActivityInstrumentationTestCase2<EmailPreferenceActivity> {
 
     private long mAccountId;
     private Account mAccount;
@@ -50,8 +51,8 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
 
     private static final String PREFERENCE_FREQUENCY = "account_check_frequency";
 
-    public AccountSettingsTests() {
-        super(AccountSettings.class);
+    public EmailPreferenceActivityTests() {
+        super(EmailPreferenceActivity.class);
     }
 
     /**
@@ -124,7 +125,7 @@ public class AccountSettingsTests extends ActivityInstrumentationTestCase2<Accou
      * Get the activity (which causes it to be started, using our intent) and get the UI fields
      */
     private void getActivityAndFields() throws Throwable {
-        final AccountSettings theActivity = getActivity();
+        final EmailPreferenceActivity theActivity = getActivity();
 
         runTestOnUiThread(new Runnable() {
             public void run() {