diff --git a/interface/resources/qml/hifi/tablet/ControllerSettings.qml b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
index 4814eaf01c..78cc2c5a00 100644
--- a/interface/resources/qml/hifi/tablet/ControllerSettings.qml
+++ b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
@@ -17,6 +17,7 @@ StackView {
     id: stack
     initialItem: inputConfiguration
     property alias messageVisible: imageMessageBox.visible
+    property alias selectedPlugin: box.currentText
     Rectangle {
         id: inputConfiguration
         anchors.fill: parent
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index 0978f23013..6f79136a49 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -36,7 +36,7 @@ Rectangle {
     readonly property bool hmdHead: headBox.checked
     readonly property bool headPuck: headPuckBox.checked
     readonly property bool handController: handBox.checked
-    
+
     readonly property bool handPuck: handPuckBox.checked
     readonly property bool hmdDesktop: hmdInDesktop.checked
 
@@ -107,7 +107,7 @@ Rectangle {
 
         RalewayBold {
             size: 12
-            text: "Vive HMD"
+            text: stack.selectedPlugin + " HMD"
             color: hifi.colors.lightGrayText
         }
 
@@ -145,7 +145,7 @@ Rectangle {
             anchors.topMargin: 5
             anchors.left: openVrConfiguration.left
             anchors.leftMargin: leftMargin + 10
-        
+
             onClicked: {
                 if (checked) {
                     headBox.checked = false;
@@ -778,12 +778,12 @@ Rectangle {
 
     RalewayBold {
         id: advanceSettings
-        
+
         text: "Advanced Settings"
         size: 12
-        
+
         color: hifi.colors.white
-        
+
         anchors.top: advanceSeperator.bottom
         anchors.topMargin: 10
         anchors.left: parent.left
@@ -801,7 +801,7 @@ Rectangle {
         anchors.topMargin: 5
         anchors.left: openVrConfiguration.left
         anchors.leftMargin: leftMargin + 10
-        
+
         onClicked: {
             if (!checked & hmdInDesktop.checked) {
                 headBox.checked = true;
@@ -815,9 +815,9 @@ Rectangle {
     RalewayBold {
         id: viveDesktopText
         size: 10
-        text: "Use Vive devices in desktop mode"
+        text: "Use " + stack.selectedPlugin + " devices in desktop mode"
         color: hifi.colors.white
-        
+
         anchors {
             left: viveInDesktop.right
             leftMargin: 5
@@ -825,7 +825,7 @@ Rectangle {
         }
     }
 
-    
+
     NumberAnimation {
         id: numberAnimation
         target: openVrConfiguration
diff --git a/libraries/plugins/src/plugins/InputConfiguration.cpp b/libraries/plugins/src/plugins/InputConfiguration.cpp
index 976a9c9463..daa8c6d08c 100644
--- a/libraries/plugins/src/plugins/InputConfiguration.cpp
+++ b/libraries/plugins/src/plugins/InputConfiguration.cpp
@@ -32,7 +32,8 @@ QStringList InputConfiguration::inputPlugins() {
     for (auto plugin : PluginManager::getInstance()->getInputPlugins()) {
         QString pluginName = plugin->getName();
         if (pluginName == QString("OpenVR")) {
-            inputPlugins << QString("Vive");
+            QString headsetName = plugin->getDeviceName();
+            inputPlugins << headsetName;
         } else {
             inputPlugins << pluginName;
         }