diff --git a/src/apps/deskflow-gui/dialogs/ActionDialog.ui b/src/apps/deskflow-gui/dialogs/ActionDialog.ui
index 4bd376e0f..032ae72ee 100644
--- a/src/apps/deskflow-gui/dialogs/ActionDialog.ui
+++ b/src/apps/deskflow-gui/dialogs/ActionDialog.ui
@@ -55,12 +55,12 @@
        </item>
        <item>
         <property name="text">
-         <string>Switch to a screen</string>
+         <string>Switch to a computer</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Switch to the screen in a direction</string>
+         <string>Switch in a direction</string>
         </property>
        </item>
        <item>
@@ -93,22 +93,22 @@
        </property>
        <item>
         <property name="text">
-         <string>Move to the screen on the left</string>
+         <string>Switch to the computer on the left</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Move to the screen on the right</string>
+         <string>Switch to the computer on the right</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Move to the screen above</string>
+         <string>Switch to the computer above</string>
         </property>
        </item>
        <item>
         <property name="text">
-         <string>Move to the screen below</string>
+         <string>Switch to the computer below</string>
         </property>
        </item>
       </widget>
diff --git a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
index 24f0bceb3..fa3d6afd8 100644
--- a/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
+++ b/src/apps/deskflow-gui/dialogs/ServerConfigDialog.ui
@@ -59,7 +59,7 @@
             <bool>true</bool>
            </property>
            <property name="toolTip">
-            <string>Drag a screen from the grid to the trashcan to remove it.</string>
+            <string>Drag a computer from the grid to the trashcan to remove it.</string>
            </property>
            <property name="frameShape">
             <enum>QFrame::StyledPanel</enum>
@@ -461,7 +461,7 @@
           <item>
            <widget class="QCheckBox" name="m_pCheckBoxDisableLockToScreen">
             <property name="text">
-             <string>Disable lock to screen (scroll lock key)</string>
+             <string>Disable lock to computer (scroll lock key)</string>
             </property>
            </widget>
           </item>
@@ -902,7 +902,7 @@
        <item>
         <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Use a server config file to create complex screen layouts that are not possible with the simple grid-based screen layout editor.
+          <string>Use a server config file to create complex computer layouts that are not possible with the simple grid-based computer layout editor.
 
 Enabling this setting will disable the server config GUI.</string>
          </property>