diff --git a/README.md b/README.md
index b31088c..285952e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # car64
 
-car64 is a Flutter + Supabase Hot Wheels collector app with a fast scanning workflow, private photo storage, collaborative collections, and community-based catalog validation.
+car64 is a Flutter + Supabase die-cast collector app with a fast scanning workflow, private photo storage, collaborative collections, and community-based catalog validation.
 
 ## Core Features
 
diff --git a/lib/scanner_screen.dart b/lib/scanner_screen.dart
index fe18aa3..f8b55b6 100644
--- a/lib/scanner_screen.dart
+++ b/lib/scanner_screen.dart
@@ -9,7 +9,7 @@ import 'theme/app_colors.dart';
 import 'utils/error_utils.dart';
 import 'utils/scanner_utils.dart';
 
-/// Screen that uses the camera to scan text (OCR) from a Hot Wheels package
+/// Screen that uses the camera to scan text (OCR) from a die-cast package
 /// and extract the hw_id (e.g. "JKF21").
 ///
 /// The detected ID is returned via Navigator.pop(context, hwId).
@@ -174,7 +174,7 @@ class _ScannerScreenState extends State<ScannerScreen>
     });
   }
 
-  /// Capture a photo, run OCR, and look for a Hot Wheels ID.
+  /// Capture a photo, run OCR, and look for a die-cast model ID.
   Future<void> _captureAndScan() async {
     if (_isBusy || _cameraController == null || !_cameraController!.value.isInitialized) return;
     if (_cameraController!.value.isTakingPicture) return;
diff --git a/lib/screens/about_screen.dart b/lib/screens/about_screen.dart
index c58b73a..7dcaaf6 100644
--- a/lib/screens/about_screen.dart
+++ b/lib/screens/about_screen.dart
@@ -106,7 +106,7 @@ class _AboutScreenState extends State<AboutScreen> {
           const SizedBox(height: 8),
           Center(
             child: Text(
-              'Track and manage your Hot Wheels collection.',
+              'Track and manage your die-cast car collection.',
               style: theme.textTheme.bodyMedium?.copyWith(
                 color: AppColors.textHint,
               ),
diff --git a/lib/screens/collections_screen.dart b/lib/screens/collections_screen.dart
index cd0fc97..3bf5828 100644
--- a/lib/screens/collections_screen.dart
+++ b/lib/screens/collections_screen.dart
@@ -167,7 +167,7 @@ class CollectionsScreenState extends State<CollectionsScreen>
                 maxLength: 50,
                 decoration: const InputDecoration(
                   labelText: 'Name',
-                  hintText: 'e.g. Hot Wheels, Matchbox…',
+                  hintText: 'e.g. Die-Cast Cars, Matchbox…',
                 ),
                 validator: (value) {
                   final trimmed = value?.trim() ?? '';
diff --git a/lib/screens/garage_screen.dart b/lib/screens/garage_screen.dart
index 0924bd2..0059306 100644
--- a/lib/screens/garage_screen.dart
+++ b/lib/screens/garage_screen.dart
@@ -10,7 +10,7 @@ import '../theme/app_colors.dart';
 import '../utils/error_utils.dart';
 import '../widgets/car_card.dart';
 
-/// The "My Garage" screen — shows a collection's cars in a grid.
+/// The "My Garage" screen — shows a collection's die-cast cars in a grid.
 class GarageScreen extends StatefulWidget {
   final String collectionId;
   final String collectionName;
@@ -1348,7 +1348,7 @@ class _EmptyGarage extends StatelessWidget {
             Text(
               hasSearch
                   ? 'Try a different search term'
-                  : 'Scan your first Hot Wheels car to get started!',
+                  : 'Scan your first die-cast car to get started!',
               textAlign: TextAlign.center,
               style: const TextStyle(color: AppColors.textHint),
             ),
diff --git a/lib/screens/scan_tab.dart b/lib/screens/scan_tab.dart
index 416d6be..06cff02 100644
--- a/lib/screens/scan_tab.dart
+++ b/lib/screens/scan_tab.dart
@@ -116,7 +116,7 @@ class ScanTabState extends State<ScanTab> {
               ),
               const SizedBox(height: 28),
               const Text(
-                'Scan a Hot Wheels Car',
+                'Scan a Die-Cast Car',
                 style: TextStyle(fontSize: 22, fontWeight: FontWeight.w700),
               ),
               const SizedBox(height: 10),
diff --git a/lib/services/storage_service.dart b/lib/services/storage_service.dart
index c437afc..5814152 100644
--- a/lib/services/storage_service.dart
+++ b/lib/services/storage_service.dart
@@ -7,7 +7,7 @@ import '../main.dart';
 /// Handles uploading / deleting car images in Supabase Storage.
 ///
 /// Bucket: `car-images` (private)
-/// Path:   `{auth.uid()}/{hotwheels.id}.jpg`
+/// Path:   `{auth.uid()}/{entry.id}.jpg`
 class StorageService {
   StorageService._();
 
@@ -20,7 +20,7 @@ class StorageService {
   static const _maxSignedUrlCacheEntries = 500;
   static final Map<String, _SignedUrlCacheEntry> _signedUrlCache = {};
 
-  /// Upload a car image for a specific hotwheels entry.
+  /// Upload a car image for a specific garage entry.
   /// Returns the storage path on success (e.g. `uid/123.jpg`).
   static Future<String> uploadCarImage({
     required File file,
diff --git a/lib/widgets/car_card.dart b/lib/widgets/car_card.dart
index 62caed0..a01a0e7 100644
--- a/lib/widgets/car_card.dart
+++ b/lib/widgets/car_card.dart
@@ -3,7 +3,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import '../services/storage_service.dart';
 import '../theme/app_colors.dart';
 
-/// A styled card for displaying a single Hot Wheels car in the garage.
+/// A styled card for displaying a single die-cast car in the garage.
 class CarCard extends StatelessWidget {
   final String hwId;
   final String? name;