diff --git a/developing-with-monado.md b/developing-with-monado.md
index 1025526400b2b4e4592e161befdee834d94288a6..7e6df667c83df5c91c4830d6c2ab3847c42de41d 100644
--- a/developing-with-monado.md
+++ b/developing-with-monado.md
@@ -155,7 +155,7 @@ Your most important reference of course will be the OpenXR specification:
 
 The qwerty driver is named after the qwerty keyboard layout. It enables basic control of a virtual HMD and controllers with keyboard and mouse.
 
-The qwerty driver is enabled by using the environment variable `QWERTY_ENABLE=1` for `monado-service`. The qwerty driver can only be used in combination with Monado's debug gui, therefore the environment variable `OXR_DEBUG_GUI=1` has to be set too: `QWERTY_ENABLE=1 OXR_DEBUG_GUI=1 monado-service`.
+The qwerty driver is enabled by using the environment variable `QWERTY_ENABLE=1` for `monado-service`. The qwerty driver can only be used in combination with Monado's debug gui, therefore the environment variable `XRT_DEBUG_GUI=1` has to be set too: `QWERTY_ENABLE=1 XRT_DEBUG_GUI=1 monado-service`.
 
 By default the qwerty driver disables all connected hardware devices. The additional environment variable `QWERTY_COMBINE=1` will only fill the HMD, left controller and right controller slots, if no hardware device is occupying that slot.
 
diff --git a/getting-started.md b/getting-started.md
index dc21503eae313d3ce016e4b814d35f3471472670..1f6c4e725a6d61666db65bb0996277beb9329da9 100644
--- a/getting-started.md
+++ b/getting-started.md
@@ -255,9 +255,9 @@ Environment variables that make use of the log level system typically end with `
 
 ### Debug GUI
 
-Available for OpenXR applications and monado-service:
+Available for monado-service and OpenXR applications (if build time option `XRT_FEATURE_CLIENT_DEBUG_GUI` is enabled):
 
-* `OXR_DEBUG_GUI=1`: Open a separate debug window for observing and manipulating certain state. For example changing a tracking origin virtually moves devices tracked on that tracking origin.
+* `XRT_DEBUG_GUI=1`: Open a separate debug window for observing and manipulating certain state. For example changing a tracking origin virtually moves devices tracked on that tracking origin.
   * the debug information shown for monado-service and OpenXR clients is different, for example monado-service shows a basic compositor frametiming graph.
 
 ### SteamVR plugin
diff --git a/positional-tracking-psmove.md b/positional-tracking-psmove.md
index 2fe86bb11e6eb0c323b66bb600e1c771bc568fff..c11ba6c1fc85ab5fdd4d752ac1afc479593e3974 100644
--- a/positional-tracking-psmove.md
+++ b/positional-tracking-psmove.md
@@ -112,4 +112,4 @@ When a PS4 camera with uvc enabled firmware is connected, a calibration file is
 
 As an example, `hello_xr -g Vulkan` should have the psmove controller enabled as a positionally tracked "khronos simple controller", including the trigger and haptic feedback.
 
-To debug issues, monado implements a debug UI in a separate window which can be enabled with an environment variable: `OXR_DEBUG_GUI=1 hello_xr -g Vulkan`. If monado can find and enable the camera, there will be windows `HSV Filter` and `PSMV Tracker #1` and `PSMV Tracker #2` available in the debug UI, showing the raw camera image as well as the color filtered camera images.
+To debug issues, monado implements a debug UI in a separate window which can be enabled with an environment variable: `XRT_DEBUG_GUI=1 monado-service` and then `hello_xr -g Vulkan`. If monado can find and enable the camera, there will be windows `HSV Filter` and `PSMV Tracker #1` and `PSMV Tracker #2` available in the debug UI, showing the raw camera image as well as the color filtered camera images.