diff --git a/src/xrt/compositor/multi/comp_multi_compositor.c b/src/xrt/compositor/multi/comp_multi_compositor.c
index 1bb74098f..9e1cc05c8 100644
--- a/src/xrt/compositor/multi/comp_multi_compositor.c
+++ b/src/xrt/compositor/multi/comp_multi_compositor.c
@@ -266,7 +266,8 @@ run_func(void *ptr)
 {
 	struct multi_compositor *mc = (struct multi_compositor *)ptr;
 
-	os_thread_helper_name(&(mc->wait_thread.oth), "Multi-Compositor Client Wait Thread");
+	U_TRACE_SET_THREAD_NAME("Multi Client Module: Waiter");
+	os_thread_helper_name(&mc->wait_thread.oth, "Multi Client Module: Waiter");
 
 	os_thread_helper_lock(&mc->wait_thread.oth);
 
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
index cc3dfb39a..fbba591e0 100644
--- a/src/xrt/compositor/multi/comp_multi_system.c
+++ b/src/xrt/compositor/multi/comp_multi_system.c
@@ -434,9 +434,8 @@ update_session_state_locked(struct multi_system_compositor *msc)
 static int
 multi_main_loop(struct multi_system_compositor *msc)
 {
-	COMP_TRACE_MARKER();
-
-	os_thread_helper_name(&(msc->oth), "Multi-Compositor");
+	U_TRACE_SET_THREAD_NAME("Multi Client Module");
+	os_thread_helper_name(&msc->oth, "Multi Client Module");
 
 	struct xrt_compositor *xc = &msc->xcn->base;