diff --git a/cves/2013/CVE-2013-6281.yaml b/cves/2013/CVE-2013-6281.yaml
index 2fb9f4d865..2f67a808c3 100644
--- a/cves/2013/CVE-2013-6281.yaml
+++ b/cves/2013/CVE-2013-6281.yaml
@@ -18,7 +18,7 @@ info:
     cve-id: CVE-2013-6281
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:/wp-content/plugins/dhtmlxspreadsheet
+    google-query: inurl:/wp-content/plugins/dhtmlxspreadsheet
     verified: "true"
   tags: wp,wpscan,cve,cve2013,wordpress,xss,wp-plugin
 
diff --git a/cves/2015/CVE-2015-1579.yaml b/cves/2015/CVE-2015-1579.yaml
index 49058f62bf..bf648b2a35 100644
--- a/cves/2015/CVE-2015-1579.yaml
+++ b/cves/2015/CVE-2015-1579.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2015-1579
     cwe-id: CWE-22
   metadata:
-    google-dork: inurl:/wp-content/plugins/revslider
+    google-query: inurl:/wp-content/plugins/revslider
   tags: wordpress,wp-plugin,lfi,revslider,wp,wpscan,cve,cve2015
 
 requests:
diff --git a/cves/2018/CVE-2018-20526.yaml b/cves/2018/CVE-2018-20526.yaml
index b9910caaf6..2a14e6a544 100644
--- a/cves/2018/CVE-2018-20526.yaml
+++ b/cves/2018/CVE-2018-20526.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2018-20526
     cwe-id: CWE-434
   metadata:
-    google-dork: intitle:"Roxy file manager"
+    google-query: intitle:"Roxy file manager"
     verified: "true"
   tags: cve,cve2018,roxy,fileman,rce,fileupload,intrusive,packetstorm,edb
 
diff --git a/cves/2018/CVE-2018-5715.yaml b/cves/2018/CVE-2018-5715.yaml
index 256d579e30..5097ee9d4b 100644
--- a/cves/2018/CVE-2018-5715.yaml
+++ b/cves/2018/CVE-2018-5715.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2018-5715
     cwe-id: CWE-79
   metadata:
-    google-dork: intext:"SugarCRM Inc. All Rights Reserved"
+    google-query: intext:"SugarCRM Inc. All Rights Reserved"
     shodan-query: http.html:"SugarCRM Inc. All Rights Reserved"
   tags: sugarcrm,xss,edb,cve,cve2018
 
diff --git a/cves/2019/CVE-2019-1010287.yaml b/cves/2019/CVE-2019-1010287.yaml
index 5761f9d43b..7dbe4cde40 100644
--- a/cves/2019/CVE-2019-1010287.yaml
+++ b/cves/2019/CVE-2019-1010287.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2019-1010287
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:"/timesheet/login.php"
+    google-query: inurl:"/timesheet/login.php"
   tags: cve,cve2019,timesheet,xss
 
 requests:
diff --git a/cves/2019/CVE-2019-12593.yaml b/cves/2019/CVE-2019-12593.yaml
index 31674dbf16..d7b1fd0f21 100644
--- a/cves/2019/CVE-2019-12593.yaml
+++ b/cves/2019/CVE-2019-12593.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2019-12593
     cwe-id: CWE-22
   metadata:
-    google-dork: Powered By IceWarp 10.4.4
+    google-query: Powered By IceWarp 10.4.4
     shodan-query: title:"icewarp"
   tags: cve,cve2019,lfi,icewarp
 
diff --git a/cves/2021/CVE-2021-20031.yaml b/cves/2021/CVE-2021-20031.yaml
index d99c6b3eac..2868443a01 100644
--- a/cves/2021/CVE-2021-20031.yaml
+++ b/cves/2021/CVE-2021-20031.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2021-20031
     cwe-id: CWE-601
   metadata:
-    google-dork: inurl:"auth.html" intitle:"SonicWall"
+    google-query: inurl:"auth.html" intitle:"SonicWall"
   tags: sonicwall,redirect,edb,packetstorm,cve,cve2021
 
 requests:
diff --git a/cves/2021/CVE-2021-24370.yaml b/cves/2021/CVE-2021-24370.yaml
index abf1424b4c..a058161264 100644
--- a/cves/2021/CVE-2021-24370.yaml
+++ b/cves/2021/CVE-2021-24370.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2021-24370
     cwe-id: CWE-434,CWE-434
   metadata:
-    google-dork: inurl:“/wp-content/plugins/fancy-product-designer”
+    google-query: inurl:“/wp-content/plugins/fancy-product-designer”
   tags: fancyproduct,wpscan,cve,cve2021,wordpress,rce,wp-plugin,wp
 
 requests:
diff --git a/cves/2021/CVE-2021-27330.yaml b/cves/2021/CVE-2021-27330.yaml
index b56532d285..6c3e5a6c0f 100644
--- a/cves/2021/CVE-2021-27330.yaml
+++ b/cves/2021/CVE-2021-27330.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2021-27330
     cwe-id: CWE-79
   metadata:
-    google-dork: intitle:TriConsole.com - PHP Calendar Date Picker
+    google-query: intitle:TriConsole.com - PHP Calendar Date Picker
     verified: "true"
   tags: xss,edb,cve,cve2021,triconsole
 
