diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
index 7a4fd955..6822e6a5 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
@@ -18,10 +18,10 @@ import java.net.URL
 import java.util.*
 import kotlin.collections.ArrayList
 
-private const val TAG = "Baresip"
-
 class AccountActivity : AppCompatActivity() {
 
+    private val TAG = "Baresip"
+
     private lateinit var binding: ActivityAccountBinding
     private lateinit var acc: Account
     private lateinit var ua: UserAgent
@@ -622,6 +622,8 @@ class AccountActivity : AppCompatActivity() {
     private class GetAccountConfigAsyncTask(context: AccountActivity):
             AsyncTask<String, String, String>() {
 
+        private val TAG = "Baresip"
+
         private val activityReference: WeakReference<AccountActivity> = WeakReference(context)
 
         override fun doInBackground(vararg url: String?): String? {
@@ -739,4 +741,3 @@ class AccountActivity : AppCompatActivity() {
     }
 
 }
-
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 98492ace..65a704ad 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -33,10 +33,10 @@ import java.util.*
 import kotlin.concurrent.schedule
 import kotlin.math.roundToInt
 
-private const val TAG = "Baresip Service"
-
 class BaresipService: Service() {
 
+    private val TAG = "Baresip Service"
+
     internal lateinit var intent: Intent
     internal lateinit var am: AudioManager
     internal lateinit var rt: Ringtone
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
index 856dd24a..67708dea 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BootCompletedReceiver.kt
@@ -13,10 +13,10 @@ import androidx.core.app.NotificationCompat
 
 import java.nio.charset.StandardCharsets
 
-const val START_NOTIFICATION_IN = 105
-
 class BootCompletedReceiver : BroadcastReceiver() {
 
+    private val START_NOTIFICATION_IN = 105
+
     override fun onReceive(context: Context, intent: Intent) {
 
         Log.i("Baresip", "BootCompletedReceiver received intent ${intent.action}")
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
index 7e1956c1..58d6ffcc 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
@@ -13,11 +13,11 @@ import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatDelegate
 import com.tutpro.baresip.databinding.ActivityConfigBinding
 
-private const val READ_CERT_PERMISSION_CODE = 1
-private const val READ_CA_PERMISSION_CODE = 2
-
 class ConfigActivity : AppCompatActivity() {
 
+    private val READ_CERT_PERMISSION_CODE = 1
+    private val READ_CA_PERMISSION_CODE = 2
+
     private lateinit var binding: ActivityConfigBinding
     private lateinit var autoStart: CheckBox
     private lateinit var listenAddr: EditText
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
index fd04520c..b9a69d03 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
@@ -28,10 +28,10 @@ import com.tutpro.baresip.databinding.ActivityContactBinding
 import java.io.ByteArrayOutputStream
 import java.io.File
 
-private const val READ_REQUEST_CODE = 42
-
 class ContactActivity : AppCompatActivity() {
 
+    private val READ_REQUEST_CODE = 42
+
     private lateinit var binding: ActivityContactBinding
     private lateinit var textAvatarView: TextView
     private lateinit var cardAvatarView: CardView