diff --git a/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/MainActivity.kt b/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/MainActivity.kt
index 005f95a..2ba86bb 100644
--- a/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/MainActivity.kt
+++ b/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/MainActivity.kt
@@ -79,7 +79,7 @@ class MainActivity : AppCompatActivity()
         }
 
         testTCPButton.setOnClickListener {
-            testTCPClicked()
+            testTCPTapped()
         }
 
         testUDPButton.setOnClickListener {
@@ -87,7 +87,7 @@ class MainActivity : AppCompatActivity()
         }
 
         stopVPNButton.setOnClickListener {
-            stopVPNButtonTapped()
+            stopVPNTapped()
         }
     }
 
@@ -116,7 +116,7 @@ class MainActivity : AppCompatActivity()
 
     }
 
-    fun stopVPNButtonTapped() {
+    fun stopVPNTapped() {
         println("Stop VPN Clicked.")
         resultText.text = "Stop VPN Tapped."
 
@@ -140,7 +140,7 @@ class MainActivity : AppCompatActivity()
         }
     }
 
-    fun testTCPClicked()
+    fun testTCPTapped()
     {
         println("Test TCP Clicked.")
 
diff --git a/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/StatusReceiver.kt b/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/StatusReceiver.kt
index 3382cec..0b87e83 100644
--- a/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/StatusReceiver.kt
+++ b/app/src/main/java/org/OperatorFoundation/MoonbounceAndroidKotlin/StatusReceiver.kt
@@ -11,7 +11,7 @@ class StatusReceiver : BroadcastReceiver()
     override fun onReceive(context: Context, intent: Intent)
     {
         // This method is called when the BroadcastReceiver is receiving an Intent broadcast.
-        var statusString = "Received a status update."
+        val statusString: String
 
         if (intent.action == MBAKVpnService.vpnStatusNotification)
         {