diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py
index 0fc6d90d10..0a1a65de4f 100644
--- a/src/pretix/base/services/cart.py
+++ b/src/pretix/base/services/cart.py
@@ -17,9 +17,9 @@ from pretix.base.models import (
 from pretix.base.models.event import SubEvent
 from pretix.base.models.orders import OrderFee
 from pretix.base.models.tax import TAXED_ZERO, TaxedPrice, TaxRule
-from pretix.base.services.async import ProfiledTask
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.pricing import get_price
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.templatetags.rich_text import rich_text
 from pretix.celery_app import app
 from pretix.presale.signals import (
diff --git a/src/pretix/base/services/export.py b/src/pretix/base/services/export.py
index 82960a45d4..4ee65230ea 100644
--- a/src/pretix/base/services/export.py
+++ b/src/pretix/base/services/export.py
@@ -5,7 +5,7 @@ from django.utils.timezone import override
 
 from pretix.base.i18n import language
 from pretix.base.models import CachedFile, Event, cachedfile_name
-from pretix.base.services.async import ProfiledTask
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.signals import register_data_exporters
 from pretix.celery_app import app
 
diff --git a/src/pretix/base/services/invoices.py b/src/pretix/base/services/invoices.py
index 655cef4926..3429cbfea5 100644
--- a/src/pretix/base/services/invoices.py
+++ b/src/pretix/base/services/invoices.py
@@ -21,7 +21,7 @@ from pretix.base.models import (
     Invoice, InvoiceAddress, InvoiceLine, Order, OrderPayment,
 )
 from pretix.base.models.tax import EU_CURRENCIES
-from pretix.base.services.async import TransactionAwareTask
+from pretix.base.services.tasks import TransactionAwareTask
 from pretix.base.settings import GlobalSettingsObject
 from pretix.base.signals import periodic_task
 from pretix.celery_app import app
diff --git a/src/pretix/base/services/notifications.py b/src/pretix/base/services/notifications.py
index 60fadb453a..43e59654b8 100644
--- a/src/pretix/base/services/notifications.py
+++ b/src/pretix/base/services/notifications.py
@@ -5,8 +5,8 @@ from inlinestyler.utils import inline_css
 from pretix.base.i18n import language
 from pretix.base.models import LogEntry, NotificationSetting, User
 from pretix.base.notifications import Notification, get_all_notification_types
-from pretix.base.services.async import ProfiledTask, TransactionAwareTask
 from pretix.base.services.mail import mail_send_task
+from pretix.base.services.tasks import ProfiledTask, TransactionAwareTask
 from pretix.celery_app import app
 from pretix.helpers.urls import build_absolute_uri
 
diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py
index 00070a45ba..43cb5dc89f 100644
--- a/src/pretix/base/services/orders.py
+++ b/src/pretix/base/services/orders.py
@@ -32,13 +32,13 @@ from pretix.base.models.orders import (
 from pretix.base.models.organizer import TeamAPIToken
 from pretix.base.models.tax import TaxedPrice
 from pretix.base.payment import BasePaymentProvider
-from pretix.base.services.async import ProfiledTask
 from pretix.base.services.invoices import (
     generate_cancellation, generate_invoice, invoice_qualified,
 )
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.mail import SendMailException
 from pretix.base.services.pricing import get_price
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.signals import (
     allow_ticket_download, order_fee_calculation, order_placed, periodic_task,
 )
diff --git a/src/pretix/base/services/shredder.py b/src/pretix/base/services/shredder.py
index c39aedb4dd..e857d19ba8 100644
--- a/src/pretix/base/services/shredder.py
+++ b/src/pretix/base/services/shredder.py
@@ -11,7 +11,7 @@ from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models import CachedFile, Event, cachedfile_name
-from pretix.base.services.async import ProfiledTask
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.shredder import ShredError
 from pretix.celery_app import app
 
diff --git a/src/pretix/base/services/async.py b/src/pretix/base/services/tasks.py
similarity index 100%
rename from src/pretix/base/services/async.py
rename to src/pretix/base/services/tasks.py
diff --git a/src/pretix/base/services/tickets.py b/src/pretix/base/services/tickets.py
index 5633148898..d1e443de59 100644
--- a/src/pretix/base/services/tickets.py
+++ b/src/pretix/base/services/tickets.py
@@ -10,7 +10,7 @@ from pretix.base.models import (
     CachedCombinedTicket, CachedTicket, Event, InvoiceAddress, Order,
     OrderPosition,
 )
-from pretix.base.services.async import ProfiledTask
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.signals import register_ticket_outputs
 from pretix.celery_app import app
 from pretix.helpers.database import rolledback_transaction
diff --git a/src/pretix/base/services/waitinglist.py b/src/pretix/base/services/waitinglist.py
index e1e81f7dcb..3955054e13 100644
--- a/src/pretix/base/services/waitinglist.py
+++ b/src/pretix/base/services/waitinglist.py
@@ -4,7 +4,7 @@ from django.dispatch import receiver
 
 from pretix.base.models import Event, User, WaitingListEntry
 from pretix.base.models.waitinglist import WaitingListException
-from pretix.base.services.async import ProfiledTask
+from pretix.base.services.tasks import ProfiledTask
 from pretix.base.signals import periodic_task
 from pretix.celery_app import app
 
diff --git a/src/pretix/base/views/async.py b/src/pretix/base/views/tasks.py
similarity index 99%
rename from src/pretix/base/views/async.py
rename to src/pretix/base/views/tasks.py
index ffde9aa749..0570f5cb41 100644
--- a/src/pretix/base/views/async.py
+++ b/src/pretix/base/views/tasks.py
@@ -10,7 +10,7 @@ from django.utils.translation import ugettext as _
 
 from pretix.celery_app import app
 
-logger = logging.getLogger('pretix.base.async')
+logger = logging.getLogger('pretix.base.tasks')
 
 
 class AsyncAction:
diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py
index 108ad243a4..c0ecb8efe7 100644
--- a/src/pretix/control/views/orders.py
+++ b/src/pretix/control/views/orders.py
@@ -50,8 +50,8 @@ from pretix.base.services.orders import (
 from pretix.base.services.stats import order_overview
 from pretix.base.signals import register_data_exporters
 from pretix.base.templatetags.money import money_filter
-from pretix.base.views.async import AsyncAction
 from pretix.base.views.mixins import OrderQuestionsViewMixin
+from pretix.base.views.tasks import AsyncAction
 from pretix.control.forms.filter import EventOrderFilterForm, RefundFilterForm
 from pretix.control.forms.orders import (
     CommentForm, ExporterForm, ExtendForm, MarkPaidForm, OrderContactForm,
diff --git a/src/pretix/control/views/shredder.py b/src/pretix/control/views/shredder.py
index 37103bb3da..70d666f13e 100644
--- a/src/pretix/control/views/shredder.py
+++ b/src/pretix/control/views/shredder.py
@@ -11,7 +11,7 @@ from django.views.generic import TemplateView
 from pretix.base.models import CachedFile
 from pretix.base.services.shredder import export, shred
 from pretix.base.shredder import ShredError, shred_constraints
-from pretix.base.views.async import AsyncAction
+from pretix.base.views.tasks import AsyncAction
 from pretix.control.permissions import EventPermissionRequiredMixin
 
 logger = logging.getLogger(__name__)
diff --git a/src/pretix/control/views/waitinglist.py b/src/pretix/control/views/waitinglist.py
index 9f047972ac..83bc756818 100644
--- a/src/pretix/control/views/waitinglist.py
+++ b/src/pretix/control/views/waitinglist.py
@@ -18,7 +18,7 @@ from django.views.generic.edit import DeleteView
 from pretix.base.models import Item, WaitingListEntry
 from pretix.base.models.waitinglist import WaitingListException
 from pretix.base.services.waitinglist import assign_automatically
-from pretix.base.views.async import AsyncAction
+from pretix.base.views.tasks import AsyncAction
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.views import PaginationMixin
 
diff --git a/src/pretix/plugins/badges/views.py b/src/pretix/plugins/badges/views.py
index 1dca9347bb..857f02a8ef 100644
--- a/src/pretix/plugins/badges/views.py
+++ b/src/pretix/plugins/badges/views.py
@@ -21,7 +21,7 @@ from reportlab.pdfgen import canvas
 
 from pretix.base.models import CachedFile, OrderPosition
 from pretix.base.pdf import Renderer
-from pretix.base.views.async import AsyncAction
+from pretix.base.views.tasks import AsyncAction
 from pretix.control.permissions import EventPermissionRequiredMixin
 from pretix.control.views.pdf import BaseEditorView
 from pretix.plugins.badges.forms import BadgeLayoutForm
diff --git a/src/pretix/plugins/banktransfer/tasks.py b/src/pretix/plugins/banktransfer/tasks.py
index 500dbde0f5..d6ac8f97b2 100644
--- a/src/pretix/plugins/banktransfer/tasks.py
+++ b/src/pretix/plugins/banktransfer/tasks.py
@@ -10,9 +10,9 @@ from django.utils.translation import ugettext_noop
 
 from pretix.base.i18n import language
 from pretix.base.models import Event, Order, OrderPayment, Organizer, Quota
-from pretix.base.services.async import TransactionAwareTask
 from pretix.base.services.locking import LockTimeoutException
 from pretix.base.services.mail import SendMailException
+from pretix.base.services.tasks import TransactionAwareTask
 from pretix.celery_app import app
 
 from .models import BankImportJob, BankTransaction
diff --git a/src/pretix/plugins/sendmail/tasks.py b/src/pretix/plugins/sendmail/tasks.py
index 099669b730..749db422f4 100644
--- a/src/pretix/plugins/sendmail/tasks.py
+++ b/src/pretix/plugins/sendmail/tasks.py
@@ -4,8 +4,8 @@ from i18nfield.strings import LazyI18nString
 
 from pretix.base.i18n import language
 from pretix.base.models import Event, InvoiceAddress, Order, User
-from pretix.base.services.async import ProfiledTask
 from pretix.base.services.mail import SendMailException, mail
+from pretix.base.services.tasks import ProfiledTask
 from pretix.celery_app import app
 from pretix.multidomain.urlreverse import build_absolute_uri
 
diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py
index 433ce3b159..bfea18d57f 100644
--- a/src/pretix/presale/checkoutflow.py
+++ b/src/pretix/presale/checkoutflow.py
@@ -17,6 +17,7 @@ from pretix.base.services.cart import (
     get_fees, set_cart_addons, update_tax_rates,
 )
 from pretix.base.services.orders import perform_order
+from pretix.base.views.tasks import AsyncAction
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.forms.checkout import (
     AddOnsForm, ContactForm, InvoiceAddressForm, InvoiceNameForm,
@@ -26,7 +27,6 @@ from pretix.presale.signals import (
     order_meta_from_request, question_form_fields,
 )
 from pretix.presale.views import CartMixin, get_cart, get_cart_total
-from pretix.presale.views.async import AsyncAction
 from pretix.presale.views.cart import (
     cart_session, create_empty_cart_id, get_or_create_cart_id,
 )
diff --git a/src/pretix/presale/style.py b/src/pretix/presale/style.py
index 575dc9a4b8..6bd9c2d4a5 100644
--- a/src/pretix/presale/style.py
+++ b/src/pretix/presale/style.py
@@ -13,7 +13,7 @@ from django.dispatch import Signal
 from django.templatetags.static import static as _static
 
 from pretix.base.models import Event, Event_SettingsStore, Organizer
-from pretix.base.services.async import ProfiledTask
+from pretix.base.services.tasks import ProfiledTask
 from pretix.celery_app import app
 from pretix.multidomain.urlreverse import get_domain
 
diff --git a/src/pretix/presale/views/async.py b/src/pretix/presale/views/async.py
deleted file mode 100644
index 359678a338..0000000000
--- a/src/pretix/presale/views/async.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from pretix.base.views.async import *  # noqa
-
-# file kept for backwards compatibility
diff --git a/src/pretix/presale/views/cart.py b/src/pretix/presale/views/cart.py
index b9c047f3d4..de5096d194 100644
--- a/src/pretix/presale/views/cart.py
+++ b/src/pretix/presale/views/cart.py
@@ -21,12 +21,12 @@ from pretix.base.models import (
 from pretix.base.services.cart import (
     CartError, add_items_to_cart, clear_cart, remove_cart_position,
 )
+from pretix.base.views.tasks import AsyncAction
 from pretix.multidomain.urlreverse import eventreverse
 from pretix.presale.views import (
     EventViewMixin, allow_cors_if_namespaced, allow_frame_if_namespaced,
     iframe_entry_view_wrapper,
 )
-from pretix.presale.views.async import AsyncAction
 from pretix.presale.views.event import (
     get_grouped_items, item_group_by_category,
 )
diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py
index 347bee7c40..1bcf4d58b7 100644
--- a/src/pretix/presale/views/order.py
+++ b/src/pretix/presale/views/order.py
@@ -30,11 +30,11 @@ from pretix.base.services.tickets import (
 )
 from pretix.base.signals import allow_ticket_download, register_ticket_outputs
 from pretix.base.views.mixins import OrderQuestionsViewMixin
+from pretix.base.views.tasks import AsyncAction
 from pretix.helpers.safedownload import check_token
 from pretix.multidomain.urlreverse import build_absolute_uri, eventreverse
 from pretix.presale.forms.checkout import InvoiceAddressForm, QuestionsForm
 from pretix.presale.views import CartMixin, EventViewMixin
-from pretix.presale.views.async import AsyncAction
 from pretix.presale.views.robots import NoSearchIndexViewMixin