diff --git a/src/ua-parser.js b/src/ua-parser.js
index 25afb63..34cabc4 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -58,9 +58,7 @@
         SONY    = 'Sony',
         XIAOMI  = 'Xiaomi',
         ZEBRA   = 'Zebra',
-        FACEBOOK   = 'Facebook',
-        KAKAO   = 'Kakao',
-        NAVER   = 'Naver';
+        FACEBOOK   = 'Facebook';
 
     ///////////
     // Helper
@@ -226,10 +224,6 @@
             /\bopr\/([\w\.]+)/i                                                 // Opera Webkit
             ], [VERSION, [NAME, OPERA]], [
 
-            /Safari\/([-\w\.]+).+NAVER\((.*)\)/i,                               // Naver InApp for iOS
-            /whale\/([-\w\.]+).+NAVER\((.*)\)/i                                 // Naver InApp Android
-            ], [VERSION,[NAME, /(.+); (.+); [0-9]+;.+/i, NAVER+' $1 $2']], [
-
             // Mixed
             /(kindle)\/([\w\.]+)/i,                                             // Kindle
             /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i,      // Lunascape/Maxthon/Netfront/Jasmine/Blazer
@@ -239,7 +233,7 @@
             /(?:ms|\()(ie) ([\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based                                               // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
-            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
+            /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale(?!.+naver)|qqbrowserlite|qq|duckduckgo)\/([-\w\.]+)/i,
                                                                                 // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
             /(weibo)__([\d\.]+)/i                                               // Weibo
             ], [NAME, VERSION], [
@@ -290,6 +284,8 @@
             // WebView
             /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i       // Facebook App for iOS & Android
             ], [[NAME, FACEBOOK], VERSION], [
+            /(kakao(?:talk|story))[\/ ]([\w\.]+)/i,                             // Kakao App
+            /(naver)\(.*?(\d+\.[\w\.]+).*\)/i,                                  // Naver InApp
             /safari (line)\/([\w\.]+)/i,                                        // Line App for iOS
             /\b(line)\/([\w\.]+)\/iab/i,                                        // Line App for Android
             /(chromium|instagram)[\/ ]([-\w\.]+)/i                              // Chromium/Instagram
@@ -297,10 +293,6 @@
             /\bgsa\/([\w\.]+) .*safari\//i                                      // Google Search Appliance on iOS
             ], [VERSION, [NAME, 'GSA']], [
 
-            /AppleWebKit\/([\w\.]+).+kakao(.*)\s+/i,                            // Kakao App for iOS
-            / wv\).+chrome\/([\w\.]+).+kakao(.+)\//i                            // Kakao App for Android
-            ], [VERSION, [NAME, /(.+)/i, KAKAO+'$1']], [
-
             /headlesschrome(?:\/([\w\.]+)| )/i                                  // Chrome Headless
             ], [VERSION, [NAME, CHROME+' Headless']], [
 
diff --git a/test/browser-test.json b/test/browser-test.json
index 2be58c2..08f8489 100644
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -1627,5 +1627,50 @@
             "version": "9.0",
             "major"  : "9"
         }
+    },
+    {
+        "desc"     : "KakaoTalk App Android",
+        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36;KAKAOTALK 2409760",
+        "expect"   : {
+            "name"   : "KAKAOTALK",
+            "version": "2409760",
+            "major"  : "2409760"
+        }
+    },
+    {
+        "desc"     : "KakaoStory App Android",
+        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/100.0.4896.79 Mobile Safari/537.36 KAKAOSTORY/6.8.3_21046",
+        "expect"   : {
+            "name"   : "KAKAOSTORY",
+            "version": "6.8.3_21046",
+            "major"  : "6"
+        }
+    },
+    {
+        "desc"     : "KakaoTalk App iOS",
+        "ua"       : "Mozilla/5.0 (iPhone; CPU; iPhone OS 15_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 BizWebView KAKAOTALK 9.7.6",
+        "expect"   : {
+            "name"   : "KAKAOTALK",
+            "version": "9.7.6",
+            "major"  : "9"
+        }
+    },
+    {
+        "desc"     : "Naver App Android",
+        "ua"       : "Mozilla/5.0 (Linux; Android 12; SM-G988N Build/SP1A.210812.016; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/90.0.4430.232 Whale/1.0.0.0 Crosswalk/26.90.3.21 Mobile Safari/537.36 NAVER(inapp; search; 1010; 11.11.2)",
+        "expect"   : {
+            "name"   : "NAVER",
+            "version": "11.11.2",
+            "major"  : "11"
+        }
+    },
+    {
+        "desc"     : "Naver App iOS",
+        "ua"       : "Mozilla/5.0 (iPhone; CPU iPhone OS 13_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0 Mobile/15E148 Safari/605.1 NAVER(inapp; search; 720; 10.25.0; 11PRO)",
+        "expect"   : {
+            "name"   : "NAVER",
+            "version": "10.25.0",
+            "major"  : "10"
+        }
     }
 ]