diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index cd11d653a..3bec75899 100644
--- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -9,9 +9,9 @@ public enum FxmlFile {
 	ADDVAULT_SUCCESS("/fxml/addvault_success.fxml"), //
 	ADDVAULT_WELCOME("/fxml/addvault_welcome.fxml"), //
 	CHANGEPASSWORD("/fxml/changepassword.fxml"), //
-	CONVERTVAULT_HUBTOLOCAL_START("/fxml/convertvault_hubtolocal_start.fxml"), //
-	CONVERTVAULT_HUBTOLOCAL_CONVERT("/fxml/convertvault_hubtolocal_convert.fxml"), //
-	CONVERTVAULT_HUBTOLOCAL_SUCCESS("/fxml/convertvault_hubtolocal_success.fxml"), //
+	CONVERTVAULT_HUBTOPASSWORD_START("/fxml/convertvault_hubtopassword_start.fxml"), //
+	CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), //
+	CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), //
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
diff --git a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultComponent.java b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultComponent.java
index f51e80723..5b162c070 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultComponent.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultComponent.java
@@ -23,12 +23,12 @@ public interface ConvertVaultComponent {
 	@ConvertVaultWindow
 	Stage window();
 
-	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START)
-	Lazy<Scene> hubToLocalScene();
+	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START)
+	Lazy<Scene> hubToPasswordScene();
 
-	default void showHubToLocalWindow() {
+	default void showHubToPasswordWindow() {
 		Stage stage = window();
-		stage.setScene(hubToLocalScene().get());
+		stage.setScene(hubToPasswordScene().get());
 		stage.sizeToScene();
 		stage.show();
 	}
diff --git a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
index 54f90d04e..f70242d2b 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/ConvertVaultModule.java
@@ -71,42 +71,42 @@ abstract class ConvertVaultModule {
 	}
 
 	@Provides
-	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START)
+	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START)
 	@ConvertVaultScoped
-	static Scene provideHubToLocalStartScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_START);
+	static Scene provideHubToPasswordStartScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_START);
 	}
 
 	@Provides
-	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT)
+	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT)
 	@ConvertVaultScoped
-	static Scene provideHubToLocalConvertScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT);
+	static Scene provideHubToPasswordConvertScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT);
 	}
 
 	@Provides
-	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS)
+	@FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS)
 	@ConvertVaultScoped
-	static Scene provideHubToLocalSuccessScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS);
+	static Scene provideHubToPasswordSuccessScene(@ConvertVaultWindow FxmlLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS);
 	}
 
 	// ------------------
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(HubToLocalStartController.class)
-	abstract FxController bindHubToLocalStartController(HubToLocalStartController controller);
+	@FxControllerKey(HubToPasswordStartController.class)
+	abstract FxController bindHubToPasswordStartController(HubToPasswordStartController controller);
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(HubToLocalConvertController.class)
-	abstract FxController bindHubToLocalConvertController(HubToLocalConvertController controller);
+	@FxControllerKey(HubToPasswordConvertController.class)
+	abstract FxController bindHubToPasswordConvertController(HubToPasswordConvertController controller);
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(HubToLocalSuccessController.class)
-	abstract FxController bindHubToLocalSuccessController(HubToLocalSuccessController controller);
+	@FxControllerKey(HubToPasswordSuccessController.class)
+	abstract FxController bindHubToPasswordSuccessController(HubToPasswordSuccessController controller);
 
 
 	@Provides
diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
similarity index 92%
rename from src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java
rename to src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
index 93ea55045..71b4cebd8 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalConvertController.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordConvertController.java
@@ -44,9 +44,9 @@ import static org.cryptomator.common.Constants.MASTERKEY_BACKUP_SUFFIX;
 import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME;
 
