diff --git a/components/CollectionSelectionModal.js b/components/CollectionSelectionModal.js
index 92a0109..b90c967 100644
--- a/components/CollectionSelectionModal.js
+++ b/components/CollectionSelectionModal.js
@@ -133,7 +133,7 @@ export default function CollectionSelectionModal({
         <div className="p-6 border-b border-gray-200 dark:border-gray-700">
           <div className="flex items-center justify-between mb-4">
             <h2 className="text-2xl font-bold text-gray-900 dark:text-white">
-              {VOCAB.ADD_TO_LIST}s
+              {VOCAB.ADD_TO_LISTS}
             </h2>
             <button
               onClick={onClose}
diff --git a/components/Layout.js b/components/Layout.js
index 99d73f4..b15d357 100644
--- a/components/Layout.js
+++ b/components/Layout.js
@@ -791,7 +791,7 @@ export default function Layout({ children, user = null, showSearch = false }) {
                 <div className="relative">
                   <input
                     type="text"
-                    placeholder="Search cards, decks, or collections..."
+                    placeholder="Search cards, decks, or lists..."
                     className="search-bar pr-12"
                     value={searchQuery}
                     onChange={(e) => setSearchQuery(e.target.value)}
diff --git a/components/LoginCTA.js b/components/LoginCTA.js
index 7d19620..e97a57b 100644
--- a/components/LoginCTA.js
+++ b/components/LoginCTA.js
@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-export default function LoginCTA({ message = "Sign up to create your own collections and more!" }) {
+export default function LoginCTA({ message = 'Sign up to create your own lists and more!' }) {
   return (
     <div className="fixed bottom-6 right-6 z-50">
       <div 
diff --git a/components/ScannerDestinationPicker.js b/components/ScannerDestinationPicker.js
index 1540098..0d5ece5 100644
--- a/components/ScannerDestinationPicker.js
+++ b/components/ScannerDestinationPicker.js
@@ -202,7 +202,7 @@ export default function ScannerDestinationPicker({
 
       {destination?.type === 'collection' && filteredCollections.length === 0 && (
         <p className="mt-3 text-sm" style={{ color: 'var(--text-secondary)' }}>
-          No collections match this game filter.
+          No lists match this game filter.
         </p>
       )}
 
diff --git a/components/ShareModal.js b/components/ShareModal.js
index 3d6c874..81749cc 100644
--- a/components/ShareModal.js
+++ b/components/ShareModal.js
@@ -113,7 +113,7 @@ export default function ShareModal({
 
   const handleSocialShare = (platform) => {
     const url = window.location.href;
-    const title = `Check out this collection on Deck Hearth`;
+    const title = 'Check out this list on Deck Hearth';
     
     const shareUrls = {
       twitter: `https://twitter.com/intent/tweet?url=${encodeURIComponent(url)}&text=${encodeURIComponent(title)}`,
@@ -176,7 +176,7 @@ export default function ShareModal({
                   </button>
                 </div>
                 <p className="text-sm text-gray-500 mt-1">
-                  This collection will be available in the community.
+                  This list will be available in the community.
                 </p>
               </div>
             </div>
@@ -244,7 +244,7 @@ export default function ShareModal({
           {/* Current Permissions */}
           <div className="mb-6">
             <p className="text-sm text-gray-700 mb-3">
-              Only those invited can view or collaborate on this collection.
+              Only those invited can view or collaborate on this list.
             </p>
             
             <div className="space-y-2">
diff --git a/lib/collection-vocabulary.js b/lib/collection-vocabulary.js
index 2875e36..5eebc91 100644
--- a/lib/collection-vocabulary.js
+++ b/lib/collection-vocabulary.js
@@ -13,6 +13,7 @@ export const VOCAB = {
   ADD_TO_MY_COLLECTION: 'Add to My Collection',
   REMOVE_FROM_MY_COLLECTION: 'Remove from My Collection',
   ADD_TO_LIST: 'Add to List',
+  ADD_TO_LISTS: 'Add to Lists',
   SYNCED_BINDER: 'Synced binder',
   SYSTEM_COLLECTION_SYNC_HINT: 'Automatically syncs with My Collection',
 };
diff --git a/pages/card/[id].js b/pages/card/[id].js
index b9099c3..65ee3c9 100644
--- a/pages/card/[id].js
+++ b/pages/card/[id].js
@@ -5,7 +5,7 @@ import { useAuth } from '../../lib/use-auth';
 import CollectionSelectionModal from '../../components/CollectionSelectionModal';
 import { ManaCost, ColorIdentity, AdvancedManaCost } from '../../components/ManaSymbols';
 import ManaSymbolSettings from '../../components/ManaSymbolSettings';
-import { VOCAB } from '../../lib/collection-vocabulary.js';
+import { VOCAB, collectionDisplayName } from '../../lib/collection-vocabulary.js';
 
 export default function CardDetail() {
   const router = useRouter();
@@ -542,7 +542,7 @@ export default function CardDetail() {
                     {cardCollections.map(collection => (
                       <div key={collection.id} className="flex items-center gap-2 text-sm">
                         <span>📁</span>
-                        <span>{collection.name}</span>
+                        <span>{collectionDisplayName(collection)}</span>
                       </div>
                     ))}
                     {cardDecks.map(deck => (
diff --git a/pages/collection/[identifier].js b/pages/collection/[identifier].js
index 05f548d..e79f9c7 100644
--- a/pages/collection/[identifier].js
+++ b/pages/collection/[identifier].js
@@ -178,7 +178,7 @@ export default function CollectionView() {
         setShowEditModal(false);
       } else {
         const error = await response.json();
-        alert(error.error || 'Failed to update collection');
+        alert(error.error || 'Failed to update list');
       }
     } catch (error) {
       console.error('Error updating collection:', error);
@@ -199,7 +199,7 @@ export default function CollectionView() {
         router.push('/collections');
       } else {
         const error = await response.json();
-        alert(error.error || 'Failed to delete collection');
+        alert(error.error || 'Failed to delete list');
       }
     } catch (error) {
       console.error('Error deleting collection:', error);
@@ -907,7 +907,7 @@ export default function CollectionView() {
                     className="input-field w-full"
                     value={editForm.name}
                     onChange={(e) => setEditForm({...editForm, name: e.target.value})}
-                    placeholder="Enter collection name"
+                    placeholder="Enter list name"
                   />
                 </div>
                 <div>
@@ -919,7 +919,7 @@ export default function CollectionView() {
                     rows="3"
                     value={editForm.description}
                     onChange={(e) => setEditForm({...editForm, description: e.target.value})}
-                    placeholder="Describe your collection"
+                    placeholder="Describe your list"
                   />
                 </div>
                 <div>
@@ -1038,7 +1038,7 @@ export default function CollectionView() {
 
       {/* Show login CTA for non-authenticated users */}
       {!user && collection?.isPublic && (
-        <LoginCTA message="Sign up to create your own collections and collaborate with others!" />
+        <LoginCTA message="Sign up to create your own lists and collaborate with others!" />
       )}
     </Layout>
   );
diff --git a/pages/community/collections.js b/pages/community/collections.js
index 6026ef0..b45f739 100644
--- a/pages/community/collections.js
+++ b/pages/community/collections.js
@@ -4,6 +4,7 @@ import Link from 'next/link';
 import Layout from '../../components/Layout';
 import PermissionIndicator from '../../components/PermissionIndicator';
 import { useAuth } from '../../lib/use-auth';
+import { VOCAB } from '../../lib/collection-vocabulary.js';
 
 export default function CommunityCollections() {
   const router = useRouter();
@@ -201,7 +202,7 @@ export default function CommunityCollections() {
               Community Lists
             </h1>
             <p className="mt-2" style={{ color: 'var(--text-secondary)' }}>
-              Discover public collections shared by the community
+              Discover public lists shared by the community
             </p>
           </div>
         </div>
@@ -211,7 +212,7 @@ export default function CommunityCollections() {
           <div className="flex-1 max-w-md">
             <input
               type="text"
-              placeholder="Search collections..."
+              placeholder="Search lists..."
               className="input-field w-full"
               value={searchQuery}
               onChange={(e) => setSearchQuery(e.target.value)}
@@ -239,12 +240,12 @@ export default function CommunityCollections() {
           <div className="text-center py-12">
             <div className="text-6xl mb-4">🌍</div>
             <h3 className="text-xl font-semibold mb-2" style={{ color: 'var(--text-primary)' }}>
-              {searchQuery ? 'No collections found' : 'No public collections yet'}
+              {searchQuery ? 'No lists found' : 'No public lists yet'}
             </h3>
             <p className="text-sm mb-6" style={{ color: 'var(--text-secondary)' }}>
               {searchQuery 
                 ? 'Try adjusting your search terms'
-                : 'Be the first to share a public collection with the community!'
+                : 'Be the first to share a public list with the community!'
               }
             </p>
             {!searchQuery && (
diff --git a/pages/index.js b/pages/index.js
index 5388c54..c2f0f9f 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -223,7 +223,7 @@ export default function Home() {
                   </div>
                   <h3 className="text-xl font-bold mb-2 gradient-text-flame">{collection.name}</h3>
                   <p className="text-sm mb-4 line-clamp-2" style={{ color: 'var(--text-secondary)' }}>
-                    {collection.description || 'A carefully curated collection'}
+                    {collection.description || 'A carefully curated list'}
                   </p>
                   <div className="flex justify-between items-center">
                     <span className="text-sm font-medium" style={{ color: 'var(--text-primary)' }}>
diff --git a/pages/invite/accept.js b/pages/invite/accept.js
index 6644a3d..61e062d 100644
--- a/pages/invite/accept.js
+++ b/pages/invite/accept.js
@@ -69,7 +69,7 @@ export default function AcceptInvite() {
                 Invitation Accepted!
               </h2>
               <p className="mb-6" style={{ color: 'var(--text-secondary)' }}>
-                You now have access to the collection "{result.collection.name}".
+                You now have access to the list "{result.collection.name}".
               </p>
               <div className="space-y-3">
                 <button
diff --git a/pages/invite/decline.js b/pages/invite/decline.js
index ef56cc8..2690595 100644
--- a/pages/invite/decline.js
+++ b/pages/invite/decline.js
@@ -69,8 +69,8 @@ export default function DeclineInvite() {
                 Invitation Declined
               </h2>
               <p className="mb-6" style={{ color: 'var(--text-secondary)' }}>
-                You have declined the invitation to "{result.collection.name}". 
-                You can always ask the collection owner for another invitation if you change your mind.
+                You have declined the invitation to "{result.collection.name}".
+                You can always ask the list owner for another invitation if you change your mind.
               </p>
               <div className="space-y-3">
                 <button
diff --git a/pages/my-cards.js b/pages/my-cards.js
index 1f9cfc7..9bc9b24 100644
--- a/pages/my-cards.js
+++ b/pages/my-cards.js
@@ -435,7 +435,7 @@ export default function MyCards() {
             </div>
             <h3 className="text-lg font-semibold mb-2" style={{ color: 'var(--text-primary)' }}>No cards in {VOCAB.MY_COLLECTION}</h3>
             <p className="mb-4" style={{ color: 'var(--text-secondary)' }}>
-              {searchQuery ? 'Try adjusting your search filters' : 'Start building your collection by browsing available cards'}
+              {searchQuery ? 'Try adjusting your search filters' : `Start adding cards to ${VOCAB.MY_COLLECTION} by browsing available cards`}
             </p>
             <Link href="/cards">
               <button className="px-6 py-3 font-medium rounded-xl transition-all duration-200 hover:opacity-90" style={{ backgroundColor: 'var(--accent-ember)', color: 'white' }}>
diff --git a/pages/scanner.js b/pages/scanner.js
index fc66c9a..3ba5787 100644
--- a/pages/scanner.js
+++ b/pages/scanner.js
@@ -770,15 +770,15 @@ export default function Scanner() {
               aria-labelledby="create-collection-title"
             >
               <h3 id="create-collection-title" className="text-lg font-semibold mb-4" style={{ color: 'var(--text-primary)' }}>
-                Create New Collection
+                Create New List
               </h3>
               <label htmlFor="create-collection-name" className="sr-only">
-                Collection name
+                List name
               </label>
               <input
                 id="create-collection-name"
                 type="text"
-                placeholder="Collection name..."
+                placeholder="List name..."
                 value={newCollectionName}
                 onChange={(e) => setNewCollectionName(e.target.value)}
                 className="w-full px-4 py-2 rounded-lg border mb-4"
diff --git a/pages/settings.js b/pages/settings.js
index 5869f67..031697c 100644
--- a/pages/settings.js
+++ b/pages/settings.js
@@ -156,7 +156,7 @@ export default function Settings() {
 
   const handleDeleteAccount = async () => {
     const confirmed = window.confirm(
-      'Are you sure you want to delete your account? This action cannot be undone and will permanently delete all your cards, collections, and decks.'
+      'Are you sure you want to delete your account? This action cannot be undone and will permanently delete all your cards, lists, and decks.'
     );
 
     if (!confirmed) return;
@@ -316,7 +316,7 @@ export default function Settings() {
                     {/* Collection Visibility */}
                     <div>
                       <label className="block text-sm font-medium mb-2" style={{ color: 'var(--text-primary)' }}>
-                        Default Collection Visibility
+                        Default List Visibility
                       </label>
                       <select
                         value={settings.collection_visibility}
@@ -328,7 +328,7 @@ export default function Settings() {
                         <option value="unlisted">Unlisted</option>
                       </select>
                       <p className="text-xs mt-1" style={{ color: 'var(--text-secondary)' }}>
-                        Controls who can see your new collections by default
+                        Controls who can see your new lists by default
                       </p>
                     </div>
 
@@ -546,7 +546,7 @@ export default function Settings() {
                           Email Notifications
                         </p>
                         <p className="text-sm" style={{ color: 'var(--text-secondary)' }}>
-                          Receive notifications about your collections and cards
+                          Receive notifications about your lists and cards
                         </p>
                       </div>
                       <button