diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index a32d58212..99d89c4b9 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -517,7 +517,7 @@
               android:theme="@android:style/Theme.Translucent.NoTitleBar">
     </activity>
 
-    <activity android:name="com.todoroo.astrid.gcal.CreateEventListActivity"
+    <activity android:name="com.todoroo.astrid.gcal.CalendarAlarmListCreator"
               android:theme="@android:style/Theme.Dialog">
     </activity>
     
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
similarity index 99%
rename from astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java
rename to astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
index 5b34ec4f6..5805fec13 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CreateEventListActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java
@@ -35,7 +35,7 @@ import com.todoroo.astrid.service.TagDataService;
 import com.todoroo.astrid.tags.TagFilterExposer;
 import com.todoroo.astrid.utility.Constants;
 
-public class CreateEventListActivity extends Activity {
+public class CalendarAlarmListCreator extends Activity {
 
     public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
index 5dab139f2..e61f4bb1d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java
@@ -214,10 +214,10 @@ public class CalendarReminderActivity extends Activity {
     }
 
     private void createNewList(String defaultName) {
-        Intent newListIntent = new Intent(this, CreateEventListActivity.class);
+        Intent newListIntent = new Intent(this, CalendarAlarmListCreator.class);
         newListIntent.putStringArrayListExtra(TOKEN_NAMES, getIntent().getStringArrayListExtra(TOKEN_NAMES));
         newListIntent.putStringArrayListExtra(TOKEN_EMAILS, getIntent().getStringArrayListExtra(TOKEN_EMAILS));
-        newListIntent.putExtra(CreateEventListActivity.TOKEN_LIST_NAME, defaultName);
+        newListIntent.putExtra(CalendarAlarmListCreator.TOKEN_LIST_NAME, defaultName);
 
         startActivity(newListIntent);
         dismissButton.performClick(); // finish with animation