diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx
index b358c4f..811dd6c 100644
--- a/src/components/Navigation.tsx
+++ b/src/components/Navigation.tsx
@@ -161,7 +161,7 @@ export const ContextSwitcher: Component<{
 
     const label = () => {
         const c = ctx();
-        return c === 'mine' ? "My Workspace" : c.name;
+        return c === 'mine' ? "My Bucket" : c.name;
     };
 
     const handleSwitch = (id: string, name: string, type: 'mine' | 'user' | 'bucket' = 'mine') => {
@@ -229,15 +229,15 @@ export const ContextSwitcher: Component<{
                             <div class="w-4 h-4 rounded-full bg-primary/20 flex items-center justify-center">
                                 <div class="w-2 h-2 rounded-full bg-primary" />
                             </div>
-                            My Workspace
+                            My Bucket
                         </button>
                         <Show when={store.subscribedBuckets.length > 0}>
                             <div class="py-1">
                                 <div class="h-px bg-border/50" />
                             </div>
                             <div class="px-2 py-1 text-[0.625rem] font-bold uppercase text-muted-foreground tracking-wider flex items-center gap-2">
-                                <span>Buckets</span>
-                                <span class="ml-auto bg-muted px-1.5 rounded text-[0.5625rem]">{store.subscribedBuckets.length}</span>
+                                <span>Pinned Global Buckets</span>
+                                <span class="ml-auto bg-muted px-1.5 rounded text-[0.5625rem]">{store.buckets.filter(b => store.subscribedBuckets.includes(b.id)).length}</span>
                             </div>
                             <For each={store.buckets.filter(b => store.subscribedBuckets.includes(b.id))}>
                                 {(bucket) => (
@@ -265,7 +265,7 @@ export const ContextSwitcher: Component<{
                                 <div class="h-px bg-border/50" />
                             </div>
                             <div class="px-2 py-1 text-[0.625rem] font-bold uppercase text-muted-foreground tracking-wider flex items-center gap-2">
-                                <span>Oversight</span>
+                                <span>Shared User Buckets</span>
                                 <span class="ml-auto bg-muted px-1.5 rounded text-[0.5625rem]">{oversightUsers()?.length}</span>
                             </div>
                             <For each={oversightUsers()}>
diff --git a/src/store/index.ts b/src/store/index.ts
index 1604c73..7df1fea 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -12,7 +12,7 @@ const getStorageKey = () => {
 };
 
 export const [now, setNow] = createSignal(Date.now());
-// Context: 'mine' = My Workspace (default), { userId: string } = Oversight View for that user, { bucketId: string, name: string } = Bucket View
+// Context: 'mine' = My Bucket (default), { userId: string } = Oversight View for that user, { bucketId: string, name: string } = Bucket View
 type TaskContext = 'mine' | { userId: string, name: string } | { bucketId: string, name: string };
 export const [activeTaskId, setActiveTaskId] = createSignal<string | null>(null);
 export const [currentTaskContext, setCurrentTaskContext] = createSignal<TaskContext>('mine');
@@ -228,11 +228,11 @@ export const matchesFilter = (task: Task) => {
             task.tags?.includes(r.tagName || "")
         );
 
-        // Bucket visibility logic for "My Workspace":
+        // Bucket visibility logic for "My Bucket":
         // Users requested: "Any user who adds that bucket to their workspaces list can view the workspace and see tasks in that bucket from all users."
         // AND "In settings a user should be able to see and edit all buckets... They should be able to add any bucket to their workspaces list."
         // When in 'mine', do we show bucket tasks? 
-        // Typically 'My Workspace' is just MY stuff + stuff shared explicitly with me.
+        // Typically 'My Bucket' is just MY stuff + stuff shared explicitly with me.
         // Buckets seem to be separate "Contexts" in the sidebar.
         // However, if the user wants them mixed in, they didn't explicitly say "mix into my main list", 
         // they said "add that bucket to their workspaces list". This usually implies a separate view.
diff --git a/src/views/SettingsView.tsx b/src/views/SettingsView.tsx
index 5af2a5f..e60c5ac 100644
--- a/src/views/SettingsView.tsx
+++ b/src/views/SettingsView.tsx
@@ -374,7 +374,7 @@ export const SettingsView: Component = () => {
                         <div class="space-y-0.5">
                             <h3 class="text-base font-semibold flex items-center gap-2">
                                 <Box size={16} />
-                                Buckets (Global Workspaces)
+                                Shared Global Buckets
                             </h3>
                             <p class="text-sm text-muted-foreground">Manage public task buckets and your subscriptions.</p>
                         </div>