diff --git a/cves/2021/CVE-2021-31589.yaml b/cves/2021/CVE-2021-31589.yaml
index 50955fa55d..6d465e9212 100644
--- a/cves/2021/CVE-2021-31589.yaml
+++ b/cves/2021/CVE-2021-31589.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2021-31589
     cwe-id: CWE-79
   metadata:
-    google-dork: '"BeyondTrust" "Redistribution Prohibited"'
+    google-query: '"BeyondTrust" "Redistribution Prohibited"'
     shodan-query: 'set-cookie: nsbase_session'
   tags: xss,packetstorm,cve,cve2021,beyondtrust,bomgar
 
diff --git a/cves/2021/CVE-2021-45043.yaml b/cves/2021/CVE-2021-45043.yaml
index a159da17f4..f0787778fa 100644
--- a/cves/2021/CVE-2021-45043.yaml
+++ b/cves/2021/CVE-2021-45043.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2021-45043
     cwe-id: CWE-22
   metadata:
-    google-dork: intitle:"HD-Network Real-time Monitoring System V2.0"
+    google-query: intitle:"HD-Network Real-time Monitoring System V2.0"
   tags: camera,edb,cve,cve2021,hdnetwork,lfi,iot
 
 requests:
diff --git a/cves/2022/CVE-2022-0656.yaml b/cves/2022/CVE-2022-0656.yaml
index 45ed583641..0cef636e67 100644
--- a/cves/2022/CVE-2022-0656.yaml
+++ b/cves/2022/CVE-2022-0656.yaml
@@ -14,7 +14,7 @@ info:
     cve-id: CVE-2022-0656
     cwe-id: CWE-552
   metadata:
-    google-dork: inurl:"/wp-content/plugins/udraw"
+    google-query: inurl:"/wp-content/plugins/udraw"
     verified: "true"
   tags: wp,wordpress,wp-plugin,unauth,cve,cve2022,lfi,udraw,wpscan
 
diff --git a/cves/2022/CVE-2022-1597.yaml b/cves/2022/CVE-2022-1597.yaml
index c4dc8dc4aa..9eecd68a9d 100644
--- a/cves/2022/CVE-2022-1597.yaml
+++ b/cves/2022/CVE-2022-1597.yaml
@@ -17,7 +17,7 @@ info:
     cve-id: CVE-2022-1597
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:/wp-content/plugins/wpqa
+    google-query: inurl:/wp-content/plugins/wpqa
     verified: "true"
   tags: wpscan,xss,wordpress,wp-plugin,wp,cve,cve2022,wpqa
 
diff --git a/cves/2022/CVE-2022-1598.yaml b/cves/2022/CVE-2022-1598.yaml
index a5484f2a3a..7ba07fced5 100644
--- a/cves/2022/CVE-2022-1598.yaml
+++ b/cves/2022/CVE-2022-1598.yaml
@@ -15,7 +15,7 @@ info:
     cve-id: CVE-2022-1598
     cwe-id: CWE-284
   metadata:
-    google-dork: inurl:/wp-content/plugins/wpqa
+    google-query: inurl:/wp-content/plugins/wpqa
     verified: "true"
   tags: cve,cve2022,wordpress,wp-plugin,wpqa,idor,wpscan
 
diff --git a/cves/2022/CVE-2022-1906.yaml b/cves/2022/CVE-2022-1906.yaml
index 87afdb7ab4..b3f4fa2e72 100644
--- a/cves/2022/CVE-2022-1906.yaml
+++ b/cves/2022/CVE-2022-1906.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2022-1906
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:/wp-content/plugins/digiproveblog
+    google-query: inurl:/wp-content/plugins/digiproveblog
     verified: "true"
   tags: wordpress,xss,wp-plugin,wp,wpscan,cve,cve2022
 
diff --git a/cves/2022/CVE-2022-1946.yaml b/cves/2022/CVE-2022-1946.yaml
index 7dc271a981..5a0757c182 100644
--- a/cves/2022/CVE-2022-1946.yaml
+++ b/cves/2022/CVE-2022-1946.yaml
@@ -15,7 +15,7 @@ info:
     cve-id: CVE-2022-1946
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:"/wp-content/plugins/gallery-album/"
+    google-query: inurl:"/wp-content/plugins/gallery-album/"
     verified: "true"
   tags: wpscan,cve2022,wp,xss,wordpress,gallery,unauth,cve,wp-plugin
 
diff --git a/cves/2022/CVE-2022-27849.yaml b/cves/2022/CVE-2022-27849.yaml
index fbf71f800c..d52f9a2027 100644
--- a/cves/2022/CVE-2022-27849.yaml
+++ b/cves/2022/CVE-2022-27849.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2022-27849
     cwe-id: CWE-200
   metadata:
-    google-dork: inurl:/wp-content/plugins/simple-ajax-chat/
+    google-query: inurl:/wp-content/plugins/simple-ajax-chat/
   tags: wp,wordpress,wp-plugin,cve,cve2022,disclosure
 
 requests:
