diff --git a/ui/src/main/java/com/wireguard/android/Application.kt b/ui/src/main/java/com/wireguard/android/Application.kt
index 4c57a7ec..223b3b04 100644
--- a/ui/src/main/java/com/wireguard/android/Application.kt
+++ b/ui/src/main/java/com/wireguard/android/Application.kt
@@ -88,7 +88,7 @@ class Application : android.app.Application(), OnSharedPreferenceChangeListener
 
     companion object {
         val USER_AGENT = String.format(Locale.ENGLISH, "WireGuard/%s (Android %d; %s; %s; %s %s; %s)", BuildConfig.VERSION_NAME, Build.VERSION.SDK_INT, if (Build.SUPPORTED_ABIS.isNotEmpty()) Build.SUPPORTED_ABIS[0] else "unknown ABI", Build.BOARD, Build.MANUFACTURER, Build.MODEL, Build.FINGERPRINT)
-        private val TAG = "WireGuard/" + Application::class.java.simpleName
+        private val TAG = "WireGuard/${Application::class.simpleName!!}"
         private lateinit var weakSelf: WeakReference<Application>
 
         @JvmStatic
diff --git a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
index e9759143..f0699b91 100644
--- a/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
+++ b/ui/src/main/java/com/wireguard/android/BootShutdownReceiver.kt
@@ -29,6 +29,6 @@ class BootShutdownReceiver : BroadcastReceiver() {
     }
 
     companion object {
-        private val TAG = "WireGuard/" + BootShutdownReceiver::class.java.simpleName
+        private val TAG = "WireGuard/${BootShutdownReceiver::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/QuickTileService.kt b/ui/src/main/java/com/wireguard/android/QuickTileService.kt
index 6e17531a..e4099bb3 100644
--- a/ui/src/main/java/com/wireguard/android/QuickTileService.kt
+++ b/ui/src/main/java/com/wireguard/android/QuickTileService.kt
@@ -153,6 +153,6 @@ class QuickTileService : TileService() {
     }
 
     companion object {
-        private val TAG = "WireGuard/" + QuickTileService::class.java.simpleName
+        private val TAG = "WireGuard/${QuickTileService::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
index 4befee03..cf54ede0 100644
--- a/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
+++ b/ui/src/main/java/com/wireguard/android/activity/TunnelToggleActivity.kt
@@ -39,6 +39,6 @@ class TunnelToggleActivity : AppCompatActivity() {
     }
 
     companion object {
-        private val TAG = "WireGuard/" + TunnelToggleActivity::class.java.simpleName
+        private val TAG = "WireGuard/${TunnelToggleActivity::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
index bda91ae3..f1289a3b 100644
--- a/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
+++ b/ui/src/main/java/com/wireguard/android/configStore/FileConfigStore.kt
@@ -77,6 +77,6 @@ class FileConfigStore(private val context: Context) : ConfigStore {
     }
 
     companion object {
-        private val TAG = "WireGuard/" + FileConfigStore::class.java.simpleName
+        private val TAG = "WireGuard/${FileConfigStore::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
index d072bc69..5238e4d6 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/BaseFragment.kt
@@ -103,6 +103,6 @@ abstract class BaseFragment : Fragment(), OnSelectedTunnelChangedListener {
 
     companion object {
         private const val REQUEST_CODE_VPN_PERMISSION = 23491
-        private val TAG = "WireGuard/" + BaseFragment::class.java.simpleName
+        private val TAG = "WireGuard/${BaseFragment::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
index 3139b29a..03b06d28 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.kt
@@ -229,6 +229,6 @@ class TunnelEditorFragment : BaseFragment(), AppExclusionListener {
     companion object {
         private const val KEY_LOCAL_CONFIG = "local_config"
         private const val KEY_ORIGINAL_NAME = "original_name"
-        private val TAG = "WireGuard/" + TunnelEditorFragment::class.java.simpleName
+        private val TAG = "WireGuard/${TunnelEditorFragment::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
index 310f2725..9b224539 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/TunnelListFragment.kt
@@ -397,6 +397,6 @@ class TunnelListFragment : BaseFragment() {
         const val REQUEST_IMPORT = 1
         private const val REQUEST_TARGET_FRAGMENT = 2
         private const val CHECKED_ITEMS = "CHECKED_ITEMS"
-        private val TAG = "WireGuard/" + TunnelListFragment::class.java.simpleName
+        private val TAG = "WireGuard/${TunnelListFragment::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
index fa6bd2fa..92c9cd80 100644
--- a/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
+++ b/ui/src/main/java/com/wireguard/android/preference/ZipExporterPreference.kt
@@ -91,6 +91,6 @@ class ZipExporterPreference(context: Context, attrs: AttributeSet?) : Preference
     }
 
     companion object {
-        private val TAG = "WireGuard/" + ZipExporterPreference::class.java.simpleName
+        private val TAG = "WireGuard/${ZipExporterPreference::class.simpleName!!}"
     }
 }
diff --git a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt
index 3fe56128..53485f46 100644
--- a/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt
+++ b/ui/src/main/java/com/wireguard/android/util/ExceptionLoggers.kt
@@ -22,6 +22,6 @@ enum class ExceptionLoggers(private val priority: Int) : BiConsumer<Any?, Throwa
     }
 
     companion object {
-        private val TAG = "WireGuard/" + ExceptionLoggers::class.java.simpleName
+        private val TAG = "WireGuard/${ExceptionLoggers::class.simpleName!!}"
     }
 }