diff --git a/makefiles/boards/ztimer_only.dep.mk b/makefiles/boards/ztimer_only.dep.mk
index f50810a051..e6e5e86b19 100644
--- a/makefiles/boards/ztimer_only.dep.mk
+++ b/makefiles/boards/ztimer_only.dep.mk
@@ -1,11 +1,11 @@
 # Include this for boards whose timer periph cannot generate a clock frequency
 # suitable for xtimer with the available clock sources and dividers.
 # This will use ztimer to perform the required frequency conversion.
-# By default, xtimer is still used with ztimer as backed, unless
-# ztimer_xtimer_compat is used.
+# By default, ztimer_xtimer_compat is used unless xtimer_on_ztimer is
+# selected.
 
 ifneq (,$(filter xtimer,$(USEMODULE)))
-  ifeq (,$(filter ztimer_xtimer_compat ztimer64_xtimer_compat,$(USEMODULE)))
-    USEMODULE += xtimer_on_ztimer
+  ifeq (,$(filter xtimer_on_ztimer,$(USEMODULE)))
+    USEMODULE += ztimer_xtimer_compat
   endif
 endif
diff --git a/sys/xtimer/Makefile.dep b/sys/xtimer/Makefile.dep
index 0525f3fd82..4d141a49aa 100644
--- a/sys/xtimer/Makefile.dep
+++ b/sys/xtimer/Makefile.dep
@@ -9,13 +9,13 @@ FEATURES_REQUIRED += periph_timer
 
 USEMODULE += xtimer_no_ztimer_default
 ifeq (,$(filter xtimer_no_ztimer_default,$(USEMODULE)))
-  ifeq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
-    USEMODULE += xtimer_on_ztimer
+  ifeq (,$(filter xtimer_on_ztimer,$(USEMODULE)))
+    USEMODULE += ztimer_xtimer_compat
   endif
 else
   ifneq (,$(filter ztimer,$(USEMODULE)))
-    ifeq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
-      USEMODULE += xtimer_on_ztimer
+    ifeq (,$(filter xtimer_on_ztimer,$(USEMODULE)))
+      USEMODULE += ztimer_xtimer_compat
     endif
   endif
 endif
diff --git a/sys/ztimer/Kconfig b/sys/ztimer/Kconfig
index 2269a86dac..f1ab66248e 100644
--- a/sys/ztimer/Kconfig
+++ b/sys/ztimer/Kconfig
@@ -143,23 +143,18 @@ choice
     bool "xtimer compatibility"
     depends on MODULE_XTIMER && MODULE_ZTIMER
 
-config MODULE_XTIMER_ON_ZTIMER
-    bool "ztimer_usec as timer backend for xtimer"
-    select MODULE_ZTIMER_USEC
-    select MODULE_ZTIMER_PERIPH_TIMER
-
 config MODULE_ZTIMER_XTIMER_COMPAT
     bool "map xtimer calls to ztimer"
     select MODULE_DIV
     select MODULE_ZTIMER_USEC
     select MODULE_ZTIMER_PERIPH_TIMER
     help
-        This is a wrapper of xtimer API on ztimer_usec and is currently
-        incomplete. Unless doing testing, use xtimer on ztimer.
-
-comment "The ztimer xtimer compatibility module is incomplete, consider using MODULE_ZTIMER64_XTIMER_COMPAT instead."
-    depends on MODULE_ZTIMER_XTIMER_COMPAT
+        This is a wrapper of xtimer API on ztimer_usec.
 
+config MODULE_XTIMER_ON_ZTIMER
+    bool "ztimer_usec as timer backend for xtimer"
+    select MODULE_ZTIMER_USEC
+    select MODULE_ZTIMER_PERIPH_TIMER
 endchoice
 
 config MODULE_ZTIMER64_XTIMER_COMPAT