diff --git a/cves/2022/CVE-2022-29548.yaml b/cves/2022/CVE-2022-29548.yaml
index 551ebec8c4..f8b6f1304d 100644
--- a/cves/2022/CVE-2022-29548.yaml
+++ b/cves/2022/CVE-2022-29548.yaml
@@ -16,7 +16,7 @@ info:
     cve-id: CVE-2022-29548
     cwe-id: CWE-79
   metadata:
-    google-dork: inurl:"carbon/admin/login"
+    google-query: inurl:"carbon/admin/login"
     verified: "true"
   tags: cve,cve2022,wso2,xss
 
diff --git a/exposed-panels/acrolinx-dashboard.yaml b/exposed-panels/acrolinx-dashboard.yaml
index 8c3d55bd48..d77c074385 100644
--- a/exposed-panels/acrolinx-dashboard.yaml
+++ b/exposed-panels/acrolinx-dashboard.yaml
@@ -12,7 +12,7 @@ info:
   metadata:
     fofa-query: title=="Acrolinx Dashboard"
     shodan-query: http.title:"Acrolinx Dashboard"
-    google-dork: inurl:"Acrolinx Dashboard"
+    google-query: inurl:"Acrolinx Dashboard"
   tags: acrolinx,panel
 
 requests:
diff --git a/exposed-panels/amcrest-login.yaml b/exposed-panels/amcrest-login.yaml
index 4fad3d990e..780e4e1b0d 100644
--- a/exposed-panels/amcrest-login.yaml
+++ b/exposed-panels/amcrest-login.yaml
@@ -11,7 +11,7 @@ info:
     cwe-id: CWE-200
   metadata:
     shodan-query: html:"amcrest"
-    google-dork: intext:"amcrest" "LDAP User"
+    google-query: intext:"amcrest" "LDAP User"
   tags: panel,camera,amcrest,edb
 
 requests:
diff --git a/exposed-panels/atvise-login.yaml b/exposed-panels/atvise-login.yaml
index 0b775e3feb..360d06ce3b 100644
--- a/exposed-panels/atvise-login.yaml
+++ b/exposed-panels/atvise-login.yaml
@@ -11,7 +11,7 @@ info:
   classification:
     cwe-id: CWE-200
   metadata:
-    google-dork: intitle:"atvise - next generation"
+    google-query: intitle:"atvise - next generation"
   tags: panel,atvise,edb
 
 requests:
diff --git a/exposed-panels/ems-webclient-panel.yaml b/exposed-panels/ems-webclient-panel.yaml
index c4caaa5ec3..9216dae7df 100644
--- a/exposed-panels/ems-webclient-panel.yaml
+++ b/exposed-panels/ems-webclient-panel.yaml
@@ -5,7 +5,7 @@ info:
   author: pussycat0x,daffainfo
   severity: info
   metadata:
-    google-dork: inurl:EMSWebClient/
+    google-query: inurl:EMSWebClient/
   tags: panel,ems
 
 requests:
diff --git a/exposed-panels/fiori-launchpad.yaml b/exposed-panels/fiori-launchpad.yaml
index 366139d81a..3e4fa43976 100644
--- a/exposed-panels/fiori-launchpad.yaml
+++ b/exposed-panels/fiori-launchpad.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7941
   metadata:
     verified: true
-    google-dork: sap/bc/ui5_ui5/ui2/ushell/shells/abap/FioriLaunchpad.html -site:sap.com
+    google-query: sap/bc/ui5_ui5/ui2/ushell/shells/abap/FioriLaunchpad.html -site:sap.com
   tags: sap,fiori,edb,panel
 
 requests:
diff --git a/exposed-panels/ftm-manager-panel.yaml b/exposed-panels/ftm-manager-panel.yaml
index 0bb21c7e9d..2a0f1671fe 100644
--- a/exposed-panels/ftm-manager-panel.yaml
+++ b/exposed-panels/ftm-manager-panel.yaml
@@ -8,7 +8,7 @@ info:
   metadata:
     verified: true
     shodan-query: http.html:"FTM manager"
-    google-dork: intitle:"FTM manager"
+    google-query: intitle:"FTM manager"
   tags: panel,ftm
 
 requests:
diff --git a/exposed-panels/intelbras-login.yaml b/exposed-panels/intelbras-login.yaml
index 5cc3ebab1f..1f2a3a5bd4 100644
--- a/exposed-panels/intelbras-login.yaml
+++ b/exposed-panels/intelbras-login.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7272
   metadata:
     shodan-query: http.title:"Intelbras"
-    google-dork: intitle:"Intelbras" "All Rights Reserved" -.com
+    google-query: intitle:"Intelbras" "All Rights Reserved" -.com
   tags: panel,edb
 
 requests:
diff --git a/exposed-panels/projectsend-login.yaml b/exposed-panels/projectsend-login.yaml
index c83f2e53cf..efdb12dc99 100644
--- a/exposed-panels/projectsend-login.yaml
+++ b/exposed-panels/projectsend-login.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7380
     - https://github.com/projectsend/projectsend
   metadata:
-    google-dork: intext:Provided by ProjectSend
+    google-query: intext:Provided by ProjectSend
   tags: panel,projectsend,edb
 
 requests:
