diff --git a/exwm-floating.el b/exwm-floating.el
index 0c8fc6fb2..6f8f9d8d3 100644
--- a/exwm-floating.el
+++ b/exwm-floating.el
@@ -274,12 +274,11 @@ This is also used by X window containers.")
                          :border-pixel exwm-floating--border-pixel
                          :override-redirect 1
                          :colormap exwm-floating--border-colormap))
-      (exwm--debug
-       (xcb:+request exwm--connection
-           (make-instance 'xcb:ewmh:set-_NET_WM_NAME
-                          :window frame-container
-                          :data
-                          (format "floating frame container for 0x%x" id))))
+      (xcb:+request exwm--connection
+          (make-instance 'xcb:ewmh:set-_NET_WM_NAME
+                         :window frame-container
+                         :data
+                         (format "EXWM floating frame container for 0x%x" id)))
       ;; Map it.
       (xcb:+request exwm--connection
           (make-instance 'xcb:MapWindow :window frame-container))
diff --git a/exwm-input.el b/exwm-input.el
index d194b5382..0c8853c5f 100644
--- a/exwm-input.el
+++ b/exwm-input.el
@@ -927,6 +927,10 @@ where both ORIGINAL-KEY and SIMULATED-KEY are key sequences."
                      :visual 0
                      :value-mask xcb:CW:EventMask
                      :event-mask xcb:EventMask:PropertyChange))
+  (xcb:+request exwm--connection
+      (make-instance 'xcb:ewmh:set-_NET_WM_NAME
+                     :window exwm-input--timestamp-window
+                     :data "EXWM: exwm-input--timestamp-window"))
   (let ((atom "_TIME"))
     (setq exwm-input--timestamp-atom
           (slot-value (xcb:+request-unchecked+reply exwm--connection
diff --git a/exwm-workspace.el b/exwm-workspace.el
index 0a1984bdf..5178e50d1 100644
--- a/exwm-workspace.el
+++ b/exwm-workspace.el
@@ -1228,13 +1228,12 @@ Please check `exwm-workspace--minibuffer-own-frame-p' first."
                        :window container
                        :value-mask xcb:ConfigWindow:StackMode
                        :stack-mode xcb:StackMode:Below))
-    (exwm--debug
-     (xcb:+request exwm--connection
-         (make-instance 'xcb:ewmh:set-_NET_WM_NAME
-                        :window container
-                        :data
-                        (format "EXWM workspace %d frame container"
-                                (exwm-workspace--position frame)))))
+    (xcb:+request exwm--connection
+        (make-instance 'xcb:ewmh:set-_NET_WM_NAME
+                       :window container
+                       :data
+                       (format "EXWM workspace %d frame container"
+                               (exwm-workspace--position frame))))
     (xcb:+request exwm--connection
         (make-instance 'xcb:ReparentWindow
                        :window outer-id :parent container :x 0 :y 0))
@@ -1427,11 +1426,10 @@ applied to all subsequently created X frames."
                                            xcb:CW:OverrideRedirect)
                        :background-pixmap xcb:BackPixmap:ParentRelative
                        :override-redirect 1))
-    (exwm--debug
-     (xcb:+request exwm--connection
-         (make-instance 'xcb:ewmh:set-_NET_WM_NAME
-                        :window container
-                        :data "Minibuffer container")))
+    (xcb:+request exwm--connection
+        (make-instance 'xcb:ewmh:set-_NET_WM_NAME
+                       :window container
+                       :data "EXWM minibuffer container"))
     ;; Reparent the minibuffer frame to the container.
     (xcb:+request exwm--connection
         (make-instance 'xcb:ReparentWindow