diff --git a/mygpo/maintenance/migrations/0005_task.py b/mygpo/maintenance/migrations/0005_task.py
new file mode 100644
index 000000000..f6a39f58e
--- /dev/null
+++ b/mygpo/maintenance/migrations/0005_task.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-08-13 08:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maintenance', '0004_rename_mergetask'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='mergetaskentry',
+            old_name='queue',
+            new_name='task',
+        ),
+    ]
diff --git a/mygpo/maintenance/models.py b/mygpo/maintenance/models.py
index d49ff7a2a..ddb70a3f4 100644
--- a/mygpo/maintenance/models.py
+++ b/mygpo/maintenance/models.py
@@ -9,7 +9,7 @@ class MergeTask(UUIDModel):
 
     @property
     def podcasts(self):
-        """ Returns the podcasts of the queue, sorted by subscribers """
+        """ Returns the podcasts of the task, sorted by subscribers """
         podcasts = [entry.podcast for entry in self.entries.all()]
         podcasts = sorted(podcasts,
                           key=lambda p: p.subscribers, reverse=True)
@@ -21,12 +21,12 @@ class MergeTaskEntry(UUIDModel):
 
     podcast = models.ForeignKey(Podcast, on_delete=models.CASCADE)
 
-    queue = models.ForeignKey(MergeTask,
+    task = models.ForeignKey(MergeTask,
                               on_delete=models.CASCADE,
                               related_name='entries',
                               related_query_name='entry')
 
     class Meta:
         unique_together = [
-            ['podcast', ]  # a podcast can only belong to one queue
+            ['podcast', ]  # a podcast can only belong to one task
         ]