diff --git a/Tests/Parser/Client/fixtures/library.yml b/Tests/Parser/Client/fixtures/library.yml
index 2daddfec75..ef893586a2 100644
--- a/Tests/Parser/Client/fixtures/library.yml
+++ b/Tests/Parser/Client/fixtures/library.yml
@@ -833,3 +833,45 @@
     type: library
     name: nscurl
     version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.22F76 (iPad; U; CPU OS 18_5 like Mac OS X; en_us)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.9A405 (iPod; U; CPU OS 5_0_1 like Mac OS X; en_us)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.19H218 (iPod touch; U; CPU OS 15_7_2 like Mac OS X; en_us)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.18A347e (Macintosh; U; Intel Mac OS X 10_14; en_us)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.18G82 (iPhone; U; CPU OS 14_7_1 like Mac OS X; es_xl)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.15F80 (HomePod; U; CPU OS 11_4 like Mac OS X; fr_fr)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
+-
+  user_agent: AppleCoreMedia/1.0.0.17K449 (Apple TV; U; CPU OS 13_3 like Mac OS X; en_us)
+  client:
+    type: library
+    name: Apple Core Media
+    version: ""
diff --git a/Tests/fixtures/smart_speaker.yml b/Tests/fixtures/smart_speaker.yml
index 7ebcb15b08..4f9dcf5044 100644
--- a/Tests/fixtures/smart_speaker.yml
+++ b/Tests/fixtures/smart_speaker.yml
@@ -7,7 +7,7 @@
     platform: ""
   client:
     type: library
-    name: iOS Application
+    name: Apple Core Media
     version: ""
   device:
     type: smart speaker
diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml
index 9f0a96ccf7..0159f23b07 100644
--- a/Tests/fixtures/tv.yml
+++ b/Tests/fixtures/tv.yml
@@ -1136,7 +1136,7 @@
     platform: ARM
   client:
     type: library
-    name: iOS Application
+    name: Apple Core Media
     version: ""
   device:
     type: tv
@@ -6601,7 +6601,7 @@
     platform: ARM
   client:
     type: library
-    name: iOS Application
+    name: Apple Core Media
     version: ""
   device:
     type: tv
@@ -6617,7 +6617,7 @@
     platform: ARM
   client:
     type: library
-    name: iOS Application
+    name: Apple Core Media
     version: ""
   device:
     type: tv
diff --git a/Tests/fixtures/wearable.yml b/Tests/fixtures/wearable.yml
index dfd3983022..3e9d8c89a3 100644
--- a/Tests/fixtures/wearable.yml
+++ b/Tests/fixtures/wearable.yml
@@ -1274,7 +1274,7 @@
     platform: ""
   client:
     type: library
-    name: iOS Application
+    name: Apple Core Media
     version: ""
   device:
     type: wearable
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
index 8858efe53e..0b3c9929a6 100644
--- a/regexes/client/browsers.yml
+++ b/regexes/client/browsers.yml
@@ -3576,7 +3576,7 @@
   version: '$1'
   engine:
     default: 'WebKit'
-- regex: '(?!^AppleCoreMedia/1\.0\.0)(?:iPod|(?<!Apple TV; U; CPU )iPhone|iPad)'
+- regex: '^(?!AppleCoreMedia).*?\b(?<!Apple-)(?:iPod|(?<!Apple TV; U; CPU )iPhone|iPad)'
   name: 'Mobile Safari'
   version: ''
   engine:
@@ -3591,7 +3591,7 @@
   version: '$1'
   engine:
     default: 'WebKit'
-- regex: 'Macintosh'
+- regex: '^(?!AppleCoreMedia).*?\bMacintosh'
   name: 'Safari'
   version: ''
   engine:
diff --git a/regexes/client/libraries.yml b/regexes/client/libraries.yml
index 4aa32c5cad..273cfacbae 100644
--- a/regexes/client/libraries.yml
+++ b/regexes/client/libraries.yml
@@ -551,8 +551,8 @@
 # agent will default to this, always with 1.0.0 version.
 # there was a time when (not even that long ago) apple didn't let you set
 # a user agent so a ton of random applications still identify themselves this way.
-- regex: 'AppleCoreMedia/1\.0\.0'
-  name: 'iOS Application'
+- regex: 'AppleCoreMedia'
+  name: 'Apple Core Media'
   version: ''
 
 - regex: 'cpp-httplib(?:/(\d+[.\d]+))?'