-public class HubToLocalConvertController implements FxController {
+public class HubToPasswordConvertController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(HubToLocalConvertController.class);
+	private static final Logger LOG = LoggerFactory.getLogger(HubToPasswordConvertController.class);
 
 	private final Stage window;
 	private final Lazy<Scene> successScene;
@@ -64,7 +64,7 @@ public class HubToLocalConvertController implements FxController {
 	public Button convertBtn;
 
 	@Inject
-	public HubToLocalConvertController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows applicationWindows, @ConvertVaultWindow Vault vault, @ConvertVaultWindow StringProperty recoveryKey, RecoveryKeyFactory recoveryKeyFactory, MasterkeyFileAccess masterkeyFileAccess, ExecutorService backgroundExecutorService, ResourceBundle resourceBundle) {
+	public HubToPasswordConvertController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_SUCCESS) Lazy<Scene> successScene, FxApplicationWindows applicationWindows, @ConvertVaultWindow Vault vault, @ConvertVaultWindow StringProperty recoveryKey, RecoveryKeyFactory recoveryKeyFactory, MasterkeyFileAccess masterkeyFileAccess, ExecutorService backgroundExecutorService, ResourceBundle resourceBundle) {
 		this.window = window;
 		this.successScene = successScene;
 		this.applicationWindows = applicationWindows;
diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalStartController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordStartController.java
similarity index 79%
rename from src/main/java/org/cryptomator/ui/convertvault/HubToLocalStartController.java
rename to src/main/java/org/cryptomator/ui/convertvault/HubToPasswordStartController.java
index d8b3cbb14..04d7167c2 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalStartController.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordStartController.java
@@ -11,7 +11,7 @@ import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-public class HubToLocalStartController implements FxController {
+public class HubToPasswordStartController implements FxController {
 
 	private final Stage window;
 	private final Lazy<Scene> convertScene;
@@ -20,7 +20,7 @@ public class HubToLocalStartController implements FxController {
 	RecoveryKeyValidateController recoveryKeyValidateController;
 
 	@Inject
-	public HubToLocalStartController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOLOCAL_CONVERT) Lazy<Scene> convertScene) {
+	public HubToPasswordStartController(@ConvertVaultWindow Stage window, @FxmlScene(FxmlFile.CONVERTVAULT_HUBTOPASSWORD_CONVERT) Lazy<Scene> convertScene) {
 		this.window = window;
 		this.convertScene = convertScene;
 	}
diff --git a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordSuccessController.java
similarity index 68%
rename from src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java
rename to src/main/java/org/cryptomator/ui/convertvault/HubToPasswordSuccessController.java
index 919901ffa..3aee13383 100644
--- a/src/main/java/org/cryptomator/ui/convertvault/HubToLocalSuccessController.java
+++ b/src/main/java/org/cryptomator/ui/convertvault/HubToPasswordSuccessController.java
@@ -2,19 +2,18 @@ package org.cryptomator.ui.convertvault;
 
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.FxApplicationWindows;
 
 import javax.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
 
-public class HubToLocalSuccessController implements FxController {
+public class HubToPasswordSuccessController implements FxController {
 
 	private final Stage window;
 	private final Vault vault;
 
 	@Inject
-	HubToLocalSuccessController(@ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
+	HubToPasswordSuccessController(@ConvertVaultWindow Stage window, @ConvertVaultWindow Vault vault) {
 		this.window = window;
 		this.vault = vault;
 	}
diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/HubOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/HubOptionsController.java
index 3ae45d972..b4eede771 100644
--- a/src/main/java/org/cryptomator/ui/vaultoptions/HubOptionsController.java
+++ b/src/main/java/org/cryptomator/ui/vaultoptions/HubOptionsController.java
@@ -22,6 +22,6 @@ public class HubOptionsController implements FxController {
 	}
 
 	public void startConversion() {
-		convertVaultFactory.create(vault,window).showHubToLocalWindow();
+		convertVaultFactory.create(vault,window).showHubToPasswordWindow();
 	}
 }
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml b/src/main/resources/fxml/convertvault_hubtopassword_convert.fxml
similarity index 93%
rename from src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
rename to src/main/resources/fxml/convertvault_hubtopassword_convert.fxml
index 5cdf8408d..7ea190fd4 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_convert.fxml
+++ b/src/main/resources/fxml/convertvault_hubtopassword_convert.fxml
@@ -8,7 +8,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.convertvault.HubToLocalConvertController"
+	  fx:controller="org.cryptomator.ui.convertvault.HubToPasswordConvertController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_start.fxml b/src/main/resources/fxml/convertvault_hubtopassword_start.fxml
similarity index 92%
rename from src/main/resources/fxml/convertvault_hubtolocal_start.fxml
rename to src/main/resources/fxml/convertvault_hubtopassword_start.fxml
index afef35820..d5c0a5e0b 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_start.fxml
+++ b/src/main/resources/fxml/convertvault_hubtopassword_start.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.control.Button?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.convertvault.HubToLocalStartController"
+	  fx:controller="org.cryptomator.ui.convertvault.HubToPasswordStartController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
diff --git a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml b/src/main/resources/fxml/convertvault_hubtopassword_success.fxml
similarity index 89%
rename from src/main/resources/fxml/convertvault_hubtolocal_success.fxml
rename to src/main/resources/fxml/convertvault_hubtopassword_success.fxml
index cc5e58426..74e1fc8e6 100644
--- a/src/main/resources/fxml/convertvault_hubtolocal_success.fxml
+++ b/src/main/resources/fxml/convertvault_hubtopassword_success.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.Group?>
 <HBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.convertvault.HubToLocalSuccessController"
+	  fx:controller="org.cryptomator.ui.convertvault.HubToPasswordSuccessController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"
@@ -41,7 +41,7 @@
 				</padding>
 			</Label>
 
-			<Label text="%convertVault.success.description" wrapText="true" textAlignment="LEFT"/>
+			<Label text="%convertVault.hubToPassword.success.description" wrapText="true" textAlignment="LEFT"/>
 
 			<Region VBox.vgrow="ALWAYS" minHeight="18"/>
 			<ButtonBar buttonMinWidth="120" buttonOrder="+C">
diff --git a/src/main/resources/fxml/vault_options_hub.fxml b/src/main/resources/fxml/vault_options_hub.fxml
index 83686ce2c..17708b3ce 100644
--- a/src/main/resources/fxml/vault_options_hub.fxml
+++ b/src/main/resources/fxml/vault_options_hub.fxml
@@ -16,7 +16,7 @@
 
 	<Label maxWidth="-Infinity" text="%vaultOptions.hub.convertInfo" wrapText="true"/>
 	<VBox spacing="6" alignment="CENTER">
-		<Button fx:id="convertToLocalButton" text="%vaultOptions.hub.convertBtn" onAction="#startConversion" maxWidth="Infinity">
+		<Button fx:id="convertHubToPasswordButton" text="%vaultOptions.hub.convertBtn" onAction="#startConversion" maxWidth="Infinity">
 			<graphic>
 				<FontAwesome5IconView glyph="EXCHANGE_ALT"/>
 			</graphic>
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index d63709392..6e51937e1 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -465,7 +465,7 @@ convertVault.title=Convert Vault
 convertVault.convert.convertBtn.before=Convert
 convertVault.convert.convertBtn.processing=Converting…
 convertVault.success.message=Conversion successful
-convertVault.success.description=You can now unlock the vault with the chosen password without requiring Hub access.
+convertVault.hubToPassword.success.description=You can now unlock the vault with the chosen password without requiring Hub access.
 
 # New Password
 newPassword.promptText=Enter a new password
diff --git a/src/test/java/org/cryptomator/ui/convertvault/HubToLocalConvertControllerTest.java b/src/test/java/org/cryptomator/ui/convertvault/HubToPasswordConvertControllerTest.java
similarity index 94%
rename from src/test/java/org/cryptomator/ui/convertvault/HubToLocalConvertControllerTest.java
rename to src/test/java/org/cryptomator/ui/convertvault/HubToPasswordConvertControllerTest.java
index 3942ce401..b0117dd9b 100644
--- a/src/test/java/org/cryptomator/ui/convertvault/HubToLocalConvertControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/convertvault/HubToPasswordConvertControllerTest.java
@@ -34,7 +34,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 
-public class HubToLocalConvertControllerTest {
+public class HubToPasswordConvertControllerTest {
 
 	Stage window;
 	Vault vault;
@@ -49,7 +49,7 @@ public class HubToLocalConvertControllerTest {
 
 	NewPasswordController newPasswordController;
 
-	HubToLocalConvertController inTest;
+	HubToPasswordConvertController inTest;
 
 	@BeforeEach
 	public void beforeEach() {
@@ -64,7 +64,7 @@ public class HubToLocalConvertControllerTest {
 		appWindows = Mockito.mock(FxApplicationWindows.class);
 		successScene = Mockito.mock(Lazy.class);
 		newPasswordController = Mockito.mock(NewPasswordController.class);
-		inTest = new HubToLocalConvertController(window, successScene, appWindows, vault, recoveryKey, recoveryKeyFactory, masterkeyFileAccess, backgroundExecutorService, resourceBundle);
+		inTest = new HubToPasswordConvertController(window, successScene, appWindows, vault, recoveryKey, recoveryKeyFactory, masterkeyFileAccess, backgroundExecutorService, resourceBundle);
 		inTest.newPasswordController = newPasswordController;
 	}
 
@@ -93,7 +93,7 @@ public class HubToLocalConvertControllerTest {
 		Path vaultPath = Mockito.mock(Path.class, "/vault/path");
 		Path configPath = Mockito.mock(Path.class, "/vault/path/config");
 		String actualRecoveryKey = "recoveryKey";
-		HubToLocalConvertController inSpy;
+		HubToPasswordConvertController inSpy;
 
 		@BeforeEach
 		public void beforeEach() throws IOException {