diff --git a/exposed-panels/roxy-fileman.yaml b/exposed-panels/roxy-fileman.yaml
index 1062ae6f0e..b7237aea8e 100644
--- a/exposed-panels/roxy-fileman.yaml
+++ b/exposed-panels/roxy-fileman.yaml
@@ -6,7 +6,7 @@ info:
   severity: info
   metadata:
     verified: true
-    google-dork: intitle:"Roxy file manager"
+    google-query: intitle:"Roxy file manager"
   tags: tech,fileupload,roxy,fileman
 
 requests:
diff --git a/exposed-panels/ruckus-unleashed-panel.yaml b/exposed-panels/ruckus-unleashed-panel.yaml
index 17a84e3050..97b561c4e2 100644
--- a/exposed-panels/ruckus-unleashed-panel.yaml
+++ b/exposed-panels/ruckus-unleashed-panel.yaml
@@ -9,7 +9,7 @@ info:
     - https://www.commscope.com/ruckus/
   metadata:
     shodan-query: http.title:"Unleashed Login"
-    google-dork: intitle:"Unleashed Login"
+    google-query: intitle:"Unleashed Login"
   tags: panel,ruckus
 
 requests:
diff --git a/exposed-panels/supermicro-bmc-panel.yaml b/exposed-panels/supermicro-bmc-panel.yaml
index 5717f7ca44..ab3b6ff63c 100644
--- a/exposed-panels/supermicro-bmc-panel.yaml
+++ b/exposed-panels/supermicro-bmc-panel.yaml
@@ -11,7 +11,7 @@ info:
     - https://www.supermicro.com/white_paper/IPMI_white_paper.pdf
   metadata:
     shodan-query: http.title:"Supermicro BMC Login"
-    google-dork: intitle:"Supermicro BMC Login"
+    google-query: intitle:"Supermicro BMC Login"
   tags: panel,supermicro,bmc
 
 requests:
diff --git a/exposed-panels/teltonika-login.yaml b/exposed-panels/teltonika-login.yaml
index 0ef4328420..5b345bcbad 100644
--- a/exposed-panels/teltonika-login.yaml
+++ b/exposed-panels/teltonika-login.yaml
@@ -9,7 +9,7 @@ info:
     - https://www.exploit-db.com/ghdb/7819
     - https://teltonika-iot-group.com/
   metadata:
-    google-dork: intitle:"Teltonika -Web UI" | intitle:"Teltonika-RUT -Web UI" inurl:"/cgi-bin/luci"
+    google-query: intitle:"Teltonika -Web UI" | intitle:"Teltonika-RUT -Web UI" inurl:"/cgi-bin/luci"
   tags: panel,teltonika,edb
 
 requests:
diff --git a/exposed-panels/webmodule-ee-panel.yaml b/exposed-panels/webmodule-ee-panel.yaml
index 8e0c7cb647..39b57834c2 100644
--- a/exposed-panels/webmodule-ee-panel.yaml
+++ b/exposed-panels/webmodule-ee-panel.yaml
@@ -7,7 +7,7 @@ info:
   reference:
     - https://www.exploit-db.com/ghdb/7001
   metadata:
-    google-dork: intitle:"Webmodule" inurl:"/webmodule-ee/login.seam" "Version"
+    google-query: intitle:"Webmodule" inurl:"/webmodule-ee/login.seam" "Version"
     shodan-query: title:"Webmodule"
   tags: edb,panel,webmodule-ee,login
 
diff --git a/exposed-panels/xweb500-panel.yaml b/exposed-panels/xweb500-panel.yaml
index f15d2b7738..c85f8ee84c 100644
--- a/exposed-panels/xweb500-panel.yaml
+++ b/exposed-panels/xweb500-panel.yaml
@@ -5,7 +5,7 @@ info:
   author: princechaddha
   severity: info
   metadata:
-    google-dork: inurl:"xweb500.cgi"
+    google-query: inurl:"xweb500.cgi"
   tags: panel,xweb500
 
 requests:
diff --git a/exposures/files/build-properties.yaml b/exposures/files/build-properties.yaml
index 53414d4131..099968bd93 100644
--- a/exposures/files/build-properties.yaml
+++ b/exposures/files/build-properties.yaml
@@ -6,7 +6,7 @@ info:
   severity: info
   metadata:
     verified: true
-    google-dork: intitle:"index of" "build.properties"
+    google-query: intitle:"index of" "build.properties"
   tags: exposure,config
 
 requests:
diff --git a/exposures/files/docker-cloud.yaml b/exposures/files/docker-cloud.yaml
index a5cca7a8bb..0258057e13 100644
--- a/exposures/files/docker-cloud.yaml
+++ b/exposures/files/docker-cloud.yaml
@@ -7,7 +7,7 @@ info:
   reference: https://www.exploit-db.com/ghdb/7959
   metadata:
     verified: true
-    google-dork: intitle:"index of" "docker-cloud.yml"
+    google-query: intitle:"index of" "docker-cloud.yml"
   tags: exposure,cloud,devops,docker
 
 requests:
