diff --git a/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmServiceTest.java b/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.java
similarity index 94%
rename from app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmServiceTest.java
rename to app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.java
index 6bdc9261b..47442a12a 100644
--- a/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmServiceTest.java
+++ b/app/src/androidTest/java/com/todoroo/astrid/alarms/AlarmJobServiceTest.java
@@ -14,7 +14,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InOrder;
 import org.tasks.injection.InjectingTestCase;
 import org.tasks.injection.TestComponent;
-import org.tasks.jobs.Alarm;
+import org.tasks.jobs.AlarmJob;
 import org.tasks.jobs.JobQueue;
 import org.tasks.time.DateTime;
 
@@ -28,7 +28,7 @@ import static org.tasks.makers.TaskMaker.REMINDER_LAST;
 import static org.tasks.makers.TaskMaker.newTask;
 
 @RunWith(AndroidJUnit4.class)
-public class AlarmServiceTest extends InjectingTestCase {
+public class AlarmJobServiceTest extends InjectingTestCase {
 
     @Inject MetadataDao metadataDao;
     @Inject TaskDao taskDao;
@@ -64,7 +64,7 @@ public class AlarmServiceTest extends InjectingTestCase {
         alarmService.scheduleAllAlarms();
 
         InOrder order = inOrder(jobs);
-        order.verify(jobs).add(new Alarm(alarm));
+        order.verify(jobs).add(new AlarmJob(alarm));
     }
 
     @Test
diff --git a/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
index 99c157b19..fc8f18f8f 100644
--- a/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
+++ b/app/src/androidTest/java/org/tasks/jobs/JobQueueTest.java
@@ -58,13 +58,13 @@ public class JobQueueTest {
         long now = currentTimeMillis();
 
         queue.add(new Reminder(1, now, TYPE_DUE));
-        queue.add(new Alarm(1, 1, now));
+        queue.add(new AlarmJob(1, 1, now));
 
         verify(jobManager).schedule(TAG, now);
 
         Freeze.freezeAt(now).thawAfter(new Snippet() {{
             assertEquals(
-                    newHashSet(new Alarm(1, 1, now),
+                    newHashSet(new AlarmJob(1, 1, now),
                             new Reminder(1, now, TYPE_DUE)),
                     newHashSet(queue.getOverdueJobs()));
         }});
@@ -75,11 +75,11 @@ public class JobQueueTest {
         long now = currentTimeMillis();
 
         queue.add(new Reminder(1, now, TYPE_DUE));
-        queue.add(new Alarm(1, 1, now));
+        queue.add(new AlarmJob(1, 1, now));
 
         verify(jobManager).schedule(TAG, now);
 
-        queue.remove(singletonList(new Alarm(1, 1, now)));
+        queue.remove(singletonList(new AlarmJob(1, 1, now)));
 
         Freeze.freezeAt(now).thawAfter(new Snippet() {{
             assertEquals(
@@ -93,7 +93,7 @@ public class JobQueueTest {
         long now = currentTimeMillis();
 
         queue.add(new Reminder(1, now, TYPE_DUE));
-        queue.add(new Alarm(1, 1, now));
+        queue.add(new AlarmJob(1, 1, now));
 
         verify(jobManager).schedule(TAG, now);
 
@@ -101,7 +101,7 @@ public class JobQueueTest {
 
         Freeze.freezeAt(now).thawAfter(new Snippet() {{
             assertEquals(
-                    singletonList(new Alarm(1, 1, now)),
+                    singletonList(new AlarmJob(1, 1, now)),
                     queue.getOverdueJobs());
         }});
     }
diff --git a/app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java b/app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java
index 022f3405e..dbfe95eae 100644
--- a/app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java
+++ b/app/src/androidTestGoogleplay/java/org/tasks/injection/TestComponent.java
@@ -1,6 +1,6 @@
 package org.tasks.injection;
 
-import com.todoroo.astrid.alarms.AlarmServiceTest;
+import com.todoroo.astrid.alarms.AlarmJobServiceTest;
 import com.todoroo.astrid.dao.MetadataDaoTests;
 import com.todoroo.astrid.dao.TaskDaoTests;
 import com.todoroo.astrid.gtasks.GtasksIndentActionTest;
@@ -58,7 +58,7 @@ public interface TestComponent {
 
     void inject(BackupServiceTests backupServiceTests);
 
-    void inject(AlarmServiceTest alarmServiceTest);
+    void inject(AlarmJobServiceTest alarmServiceTest);
 
     void inject(RepeatTaskHelperTest repeatTaskHelperTest);
 }
diff --git a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
index e9124c978..c85e077a1 100644
--- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
+++ b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
@@ -20,7 +20,7 @@ import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.SynchronizeMetadataCallback;
 
 import org.tasks.injection.ApplicationScope;
-import org.tasks.jobs.Alarm;
+import org.tasks.jobs.AlarmJob;
 import org.tasks.jobs.JobQueue;
 
 import java.util.ArrayList;
@@ -139,12 +139,12 @@ public class AlarmService {
             return;
         }
 
-        Alarm alarm = new Alarm(metadata);
-        long time = alarm.getTime();
+        AlarmJob alarmJob = new AlarmJob(metadata);
+        long time = alarmJob.getTime();
         if(time == 0 || time == NO_ALARM) {
-            jobs.cancelAlarm(alarm.getId());
+            jobs.cancelAlarm(alarmJob.getId());
         } else {
-            jobs.add(alarm);
+            jobs.add(alarmJob);
         }
     }
 
diff --git a/app/src/main/java/org/tasks/jobs/Alarm.java b/app/src/main/java/org/tasks/jobs/AlarmJob.java
similarity index 81%
rename from app/src/main/java/org/tasks/jobs/Alarm.java
rename to app/src/main/java/org/tasks/jobs/AlarmJob.java
index 3262ccaaa..7fe1db7d8 100644
--- a/app/src/main/java/org/tasks/jobs/Alarm.java
+++ b/app/src/main/java/org/tasks/jobs/AlarmJob.java
@@ -8,16 +8,16 @@ import org.tasks.notifications.Notification;
 
 import static org.tasks.time.DateTimeUtils.currentTimeMillis;
 
-public class Alarm implements JobQueueEntry {
+public class AlarmJob implements JobQueueEntry {
     private final long alarmId;
     private final long taskId;
     private final long time;
 
-    public Alarm(Metadata metadata) {
+    public AlarmJob(Metadata metadata) {
         this(metadata.getId(), metadata.getTask(), metadata.getValue(AlarmFields.TIME));
     }
 
-    public Alarm(long alarmId, long taskId, Long time) {
+    public AlarmJob(long alarmId, long taskId, Long time) {
         this.alarmId = alarmId;
         this.taskId = taskId;
         this.time = time;
@@ -47,11 +47,11 @@ public class Alarm implements JobQueueEntry {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        Alarm alarm = (Alarm) o;
+        AlarmJob alarmJob = (AlarmJob) o;
 
-        if (alarmId != alarm.alarmId) return false;
-        if (taskId != alarm.taskId) return false;
-        return time == alarm.time;
+        if (alarmId != alarmJob.alarmId) return false;
+        if (taskId != alarmJob.taskId) return false;
+        return time == alarmJob.time;
     }
 
     @Override
@@ -64,7 +64,7 @@ public class Alarm implements JobQueueEntry {
 
     @Override
     public String toString() {
-        return "Alarm{" +
+        return "AlarmJob{" +
                 "alarmId=" + alarmId +
                 ", taskId=" + taskId +
                 ", time=" + time +
diff --git a/app/src/main/java/org/tasks/jobs/JobQueue.java b/app/src/main/java/org/tasks/jobs/JobQueue.java
index 3ddcf21d9..5f9fcbc8d 100644
--- a/app/src/main/java/org/tasks/jobs/JobQueue.java
+++ b/app/src/main/java/org/tasks/jobs/JobQueue.java
@@ -42,7 +42,7 @@ public class JobQueue {
     }
 
     public synchronized void cancelAlarm(long alarmId) {
-        cancel(Alarm.class, alarmId);
+        cancel(AlarmJob.class, alarmId);
     }
 
     public synchronized void cancelReminder(long taskId) {