diff --git a/src/lib/components/NoteCard.svelte b/src/lib/components/NoteCard.svelte
index ddfb1e0..3b85249 100644
--- a/src/lib/components/NoteCard.svelte
+++ b/src/lib/components/NoteCard.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { NOTE_COLORS } from '$lib/utils/colors.js';
 	import { renderMarkdown } from '$lib/utils/markdown.js';
-	import { togglePin, trashNote, archiveNote, unarchiveNote, restoreNote, deleteNote, leaveNote, currentFilter } from '$lib/stores/notes.js';
+	import { toggleFavorite, trashNote, archiveNote, unarchiveNote, restoreNote, deleteNote, leaveNote, currentFilter } from '$lib/stores/notes.js';
 	import ImageLightbox from './ImageLightbox.svelte';
 	import CollaboratorPopover from './CollaboratorPopover.svelte';
 	import type { Note } from '$lib/types/index.js';
@@ -109,10 +109,10 @@
 		{/if}
 		{#if note.pinned}
 			<button
-				onclick={stop(() => togglePin(note.id, note.pinned))}
+				onclick={stop(() => toggleFavorite(note.id, note.pinned))}
 				class="rounded-sm p-1 text-[var(--primary)] hover:bg-[var(--border)]/10"
-				title="Unpin"
-				data-testid="pin-indicator"
+				title="Unfavorite"
+				data-testid="favorite-indicator"
 			>
 				<Bookmark class="h-4 w-4 fill-[var(--primary)]" />
 			</button>
@@ -169,10 +169,10 @@
 		{:else}
 			{#if !note.pinned}
 				<button
-					onclick={stop(() => togglePin(note.id, note.pinned))}
+					onclick={stop(() => toggleFavorite(note.id, note.pinned))}
 					class="rounded-sm p-1.5 hover:bg-[var(--border)]/10"
-					title="Pin"
-					data-testid="pin-btn"
+					title="Favorite"
+					data-testid="favorite-btn"
 				>
 					<Bookmark class="h-4 w-4" />
 				</button>
diff --git a/src/lib/components/NotesView.svelte b/src/lib/components/NotesView.svelte
index 76b5b89..8af7795 100644
--- a/src/lib/components/NotesView.svelte
+++ b/src/lib/components/NotesView.svelte
@@ -2,7 +2,7 @@
 	import NoteGrid from '$lib/components/NoteGrid.svelte';
 	import NoteEditor from '$lib/components/NoteEditor.svelte';
 	import TagFilter from '$lib/components/TagFilter.svelte';
-	import { pinnedNotes, unpinnedNotes, selectedTag, currentFilter, notes, notesLoaded, loadNotes, updateSortOrders } from '$lib/stores/notes.js';
+	import { favoriteNotes, unfavoritedNotes, selectedTag, currentFilter, notes, notesLoaded, loadNotes, updateSortOrders } from '$lib/stores/notes.js';
 	import { onMount } from 'svelte';
 	import type { Note, NoteFilter } from '$lib/types/index.js';
 	import Plus from 'lucide-svelte/icons/plus';
@@ -86,22 +86,22 @@
 	<h2 class="mb-4 text-lg font-medium text-[var(--text-muted)]">#{tag}</h2>
 {/if}
 
-{#if $pinnedNotes.length > 0}
+{#if $favoriteNotes.length > 0}
 	<div class="mb-6">
-		<NoteGrid notes={$pinnedNotes} label="Pinned" onEdit={openEditor} draggable dndType="pinned-notes" onReorder={handleReorder} />
+		<NoteGrid notes={$favoriteNotes} label="Favorites" onEdit={openEditor} draggable dndType="pinned-notes" onReorder={handleReorder} />
 	</div>
 {/if}
 
 <NoteGrid
-	notes={$unpinnedNotes}
-	label={$pinnedNotes.length > 0 ? 'Others' : ''}
+	notes={$unfavoritedNotes}
+	label={$favoriteNotes.length > 0 ? 'Others' : ''}
 	onEdit={openEditor}
 	draggable
 	dndType="unpinned-notes"
 	onReorder={handleReorder}
 />
 
-{#if $notesLoaded && $pinnedNotes.length === 0 && $unpinnedNotes.length === 0}
+{#if $notesLoaded && $favoriteNotes.length === 0 && $unfavoritedNotes.length === 0}
 	<div class="flex flex-col items-center justify-center py-20 text-[var(--text-muted)]">
 		<img src="/favicon.svg" alt="" class="mb-4 h-18 w-18" />
 		<p class="font-['Press_Start_2P'] text-xs">
diff --git a/src/lib/server/mcp/server.ts b/src/lib/server/mcp/server.ts
index 8024e53..1189796 100644
--- a/src/lib/server/mcp/server.ts
+++ b/src/lib/server/mcp/server.ts
@@ -239,8 +239,8 @@ export function createMcpServer(userId: number): McpServer {
 	});
 
 	server.tool(
-		'pin_note',
-		'Pin or unpin a note',
+		'favorite_note',
+		'Favorite or unfavorite a note',
 		{
 			id: z.string().describe('Note ID'),
 			pinned: z.boolean().describe('Whether to pin (true) or unpin (false)')
@@ -257,7 +257,7 @@ export function createMcpServer(userId: number): McpServer {
 				content: [
 					{
 						type: 'text' as const,
-						text: `Note "${result.title}" ${pinned ? 'pinned' : 'unpinned'}`
+						text: `Note "${result.title}" ${pinned ? 'favorited' : 'unfavorited'}`
 					}
 				]
 			};
diff --git a/src/lib/stores/notes.ts b/src/lib/stores/notes.ts
index a6c1c64..b7cc0db 100644
--- a/src/lib/stores/notes.ts
+++ b/src/lib/stores/notes.ts
@@ -35,11 +35,11 @@ function sortNotes(list: Note[]): Note[] {
 	});
 }
 
-export const pinnedNotes = derived(filteredNotes, ($notes) =>
+export const favoriteNotes = derived(filteredNotes, ($notes) =>
 	sortNotes($notes.filter((n) => n.pinned))
 );
 
-export const unpinnedNotes = derived(filteredNotes, ($notes) =>
+export const unfavoritedNotes = derived(filteredNotes, ($notes) =>
 	sortNotes($notes.filter((n) => !n.pinned))
 );
 
@@ -231,7 +231,7 @@ export async function unarchiveNote(id: string): Promise<Note | null> {
 	return updateNote(id, { archived: false });
 }
 
-export async function togglePin(id: string, currentPinned: boolean): Promise<Note | null> {
+export async function toggleFavorite(id: string, currentPinned: boolean): Promise<Note | null> {
 	return updateNote(id, { pinned: !currentPinned });
 }
 
diff --git a/tests/e2e/organization.spec.ts b/tests/e2e/organization.spec.ts
index cf91b5c..b7c5afe 100644
--- a/tests/e2e/organization.spec.ts
+++ b/tests/e2e/organization.spec.ts
@@ -1,17 +1,17 @@
 import { test, expect, noteCard, createNote } from './helpers/fixtures.js';
 
 test.describe('Organization Features', () => {
-	test('Scenario: Pinned note appears under the Pinned section', async ({ authenticatedPage: page }) => {
-		// Given a note titled "Pin Me" exists
-		await createNote(page, 'Pin Me');
+	test('Scenario: Favorited note appears under the Favorites section', async ({ authenticatedPage: page }) => {
+		// Given a note titled "Favorite Me" exists
+		await createNote(page, 'Favorite Me');
 
-		// When the user pins the note
-		const pinCard = noteCard(page, 'Pin Me');
-		await pinCard.hover();
-		await pinCard.getByTestId('pin-btn').first().click({ force: true });
+		// When the user favorites the note
+		const favCard = noteCard(page, 'Favorite Me');
+		await favCard.hover();
+		await favCard.getByTestId('favorite-btn').first().click({ force: true });
 
-		// Then the "Pinned" section is visible
-		await expect(page.getByText('Pinned')).toBeVisible();
+		// Then the "Favorites" section is visible
+		await expect(page.getByText('Favorites')).toBeVisible();
 	});
 
 	test('Scenario: Archived note is removed from the main view', async ({ authenticatedPage: page }) => {