diff --git a/exposures/files/pantheon-upstream.yaml b/exposures/files/pantheon-upstream.yaml
index cdc92a8e9c..75790fadb2 100644
--- a/exposures/files/pantheon-upstream.yaml
+++ b/exposures/files/pantheon-upstream.yaml
@@ -6,7 +6,7 @@ info:
   severity: low
   metadata:
     verified: true
-    google-dork: intitle:"index of" "pantheon.upstream.yml"
+    google-query: intitle:"index of" "pantheon.upstream.yml"
   tags: exposure,devops,patheon,config
 
 requests:
diff --git a/exposures/files/redmine-config.yaml b/exposures/files/redmine-config.yaml
index 6f1e8d84fa..91e36041a1 100644
--- a/exposures/files/redmine-config.yaml
+++ b/exposures/files/redmine-config.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/5803
   metadata:
     verified: true
-    google-dork: intitle:"index of" configuration.yml
+    google-query: intitle:"index of" configuration.yml
   tags: exposure,redmine,devops,edb
 
 requests:
diff --git a/exposures/files/redmine-settings.yaml b/exposures/files/redmine-settings.yaml
index a448f05a5f..87a61ceb79 100644
--- a/exposures/files/redmine-settings.yaml
+++ b/exposures/files/redmine-settings.yaml
@@ -7,7 +7,7 @@ info:
   reference: https://www.exploit-db.com/ghdb/5796
   metadata:
     verified: true
-    google-dork: intitle:"index of" "settings.yml"
+    google-query: intitle:"index of" "settings.yml"
   tags: misconfig,redmine,devops
 
 requests:
diff --git a/exposures/files/ruby-rail-storage.yaml b/exposures/files/ruby-rail-storage.yaml
index 30370a9720..1292bbcb82 100644
--- a/exposures/files/ruby-rail-storage.yaml
+++ b/exposures/files/ruby-rail-storage.yaml
@@ -6,7 +6,7 @@ info:
   severity: low
   metadata:
     verified: true
-    google-dork: intitle:"index of" storage.yml
+    google-query: intitle:"index of" storage.yml
   tags: exposure,ruby,devops
 
 requests:
diff --git a/exposures/files/secrets-file.yaml b/exposures/files/secrets-file.yaml
index 145d938e6a..de2d0db35c 100644
--- a/exposures/files/secrets-file.yaml
+++ b/exposures/files/secrets-file.yaml
@@ -7,7 +7,7 @@ info:
   reference: https://www.exploit-db.com/ghdb/6283
   metadata:
     verified: true
-    google-dork: intitle:"index of" "secrets.yml"
+    google-query: intitle:"index of" "secrets.yml"
   tags: misconfig,cloud,devops
 
 requests:
diff --git a/exposures/files/symfony-properties-ini.yaml b/exposures/files/symfony-properties-ini.yaml
index 8ff879109f..31c2ef9585 100644
--- a/exposures/files/symfony-properties-ini.yaml
+++ b/exposures/files/symfony-properties-ini.yaml
@@ -6,7 +6,7 @@ info:
   severity: info
   metadata:
     verified: true
-    google-dork: intitle:"index of" "properties.ini"
+    google-query: intitle:"index of" "properties.ini"
   tags: symfony,exposure
 
 requests:
diff --git a/exposures/files/symfony-security.yaml b/exposures/files/symfony-security.yaml
index 6910ffc5fd..83ffe89184 100644
--- a/exposures/files/symfony-security.yaml
+++ b/exposures/files/symfony-security.yaml
@@ -6,7 +6,7 @@ info:
   severity: info
   metadata:
     verified: true
-    google-dork: intitle:"index of" "security.yml"
+    google-query: intitle:"index of" "security.yml"
   tags: symfony,devops,exposure
 
 requests:
diff --git a/exposures/files/ws-ftp-ini.yaml b/exposures/files/ws-ftp-ini.yaml
index 9bb709e9cf..f956a6a255 100644
--- a/exposures/files/ws-ftp-ini.yaml
+++ b/exposures/files/ws-ftp-ini.yaml
@@ -6,7 +6,7 @@ info:
   severity: low
   metadata:
     verified: true
-    google-dork: intitle:"Index of" ws_ftp.ini
+    google-query: intitle:"Index of" ws_ftp.ini
   tags: exposure,ftp
 
 requests:
diff --git a/exposures/logs/fastcgi-echo.yaml b/exposures/logs/fastcgi-echo.yaml
index af00d74cba..157728e6a3 100644
--- a/exposures/logs/fastcgi-echo.yaml
+++ b/exposures/logs/fastcgi-echo.yaml
@@ -11,7 +11,7 @@ info:
     - https://www.integrigy.com/oracle-application-server-fastcgi-echo-vulnerability-reports
   metadata:
     verified: true
-    google-dork: inurl:fcgi-bin/echo
+    google-query: inurl:fcgi-bin/echo
   tags: exposure,logs,oracle,fastcgi,edb
 
 requests:
