diff --git a/README.md b/README.md
index a337832..75e91be 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,9 @@ AppleProductName().lookup('iPad13,10')
 // iPad Pro 5th Gen (12.9 inch, WiFi+Cellular)
 ```
 
-## Sources
+## Source
 
-- iOS: [fieldnotescommunities/ios-device-identifiers](https://github.com/fieldnotescommunities/ios-device-identifiers)
-- macOS: [kyle-seongwoo-jun/mac-device-identifiers](https://github.com/kyle-seongwoo-jun/mac-device-identifiers)
+- [kyle-seongwoo-jun/apple-device-identifiers](https://github.com/kyle-seongwoo-jun/apple-device-identifiers)
 
 [ios image]: https://raw.githubusercontent.com/kyle-seongwoo-jun/flutter_apple_product_name/main/images/ios.png
 [macos image]: https://raw.githubusercontent.com/kyle-seongwoo-jun/flutter_apple_product_name/main/images/macos.png
diff --git a/gen/main.dart b/gen/main.dart
index ce56cbf..bde9993 100644
--- a/gen/main.dart
+++ b/gen/main.dart
@@ -7,10 +7,14 @@ void main() async {
   print('Generating...');
 
   final urls = [
-    // iPhone, iPod, iPad, Apple Watch
-    'https://raw.githubusercontent.com/kyle-seongwoo-jun/ios-device-identifiers/master/ios-device-identifiers.json',
+    // iPhone, iPad, iPod
+    'https://raw.githubusercontent.com/kyle-seongwoo-jun/apple-device-identifiers/main/ios-device-identifiers.json',
+    // Apple Watch
+    'https://raw.githubusercontent.com/kyle-seongwoo-jun/apple-device-identifiers/main/watchos-device-identifiers.json',
+    // Apple TV
+    'https://raw.githubusercontent.com/kyle-seongwoo-jun/apple-device-identifiers/main/tvos-device-identifiers.json',
     // iMac, MacBook, MacBook Air, MacBook Pro, Mac mini, Mac Pro
-    'https://raw.githubusercontent.com/kyle-seongwoo-jun/mac-device-identifiers/main/mac-device-identifiers-unique.json',
+    'https://raw.githubusercontent.com/kyle-seongwoo-jun/apple-device-identifiers/main/mac-device-identifiers-unique.json',
   ];
 
   final responses =
diff --git a/lib/apple_product_name.g.dart b/lib/apple_product_name.g.dart
index 2867fd5..d5f4601 100644
--- a/lib/apple_product_name.g.dart
+++ b/lib/apple_product_name.g.dart
@@ -1,45 +1,45 @@
 part of 'apple_product_name.dart';
 
 const _map = {
-  "i386": "iOS Simulator 32-bit",
-  "x86_64": "iOS Simulator 64-bit",
-  "arm64": "iPhone Simulator ARM",
-  "iPhone1,1": "iPhone 1st Gen",
-  "iPhone1,2": "iPhone 3G 2nd Gen",
-  "iPhone2,1": "iPhone 3GS 3rd Gen",
+  "i386": "iPhone Simulator",
+  "x86_64": "iPhone Simulator",
+  "arm64": "iPhone Simulator",
+  "iPhone1,1": "iPhone",
+  "iPhone1,2": "iPhone 3G",
+  "iPhone2,1": "iPhone 3GS",
   "iPhone3,1": "iPhone 4",
-  "iPhone3,2": "iPhone 4 (GSM) Rev A",
-  "iPhone3,3": "iPhone 4 (CDMA)",
+  "iPhone3,2": "iPhone 4",
+  "iPhone3,3": "iPhone 4",
   "iPhone4,1": "iPhone 4s",
-  "iPhone5,1": "iPhone 5 (GSM)",
-  "iPhone5,2": "iPhone 5 (CDMA+LTE)",
-  "iPhone5,3": "iPhone 5c (GSM)",
-  "iPhone5,4": "iPhone 5c (Global)",
-  "iPhone6,1": "iPhone 5s (GSM)",
-  "iPhone6,2": "iPhone 5s (Global)",
+  "iPhone5,1": "iPhone 5",
+  "iPhone5,2": "iPhone 5",
+  "iPhone5,3": "iPhone 5c",
+  "iPhone5,4": "iPhone 5c",
+  "iPhone6,1": "iPhone 5s",
+  "iPhone6,2": "iPhone 5s",
   "iPhone7,1": "iPhone 6 Plus",
   "iPhone7,2": "iPhone 6",
   "iPhone8,1": "iPhone 6s",
   "iPhone8,2": "iPhone 6s Plus",
-  "iPhone8,4": "iPhone SE",
+  "iPhone8,4": "iPhone SE (1st generation)",
   "iPhone9,1": "iPhone 7",
   "iPhone9,2": "iPhone 7 Plus",
-  "iPhone9,3": "iPhone 7 (no CDMA)",
-  "iPhone9,4": "iPhone 7 Plus (no CDMA)",
+  "iPhone9,3": "iPhone 7",
+  "iPhone9,4": "iPhone 7 Plus",
   "iPhone10,1": "iPhone 8",
   "iPhone10,2": "iPhone 8 Plus",
   "iPhone10,3": "iPhone X",
-  "iPhone10,4": "iPhone 8 (no CDMA)",
-  "iPhone10,5": "iPhone 8 Plus (no CDMA)",
-  "iPhone10,6": "iPhone X (no CDMA)",
+  "iPhone10,4": "iPhone 8",
+  "iPhone10,5": "iPhone 8 Plus",
+  "iPhone10,6": "iPhone X",
   "iPhone11,2": "iPhone XS",
-  "iPhone11,4": "iPhone XS Max (China)",
+  "iPhone11,4": "iPhone XS Max",
   "iPhone11,6": "iPhone XS Max",
   "iPhone11,8": "iPhone XR",
   "iPhone12,1": "iPhone 11",
   "iPhone12,3": "iPhone 11 Pro",
   "iPhone12,5": "iPhone 11 Pro Max",
-  "iPhone12,8": "iPhone SE 2nd Gen",
+  "iPhone12,8": "iPhone SE (2nd generation)",
   "iPhone13,1": "iPhone 12 mini",
   "iPhone13,2": "iPhone 12",
   "iPhone13,3": "iPhone 12 Pro",
@@ -48,139 +48,147 @@ const _map = {
   "iPhone14,3": "iPhone 13 Pro Max",
   "iPhone14,4": "iPhone 13 mini",
   "iPhone14,5": "iPhone 13",
-  "iPhone14,6": "iPhone SE 3rd Gen",
+  "iPhone14,6": "iPhone SE (3rd generation)",
   "iPhone14,7": "iPhone 14",
   "iPhone14,8": "iPhone 14 Plus",
   "iPhone15,2": "iPhone 14 Pro",
   "iPhone15,3": "iPhone 14 Pro Max",
-  "iPod1,1": "iPod 1st Gen",
-  "iPod2,1": "iPod 2nd Gen",
-  "iPod3,1": "iPod 3rd Gen",
-  "iPod4,1": "iPod 4th Gen",
-  "iPod5,1": "iPod 5th Gen",
-  "iPod7,1": "iPod 6th Gen",
-  "iPod9,1": "iPod 7th Gen",
-  "iPad1,1": "iPad 1st Gen (WiFi)",
-  "iPad1,2": "iPad 1st Gen (3G)",
-  "iPad2,1": "iPad 2nd Gen (WiFi)",
-  "iPad2,2": "iPad 2nd Gen (GSM)",
-  "iPad2,3": "iPad 2nd Gen (CDMA)",
-  "iPad2,4": "iPad 2nd Gen New Revision",
-  "iPad2,5": "iPad mini 1st Gen (WiFi)",
-  "iPad2,6": "iPad mini 1st Gen (GSM+LTE)",
-  "iPad2,7": "iPad mini 1st Gen (CDMA+LTE)",
-  "iPad3,1": "iPad 3rd Gen (WiFi)",
-  "iPad3,2": "iPad 3rd Gen (CDMA)",
-  "iPad3,3": "iPad 3rd Gen (GSM)",
-  "iPad3,4": "iPad 4th Gen (WiFi)",
-  "iPad3,5": "iPad 4th Gen (GSM+LTE)",
-  "iPad3,6": "iPad 4th Gen (CDMA+LTE)",
-  "iPad4,1": "iPad Air 1st Gen (WiFi)",
-  "iPad4,2": "iPad Air 1st Gen (GSM+CDMA)",
-  "iPad4,3": "iPad Air 1st Gen (China)",
-  "iPad4,4": "iPad mini 2nd Gen (WiFi)",
-  "iPad4,5": "iPad mini 2nd Gen (WiFi+Cellular)",
-  "iPad4,6": "iPad mini 2nd Gen (China)",
-  "iPad4,7": "iPad mini 3rd Gen (WiFi)",
-  "iPad4,8": "iPad mini 3rd Gen (WiFi+Cellular)",
-  "iPad4,9": "iPad mini 3rd Gen (China)",
-  "iPad5,1": "iPad mini 4th Gen (WiFi)",
-  "iPad5,2": "iPad mini 4th Gen (WiFi+Cellular)",
-  "iPad5,3": "iPad Air 2 (WiFi)",
-  "iPad5,4": "iPad Air 2 (WiFi+Cellular)",
-  "iPad6,3": "iPad Pro 1st Gen (9.7 inch, WiFi)",
-  "iPad6,4": "iPad Pro 1st Gen (9.7 inch, WiFi+Cellular)",
-  "iPad6,7": "iPad Pro 1st Gen (12.9 inch, WiFi)",
-  "iPad6,8": "iPad Pro 1st Gen (12.9 inch, WiFi+Cellular)",
-  "iPad6,11": "iPad 5th Gen (WiFi)",
-  "iPad6,12": "iPad 5th Gen (WiFi+Cellular)",
-  "iPad7,1": "iPad Pro 2nd Gen (12.9 inch, WiFi)",
-  "iPad7,2": "iPad Pro 2nd Gen (12.9 inch, WiFi+Cellular)",
-  "iPad7,3": "iPad Pro 2nd Gen (10.5 inch, WiFi)",
-  "iPad7,4": "iPad Pro 2nd Gen (10.5 inch, WiFi+Cellular)",
-  "iPad7,5": "iPad 6th Gen (WiFi)",
-  "iPad7,6": "iPad 6th Gen (WiFi+Cellular)",
-  "iPad7,11": "iPad 7th Gen (WiFi)",
-  "iPad7,12": "iPad 7th Gen (WiFi+Cellular)",
-  "iPad8,1": "iPad Pro 3rd Gen (11 inch, WiFi)",
-  "iPad8,2": "iPad Pro 3rd Gen (11 inch, WiFi, 1TB)",
-  "iPad8,3": "iPad Pro 3rd Gen (11 inch, WiFi+Cellular)",
-  "iPad8,4": "iPad Pro 3rd Gen (11 inch, WiFi+Cellular, 1TB)",
-  "iPad8,5": "iPad Pro 3rd Gen (12.9 inch, WiFi)",
-  "iPad8,6": "iPad Pro 3rd Gen (12.9 inch, WiFi, 1TB)",
-  "iPad8,7": "iPad Pro 3rd Gen (12.9 inch, WiFi+Cellular)",
-  "iPad8,8": "iPad Pro 3rd Gen (12.9 inch, WiFi+Cellular, 1TB)",
-  "iPad8,9": "iPad Pro 4th Gen (11 inch, WiFi)",
-  "iPad8,10": "iPad Pro 4th Gen (11 inch, WiFi+Cellular)",
-  "iPad8,11": "iPad Pro 4th Gen (12.9 inch, WiFi)",
-  "iPad8,12": "iPad Pro 4th Gen (12.9 inch, WiFi+Cellular)",
-  "iPad11,1": "iPad mini 5th Gen (WiFi)",
-  "iPad11,2": "iPad mini 5th Gen (WiFi+Cellular)",
-  "iPad11,3": "iPad Air 3rd Gen (WiFi)",
-  "iPad11,4": "iPad Air 3rd Gen (WiFi+Cellular)",
-  "iPad11,6": "iPad 8th Gen (WiFi)",
-  "iPad11,7": "iPad 8th Gen (WiFi+Cellular)",
-  "iPad12,1": "iPad 9th Gen (WiFi)",
-  "iPad12,2": "iPad 9th Gen (WiFi+Cellular)",
-  "iPad13,1": "iPad Air 4th Gen (WiFi)",
-  "iPad13,2": "iPad Air 4th Gen (WiFi+Cellular)",
-  "iPad13,4": "iPad Pro 3rd Gen (11 inch, WiFi)",
-  "iPad13,5": "iPad Pro 3rd Gen (11 inch, WiFi)",
-  "iPad13,6": "iPad Pro 3rd Gen (11 inch, WiFi+Cellular)",
-  "iPad13,7": "iPad Pro 3rd Gen (11 inch, WiFi+Cellular)",
-  "iPad13,8": "iPad Pro 5th Gen (12.9 inch, WiFi)",
-  "iPad13,9": "iPad Pro 5th Gen (12.9 inch, WiFi)",
-  "iPad13,10": "iPad Pro 5th Gen (12.9 inch, WiFi+Cellular)",
-  "iPad13,11": "iPad Pro 5th Gen (12.9 inch, WiFi+Cellular)",
-  "iPad13,16": "iPad Air 5th Gen (WiFi)",
-  "iPad13,17": "iPad Air 5th Gen (WiFi+Cellular)",
-  "iPad13,18": "iPad 10th Gen",
-  "iPad13,19": "iPad 10th Gen",
-  "iPad14,1": "iPad mini 6th Gen (WiFi)",
-  "iPad14,2": "iPad mini 6th Gen (WiFi+Cellular)",
-  "iPad14,3": "iPad Pro 4th Gen (11 inch)",
-  "iPad14,4": "iPad Pro 4th Gen (11 inch)",
-  "iPad14,5": "iPad Pro 6th Gen (12.9 inch)",
-  "iPad14,6": "iPad Pro 6th Gen (12.9 inch)",
-  "Watch1,1": "Apple Watch 1st Gen 38mm case",
-  "Watch1,2": "Apple Watch 1st Gen 42mm case",
-  "Watch2,6": "Apple Watch Series 1 38mm case",
-  "Watch2,7": "Apple Watch Series 1 42mm case",
-  "Watch2,3": "Apple Watch Series 2 38mm case",
-  "Watch2,4": "Apple Watch Series 2 42mm case",
-  "Watch3,1": "Apple Watch Series 3 38mm case (GPS+Cellular)",
-  "Watch3,2": "Apple Watch Series 3 42mm case (GPS+Cellular)",
-  "Watch3,3": "Apple Watch Series 3 38mm case (GPS)",
-  "Watch3,4": "Apple Watch Series 3 42mm case (GPS)",
-  "Watch4,1": "Apple Watch Series 4 40mm case (GPS)",
-  "Watch4,2": "Apple Watch Series 4 44mm case (GPS)",
-  "Watch4,3": "Apple Watch Series 4 40mm case (GPS+Cellular)",
-  "Watch4,4": "Apple Watch Series 4 44mm case (GPS+Cellular)",
-  "Watch5,1": "Apple Watch Series 5 40mm case (GPS)",
-  "Watch5,2": "Apple Watch Series 5 44mm case (GPS)",
-  "Watch5,3": "Apple Watch Series 5 40mm case (GPS+Cellular)",
-  "Watch5,4": "Apple Watch Series 5 44mm case (GPS+Cellular)",
-  "Watch5,9": "Apple Watch SE 40mm case (GPS)",
-  "Watch5,10": "Apple Watch SE 44mm case (GPS)",
-  "Watch5,11": "Apple Watch SE 40mm case (GPS+Cellular)",
-  "Watch5,12": "Apple Watch SE 44mm case (GPS+Cellular)",
-  "Watch6,1": "Apple Watch Series 6 40mm case (GPS)",
-  "Watch6,2": "Apple Watch Series 6 44mm case (GPS)",
-  "Watch6,3": "Apple Watch Series 6 40mm case (GPS+Cellular)",
-  "Watch6,4": "Apple Watch Series 6 44mm case (GPS+Cellular)",
-  "Watch6,6": "Apple Watch Series 7 41mm case (GPS)",
-  "Watch6,7": "Apple Watch Series 7 45mm case (GPS)",
-  "Watch6,8": "Apple Watch Series 7 41mm case (GPS+Cellular)",
-  "Watch6,9": "Apple Watch Series 7 45mm case (GPS+Cellular)",
-  "Watch6,10": "Apple Watch SE 40mm case (GPS)",
-  "Watch6,11": "Apple Watch SE 44mm case (GPS)",
-  "Watch6,12": "Apple Watch SE 40mm case (GPS+Cellular)",
-  "Watch6,13": "Apple Watch SE 44mm case (GPS+Cellular)",
-  "Watch6,14": "Apple Watch Series 8 41mm case (GPS)",
-  "Watch6,15": "Apple Watch Series 8 45mm case (GPS)",
-  "Watch6,16": "Apple Watch Series 8 41mm case (GPS+Cellular)",
-  "Watch6,17": "Apple Watch Series 8 45mm case (GPS+Cellular)",
+  "iPad1,1": "iPad",
+  "iPad1,2": "iPad",
+  "iPad2,1": "iPad 2",
+  "iPad2,2": "iPad 2",
+  "iPad2,3": "iPad 2",
+  "iPad2,4": "iPad 2",
+  "iPad2,5": "iPad mini",
+  "iPad2,6": "iPad mini",
+  "iPad2,7": "iPad mini",
+  "iPad3,1": "iPad (3rd generation)",
+  "iPad3,2": "iPad (3rd generation)",
+  "iPad3,3": "iPad (3rd generation)",
+  "iPad3,4": "iPad (4th generation)",
+  "iPad3,5": "iPad (4th generation)",
+  "iPad3,6": "iPad (4th generation)",
+  "iPad4,1": "iPad Air",
+  "iPad4,2": "iPad Air",
+  "iPad4,3": "iPad Air",
+  "iPad4,4": "iPad mini 2",
+  "iPad4,5": "iPad mini 2",
+  "iPad4,6": "iPad mini 2",
+  "iPad4,7": "iPad mini 3",
+  "iPad4,8": "iPad mini 3",
+  "iPad4,9": "iPad mini 3",
+  "iPad5,1": "iPad mini 4",
+  "iPad5,2": "iPad mini 4",
+  "iPad5,3": "iPad Air 2",
+  "iPad5,4": "iPad Air 2",
+  "iPad6,3": "iPad Pro (9.7-inch)",
+  "iPad6,4": "iPad Pro (9.7-inch)",
+  "iPad6,7": "iPad Pro (12.9-inch)",
+  "iPad6,8": "iPad Pro (12.9-inch)",
+  "iPad6,11": "iPad (5th generation)",
+  "iPad6,12": "iPad (5th generation)",
+  "iPad7,1": "iPad Pro (12.9-inch) (2nd generation)",
+  "iPad7,2": "iPad Pro (12.9-inch) (2nd generation)",
+  "iPad7,3": "iPad Pro (10.5-inch)",
+  "iPad7,4": "iPad Pro (10.5-inch)",
+  "iPad7,5": "iPad (6th generation)",
+  "iPad7,6": "iPad (6th generation)",
+  "iPad7,11": "iPad (7th generation)",
+  "iPad7,12": "iPad (7th generation)",
+  "iPad8,1": "iPad Pro (11-inch)",
+  "iPad8,2": "iPad Pro (11-inch)",
+  "iPad8,3": "iPad Pro (11-inch)",
+  "iPad8,4": "iPad Pro (11-inch)",
+  "iPad8,5": "iPad Pro (12.9-inch) (3rd generation)",
+  "iPad8,6": "iPad Pro (12.9-inch) (3rd generation)",
+  "iPad8,7": "iPad Pro (12.9-inch) (3rd generation)",
+  "iPad8,8": "iPad Pro (12.9-inch) (3rd generation)",
+  "iPad8,9": "iPad Pro (11-inch) (2nd generation)",
+  "iPad8,10": "iPad Pro (11-inch) (2nd generation)",
+  "iPad8,11": "iPad Pro (12.9-inch) (4th generation)",
+  "iPad8,12": "iPad Pro (12.9-inch) (4th generation)",
+  "iPad11,1": "iPad mini (5th generation)",
+  "iPad11,2": "iPad mini (5th generation)",
+  "iPad11,3": "iPad Air (3rd generation)",
+  "iPad11,4": "iPad Air (3rd generation)",
+  "iPad11,6": "iPad (8th generation)",
+  "iPad11,7": "iPad (8th generation)",
+  "iPad12,1": "iPad (9th generation)",
+  "iPad12,2": "iPad (9th generation)",
+  "iPad13,1": "iPad Air (4th generation)",
+  "iPad13,2": "iPad Air (4th generation)",
+  "iPad13,4": "iPad Pro (11-inch) (3rd generation)",
+  "iPad13,5": "iPad Pro (11-inch) (3rd generation)",
+  "iPad13,6": "iPad Pro (11-inch) (3rd generation)",
+  "iPad13,7": "iPad Pro (11-inch) (3rd generation)",
+  "iPad13,8": "iPad Pro (12.9-inch) (5th generation)",
+  "iPad13,9": "iPad Pro (12.9-inch) (5th generation)",
+  "iPad13,10": "iPad Pro (12.9-inch) (5th generation)",
+  "iPad13,11": "iPad Pro (12.9-inch) (5th generation)",
+  "iPad13,16": "iPad Air (5th generation)",
+  "iPad13,17": "iPad Air (5th generation)",
+  "iPad13,18": "iPad (10th generation)",
+  "iPad13,19": "iPad (10th generation)",
+  "iPad14,1": "iPad mini (6th generation)",
+  "iPad14,2": "iPad mini (6th generation)",
+  "iPad14,3": "iPad Pro (11-inch) (4th generation)",
+  "iPad14,4": "iPad Pro (11-inch) (4th generation)",
+  "iPad14,5": "iPad Pro (12.9-inch) (6th generation)",
+  "iPad14,6": "iPad Pro (12.9-inch) (6th generation)",
+  "iPod1,1": "iPod touch",
+  "iPod2,1": "iPod touch (2nd generation)",
+  "iPod3,1": "iPod touch (3rd generation)",
+  "iPod4,1": "iPod touch (4th generation)",
+  "iPod5,1": "iPod touch (5th generation)",
+  "iPod7,1": "iPod touch (6th generation)",
+  "iPod9,1": "iPod touch (7th generation)",
+  "Watch1,1": "Apple Watch (1st generation)",
+  "Watch1,2": "Apple Watch (1st generation)",
+  "Watch2,3": "Apple Watch Series 2",
+  "Watch2,4": "Apple Watch Series 2",
+  "Watch2,6": "Apple Watch Series 1",
+  "Watch2,7": "Apple Watch Series 1",
+  "Watch3,1": "Apple Watch Series 3 (GPS + Cellular)",
+  "Watch3,2": "Apple Watch Series 3 (GPS + Cellular)",
+  "Watch3,3": "Apple Watch Series 3 (GPS)",
+  "Watch3,4": "Apple Watch Series 3 (GPS)",
+  "Watch4,1": "Apple Watch Series 4 (GPS)",
+  "Watch4,2": "Apple Watch Series 4 (GPS)",
+  "Watch4,3": "Apple Watch Series 4 (GPS + Cellular)",
+  "Watch4,4": "Apple Watch Series 4 (GPS + Cellular)",
+  "Watch5,1": "Apple Watch Series 5 (GPS)",
+  "Watch5,2": "Apple Watch Series 5 (GPS)",
+  "Watch5,3": "Apple Watch Series 5 (GPS + Cellular)",
+  "Watch5,4": "Apple Watch Series 5 (GPS + Cellular)",
+  "Watch5,9": "Apple Watch SE (GPS)",
+  "Watch5,10": "Apple Watch SE (GPS)",
+  "Watch5,11": "Apple Watch SE (GPS + Cellular)",
+  "Watch5,12": "Apple Watch SE (GPS + Cellular)",
+  "Watch6,1": "Apple Watch Series 6 (GPS)",
+  "Watch6,2": "Apple Watch Series 6 (GPS)",
+  "Watch6,3": "Apple Watch Series 6 (GPS + Cellular)",
+  "Watch6,4": "Apple Watch Series 6 (GPS + Cellular)",
+  "Watch6,6": "Apple Watch Series 7 (GPS)",
+  "Watch6,7": "Apple Watch Series 7 (GPS)",
+  "Watch6,8": "Apple Watch Series 7 (GPS + Cellular)",
+  "Watch6,9": "Apple Watch Series 7 (GPS + Cellular)",
+  "Watch6,10": "Apple Watch SE (GPS)",
+  "Watch6,11": "Apple Watch SE (GPS)",
+  "Watch6,12": "Apple Watch SE (GPS + Cellular)",
+  "Watch6,13": "Apple Watch SE (GPS + Cellular)",
+  "Watch6,14": "Apple Watch Series 8 (GPS)",
+  "Watch6,15": "Apple Watch Series 8 (GPS)",
+  "Watch6,16": "Apple Watch Series 8 (GPS + Cellular)",
+  "Watch6,17": "Apple Watch Series 8 (GPS + Cellular)",
   "Watch6,18": "Apple Watch Ultra",
+  "AppleTV1,1": "Apple TV (1st generation)",
+  "AppleTV2,1": "Apple TV (2nd generation)",
+  "AppleTV3,1": "Apple TV (3rd generation)",
+  "AppleTV3,2": "Apple TV (3rd generation)",
+  "AppleTV5,3": "Apple TV HD",
+  "AppleTV6,2": "Apple TV 4K (1st generation)",
+  "AppleTV11,1": "Apple TV 4K (2nd generation)",
+  "AppleTV14,1": "Apple TV 4K (3rd generation)",
   "iMac9,1": "iMac (Early 2009)",
   "iMac10,1": "iMac (Late 2009)",
   "iMac11,2": "iMac (21.5-inch, Mid 2010)",
diff --git a/test/apple_product_name_test.dart b/test/apple_product_name_test.dart
index d31b8d9..cf857e8 100644
--- a/test/apple_product_name_test.dart
+++ b/test/apple_product_name_test.dart
@@ -5,7 +5,7 @@ void main() {
   test('lookup product name with machine id', () {
     expect(
       AppleProductName().lookup('x86_64'),
-      'iOS Simulator 64-bit',
+      'iPhone Simulator',
     );
     expect(
       AppleProductName().lookup('iPhone13,2'),
@@ -13,7 +13,7 @@ void main() {
     );
     expect(
       AppleProductName().lookup('iPad13,10'),
-      'iPad Pro 5th Gen (12.9 inch, WiFi+Cellular)',
+      'iPad Pro (12.9-inch) (5th generation)',
     );
     expect(
       AppleProductName().lookup('iMac21,1'),