diff --git a/rvctl.py b/rvctl.py
index 8382f1f..6c03f24 100755
--- a/rvctl.py
+++ b/rvctl.py
@@ -3373,12 +3373,10 @@ def build_container_command(
 
     home_dir = Path(os.environ.get("HOME") or str(Path.home()))
     card_path_text = str(card_path)
-    session_slug = slug_value(session_name, "tmux session name")
-    instance_name = slug_value(instance, "container instance")
-    container_name_parts = [session_slug]
-    if profile not in session_slug.split("-"):
-        container_name_parts.append(profile)
-    container_name_parts.append(instance_name)
+    selector_slug = slug_value(selector.replace("/", "-"), "card selector")
+    window_slug = slug_value(window_name, "tmux window name")
+    user_name = current_user_slug()
+    container_name_parts = [selector_slug, window_slug, profile, user_name]
     container_name = "-".join(container_name_parts)
     env_parts = [
         f"WORKSPACE_ROOT={shlex.quote(str(config.workspace_root))}",
@@ -3442,7 +3440,7 @@ def run_tmux_container(config: WorkspaceConfig, args: argparse.Namespace) -> Non
 
     profile = normalize_env_profile(args.profile)
     user_name = current_user_slug()
-    default_session_name = f"rv-{user_name}-{slug_value(selector.replace('/', '-'), 'card selector')}-{profile}"
+    default_session_name = f"rvctl-{user_name}-{slug_value(selector.replace('/', '-'), 'card selector')}-{profile}"
     session_name = args.session or default_session_name
     window_name = args.window or config.defaults.get("tmux_window", "rv")
     instance = args.instance or config.defaults.get("instance", "shell")