diff --git a/helpers/payloads/CVE-2020-5776.csv b/helpers/payloads/CVE-2020-5776.csv
index 46ecc61ce2..b6c0022401 100644
--- a/helpers/payloads/CVE-2020-5776.csv
+++ b/helpers/payloads/CVE-2020-5776.csv
@@ -1,34 +1,34 @@
-sku,attribute_set,type,store,websites,configurable_attributes,color,full_size,name,description,short_description,full_features,att_ean,price,special_price,rrp,qty,is_in_stock,manage_stock,use_config_manage_stock,status,visibility,weight,category_ids,tax_class_id,thumbnail,small_image,image,media_gallery,arw_brand 
+sku,attribute_set,type,store,websites,configurable_attributes,color,full_size,name,description,short_description,full_features,att_ean,price,special_price,rrp,qty,is_in_stock,manage_stock,use_config_manage_stock,status,visibility,weight,category_ids,tax_class_id,thumbnail,small_image,image,media_gallery,arw_brand 
 AF001WHIT2XL,Default,simple,admin,Default,"color,full_size",White,2XL,Chef's kit jacket with press stud (DD16)-White-2XL,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHIT2XS,Default,simple,admin,Default,"color,full_size",White,2XS,Chef's kit jacket with press stud (DD16)-White-2XS,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHIT3XL,Default,simple,admin,Default,"color,full_size",White,3XL,Chef's kit jacket with press stud (DD16)-White-3XL,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHIT4XL,Default,simple,admin,Default,"color,full_size",White,4XL,Chef's kit jacket with press stud (DD16)-White-4XL,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHITL,Default,simple,admin,Default,"color,full_size",White,L,Chef's kit jacket with press stud (DD16)-White-L,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHITM,Default,simple,admin,Default,"color,full_size",White,M,Chef's kit jacket with press stud (DD16)-White-M,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHITS,Default,simple,admin,Default,"color,full_size",White,S,Chef's kit jacket with press stud (DD16)-White-S,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHITXL,Default,simple,admin,Default,"color,full_size",White,XL,Chef's kit jacket with press stud (DD16)-White-XL,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001WHITXS,Default,simple,admin,Default,"color,full_size",White,XS,Chef's kit jacket with press stud (DD16)-White-XS,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,,Kustom Kit
 AF001BLAC2XL,Default,simple,admin,Default,"color,full_size",Black,2XL,Chef's kit jacket with press stud (DD16)-Black-2XL,"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,Not Visible Individually,0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg,,Kustom Kit
 AF001,Default,configurable,admin,Default,"color,full_size",,,Chef's kit jacket with press stud (DD16),"Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
 ","Made in 200gsm Poly/Cotton with 10 stainless steel press studs. Best value.  Washing Instructions: 65 degree industrial wash.
-","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,"Catalog, Search",0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg::White;/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg::Black;/wetransfer-b10265/Alexandra/AX001_LS1.jpg;/wetransfer-b10265/Alexandra/AX005_LS1.jpg;,Kustom Kit
+","Stainless steel press studs    One way fastening    Industrial wash Fabric:65% Polyester, 35% Cotton Weight:200gsm",,7.95,,,100,1,1,1,1,"Catalog, Search",0,"32,33",None,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg,/Wetransfer-b10265/AFD by Dennys/AF001_LS1.jpg::White;/Wetransfer-b10265/AFD by Dennys/AF011_LS1.jpg::Black;/wetransfer-b10265/Alexandra/AX001_LS1.jpg;/wetransfer-b10265/Alexandra/AX005_LS1.jpg;,Kustom Kit
diff --git a/iot/automation-direct.yaml b/iot/automation-direct.yaml
index a98672fafe..ed148f02e8 100644
--- a/iot/automation-direct.yaml
+++ b/iot/automation-direct.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7295
   metadata:
     shodan-query: http.title:"C-more -- the best HMI presented by AutomationDirect"
-    google-dork: intitle:"C-more -- the best HMI presented by AutomationDirect"
+    google-query: intitle:"C-more -- the best HMI presented by AutomationDirect"
   tags: panel,iot,edb
 
 requests:
diff --git a/iot/netsurveillance-web.yaml b/iot/netsurveillance-web.yaml
index d6f2df8703..91a96b646b 100644
--- a/iot/netsurveillance-web.yaml
+++ b/iot/netsurveillance-web.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7288
   metadata:
     shodan-query: http.title:"NETSurveillance WEB"
-    google-dork: intitle:"NETSurveillance WEB"
+    google-query: intitle:"NETSurveillance WEB"
   tags: tech,iot,edb
 
 requests:
diff --git a/iot/novus-ip-camera.yaml b/iot/novus-ip-camera.yaml
index c6fa330a72..6b1a7e908b 100644
--- a/iot/novus-ip-camera.yaml
+++ b/iot/novus-ip-camera.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/8002
   metadata:
     verified: true
-    google-dork: intitle:"NoVus IP camera" -com
+    google-query: intitle:"NoVus IP camera" -com
   tags: camera,novus,edb,iot,panel
 
 requests:
diff --git a/misconfiguration/roxyfileman-fileupload.yaml b/misconfiguration/roxyfileman-fileupload.yaml
index 85126fcc2d..e11fe7176b 100644
--- a/misconfiguration/roxyfileman-fileupload.yaml
+++ b/misconfiguration/roxyfileman-fileupload.yaml
@@ -10,7 +10,7 @@ info:
     - https://www.exploit-db.com/exploits/39963
   metadata:
     verified: "true"
