diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 904817c3..9ae89bf1 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -5968,7 +5968,7 @@
             if (currentMesh.mtype == 1) meshtype = "Intel® AMT only, no agent";
             if (currentMesh.mtype == 2) meshtype = "Managed using a software agent";
             if (currentMesh.mtype == 3) meshtype = "Local devices, no agent";
-            if (currentMesh.mtype == 4) { meshtype = "IP KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
+            if (currentMesh.mtype == 4) { meshtype = "IP-KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
 
             var x = '';
             x += addHtmlValue("Name", addLinkConditional(EscapeHtml(currentMesh.name), 'p20editmesh(1)', (meshrights & 1) != 0));
@@ -5976,7 +5976,7 @@
             x += addHtmlValue("Type", meshtype);
             //x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]);
 
-            // Display IP KVM information if needed
+            // Display IP-KVM information if needed
             if (currentMesh.mtype == 4) {
                 x += addHtmlValue("Hostname", currentMesh.kvm.host);
                 x += addHtmlValue("Username", currentMesh.kvm.user);
diff --git a/views/default.handlebars b/views/default.handlebars
index 52ebdfd7..d4513593 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5150,7 +5150,7 @@
                         if (node.porttype == 'PDU') {
                             states.push('<span title="' + "Power switch is ready for use." + '">' + "Switch" + '</span>');
                         } else {
-                            states.push('<span title="' + "IP KVM port is up and ready for use." + '">' + "IP-KVM" + '</span>');
+                            states.push('<span title="' + "IP-KVM port is up and ready for use." + '">' + "IP-KVM" + '</span>');
                         }
                     } else {
                         states.push('<span title="' + "Mesh agent is connected and ready for use." + '">' + "Agent" + '</span>');
@@ -11390,7 +11390,7 @@
             var x = "Create a new device group using the options below." + '<br /><br />', localGroupType = '';
             x += addHtmlValue("Name", '<input id=dp2meshname style=width:230px maxlength=128 onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,1) />');
             if ((features & 1) == 0) { localGroupType += '<option value=3>' + "Local devices, no agent" + '</option>'; }
-            if (features2 & 0x10000) { localGroupType += '<option value=4>' + "IP KVM device" + '</option>'; }
+            if (features2 & 0x10000) { localGroupType += '<option value=4>' + "IP-KVM / Power device" + '</option>'; }
             x += addHtmlValue("Type", '<div style=width:230px;margin:0;padding:0><select id=dp2meshtype style=width:100% onchange=account_validateMeshCreate() onkeyup=account_validateMeshCreate(event,2) ><option value=2>' + "Manage using a software agent" + '</option><option value=1>' + "Intel&reg; AMT only, no agent" + '</option>' + localGroupType + '</select></div>');
             x += addHtmlValue("Description", '<div style=width:230px;margin:0;padding:0><textarea id=dp2meshdesc maxlength=1024 style=width:100%;resize:none></textarea></div>');
             x += '<div id=d2ipkvm style=display:none><hr />';
@@ -11642,7 +11642,7 @@
             if (currentMesh.mtype == 1) meshtype = "Intel&reg; AMT only, no agent";
             if (currentMesh.mtype == 2) meshtype = "Managed using a software agent";
             if (currentMesh.mtype == 3) meshtype = "Local devices, no agent";
-            if (currentMesh.mtype == 4) { meshtype = "IP KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
+            if (currentMesh.mtype == 4) { meshtype = "IP-KVM device"; if (currentMesh.kvm.model == 1) { meshtype += ', ' + 'Raritan KX III'; } }
 
             var x = '';
             if ((args.hide & 8) != 0) { x += addHtmlValue("Name", mname); } // If title bar is hidden, display the mesh name here
@@ -11652,7 +11652,7 @@
             x += addHtmlValue("Type", meshtype);
             //x += addHtmlValue('Identifier', currentMesh._id.split('/')[2]);
 
-            // Display IP KVM information if needed
+            // Display IP-KVM information if needed
             if (currentMesh.mtype == 4) {
                 x += addHtmlValue("Hostname", currentMesh.kvm.host);
                 x += addHtmlValue("Username", currentMesh.kvm.user);