diff --git a/src/main/java/org/qora/api/ApiService.java b/src/main/java/org/qora/api/ApiService.java
index d5fe62de..917aac4f 100644
--- a/src/main/java/org/qora/api/ApiService.java
+++ b/src/main/java/org/qora/api/ApiService.java
@@ -86,7 +86,8 @@ public class ApiService {
 		swaggerUIServlet.setInitParameter("pathInfoOnly", "true");
 		context.addServlet(swaggerUIServlet, "/api-documentation/*");
 
-		rewriteHandler.addRule(new RedirectPatternRule("/api-documentation", "/api-documentation/index.html")); // redirect to swagger ui start page
+		rewriteHandler.addRule(new RedirectPatternRule("", "/api-documentation/")); // redirect to Swagger UI start page
+		rewriteHandler.addRule(new RedirectPatternRule("/api-documentation", "/api-documentation/")); // redirect to Swagger UI start page
 	}
 
 	// XXX: replace singleton pattern by dependency injection?
diff --git a/src/main/java/org/qora/controller/Controller.java b/src/main/java/org/qora/controller/Controller.java
index 3abbfdf2..1ef5da75 100644
--- a/src/main/java/org/qora/controller/Controller.java
+++ b/src/main/java/org/qora/controller/Controller.java
@@ -224,12 +224,12 @@ public class Controller extends Thread {
 		LOGGER.info("Starting auto-update");
 		AutoUpdate.getInstance().start();
 
-		LOGGER.info("Starting bundled UI on port " + Settings.getInstance().getUiPort());
+		LOGGER.info("Starting node management UI on port " + Settings.getInstance().getUiPort());
 		try {
 			UiService uiService = UiService.getInstance();
 			uiService.start();
 		} catch (Exception e) {
-			LOGGER.error("Unable to start bundled UI", e);
+			LOGGER.error("Unable to start node management UI", e);
 			System.exit(1);
 		}
 
@@ -329,7 +329,7 @@ public class Controller extends Thread {
 			if (!isStopping) {
 				isStopping = true;
 
-				LOGGER.info("Shutting down bundled UI");
+				LOGGER.info("Shutting down node management UI");
 				UiService.getInstance().stop();
 
 				LOGGER.info("Shutting down auto-update");
diff --git a/src/main/java/org/qora/settings/Settings.java b/src/main/java/org/qora/settings/Settings.java
index fb3aa9fc..bd1d94c1 100644
--- a/src/main/java/org/qora/settings/Settings.java
+++ b/src/main/java/org/qora/settings/Settings.java
@@ -36,7 +36,7 @@ public class Settings {
 	// Settings, and other config files
 	private String userPath;
 
-	// Bundled UI related
+	// Node management UI
 	private boolean uiEnabled = true;
 	private int uiPort = 9080;
 	private String[] uiWhitelist = new String[] {
diff --git a/src/main/java/org/qora/ui/UiService.java b/src/main/java/org/qora/ui/UiService.java
index e50dec6a..51d9bdff 100644
--- a/src/main/java/org/qora/ui/UiService.java
+++ b/src/main/java/org/qora/ui/UiService.java
@@ -16,7 +16,7 @@ public class UiService {
 	private final Server server;
 
 	public UiService() {
-		// Create bundled UI server
+		// Create node management UI server
 		this.server = new Server(Settings.getInstance().getUiPort());
 
 		// IP address based access control
@@ -42,15 +42,15 @@ public class UiService {
 		corsFilterHolder.setInitParameter(CrossOriginFilter.CHAIN_PREFLIGHT_PARAM, "false");
 		context.addFilter(corsFilterHolder, "/*", null);
 
-		// Bundled-UI static content servlet
-		ServletHolder uiServlet = new ServletHolder("bundled-ui", DefaultServlet.class);
+		// Node management UI static content servlet
+		ServletHolder uiServlet = new ServletHolder("node-management-ui", DefaultServlet.class);
 		ClassLoader loader = this.getClass().getClassLoader();
-		uiServlet.setInitParameter("resourceBase", loader.getResource("bundled-ui/").toString());
+		uiServlet.setInitParameter("resourceBase", loader.getResource("node-management-ui/").toString());
 		uiServlet.setInitParameter("dirAllowed", "true");
 		uiServlet.setInitParameter("pathInfoOnly", "true");
 		context.addServlet(uiServlet, "/*");
 
-		rewriteHandler.addRule(new RedirectPatternRule("", "/home.html")); // redirect to bundled UI start page
+		rewriteHandler.addRule(new RedirectPatternRule("", "/peer.html")); // node management UI start page
 	}
 
 	private static UiService instance;
@@ -69,7 +69,7 @@ public class UiService {
 			server.start();
 		} catch (Exception e) {
 			// Failed to start
-			throw new RuntimeException("Failed to start bundled UI", e);
+			throw new RuntimeException("Failed to start node management UI", e);
 		}
 	}
 
diff --git a/src/main/resources/bundled-ui b/src/main/resources/node-management-ui
similarity index 100%
rename from src/main/resources/bundled-ui
rename to src/main/resources/node-management-ui