-    google-dork: intitle:"Roxy file manager"
+    google-query: intitle:"Roxy file manager"
   tags: intrusive,misconfig,edb,roxy,fileman,rce,fileupload
 
 requests:
diff --git a/technologies/dwr-index-detect.yaml b/technologies/dwr-index-detect.yaml
index 1edd6614b4..9de9c318f8 100644
--- a/technologies/dwr-index-detect.yaml
+++ b/technologies/dwr-index-detect.yaml
@@ -9,7 +9,7 @@ info:
   reference:
     - http://aetherlab.net/2012/09/experiences-in-pentesting-dwr/
   metadata:
-    google-dork: intitle:"DWR Test Index"
+    google-query: intitle:"DWR Test Index"
   tags: tech,misconfig,dwr
 
 requests:
diff --git a/technologies/projectsend-detect.yaml b/technologies/projectsend-detect.yaml
index 3a1ae7c8b5..bfcea70f12 100644
--- a/technologies/projectsend-detect.yaml
+++ b/technologies/projectsend-detect.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7380
     - https://github.com/projectsend/projectsend
   metadata:
-    google-dork: intext:Provided by ProjectSend
+    google-query: intext:Provided by ProjectSend
   tags: tech,projectsend,edb
 
 requests:
diff --git a/technologies/tileserver-gl.yaml b/technologies/tileserver-gl.yaml
index e9a72e9489..19307b4486 100644
--- a/technologies/tileserver-gl.yaml
+++ b/technologies/tileserver-gl.yaml
@@ -8,7 +8,7 @@ info:
     - https://www.exploit-db.com/ghdb/7296
   metadata:
     shodan-query: http.title:"TileServer GL - Server for vector and raster maps with GL styles"
-    google-dork: intitle:"TileServer GL - Server for vector and raster maps with GL styles"
+    google-query: intitle:"TileServer GL - Server for vector and raster maps with GL styles"
   tags: tech,tileserver,edb
 
 requests:
diff --git a/vulnerabilities/other/dixell-xweb500-filewrite.yaml b/vulnerabilities/other/dixell-xweb500-filewrite.yaml
index 40452492fc..445c9333ac 100644
--- a/vulnerabilities/other/dixell-xweb500-filewrite.yaml
+++ b/vulnerabilities/other/dixell-xweb500-filewrite.yaml
@@ -9,7 +9,7 @@ info:
     - https://www.exploit-db.com/exploits/50639
     - https://nvd.nist.gov/vuln/detail/CVE-2021-45420
   metadata:
-    google-dork: inurl:"xweb500.cgi"
+    google-query: inurl:"xweb500.cgi"
   tags: lfw,iot,dixell,xweb500,edb,fileupload,intrusive
 
 requests:
diff --git a/vulnerabilities/other/laravel-filemanager-lfi.yaml b/vulnerabilities/other/laravel-filemanager-lfi.yaml
index bebba5de5c..2780e94725 100644
--- a/vulnerabilities/other/laravel-filemanager-lfi.yaml
+++ b/vulnerabilities/other/laravel-filemanager-lfi.yaml
@@ -9,7 +9,7 @@ info:
     - https://www.exploit-db.com/exploits/48166
     - https://github.com/UniSharp/laravel-filemanager
   metadata:
-    google-dork: inurl:"laravel-filemanager?type=Files" -site:github.com -site:github.io
+    google-query: inurl:"laravel-filemanager?type=Files" -site:github.com -site:github.io
     shodan-query: http.html:"Laravel FileManager"
   tags: lfr,edb,lfi,unisharp,laravel,filemanager,fileupload
 
diff --git a/vulnerabilities/other/siteminder-dom-xss.yaml b/vulnerabilities/other/siteminder-dom-xss.yaml
index 9cc9d3a7b1..adf0b5abd0 100644
--- a/vulnerabilities/other/siteminder-dom-xss.yaml
+++ b/vulnerabilities/other/siteminder-dom-xss.yaml
@@ -8,7 +8,7 @@ info:
   reference: https://blog.reigningshells.com/2019/12/reviving-old-cves-reflected-xss-in-ca.html
   metadata:
     verified: true
-    google-dork: inurl:"smpwservices.fcc"
+    google-query: inurl:"smpwservices.fcc"
   tags: dom,xss,siteminder
 
 requests:
diff --git a/vulnerabilities/other/sl-studio-lfi.yaml b/vulnerabilities/other/sl-studio-lfi.yaml
index 730224f295..4ae06e01eb 100644
--- a/vulnerabilities/other/sl-studio-lfi.yaml
+++ b/vulnerabilities/other/sl-studio-lfi.yaml
@@ -12,7 +12,7 @@ info:
     cvss-score: 7.5
     cwe-id: CWE-22
   metadata:
-    google-dork: 'inurl:index.php?page= intext:Webbdesign: SL-Studio.'
+    google-query: 'inurl:index.php?page= intext:Webbdesign: SL-Studio.'
   tags: slstudio,lfi
 
 requests:
