diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f445adb..7f0422df 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -112,7 +112,7 @@
 
 
         <service
-            android:name=".DavService"
+            android:name=".AccountUpdateService"
             android:enabled="true">
         </service>
 
diff --git a/app/src/main/java/at/bitfire/davdroid/DavService.java b/app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java
similarity index 94%
rename from app/src/main/java/at/bitfire/davdroid/DavService.java
rename to app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java
index 920f2d30..a79c571f 100644
--- a/app/src/main/java/at/bitfire/davdroid/DavService.java
+++ b/app/src/main/java/at/bitfire/davdroid/AccountUpdateService.java
@@ -30,11 +30,10 @@ import java.util.Set;
 import at.bitfire.davdroid.model.ServiceDB.OpenHelper;
 import at.bitfire.davdroid.model.ServiceDB.Services;
 
-public class DavService extends Service {
+public class AccountUpdateService extends Service {
 
     public static final String
-            ACTION_ACCOUNTS_UPDATED = "accountsUpdated",
-            EXTRA_DAV_SERVICE_ID = "davServiceID";
+            ACTION_ACCOUNTS_UPDATED = "accountsUpdated";
 
     private final IBinder binder = new InfoBinder();
 
@@ -46,7 +45,6 @@ public class DavService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         if (intent != null) {
             String action = intent.getAction();
-            long id = intent.getLongExtra(EXTRA_DAV_SERVICE_ID, -1);
 
             switch (action) {
                 case ACTION_ACCOUNTS_UPDATED:
diff --git a/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java b/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java
index e76b7ca8..e48ee36c 100644
--- a/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java
+++ b/app/src/main/java/at/bitfire/davdroid/AccountsChangedReceiver.java
@@ -24,8 +24,8 @@ public class AccountsChangedReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION.equals(intent.getAction())) {
-            Intent serviceIntent = new Intent(context, DavService.class);
-            serviceIntent.setAction(DavService.ACTION_ACCOUNTS_UPDATED);
+            Intent serviceIntent = new Intent(context, AccountUpdateService.class);
+            serviceIntent.setAction(AccountUpdateService.ACTION_ACCOUNTS_UPDATED);
             context.startService(serviceIntent);
 
             for (OnAccountsUpdateListener listener : listeners)
diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
index d601a0a2..94beb50b 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.java
@@ -61,8 +61,8 @@ import java.util.List;
 import java.util.logging.Level;
 
 import at.bitfire.cert4android.CustomCertManager;
+import at.bitfire.davdroid.AccountUpdateService;
 import at.bitfire.davdroid.App;
-import at.bitfire.davdroid.DavService;
 import at.bitfire.davdroid.R;
 import at.bitfire.davdroid.model.CollectionInfo;
 import at.bitfire.davdroid.model.ServiceDB.Collections;
@@ -319,9 +319,9 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu
     }
 
 
-    private static class AccountLoader extends AsyncTaskLoader<AccountInfo> implements DavService.RefreshingStatusListener, ServiceConnection, SyncStatusObserver {
+    private static class AccountLoader extends AsyncTaskLoader<AccountInfo> implements AccountUpdateService.RefreshingStatusListener, ServiceConnection, SyncStatusObserver {
         private final Account account;
-        private DavService.InfoBinder davService;
+        private AccountUpdateService.InfoBinder davService;
         private Object syncStatusListener;
 
         public AccountLoader(Context context, Account account) {
@@ -333,7 +333,7 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu
         protected void onStartLoading() {
             syncStatusListener = ContentResolver.addStatusChangeListener(SYNC_OBSERVER_TYPE_ACTIVE, this);
 
-            getContext().bindService(new Intent(getContext(), DavService.class), this, Context.BIND_AUTO_CREATE);
+            getContext().bindService(new Intent(getContext(), AccountUpdateService.class), this, Context.BIND_AUTO_CREATE);
         }
 
         @Override
@@ -347,7 +347,7 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu
 
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
-            davService = (DavService.InfoBinder)service;
+            davService = (AccountUpdateService.InfoBinder)service;
             davService.addRefreshingStatusListener(this, false);
 
             forceLoad();
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index b4e67ebd..f68127fd 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -7,7 +7,7 @@
   <!--AboutActivity-->
   <!--global settings-->
   <!--AccountsActivity-->
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <!--AppSettingsActivity-->
   <!--AccountActivity-->
   <!--PermissionsActivity-->
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 6d68ad8c..7e2417c6 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Komunita</string>
   <string name="navigation_drawer_donate">Obdarovat</string>
   <string name="account_list_empty">Vítejte v aplikaci DAVdroid!\n\nNyní můžete přidat CalDAV/CardDAV účet.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Vyhledání služby selhalo</string>
   <string name="dav_service_refresh_couldnt_refresh">Nelze obnovit seznam sbírky</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 8e9149d5..d2a3df65 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -44,7 +44,7 @@
   <string name="navigation_drawer_forums">Community</string>
   <string name="navigation_drawer_donate">Donation</string>
   <string name="account_list_empty">Velkommen til DAVdroid!\n\nDu kan nu tilføje en CaDAV/CardDAV-konto.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Registrering af tjeneste kunne ikke foretages</string>
   <string name="dav_service_refresh_couldnt_refresh">Kunne opdatere liste over sæt</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3dc73e6a..308f5088 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Community</string>
   <string name="navigation_drawer_donate">Spenden</string>
   <string name="account_list_empty">Herzlich willkommen!\n\nSie können jetzt ein CalDAV/CardDAV-Konto hinzufügen.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Diensterkennung fehlgeschlagen</string>
   <string name="dav_service_refresh_couldnt_refresh">Ordnerliste konnte nicht aktualisiert werden</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 75457841..f33fc837 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Comunidad</string>
   <string name="navigation_drawer_donate">Donar</string>
   <string name="account_list_empty">Bienvenido a DAVdroid!\n\nAhora puedes añadir una cuenta CalDAV/CardDAV.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Falló la detección del servicio</string>
   <string name="dav_service_refresh_couldnt_refresh">No se pudo refrescar lista de colección</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7fb6f887..ddf834b6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Communauté</string>
   <string name="navigation_drawer_donate">Faire un don</string>
   <string name="account_list_empty">Bienvenue sur DAVdroid!\n\nVous pouvez maintenant ajouter un compte CalDAV/CardDAV.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">La détection du service a échoué</string>
   <string name="dav_service_refresh_couldnt_refresh">Impossible d\'actualiser la liste de collection</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 8a768c3c..173ad6e9 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Közösség</string>
   <string name="navigation_drawer_donate">Támogatás</string>
   <string name="account_list_empty">Üdvözöljük a DAVdroid felhasználók között!\n\nMost már felvehet CalDAV/CardDav fiókokat.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Szolgáltatások felderítése nem sikerült</string>
   <string name="dav_service_refresh_couldnt_refresh">Gyűjteménylista frissítése nem sikerült</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8c561a71..fc7897fa 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -45,7 +45,7 @@
   <string name="navigation_drawer_forums">Comunità</string>
   <string name="navigation_drawer_donate">Donazione</string>
   <string name="account_list_empty">Benvenuto a DAVdroid!\n\nÈ ora possibile aggiungere account CalDAV/CardDAV.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Fallita l\'individuazione dei servizi</string>
   <string name="dav_service_refresh_couldnt_refresh">Impossibile rinnovare la lista delle collezioni</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 88bc2818..b5cf662d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">コミュニティ</string>
   <string name="navigation_drawer_donate">寄付</string>
   <string name="account_list_empty">DAVdroid にようこそ!\n\nCalDAV/CardDAV アカウントを追加できるようになりました。</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">サービスの検出に失敗しました</string>
   <string name="dav_service_refresh_couldnt_refresh">コレクション リストを更新できません</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 78f526fb..6308a67b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Community</string>
   <string name="navigation_drawer_donate">Doneren</string>
   <string name="account_list_empty">Welkom bij DAVdroid!\n\nJe kunt nu een CalDAV/CardDAv account toevoegen.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Service herkenning is mislukt</string>
   <string name="dav_service_refresh_couldnt_refresh">Kon de collectie lijst niet vernieuwen</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5ee12ace..dae74468 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Społeczność</string>
   <string name="navigation_drawer_donate">Dotacja</string>
   <string name="account_list_empty">Witamy w DAVdroid!\n\nMożesz teraz dodać konto CalDAV/CardDAV.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Wykrycie serwisu nie powiodło się</string>
   <string name="dav_service_refresh_couldnt_refresh">Nie można odświeżyć listy kolekcji</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index cf559ab5..37ca5858 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Comunidade</string>
   <string name="navigation_drawer_donate">Doações</string>
   <string name="account_list_empty">Bem-vindo ao DAVdroid!\n\nVocê pode adicionar uma conta CalDAV/CardDAV agora.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Falha na detecção do serviço</string>
   <string name="dav_service_refresh_couldnt_refresh">Não foi possível atualizar a lista da coleção</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bfb2aef8..d55fe310 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -7,7 +7,7 @@
   <!--AboutActivity-->
   <!--global settings-->
   <!--AccountsActivity-->
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <!--AppSettingsActivity-->
   <!--AccountActivity-->
   <!--PermissionsActivity-->
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 9dce7474..93d0202b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -8,7 +8,7 @@
   <!--AboutActivity-->
   <!--global settings-->
   <!--AccountsActivity-->
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <!--AppSettingsActivity-->
   <!--AccountActivity-->
   <!--PermissionsActivity-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 57ca26c0..89de9f9c 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">Заједница</string>
   <string name="navigation_drawer_donate">Донирај</string>
   <string name="account_list_empty">Добро дошли у ДАВдроид!\n\nМожете сада да додате КалДАВ/КардДАВ налог.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Откривање услуге није успело</string>
   <string name="dav_service_refresh_couldnt_refresh">Не могох да освежим списак збирки</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index faadcde8..3a0dc624 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -44,7 +44,7 @@
   <string name="navigation_drawer_forums">Camia</string>
   <string name="navigation_drawer_donate">Bağış yap</string>
   <string name="account_list_empty">DAVdroid\'e hoşgeldin!\n\nŞimdi bir CalDAV/CardDAV hesabı ekleyebilirsin.</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">Servis keşfi başarısız</string>
   <string name="dav_service_refresh_couldnt_refresh">Kolleksiyon listesi yenilenemedi</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index b8c12847..c39c0ec9 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -7,7 +7,7 @@
   <!--AboutActivity-->
   <!--global settings-->
   <!--AccountsActivity-->
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <!--AppSettingsActivity-->
   <!--AccountActivity-->
   <!--PermissionsActivity-->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2b5691a7..863a91ae 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -47,7 +47,7 @@
   <string name="navigation_drawer_forums">社区</string>
   <string name="navigation_drawer_donate">捐助</string>
   <string name="account_list_empty">欢迎使用 DAVdroid！\n\n现在你可以增加 CalDAV/CardDAV 账户。</string>
-  <!--DavService-->
+  <!--AccountUpdateService-->
   <string name="dav_service_refresh_failed">服务配置检测失败</string>
   <string name="dav_service_refresh_couldnt_refresh">无法刷新集合列表</string>
   <!--AppSettingsActivity-->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cff1335b..e9b2002c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,7 +64,7 @@
 
     <string name="account_list_empty">Welcome to EteSync!\n\nAdd an account to start.</string>
 
-    <!-- DavService -->
+    <!-- AccountUpdateService -->
     <string name="dav_service_refresh_failed">Service detection failed</string>
     <string name="dav_service_refresh_couldnt_refresh">Couldn\'t refresh collection list</string>