diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
index fd2c014b54dd65993d883a100d67dcc897122dde..64dbb66c523c61c4ab84570259a18a2437c028ab 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
@@ -33,7 +33,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack
 import org.briarproject.briar.desktop.paul.theme.briarBlue
 
 @Composable
-fun BriarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
+fun BriarSidebar(uiMode: String, onModeChange: (String) -> Unit) {
     Surface(modifier = Modifier.width(66.dp).fillMaxHeight(), color = briarBlue) {
         Column(verticalArrangement = Arrangement.Top) {
             IconButton(
@@ -50,25 +50,25 @@ fun BriarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
                 )
             }
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Contacts",
                 Icons.Filled.Contacts
             )
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Private Groups",
                 Icons.Filled.Group
             )
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Forums",
                 Icons.Filled.Forum
             )
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Blogs",
                 Icons.Filled.ChromeReaderMode
@@ -76,19 +76,19 @@ fun BriarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
         }
         Column(verticalArrangement = Arrangement.Bottom) {
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Transports",
                 Icons.Filled.WifiTethering
             )
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Settings",
                 Icons.Filled.Settings
             )
             BriarSidebarButton(
-                UIMode = UIMode,
+                uiMode = uiMode,
                 onModeChange = onModeChange,
                 "Sign Out",
                 Icons.Filled.Logout
@@ -99,12 +99,12 @@ fun BriarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
 
 @Composable
 fun BriarSidebarButton(
-    UIMode: String,
+    uiMode: String,
     onModeChange: (String) -> Unit,
     thisMode: String,
     icon: ImageVector
 ) {
-    val bg = if (UIMode == thisMode) briarBlack else briarBlue
+    val bg = if (uiMode == thisMode) briarBlack else briarBlue
     Column() {
         IconButton(
             modifier = Modifier.align(Alignment.CenterHorizontally).background(color = bg)
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
index c56e53fdf14661cf0a60fd358daf9d5d92fd4063..879e2a710a42a1cdffff22279954faa47fc63083 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
@@ -66,7 +66,7 @@ import org.briarproject.briar.desktop.paul.theme.lightGray
 val HEADER_SIZE = 66.dp
 
 @Composable
-fun PrivateMessageView(UIContact: Contact, onContactSelect: (Contact) -> Unit) {
+fun PrivateMessageView(uiContact: Contact, onContactSelect: (Contact) -> Unit) {
     // Local State for managing the Add Contact Popup
     val (AddContactDialog, onCancelAdd) = remember { mutableStateOf(false) }
     AddContactDialog(AddContactDialog, onCancelAdd)
@@ -94,13 +94,13 @@ fun PrivateMessageView(UIContact: Contact, onContactSelect: (Contact) -> Unit) {
                 Divider(color = divider, thickness = 1.dp, modifier = Modifier.fillMaxWidth())
                 Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
                     for (c in ContactList.contacts) {
-                        ContactCard(c, UIContact, onSel = onContactSelect)
+                        ContactCard(c, uiContact, onSel = onContactSelect)
                     }
                 }
             }
             Divider(color = divider, modifier = Modifier.fillMaxHeight().width(1.dp))
             Column(modifier = Modifier.weight(1f).fillMaxHeight().background(color = darkGray)) {
-                DrawMessageRow(UIContact)
+                DrawMessageRow(uiContact)
             }
         }
     }
@@ -314,12 +314,12 @@ fun DrawTextBubbles(msgList: List<Message>) {
 }
 
 @Composable
-fun DrawMessageRow(UIContact: Contact) {
+fun DrawMessageRow(uiContact: Contact) {
     Box(Modifier.fillMaxHeight()) {
         Box(modifier = Modifier.fillMaxWidth().height(HEADER_SIZE + 1.dp)) {
             Row(modifier = Modifier.align(Alignment.Center)) {
                 Image(
-                    bitmap = imageFromResource("images/profile_images/" + UIContact.profile_pic),
+                    bitmap = imageFromResource("images/profile_images/" + uiContact.profile_pic),
                     "sel_contact_prof",
                     modifier = Modifier.size(36.dp).align(
                         Alignment.CenterVertically
@@ -328,7 +328,7 @@ fun DrawMessageRow(UIContact: Contact) {
                     ).border(2.dp, color = Color.White, CircleShape)
                 )
                 Text(
-                    UIContact.name,
+                    uiContact.name,
                     color = Color.White,
                     modifier = Modifier.align(Alignment.CenterVertically).padding(start = 12.dp),
                     fontSize = 24.sp
@@ -340,7 +340,7 @@ fun DrawMessageRow(UIContact: Contact) {
             Divider(color = divider, thickness = 1.dp, modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter))
         }
         Box(Modifier.padding(top = HEADER_SIZE + 1.dp, bottom = HEADER_SIZE)) {
-            DrawTextBubbles(UIContact.privateMessages)
+            DrawTextBubbles(uiContact.privateMessages)
         }
         var text by remember { mutableStateOf(TextFieldValue("")) }
         Box(Modifier.align(Alignment.BottomCenter).background(darkGray)) {
@@ -351,7 +351,7 @@ fun DrawMessageRow(UIContact: Contact) {
                 modifier = Modifier.padding(start = 8.dp, end = 8.dp, bottom = 8.dp).fillMaxWidth(),
                 label = { Text(text = "Message") },
                 textStyle = TextStyle(color = Color.White),
-                placeholder = { Text(text = "Your message to " + UIContact.name) },
+                placeholder = { Text(text = "Your message to " + uiContact.name) },
                 onValueChange = {
                     text = it
                 },