diff --git a/vulnerabilities/other/sofneta-mecdream-pacs-lfi.yaml b/vulnerabilities/other/sofneta-mecdream-pacs-lfi.yaml
index e731b5fe44..0a55207510 100644
--- a/vulnerabilities/other/sofneta-mecdream-pacs-lfi.yaml
+++ b/vulnerabilities/other/sofneta-mecdream-pacs-lfi.yaml
@@ -13,7 +13,7 @@ info:
     cvss-score: 7.5
     cwe-id: CWE-22
   metadata:
-    google-dork: inurl:pacs/login.php, inurl:pacsone/login.php, inurl:pacsone filetype:php home, inurl:pacsone filetype:php login
+    google-query: inurl:pacs/login.php, inurl:pacsone/login.php, inurl:pacsone filetype:php home, inurl:pacsone filetype:php login
   tags: sofneta,lfi,edb
 
 requests:
diff --git a/vulnerabilities/wordpress/analytify-plugin-xss.yaml b/vulnerabilities/wordpress/analytify-plugin-xss.yaml
index a67b47ab90..d4547f82d2 100644
--- a/vulnerabilities/wordpress/analytify-plugin-xss.yaml
+++ b/vulnerabilities/wordpress/analytify-plugin-xss.yaml
@@ -10,7 +10,7 @@ info:
     - https://wpscan.com/vulnerability/b8415ed5-6fd0-42fe-9201-73686c1871c5
   metadata:
     verified: true
-    google-dork: inurl:/wp-content/plugins/wp-analytify
+    google-query: inurl:/wp-content/plugins/wp-analytify
   classification:
     cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:C/C:L/I:L/A:N
     cvss-score: 7.2
diff --git a/vulnerabilities/wordpress/hb-audio-lfi.yaml b/vulnerabilities/wordpress/hb-audio-lfi.yaml
index cac0c6010d..2d7e38cca5 100644
--- a/vulnerabilities/wordpress/hb-audio-lfi.yaml
+++ b/vulnerabilities/wordpress/hb-audio-lfi.yaml
@@ -8,7 +8,7 @@ info:
   reference:
     - https://packetstormsecurity.com/files/136340/WordPress-HB-Audio-Gallery-Lite-1.0.0-Arbitrary-File-Download.html
   metadata:
-    google-dork: inurl:/wp-content/plugins/hb-audio-gallery-lite
+    google-query: inurl:/wp-content/plugins/hb-audio-gallery-lite
   classification:
     cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N
     cvss-score: 7.5
diff --git a/vulnerabilities/wordpress/shortcode-lfi.yaml b/vulnerabilities/wordpress/shortcode-lfi.yaml
index 55d873b643..0fe1c934d2 100644
--- a/vulnerabilities/wordpress/shortcode-lfi.yaml
+++ b/vulnerabilities/wordpress/shortcode-lfi.yaml
@@ -8,7 +8,7 @@ info:
   reference:
     - https://packetstormsecurity.com/files/128024/WordPress-ShortCode-1.1-Local-File-Inclusion.html
   metadata:
-    google-dork: inurl:wp/wp-content/force-download.php
+    google-query: inurl:wp/wp-content/force-download.php
   classification:
     cvss-metrics: CVSS:3.0/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:N
     cvss-score: 7.5
diff --git a/vulnerabilities/wordpress/wp-haberadam-idor.yaml b/vulnerabilities/wordpress/wp-haberadam-idor.yaml
index c8001614ba..986f377396 100644
--- a/vulnerabilities/wordpress/wp-haberadam-idor.yaml
+++ b/vulnerabilities/wordpress/wp-haberadam-idor.yaml
@@ -7,7 +7,7 @@ info:
   reference:
     - https://cxsecurity.com/issue/WLB-2021090078
   metadata:
-    google-dork: inurl:/wp-content/themes/haberadam/
+    google-query: inurl:/wp-content/themes/haberadam/
   tags: wordpress,idor,wp-theme,disclosure
 
 requests:
diff --git a/vulnerabilities/wordpress/wp-mstore-plugin-listing.yaml b/vulnerabilities/wordpress/wp-mstore-plugin-listing.yaml
index 62099df1e8..ba8020d0a3 100644
--- a/vulnerabilities/wordpress/wp-mstore-plugin-listing.yaml
+++ b/vulnerabilities/wordpress/wp-mstore-plugin-listing.yaml
@@ -6,7 +6,7 @@ info:
   severity: low
   description: Searches for sensitive directories present in the wordpress-plugins plugin.
   metadata:
-    google-dork: inurl:/wp-content/plugins/mstore-api/
+    google-query: inurl:/wp-content/plugins/mstore-api/
   tags: wordpress,listing,wp-plugin
 
 requests:
diff --git a/vulnerabilities/wordpress/wp-sym404.yaml b/vulnerabilities/wordpress/wp-sym404.yaml
index 4aa0e278e1..ffff9d2681 100644
--- a/vulnerabilities/wordpress/wp-sym404.yaml
+++ b/vulnerabilities/wordpress/wp-sym404.yaml
@@ -9,7 +9,7 @@ info:
     - https://twitter.com/momika233/status/1540325055280070656
   metadata:
     verified: true
-    google-dork: inurl:"/wp-includes/sym404/"
+    google-query: inurl:"/wp-includes/sym404/"
   tags: wordpress,listing,wp,exposure
 
 requests: