diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
index f2e76dc2a..756305cbe 100644
--- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
+++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java
@@ -6,9 +6,8 @@ public interface IpcMessageListener {
 
 	default void handleMessage(IpcMessage message) {
 		switch (message) {
-			case RevealRunningAppMessage x -> revealRunningApp();
-			case HandleLaunchArgsMessage hlam -> handleLaunchArgs(hlam.args());
-			default -> {}
+			case RevealRunningAppMessage m -> revealRunningApp(); // TODO: rename to _ with JEP 443
+			case HandleLaunchArgsMessage m -> handleLaunchArgs(m.args());
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
index 2f1d4e620..5cb1af7a3 100644
--- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
+++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
@@ -91,10 +91,10 @@ public class AwtTrayMenuController implements TrayMenuController {
 					menuItem.setEnabled(a.enabled());
 					menu.add(menuItem);
 				}
-				case SeparatorItem si -> menu.addSeparator();
-				case SubMenuItem smi -> {
-					var submenu = new Menu(smi.title());
-					addChildren(submenu, smi.items());
+				case SeparatorItem s -> menu.addSeparator(); // TODO: rename to _ with JEP 443
+				case SubMenuItem s -> {
+					var submenu = new Menu(s.title());
+					addChildren(submenu, s.items());
 					menu.add(submenu);
 				}
 			}
diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index 22a1b1eec..7bc0cbccd 100644
--- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -38,12 +38,12 @@ public class UnlockInvalidMountPointController implements FxController {
 	@FXML
 	public void initialize() {
 		var e = unlockException.get();
-		var translationKeySuffix = switch (e) {
-			case MountPointNotSupportedException x -> "notSupported";
-			case MountPointNotExistsException x -> "notExists";
-			default -> "generic";
+		var translationKey = switch (e) {
+			case MountPointNotSupportedException x -> "unlock.error.customPath.description.notSupported";
+			case MountPointNotExistsException x -> "unlock.error.customPath.description.notExists";
+			default -> "unlock.error.customPath.description.generic";
 		};
-		dialogDescription.setFormat(resourceBundle.getString("unlock.error.customPath.description." + translationKeySuffix));
+		dialogDescription.setFormat(resourceBundle.getString(translationKey));
 		dialogDescription.setArg1(e.getMessage());
 	}