diff --git a/extension/src/popup/components/entry-detail.ts b/extension/src/popup/components/item-detail.ts
similarity index 99%
rename from extension/src/popup/components/entry-detail.ts
rename to extension/src/popup/components/item-detail.ts
index 2a29874..beba57f 100644
--- a/extension/src/popup/components/entry-detail.ts
+++ b/extension/src/popup/components/item-detail.ts
@@ -29,7 +29,7 @@ async function copyToClipboard(text: string): Promise<void> {
   }
 }
 
-export function renderEntryDetail(app: HTMLElement): void {
+export function renderItemDetail(app: HTMLElement): void {
   const state = getState();
   const entry = state.selectedEntry;
   const id = state.selectedId;
diff --git a/extension/src/popup/components/entry-form.ts b/extension/src/popup/components/item-form.ts
similarity index 98%
rename from extension/src/popup/components/entry-form.ts
rename to extension/src/popup/components/item-form.ts
index 2391461..16fd9a9 100644
--- a/extension/src/popup/components/entry-form.ts
+++ b/extension/src/popup/components/item-form.ts
@@ -4,7 +4,7 @@
 import { getState, setState, sendMessage, navigate, escapeHtml } from '../popup';
 import type { Entry, ManifestEntry } from '../../shared/types';
 
-export function renderEntryForm(app: HTMLElement, mode: 'add' | 'edit'): void {
+export function renderItemForm(app: HTMLElement, mode: 'add' | 'edit'): void {
   const state = getState();
   const existing = mode === 'edit' ? state.selectedEntry : null;
 
diff --git a/extension/src/popup/components/entry-list.ts b/extension/src/popup/components/item-list.ts
similarity index 98%
rename from extension/src/popup/components/entry-list.ts
rename to extension/src/popup/components/item-list.ts
index 0c1cc34..ca637ff 100644
--- a/extension/src/popup/components/entry-list.ts
+++ b/extension/src/popup/components/item-list.ts
@@ -23,7 +23,7 @@ function getGroups(entries: Array<[string, ManifestEntry]>): string[] {
   return Array.from(groups).sort();
 }
 
-export function renderEntryList(app: HTMLElement): void {
+export function renderItemList(app: HTMLElement): void {
   const state = getState();
   const groups = getGroups(state.entries);
   const filtered = getFilteredEntries();
diff --git a/extension/src/popup/popup.ts b/extension/src/popup/popup.ts
index a808007..2116f1d 100644
--- a/extension/src/popup/popup.ts
+++ b/extension/src/popup/popup.ts
@@ -7,9 +7,9 @@
 import type { Request, Response } from '../shared/messages';
 import type { ManifestEntry, Entry } from '../shared/types';
 import { renderUnlock } from './components/unlock';
-import { renderEntryList } from './components/entry-list';
-import { renderEntryDetail } from './components/entry-detail';
-import { renderEntryForm } from './components/entry-form';
+import { renderItemList } from './components/item-list';
+import { renderItemDetail } from './components/item-detail';
+import { renderItemForm } from './components/item-form';
 import { renderSettings } from './components/settings';
 
 // --- Escape HTML to prevent XSS ---
@@ -91,16 +91,16 @@ function render(): void {
       renderUnlock(app);
       break;
     case 'list':
-      renderEntryList(app);
+      renderItemList(app);
       break;
     case 'detail':
-      renderEntryDetail(app);
+      renderItemDetail(app);
       break;
     case 'add':
-      renderEntryForm(app, 'add');
+      renderItemForm(app, 'add');
       break;
     case 'edit':
-      renderEntryForm(app, 'edit');
+      renderItemForm(app, 'edit');
       break;
     case 'settings':
       renderSettings(app);