diff --git a/web/kvm/index.html b/web/kvm/index.html
index c2035496..5bf4ed74 100644
--- a/web/kvm/index.html
+++ b/web/kvm/index.html
@@ -657,7 +657,7 @@
                     </div>
                   </td>
               <td>&nbsp;</td>
-                  <td>Writable:
+                  <td i18n="msd-rw-switch">Writable:
                   </td>
                   <td align="right">
                     <div class="switch-box">
diff --git a/web/share/js/index/main.js b/web/share/js/index/main.js
index 06cc5c44..c09fe691 100644
--- a/web/share/js/index/main.js
+++ b/web/share/js/index/main.js
@@ -103,10 +103,10 @@ function __showKvmdInfo(info) {
 
 	if (info.meta !== null && info.meta.server && info.meta.server.host) {
 		$("kvmd-meta-server-host").innerText = info.meta.server.host;
-		document.title = `${info.meta.server.host} | PiKVM Index`;
+		document.title = `${info.meta.server.host} | One-KVM Index`;
 	} else {
 		$("kvmd-meta-server-host").innerHTML = "<i>Invalid meta</i>";
-		document.title = "PiKVM Index";
+		document.title = "One-KVM Index";
 	}
 }
 
diff --git a/web/share/js/kvm/keyboard.js b/web/share/js/kvm/keyboard.js
index 3c30a900..d7fbbcaf 100644
--- a/web/share/js/kvm/keyboard.js
+++ b/web/share/js/kvm/keyboard.js
@@ -118,7 +118,7 @@ export function Keyboard(__recordWsEvent) {
 			}
 		} else {
 			if (is_captured) {
-				title = "Keyboard captured, PiKVM offline";
+				title = "Keyboard captured, One-KVM offline";
 			}
 		}
 		$("hid-keyboard-led").className = led;
diff --git a/web/share/js/kvm/mouse.js b/web/share/js/kvm/mouse.js
index aaa27d6e..ec3ec5e0 100644
--- a/web/share/js/kvm/mouse.js
+++ b/web/share/js/kvm/mouse.js
@@ -169,7 +169,7 @@ export function Mouse(__getGeometry, __recordWsEvent) {
 			}
 		} else {
 			if (is_captured) {
-				title = "Mouse captured, PiKVM offline";
+				title = "Mouse captured, One-KVM offline";
 			}
 		}
 		$("hid-mouse-led").className = led;
diff --git a/web/share/js/kvm/stream.js b/web/share/js/kvm/stream.js
index 06207bd4..2f62af7a 100644
--- a/web/share/js/kvm/stream.js
+++ b/web/share/js/kvm/stream.js
@@ -46,7 +46,7 @@ export function Streamer() {
 	var __init__ = function() {
 		__streamer = new MjpegStreamer(__setActive, __setInactive, __setInfo, __organizeHook);
 
-		$("stream-led").title = "No stream from PiKVM";
+		$("stream-led").title = "No stream from One-KVM";
 
 		tools.slider.setParams($("stream-quality-slider"), 5, 100, 5, 80, function(value) {
 			$("stream-quality-value").innerText = `${value}%`;
@@ -289,7 +289,7 @@ export function Streamer() {
 
 	var __setInactive = function() {
 		$("stream-led").className = "led-gray";
-		$("stream-led").title = "No stream from PiKVM";
+		$("stream-led").title = "No stream from One-KVM";
 	};
 
 	var __setControlsEnabled = function(enabled) {
@@ -317,7 +317,7 @@ export function Streamer() {
 			if (text.length > 0) {
 				title += text;
 			} else {
-				title += "No stream from PiKVM";
+				title += "No stream from One-KVM";
 			}
 		}
 		el_grab.innerText = el_info.innerText = title;
diff --git a/web/share/js/kvm/stream_media.js b/web/share/js/kvm/stream_media.js
index 9809cc90..97851650 100644
--- a/web/share/js/kvm/stream_media.js
+++ b/web/share/js/kvm/stream_media.js
@@ -166,7 +166,7 @@ export function MediaStreamer(__setActive, __setInactive, __setInfo, __organizeH
 	var __setupCodec = function(formats) {
 		__closeDecoder();
 		if (formats.h264 === undefined) {
-			let msg = "No H.264 stream available on PiKVM";
+			let msg = "No H.264 stream available on One-KVM";
 			__setInfo(false, false, msg);
 			__logInfo(msg);
 			return;