diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d8c2337e..c8ff5974 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -195,7 +195,7 @@
             android:parentActivityName=".ui.AccountsActivity"/>
 
         <activity
-            android:name=".NotificationHelper$NotificationHandlerActivity"
+            android:name=".syncadapter.SyncNotification$NotificationHandlerActivity"
             android:theme="@style/Theme.Transparent" />
 
         <activity
diff --git a/app/src/main/java/com/etesync/syncadapter/log/Logger.kt b/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
index 1e8a1611..59bd803f 100644
--- a/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
+++ b/app/src/main/java/com/etesync/syncadapter/log/Logger.kt
@@ -21,10 +21,8 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.etesync.syncadapter.App
 import com.etesync.syncadapter.Constants
-import com.etesync.syncadapter.NotificationHelper
+import com.etesync.syncadapter.syncadapter.SyncNotification
 import com.etesync.syncadapter.R
-import com.etesync.syncadapter.model.ServiceDB
-import com.etesync.syncadapter.model.Settings
 import com.etesync.syncadapter.ui.AppSettingsActivity
 import org.apache.commons.lang3.time.DateFormatUtils
 import java.io.File
@@ -79,7 +77,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener {
             builder.setSmallIcon(R.drawable.ic_sd_storage_light)
                     .setLargeIcon(App.getLauncherBitmap(context))
                     .setContentTitle(context.getString(R.string.logging_davdroid_file_logging))
-                    .setChannelId(NotificationHelper.CHANNEL_ID)
+                    .setChannelId(SyncNotification.CHANNEL_ID)
 
             val logDir = debugDir(context) ?: return
             val logFile = File(logDir,
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt
index 23bd126c..1240b89c 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/AddressBooksSyncAdapterService.kt
@@ -41,7 +41,7 @@ class AddressBooksSyncAdapterService : SyncAdapterService() {
         override fun onPerformSync(account: Account, extras: Bundle, authority: String, provider: ContentProviderClient, syncResult: SyncResult) {
             super.onPerformSync(account, extras, authority, provider, syncResult)
 
-            val notificationManager = NotificationHelper(context, "journals-contacts", Constants.NOTIFICATION_CONTACTS_SYNC)
+            val notificationManager = SyncNotification(context, "journals-contacts", Constants.NOTIFICATION_CONTACTS_SYNC)
             notificationManager.cancel()
 
             try {
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt
index 59ab5518..b02f4048 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarSyncManager.kt
@@ -19,7 +19,6 @@ import at.bitfire.ical4android.InvalidCalendarException
 import at.bitfire.vcard4android.ContactsStorageException
 import com.etesync.syncadapter.AccountSettings
 import com.etesync.syncadapter.Constants
-import com.etesync.syncadapter.NotificationHelper
 import com.etesync.syncadapter.R
 import com.etesync.syncadapter.journalmanager.Exceptions
 import com.etesync.syncadapter.journalmanager.JournalEntryManager
@@ -129,7 +128,7 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra
     private fun createInviteAttendeesNotification(event: Event, icsContent: String) {
         val intent = EventEmailInvitation(context, account).createIntent(event, icsContent)
         if (intent != null) {
-            val notificationHelper = NotificationHelper(context, event.uid!!, event.uid!!.hashCode())
+            val notificationHelper = SyncNotification(context, event.uid!!, event.uid!!.hashCode())
             notificationHelper.notify(
                     context.getString(
                             R.string.sync_calendar_attendees_notification_title, event.summary),
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt
index 62500026..bf27a604 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/CalendarsSyncAdapterService.kt
@@ -39,7 +39,7 @@ class CalendarsSyncAdapterService : SyncAdapterService() {
         override fun onPerformSync(account: Account, extras: Bundle, authority: String, provider: ContentProviderClient, syncResult: SyncResult) {
             super.onPerformSync(account, extras, authority, provider, syncResult)
 
-            val notificationManager = NotificationHelper(context, "journals-calendar", Constants.NOTIFICATION_CALENDAR_SYNC)
+            val notificationManager = SyncNotification(context, "journals-calendar", Constants.NOTIFICATION_CALENDAR_SYNC)
             notificationManager.cancel()
 
             try {
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt
index 3d17d516..068de217 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncAdapterService.kt
@@ -30,7 +30,7 @@ class ContactsSyncAdapterService : SyncAdapterService() {
 
         override fun onPerformSync(account: Account, extras: Bundle, authority: String, provider: ContentProviderClient, syncResult: SyncResult) {
             super.onPerformSync(account, extras, authority, provider, syncResult)
-            val notificationManager = NotificationHelper(context, "journals-contacts", Constants.NOTIFICATION_CONTACTS_SYNC)
+            val notificationManager = SyncNotification(context, "journals-contacts", Constants.NOTIFICATION_CONTACTS_SYNC)
             notificationManager.cancel()
 
             try {
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
index f2afd514..0a3f9345 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
@@ -41,7 +41,7 @@ import java.util.logging.Level
 abstract class SyncManager<T: LocalResource<*>> @Throws(Exceptions.IntegrityException::class, Exceptions.GenericCryptoException::class)
 constructor(protected val context: Context, protected val account: Account, protected val settings: AccountSettings, protected val extras: Bundle, protected val authority: String, protected val syncResult: SyncResult, journalUid: String, protected val serviceType: CollectionInfo.Type, accountName: String) {
 
-    protected val notificationManager: NotificationHelper
+    protected val notificationManager: SyncNotification
     protected val info: CollectionInfo
     protected var localCollection: LocalCollection<T>? = null
 
@@ -94,7 +94,7 @@ constructor(protected val context: Context, protected val account: Account, prot
         info = JournalEntity.fetch(data, serviceEntity, journalUid)!!.info
 
         // dismiss previous error notifications
-        notificationManager = NotificationHelper(context, journalUid, notificationId())
+        notificationManager = SyncNotification(context, journalUid, notificationId())
         notificationManager.cancel()
 
         Logger.log.info(String.format(Locale.getDefault(), "Syncing collection %s (version: %d)", journalUid, info.version))
@@ -233,7 +233,7 @@ constructor(protected val context: Context, protected val account: Account, prot
         if (remoteEntries!!.isEmpty() || !changeNotification) {
             return
         }
-        val notificationHelper = NotificationHelper(context,
+        val notificationHelper = SyncNotification(context,
                 System.currentTimeMillis().toString(), notificationId())
 
         var deleted = 0
@@ -533,7 +533,7 @@ constructor(protected val context: Context, protected val account: Account, prot
     }
 
     private fun notifyDiscardedChange() {
-        val notification = NotificationHelper(context, "discarded_${info.uid}", notificationId())
+        val notification = SyncNotification(context, "discarded_${info.uid}", notificationId())
         val intent = Intent(context, AccountsActivity::class.java)
         notification.notify(context.getString(R.string.sync_journal_readonly, info.displayName), context.getString(R.string.sync_journal_readonly_message, numDiscarded), null, intent, R.drawable.ic_error_light)
     }
diff --git a/app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
similarity index 94%
rename from app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt
rename to app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
index 6c752eb7..57c211d2 100644
--- a/app/src/main/java/com/etesync/syncadapter/NotificationHelper.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncNotification.kt
@@ -1,4 +1,4 @@
-package com.etesync.syncadapter
+package com.etesync.syncadapter.syncadapter
 
 import android.app.Activity
 import android.app.NotificationChannel
@@ -14,6 +14,10 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import at.bitfire.ical4android.CalendarStorageException
 import at.bitfire.vcard4android.ContactsStorageException
+import com.etesync.syncadapter.AccountSettings
+import com.etesync.syncadapter.App
+import com.etesync.syncadapter.Constants
+import com.etesync.syncadapter.R
 import com.etesync.syncadapter.journalmanager.Exceptions
 import com.etesync.syncadapter.log.Logger
 import com.etesync.syncadapter.ui.AccountSettingsActivity
@@ -21,7 +25,7 @@ import com.etesync.syncadapter.ui.DebugInfoActivity
 import com.etesync.syncadapter.ui.WebViewActivity
 import java.util.logging.Level
 
-class NotificationHelper(internal val context: Context, internal val notificationTag: String, internal val notificationId: Int) {
+class SyncNotification(internal val context: Context, internal val notificationTag: String, internal val notificationId: Int) {
 
     internal val notificationManager: NotificationManagerCompat
     lateinit var detailsIntent: Intent
diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt
index 8c5a503c..454141c9 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/TasksSyncAdapterService.kt
@@ -46,7 +46,7 @@ class TasksSyncAdapterService: SyncAdapterService() {
         override fun onPerformSync(account: Account, extras: Bundle, authority: String, provider: ContentProviderClient, syncResult: SyncResult) {
             super.onPerformSync(account, extras, authority, provider, syncResult)
 
-            val notificationManager = NotificationHelper(context, "journals-tasks", Constants.NOTIFICATION_TASK_SYNC)
+            val notificationManager = SyncNotification(context, "journals-tasks", Constants.NOTIFICATION_TASK_SYNC)
             notificationManager.cancel()
 
             try {