diff --git a/src/controls.ts b/src/controls.ts
index 1fcade69..f97601af 100644
--- a/src/controls.ts
+++ b/src/controls.ts
@@ -22,8 +22,8 @@ export interface OutputDevice {
 }
 
 export const setPipEnabled$ = new Subject<boolean>();
-export const setOutputDevices = new Subject<OutputDevice[]>();
-export const setOutputEnabled = new Subject<boolean>();
+export const setOutputDevices$ = new Subject<OutputDevice[]>();
+export const setOutputEnabled$ = new Subject<boolean>();
 
 window.controls = {
   canEnterPip(): boolean {
@@ -38,13 +38,13 @@ window.controls = {
     setPipEnabled$.next(false);
   },
   setOutputDevices(devices: OutputDevice[]): void {
-    if (!setOutputDevices.observed)
+    if (!setOutputDevices$.observed)
       throw new Error("Output controls are disabled");
-    setOutputDevices.next(devices);
+    setOutputDevices$.next(devices);
   },
   setOutputEnabled(enabled: boolean): void {
-    if (!setOutputEnabled.observed)
+    if (!setOutputEnabled$.observed)
       throw new Error("Output controls are disabled");
-    setOutputEnabled.next(enabled);
+    setOutputEnabled$.next(enabled);
   },
 };
diff --git a/src/livekit/MediaDevicesContext.tsx b/src/livekit/MediaDevicesContext.tsx
index 3b4525fe..6bca910f 100644
--- a/src/livekit/MediaDevicesContext.tsx
+++ b/src/livekit/MediaDevicesContext.tsx
@@ -29,7 +29,7 @@ import {
   alwaysShowIphoneEarpiece as alwaysShowIphoneEarpieceSetting,
   type Setting,
 } from "../settings/settings";
-import { type OutputDevice, setOutputDevices } from "../controls";
+import { type OutputDevice, setOutputDevices$ } from "../controls";
 
 export const EARPIECE_CONFIG_ID = "earpiece-id";
 
@@ -300,7 +300,7 @@ export const MediaDevicesProvider: FC<Props> = ({ children }) => {
 function useControlledOutput(): MediaDevice {
   const available = useObservableEagerState(
     useObservable(() =>
-      setOutputDevices.pipe(
+      setOutputDevices$.pipe(
         startWith<OutputDevice[]>([]),
         map(
           (devices) =>