diff --git a/cves/2013/CVE-2013-2251.yaml b/cves/2013/CVE-2013-2251.yaml
index bef95ecb02..ba88f6aa5f 100644
--- a/cves/2013/CVE-2013-2251.yaml
+++ b/cves/2013/CVE-2013-2251.yaml
@@ -2,7 +2,7 @@ id: CVE-2013-2251
 
 info:
   name: Apache Struts 2 - DefaultActionMapper Prefixes OGNL Code Execution
-  author: exploitation & @dwisiswant0
+  author: exploitation,dwisiswant0
   severity: critical
   description: In Struts 2 before 2.3.15.1 the information following "action:", "redirect:" or "redirectAction:" is not properly sanitized. Since said information will be evaluated as OGNL expression against the value stack, this introduces the possibility to inject server side code.
   reference: http://struts.apache.org/release/2.3.x/docs/s2-016.html
diff --git a/cves/2017/CVE-2017-14849.yaml b/cves/2017/CVE-2017-14849.yaml
index 01b36cd82b..a6fe2a3244 100644
--- a/cves/2017/CVE-2017-14849.yaml
+++ b/cves/2017/CVE-2017-14849.yaml
@@ -2,7 +2,7 @@ id: CVE-2017-14849
 
 info:
   name: Node.js 8.5.0 >=< 8.6.0 Directory Traversal
-  author: Random-Robbie
+  author: Random_Robbie
   severity: high
   description: Node.js 8.5.0 before 8.6.0 allows remote attackers to access unintended files, because a change to ".." handling was incompatible with the pathname validation used by unspecified community modules.
   tags: cve,cve2017,nodejs,lfi
diff --git a/cves/2017/CVE-2017-5638.yaml b/cves/2017/CVE-2017-5638.yaml
index 43a75f32f6..5d477c119a 100644
--- a/cves/2017/CVE-2017-5638.yaml
+++ b/cves/2017/CVE-2017-5638.yaml
@@ -1,6 +1,6 @@
 id: CVE-2017-5638
 info:
-  author: Random Robbie
+  author: Random_Robbie
   name: Apache Struts2 RCE
   severity: critical
   description: Struts is vulnerable to remote command injection attacks through incorrectly parsing an attacker’s invalid Content-Type HTTP header. The Struts vulnerability allows these commands to be executed under the privileges of the Web server.
diff --git a/cves/2017/CVE-2017-7269.yaml b/cves/2017/CVE-2017-7269.yaml
index 72e59465d5..82e8e080d4 100644
--- a/cves/2017/CVE-2017-7269.yaml
+++ b/cves/2017/CVE-2017-7269.yaml
@@ -2,7 +2,7 @@ id: CVE-2017-7269
 
 info:
   name: Windows Server 2003 & IIS 6.0 RCE
-  author: thomas_from_offensity & @geeknik
+  author: thomas_from_offensity,geeknik
   severity: critical
   description: Buffer overflow in the ScStoragePathFromUrl function in the WebDAV service in Internet Information Services (IIS) 6.0 in Microsoft Windows Server 2003 R2 allows remote attackers to execute arbitrary code via a long header beginning with "If <http://" in a PROPFIND request.
   reference:
diff --git a/cves/2017/CVE-2017-7615.yaml b/cves/2017/CVE-2017-7615.yaml
index d12a002cf4..7ff2d8bbde 100644
--- a/cves/2017/CVE-2017-7615.yaml
+++ b/cves/2017/CVE-2017-7615.yaml
@@ -2,7 +2,7 @@ id: CVE-2017-7615
 
 info:
   name: CVE-2017-7615
-  author: bp0lr & dwisiswant0
+  author: bp0lr,dwisiswant0
   severity: high
   description: MantisBT through 2.3.0 allows arbitrary password reset and unauthenticated admin access via an empty confirm_hash value to verify.php.
   tags: cve,cve2017,mantisbt
diff --git a/cves/2017/CVE-2017-9841.yaml b/cves/2017/CVE-2017-9841.yaml
index 1e78db74a6..981176418d 100644
--- a/cves/2017/CVE-2017-9841.yaml
+++ b/cves/2017/CVE-2017-9841.yaml
@@ -2,7 +2,7 @@ id: CVE-2017-9841
 
 info:
   name: CVE-2017-9841
-  author: Random-Robbie
+  author: Random_Robbie
   severity: high
   description: Util/PHP/eval-stdin.php in PHPUnit before 4.8.28 and 5.x before 5.6.3 allows remote attackers to execute arbitrary PHP code via HTTP POST data beginning with a "<?php " substring, as demonstrated by an attack on a site with an exposed /vendor folder, i.e., external access to the /vendor/phpunit/phpunit/src/Util/PHP/eval-stdin.php URI
   tags: cve,cve2017,php,phpunit,rce
diff --git a/cves/2018/CVE-2018-1000129.yaml b/cves/2018/CVE-2018-1000129.yaml
index ce85bf8758..7e1a3a440a 100644
--- a/cves/2018/CVE-2018-1000129.yaml
+++ b/cves/2018/CVE-2018-1000129.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-1000129
 
 info:
   name: Jolokia XSS
-  author: mavericknerd @0h1in9e
+  author: mavericknerd,0h1in9e
   severity: high
   description: An XSS vulnerability exists in the Jolokia agent version 1.3.7 in the HTTP servlet that allows an attacker to execute malicious javascript in the victim's browser.
   tags: cve,cve2018,jolokia,xss
diff --git a/cves/2018/CVE-2018-1000861.yaml b/cves/2018/CVE-2018-1000861.yaml
index ffecdfff4b..27841387a4 100644
--- a/cves/2018/CVE-2018-1000861.yaml
+++ b/cves/2018/CVE-2018-1000861.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-1000861
 
 info:
   name: Jenkins 2.138 Remote Command Execution
-  author: dhiyaneshDK & @pikpikcu
+  author: dhiyaneshDK,pikpikcu
   severity: critical
   reference: https://github.com/vulhub/vulhub/tree/master/jenkins/CVE-2018-1000861
   tags: cve,cve2018,jenkin,rce
diff --git a/cves/2018/CVE-2018-11409.yaml b/cves/2018/CVE-2018-11409.yaml
index d197dadcda..3825c9357d 100644
--- a/cves/2018/CVE-2018-11409.yaml
+++ b/cves/2018/CVE-2018-11409.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-11409
 
 info:
   name: Splunk Sensitive Information Disclosure
-  author: Harsh Bothra
+  author: harshbothra_
   severity: medium
   reference: https://nvd.nist.gov/vuln/detail/CVE-2018-11409
   tags: cve,cve2018,splunk
diff --git a/cves/2018/CVE-2018-11759.yaml b/cves/2018/CVE-2018-11759.yaml
index 0a3673aa75..edf69a2714 100644
--- a/cves/2018/CVE-2018-11759.yaml
+++ b/cves/2018/CVE-2018-11759.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-11759
 
 info:
   name: Apache Tomcat JK Status Manager Access
-  author: Harsh Bothra
+  author: harshbothra_
   severity: medium
   reference: https://github.com/immunIT/CVE-2018-11759
   tags: cve,cve2018,apache
diff --git a/cves/2018/CVE-2018-19439.yaml b/cves/2018/CVE-2018-19439.yaml
index 38851b6a0c..b953866c96 100644
--- a/cves/2018/CVE-2018-19439.yaml
+++ b/cves/2018/CVE-2018-19439.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-19439
 
 info:
   name: Cross Site Scripting in Oracle Secure Global Desktop Administration Console
-  author: madrobot & dwisiswant0
+  author: madrobot,dwisiswant0
   severity: high
   description: XSS exists in the Administration Console in Oracle Secure Global Desktop 4.4 20080807152602 (but was fixed in later versions including 5.4)
   tags: cve,cve2018,oracle,xss
diff --git a/cves/2018/CVE-2018-20824.yaml b/cves/2018/CVE-2018-20824.yaml
index 7f4bf6ffcb..a86b7d6a62 100644
--- a/cves/2018/CVE-2018-20824.yaml
+++ b/cves/2018/CVE-2018-20824.yaml
@@ -2,7 +2,7 @@ id: CVE-2018-20824
 
 info:
   name: Atlassian Jira WallboardServlet XSS
-  author: madrobot & dwisiswant0
+  author: madrobot,dwisiswant0
   severity: medium
   description: The WallboardServlet resource in Jira before version 7.13.1 allows remote attackers to inject arbitrary HTML or JavaScript via a cross site scripting (XSS) vulnerability in the cyclePeriod parameter.
   tags: cve,cve2018,atlassian,jira,xss
diff --git a/cves/2019/CVE-2019-15858.yaml b/cves/2019/CVE-2019-15858.yaml
index 6b9246ddf0..f243e8b2af 100644
--- a/cves/2019/CVE-2019-15858.yaml
+++ b/cves/2019/CVE-2019-15858.yaml
@@ -2,7 +2,7 @@ id: CVE-2019-15858
 
 info:
   name: Unauthenticated Woody Ad Snippets WordPress Plugin RCE
-  author: dwisiswant0 & fmunozs & patralos
+  author: dwisiswant0,fmunozs,patralos
   severity: high
   description: |
     This template supports the detection part only. See references.
diff --git a/cves/2019/CVE-2019-17382.yaml b/cves/2019/CVE-2019-17382.yaml
index 6fadb5a751..c4e52beccf 100644
--- a/cves/2019/CVE-2019-17382.yaml
+++ b/cves/2019/CVE-2019-17382.yaml
@@ -2,7 +2,7 @@ id: CVE-2019-17382
 
 info:
   name: Zabbix Authentication Bypass
-  author: Harsh Bothra
+  author: harshbothra_
   severity: critical
   description: An issue was discovered in zabbix.php?action=dashboard.view&dashboardid=1 in Zabbix through 4.4. An attacker can bypass the login page and access the dashboard page, and then create a Dashboard, Report, Screen, or Map without any Username/Password (i.e., anonymously). All created elements (Dashboard/Report/Screen/Map) are accessible by other users and by an admin.
   reference: https://www.exploit-db.com/exploits/47467
diff --git a/cves/2019/CVE-2019-17558.yaml b/cves/2019/CVE-2019-17558.yaml
index e4e97cc16b..9a90fab202 100644
--- a/cves/2019/CVE-2019-17558.yaml
+++ b/cves/2019/CVE-2019-17558.yaml
@@ -1,7 +1,7 @@
 id: CVE-2019-17558
 info:
   name: Apache Solr 8.3.0 - Remote Code Execution via Velocity Template
-  author: pikpikcu & madrobot
+  author: pikpikcu,madrobot
   severity: critical
   refrense: https://nvd.nist.gov/vuln/detail/CVE-2019-17558
   tags: cve,cve2019,apache,rce,solr
diff --git a/cves/2019/CVE-2019-19985.yaml b/cves/2019/CVE-2019-19985.yaml
index aad285be19..0d20df8d6a 100644
--- a/cves/2019/CVE-2019-19985.yaml
+++ b/cves/2019/CVE-2019-19985.yaml
@@ -2,7 +2,7 @@ id: CVE-2019-19985
 
 info:
   name: WordPress Plugin Email Subscribers & Newsletters 4.2.2 - Unauthenticated File Download
-  author: KBA@SOGETI_ESEC, madrobot & dwisiswant0
+  author: KBA@SOGETI_ESEC,madrobot,dwisiswant0
   severity: medium
   description: The WordPress plugin, Email Subscribers & Newsletters, before 4.2.3 had a flaw that allowed unauthenticated file download with user information disclosure.
   refrense: https://www.exploit-db.com/exploits/48698
diff --git a/cves/2019/CVE-2019-3396.yaml b/cves/2019/CVE-2019-3396.yaml
index 231678b8b8..646c8d53ef 100644
--- a/cves/2019/CVE-2019-3396.yaml
+++ b/cves/2019/CVE-2019-3396.yaml
@@ -1,6 +1,6 @@
 id: CVE-2019-3396
 info:
-  author: Harsh Bothra
+  author: harshbothra_
   name: Atlassian Confluence Path Traversal
   severity: high
   description: The Widget Connector macro in Atlassian Confluence Server before version 6.6.12 (the fixed version for 6.6.x), from version 6.7.0 before 6.12.3 (the fixed version for 6.12.x), from version 6.13.0 before 6.13.3 (the fixed version for 6.13.x), and from version 6.14.0 before 6.14.2 (the fixed version for 6.14.x), allows remote attackers to achieve path traversal and remote code execution on a Confluence Server or Data Center instance via server-side template injection.
diff --git a/cves/2019/CVE-2019-8449.yaml b/cves/2019/CVE-2019-8449.yaml
index 6d4fcdffe2..e1ab720711 100644
--- a/cves/2019/CVE-2019-8449.yaml
+++ b/cves/2019/CVE-2019-8449.yaml
@@ -2,7 +2,7 @@ id: CVE-2019-8449
 
 info:
   name: JIRA Unauthenticated Sensitive Information Disclosure
-  author: Harsh Bothra
+  author: harshbothra_
   severity: medium
   description: The /rest/api/latest/groupuserpicker resource in Jira before version 8.4.0 allows remote attackers to enumerate usernames via an information disclosure vulnerability.
   reference: |
diff --git a/cves/2019/CVE-2019-9978.yaml b/cves/2019/CVE-2019-9978.yaml
index 49beed0a02..871ea7acfb 100644
--- a/cves/2019/CVE-2019-9978.yaml
+++ b/cves/2019/CVE-2019-9978.yaml
@@ -2,7 +2,7 @@ id: CVE-2019-9978
 
 info:
   name: WordPress social-warfare RFI
-  author: madrobot & dwisiswant0
+  author: madrobot,dwisiswant0
   severity: critical
   description: The social-warfare plugin before 3.5.3 for WordPress has stored XSS via the wp-admin/admin-post.php?swp_debug=load_options swp_url parameter, as exploited in the wild in March 2019. This affects Social Warfare and Social Warfare Pro.
   reference: https://github.com/mpgn/CVE-2019-9978
diff --git a/cves/2020/CVE-2020-12720.yaml b/cves/2020/CVE-2020-12720.yaml
index 49c158ee62..cf0dc3791a 100644
--- a/cves/2020/CVE-2020-12720.yaml
+++ b/cves/2020/CVE-2020-12720.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-12720
 
 info:
   name: CVE-2020-12720 vBulletin SQLI
-  author: pdnuclei - projectdiscovery.io
+  author: pdteam
   severity: critical
   description: vBulletin before 5.5.6pl1, 5.6.0 before 5.6.0pl1, and 5.6.1 before 5.6.1pl1 has incorrect access control.
   reference: https://github.com/rekter0/exploits/tree/master/CVE-2020-12720
diff --git a/cves/2020/CVE-2020-5284.yaml b/cves/2020/CVE-2020-5284.yaml
index 1696c9074a..90ae483682 100644
--- a/cves/2020/CVE-2020-5284.yaml
+++ b/cves/2020/CVE-2020-5284.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-5284
 
 info:
   name: Next.js .next/ limited path traversal
-  author: Harsh & Rahul & dwisiswant0
+  author: rootxharsh,iamnoooob,dwisiswant0
   severity: medium
   description: Next.js versions before 9.3.2 have a directory traversal vulnerability. Attackers could craft special requests to access files in the dist directory (.next). This does not affect files outside of the dist directory (.next). In general, the dist directory only holds build assets unless your application intentionally stores other assets under this directory. This issue is fixed in version 9.3.2.
   tags: cve,cve2020,nextjs,lfi
diff --git a/cves/2020/CVE-2020-5405.yaml b/cves/2020/CVE-2020-5405.yaml
index 76d937984c..0bc12c060b 100644
--- a/cves/2020/CVE-2020-5405.yaml
+++ b/cves/2020/CVE-2020-5405.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-5405
 
 info:
   name: Spring Cloud Directory Traversal
-  author: Harsh Bothra
+  author: harshbothra_
   severity: high
   description: Spring Cloud Config, versions 2.2.x prior to 2.2.2, versions 2.1.x prior to 2.1.7, and older unsupported versions allow applications to serve arbitrary configuration files through the spring-cloud-config-server module. A malicious user, or attacker, can send a request using a specially crafted URL that can lead a directory traversal attack.
   reference: https://pivotal.io/security/cve-2020-5405
diff --git a/cves/2020/CVE-2020-5902.yaml b/cves/2020/CVE-2020-5902.yaml
index 6f3d9d76f3..362ad7195a 100644
--- a/cves/2020/CVE-2020-5902.yaml
+++ b/cves/2020/CVE-2020-5902.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-5902
 
 info:
   name: F5 BIG-IP TMUI RCE
-  author: madrobot & dwisiswant0 & ringo
+  author: madrobot,dwisiswant0,ringo
   severity: high
   description: In BIG-IP versions 15.0.0-15.1.0.3, 14.1.0-14.1.2.5, 13.1.0-13.1.3.3, 12.1.0-12.1.5.1, and 11.6.1-11.6.5.1, the Traffic Management User Interface (TMUI), also referred to as the Configuration utility, has a Remote Code Execution (RCE) vulnerability in undisclosed pages.
   reference: |
diff --git a/cves/2020/CVE-2020-8115.yaml b/cves/2020/CVE-2020-8115.yaml
index 45814556fa..a489c499a7 100644
--- a/cves/2020/CVE-2020-8115.yaml
+++ b/cves/2020/CVE-2020-8115.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-8115
 
 info:
   name: Revive Adserver XSS
-  author: madrobot & dwisiswant0
+  author: madrobot,dwisiswant0
   severity: medium
   description: |
     A reflected XSS vulnerability has been discovered in the publicly accessible afr.php delivery script of Revive Adserver <= 5.0.3 by Jacopo Tediosi. There are currently no known exploits: the session identifier cannot be accessed as it is stored in an http-only cookie as of v3.2.2. On older versions, however, under specific circumstances, it could be possible to steal the session identifier and gain access to the admin interface. The query string sent to the www/delivery/afr.php script was printed back without proper escaping in a JavaScript context, allowing an attacker to execute arbitrary JS code on the browser of the victim.
diff --git a/cves/2020/CVE-2020-8512.yaml b/cves/2020/CVE-2020-8512.yaml
index ced35fb071..f7b28604d5 100644
--- a/cves/2020/CVE-2020-8512.yaml
+++ b/cves/2020/CVE-2020-8512.yaml
@@ -2,7 +2,7 @@ id: CVE-2020-8512
 
 info:
   name: IceWarp WebMail XSS
-  author: pdnuclei & dwisiswant0
+  author: pdteam,dwisiswant0
   severity: medium
   description: In IceWarp Webmail Server through 11.4.4.1, there is XSS in the /webmail/ color parameter.
   reference: |
diff --git a/cves/2021/CVE-2021-22986.yaml b/cves/2021/CVE-2021-22986.yaml
index 01328cb71e..bf2d922d36 100644
--- a/cves/2021/CVE-2021-22986.yaml
+++ b/cves/2021/CVE-2021-22986.yaml
@@ -1,7 +1,7 @@
 id: CVE-2021-22986
 info:
   name: F5 BIG-IP iControl REST unauthenticated RCE
-  author: Harsh Jaiswal (@rootxharsh) & Rahul Maini (@iamnoooob)
+  author: rootxharsh,iamnoooob
   severity: critical
   tags: bigip,cve,cve2021,rce
   description: The iControl REST interface has an unauthenticated remote command execution vulnerability.
diff --git a/default-logins/rabbitmq/rabbitmq-default-admin.yaml b/default-logins/rabbitmq/rabbitmq-default-admin.yaml
index 104cb657da..034e6d241c 100644
--- a/default-logins/rabbitmq/rabbitmq-default-admin.yaml
+++ b/default-logins/rabbitmq/rabbitmq-default-admin.yaml
@@ -2,7 +2,7 @@ id: rabbitmq-default-admin
 
 info:
   name: RabbitMQ Default Credentials
-  author: fyoorer & dwisiswant0
+  author: fyoorer,dwisiswant0
   severity: high
   tags: rabbitmq,default-login
 
diff --git a/dns/dead-host-with-cname.yaml b/dns/dead-host-with-cname.yaml
index b770519f5e..3d57d9b556 100644
--- a/dns/dead-host-with-cname.yaml
+++ b/dns/dead-host-with-cname.yaml
@@ -2,7 +2,7 @@ id: dead-host-with-cname
 
 info:
   name: dead-host-with-cname
-  author: pdnuclei - projectdiscovery.io
+  author: pdteam
   severity: info
   tags: dns
 
diff --git a/exposed-panels/adminer-panel.yaml b/exposed-panels/adminer-panel.yaml
index 656b06c8bd..c00d3449c5 100644
--- a/exposed-panels/adminer-panel.yaml
+++ b/exposed-panels/adminer-panel.yaml
@@ -1,7 +1,7 @@
 id: adminer-panel
 info:
   name: Adminer Login panel
-  author: random-robbie & meme-lord
+  author: random_robbie,meme-lord
   severity: info
   reference: https://blog.sorcery.ie/posts/adminer/
   tags: panel
diff --git a/exposed-panels/jmx-console.yaml b/exposed-panels/jmx-console.yaml
index d42d8c1648..d223904914 100644
--- a/exposed-panels/jmx-console.yaml
+++ b/exposed-panels/jmx-console.yaml
@@ -1,7 +1,7 @@
 id: jmx-console
 info:
   name: JMX Console
-  author: Yash Anand @yashanand155
+  author: yashanand155
   severity: low
   tags: panel
 
diff --git a/exposed-panels/joomla-panel.yaml b/exposed-panels/joomla-panel.yaml
index 0ba3c3e6d5..84ee9d3a3c 100644
--- a/exposed-panels/joomla-panel.yaml
+++ b/exposed-panels/joomla-panel.yaml
@@ -2,7 +2,7 @@ id: joomla-panel
 
 info:
   name: Joomla Panel
-  author: github.com/its0x08
+  author: its0x08
   severity: info
   tags: panel
 
diff --git a/exposed-panels/mobileiron-login.yaml b/exposed-panels/mobileiron-login.yaml
index d5c1833dce..2738707129 100644
--- a/exposed-panels/mobileiron-login.yaml
+++ b/exposed-panels/mobileiron-login.yaml
@@ -2,7 +2,7 @@ id: mobileiron-login
 
 info:
   name: MobileIron Login
-  author: dhiyaneshDK & @dwisiswant0
+  author: dhiyaneshDK,dwisiswant0
   Severity: info
   tags: panel
 
diff --git a/exposed-panels/open-stack-dashboard-login.yaml b/exposed-panels/open-stack-dashboard-login.yaml
index b2fe114513..83e2e5fe2c 100644
--- a/exposed-panels/open-stack-dashboard-login.yaml
+++ b/exposed-panels/open-stack-dashboard-login.yaml
@@ -2,7 +2,7 @@ id: open-stack-dashboard-login
 
 info:
   name: OpenStack Dashboard
-  author: dhiyaneshDK & hackergautam
+  author: dhiyaneshDK,hackergautam
   severity: info
   reference: https://www.exploit-db.com/ghdb/6464
   tags: panel,openstack
diff --git a/exposed-panels/public-tomcat-manager.yaml b/exposed-panels/public-tomcat-manager.yaml
index 191857362f..67f8d2ab1b 100644
--- a/exposed-panels/public-tomcat-manager.yaml
+++ b/exposed-panels/public-tomcat-manager.yaml
@@ -2,7 +2,7 @@ id: public-tomcat-manager
 
 info:
   name: tomcat manager disclosure
-  author: Ahmed Sherif & geeknik
+  author: Ahmed Sherif,geeknik
   severity: info
   tags: panel
 
diff --git a/exposed-panels/traefik-dashboard.yaml b/exposed-panels/traefik-dashboard.yaml
index fa2aee542e..4ec724074d 100644
--- a/exposed-panels/traefik-dashboard.yaml
+++ b/exposed-panels/traefik-dashboard.yaml
@@ -2,7 +2,7 @@ id: traefik-dashboard-detect
 
 info:
   name: Traefik Dashboard
-  author: schniggie & StreetOfHackerR007
+  author: schniggie,StreetOfHackerR007
   severity: info
   tags: panel
 
diff --git a/exposed-panels/webeditors.yaml b/exposed-panels/webeditors.yaml
index b00aba5461..52f1068c2c 100644
--- a/exposed-panels/webeditors.yaml
+++ b/exposed-panels/webeditors.yaml
@@ -2,7 +2,7 @@ id: webeditors
 
 info:
   name: Web Editors
-  author: pwnmachine
+  author: princechaddha
   severity: info
   tags: panel
 
diff --git a/exposures/apis/wadl-api.yaml b/exposures/apis/wadl-api.yaml
index 3b0dcf77a0..6c429e30c6 100644
--- a/exposures/apis/wadl-api.yaml
+++ b/exposures/apis/wadl-api.yaml
@@ -2,7 +2,7 @@ id: wadl-api
 
 info:
   name: wadl file disclosure
-  author: 0xrudra & manuelbua
+  author: 0xrudra,manuelbua
   severity: info
   tags: exposure,api
   reference: |
diff --git a/exposures/backups/sql-dump.yaml b/exposures/backups/sql-dump.yaml
index ed7bb21c67..c6747c39b3 100644
--- a/exposures/backups/sql-dump.yaml
+++ b/exposures/backups/sql-dump.yaml
@@ -2,7 +2,7 @@ id: default-sql-dump
 
 info:
   name: MySQL Dump Files
-  author: geeknik & @dwisiswant0
+  author: geeknik,dwisiswant0
   severity: medium
   tags: exposure,backup
 
diff --git a/exposures/backups/zip-backup-files.yaml b/exposures/backups/zip-backup-files.yaml
index 6feee72a8e..9fb539b21e 100644
--- a/exposures/backups/zip-backup-files.yaml
+++ b/exposures/backups/zip-backup-files.yaml
@@ -2,7 +2,7 @@ id: zip-backup-files
 
 info:
   name: Compressed Web File
-  author: Toufik Airane & @dwisiswant0
+  author: Toufik Airane,dwisiswant0
   severity: medium
   tags: exposure,backup
 
diff --git a/exposures/configs/docker-compose-config.yaml b/exposures/configs/docker-compose-config.yaml
index 3206bc3af8..a6c7a48199 100644
--- a/exposures/configs/docker-compose-config.yaml
+++ b/exposures/configs/docker-compose-config.yaml
@@ -2,7 +2,7 @@ id: docker-compose-config
 
 info:
   name: docker-compose.yml exposure
-  author: meme-lord & blckraven & geeknik
+  author: meme-lord,blckraven,geeknik
   severity: medium
   tags: config,exposure,devops
 
diff --git a/exposures/configs/exposed-svn.yaml b/exposures/configs/exposed-svn.yaml
index 7be0564837..9e8aed327a 100644
--- a/exposures/configs/exposed-svn.yaml
+++ b/exposures/configs/exposed-svn.yaml
@@ -2,7 +2,7 @@ id: exposed-svn
 
 info:
   name: Exposed SVN Directory
-  author: udit_thakkur & dwisiswant0
+  author: udit_thakkur,dwisiswant0
   severity: medium
   tags: config,exposure,svn
 
diff --git a/exposures/configs/git-config.yaml b/exposures/configs/git-config.yaml
index 53766846a5..bddd47f576 100644
--- a/exposures/configs/git-config.yaml
+++ b/exposures/configs/git-config.yaml
@@ -2,7 +2,7 @@ id: git-config
 
 info:
   name: Git Config Disclosure
-  author: pdteam & pikpikcu
+  author: pdteam,pikpikcu
   severity: medium
   description: Searches for the pattern /.git/config on passed URLs.
   tags: config,git,exposure
diff --git a/exposures/configs/laravel-env.yaml b/exposures/configs/laravel-env.yaml
index b67f6b3be1..0e02cc8ff2 100644
--- a/exposures/configs/laravel-env.yaml
+++ b/exposures/configs/laravel-env.yaml
@@ -2,7 +2,7 @@ id: laravel-env
 
 info:
   name: Laravel .env file accessible
-  author: pxmme1337 & dwisiswant0 & geeknik & emenalf
+  author: pxmme1337,dwisiswant0,geeknik,emenalf
   severity: critical
   description: Laravel uses the .env file to store sensitive information like database credentials and tokens. It should not be publicly accessible.
   reference: https://laravel.com/docs/master/configuration#environment-configuration
diff --git a/exposures/configs/package-json.yaml b/exposures/configs/package-json.yaml
index ee4a0c8cb2..c397c41544 100644
--- a/exposures/configs/package-json.yaml
+++ b/exposures/configs/package-json.yaml
@@ -2,7 +2,7 @@ id: package-json
 
 info:
   name: npm package.json disclosure
-  author: geeknik & afaq
+  author: geeknik,afaq
   severity: info
   description: All npm packages contain a file, usually in the project root, called package.json - this file holds various metadata relevant to the project.
   tags: config,exposure
diff --git a/exposures/configs/phpinfo.yaml b/exposures/configs/phpinfo.yaml
index 7b00715cbb..7e135845c8 100644
--- a/exposures/configs/phpinfo.yaml
+++ b/exposures/configs/phpinfo.yaml
@@ -2,7 +2,7 @@ id: phpinfo-files
 
 info:
   name: phpinfo Disclosure
-  author: pdteam & daffainfo & meme-lord
+  author: pdteam,daffainfo,meme-lord
   severity: low
   tags: config,exposure
 
diff --git a/exposures/configs/rails-database-config.yaml b/exposures/configs/rails-database-config.yaml
index e32cdaaa57..6e5b4f8f2b 100644
--- a/exposures/configs/rails-database-config.yaml
+++ b/exposures/configs/rails-database-config.yaml
@@ -2,7 +2,7 @@ id: rails-database-config
 
 info:
   name: Ruby-on-Rails Database Configuration Exposure
-  author: pdteam & geeknik
+  author: pdteam,geeknik
   severity: low
   tags: config,exposure,rails
 
diff --git a/exposures/logs/error-logs.yaml b/exposures/logs/error-logs.yaml
index f001421a85..fef1228189 100644
--- a/exposures/logs/error-logs.yaml
+++ b/exposures/logs/error-logs.yaml
@@ -1,7 +1,7 @@
 id: error-logs
 info:
   name: common error log files
-  author: geeknik & daffainfo
+  author: geeknik,daffainfo
   severity: low
   tags: logs,exposure
 
diff --git a/exposures/logs/laravel-log-file.yaml b/exposures/logs/laravel-log-file.yaml
index bcd36d36e1..9e81996767 100644
--- a/exposures/logs/laravel-log-file.yaml
+++ b/exposures/logs/laravel-log-file.yaml
@@ -2,7 +2,7 @@ id: laravel-log-file
 
 info:
   name: Laravel log file publicly accessible
-  author: sheikhrishad & geeknik
+  author: sheikhrishad,geeknik
   severity: high
   description: The log file of this Laravel web app might reveal details on the inner workings of the app, possibly even tokens, credentials or personal information.
   reference: https://laravel.com/docs/master/logging
diff --git a/exposures/tokens/generic/general-tokens.yaml b/exposures/tokens/generic/general-tokens.yaml
index d2fc17a7a6..056093b682 100644
--- a/exposures/tokens/generic/general-tokens.yaml
+++ b/exposures/tokens/generic/general-tokens.yaml
@@ -2,7 +2,7 @@ id: generic-tokens
 
 info:
   name: Generic Tokens
-  author: nadino & geeknik
+  author: nadino,geeknik
   severity: info
   tags: exposure,token
 
diff --git a/exposures/tokens/google/fcm-server-key.yaml b/exposures/tokens/google/fcm-server-key.yaml
index e4074e30bf..4864fba0a5 100644
--- a/exposures/tokens/google/fcm-server-key.yaml
+++ b/exposures/tokens/google/fcm-server-key.yaml
@@ -2,7 +2,7 @@ id: fcm-server-key
 
 info:
   name: FCM Server Key
-  author: Abss (@absshax)
+  author: absshax
   severity: high
   tags: exposure,token,google
   reference: https://abss.me/posts/fcm-takeover
diff --git a/fuzzing/adminer-panel-fuzz.yaml b/fuzzing/adminer-panel-fuzz.yaml
index 17229354b9..74f93afaec 100644
--- a/fuzzing/adminer-panel-fuzz.yaml
+++ b/fuzzing/adminer-panel-fuzz.yaml
@@ -1,7 +1,7 @@
 id: adminer-panel-fuzz
 info:
   name: Adminer Login Panel Fuzz
-  author: random-robbie & meme-lord
+  author: random_robbie,meme-lord
   severity: info
   reference: https://blog.sorcery.ie/posts/adminer/
   tags: fuzz,adminer
diff --git a/fuzzing/generic-lfi-fuzzing.yaml b/fuzzing/generic-lfi-fuzzing.yaml
index 10bdcf24d2..7d89273e5d 100644
--- a/fuzzing/generic-lfi-fuzzing.yaml
+++ b/fuzzing/generic-lfi-fuzzing.yaml
@@ -1,7 +1,7 @@
 id: generic-lfi-fuzzing
 info:
   name: Generic LFI Test
-  author: geeknik & unstabl3
+  author: geeknik,unstabl3
   severity: high
   description: A generic test for Local File Inclusion
   tags: fuzz,lfi
diff --git a/miscellaneous/dir-listing.yaml b/miscellaneous/dir-listing.yaml
index b4209255cf..0f4cbf8095 100644
--- a/miscellaneous/dir-listing.yaml
+++ b/miscellaneous/dir-listing.yaml
@@ -2,7 +2,7 @@ id: dir-listing
 
 info:
   name: Directory listing enabled
-  author: _harleo & pentest_swissky
+  author: _harleo,pentest_swissky
   severity: info
   tags: misc
 
diff --git a/misconfiguration/aem/aem-groovyconsole.yaml b/misconfiguration/aem/aem-groovyconsole.yaml
index 9829f83862..f80de92502 100644
--- a/misconfiguration/aem/aem-groovyconsole.yaml
+++ b/misconfiguration/aem/aem-groovyconsole.yaml
@@ -2,7 +2,7 @@ id: aem-groovyconsole
 
 info:
   name: AEM Groovy console enabled
-  author: twitter.com/Dheerajmadhukar
+  author: Dheerajmadhukar
   severity: critical
   description: Groovy console is exposed, RCE is possible.
   reference: https://hackerone.com/reports/672243
diff --git a/misconfiguration/django-debug-detect.yaml b/misconfiguration/django-debug-detect.yaml
index 5cdbe39c8f..3e64cd2b66 100644
--- a/misconfiguration/django-debug-detect.yaml
+++ b/misconfiguration/django-debug-detect.yaml
@@ -2,7 +2,7 @@ id: django-debug
 
 info:
   name: Django Debug Method Enabled
-  author: dhiyaneshDK & hackergautam
+  author: dhiyaneshDK,hackergautam
   severity: medium
   tags: django,debug
 
diff --git a/misconfiguration/druid-monitor.yaml b/misconfiguration/druid-monitor.yaml
index a04a6e42d9..284d2aec69 100644
--- a/misconfiguration/druid-monitor.yaml
+++ b/misconfiguration/druid-monitor.yaml
@@ -1,7 +1,7 @@
 id: druid-monitor
 info:
   name: Druid Monitor Unauthorized Access
-  author: 0h1in9e @ohlinge
+  author: ohlinge
   severity: high
   tags: druid,unauth
 
diff --git a/misconfiguration/exposed-docker-api.yaml b/misconfiguration/exposed-docker-api.yaml
index f3b973ca86..33d9b3af70 100644
--- a/misconfiguration/exposed-docker-api.yaml
+++ b/misconfiguration/exposed-docker-api.yaml
@@ -2,7 +2,7 @@ id: exposed-docker-api
 
 info:
   name: Exposed Docker API
-  author: furkansenan & dwisiswant0
+  author: furkansenan,dwisiswant0
   severity: info
   tags: docker,unauth,devops
 
diff --git a/misconfiguration/front-page-misconfig.yaml b/misconfiguration/front-page-misconfig.yaml
index 6f3076ad6f..7e982772b0 100644
--- a/misconfiguration/front-page-misconfig.yaml
+++ b/misconfiguration/front-page-misconfig.yaml
@@ -2,7 +2,7 @@ id: front-page-misconfig
 
 info:
   name: FrontPage configuration information discloure
-  author: JTeles & pikpikcu
+  author: JTeles,pikpikcu
   severity: info
   reference: https://docs.microsoft.com/en-us/archive/blogs/fabdulwahab/security-protecting-sharepoint-server-applications
 
diff --git a/misconfiguration/java-melody-exposed.yaml b/misconfiguration/java-melody-exposed.yaml
index 188b7a53bd..0139f7ec02 100644
--- a/misconfiguration/java-melody-exposed.yaml
+++ b/misconfiguration/java-melody-exposed.yaml
@@ -2,7 +2,7 @@ id: java-melody-exposed
 
 info:
   name: JavaMelody Monitoring Exposed
-  author: dhiyaneshDK & thomas_from_offensity
+  author: dhiyaneshDK,thomas_from_offensity
   severity: medium
   description: JavaMelody is a tool used to monitor Java or Java EE applications in QA and production environments. JavaMelody was detected on this web application. One option in the dashboard is to “View http sessions”. This can be used by an attacker to steal a user’s session.
   reference: |
diff --git a/misconfiguration/kubernetes-pods.yaml b/misconfiguration/kubernetes-pods.yaml
index dcb78164d4..97e6143374 100644
--- a/misconfiguration/kubernetes-pods.yaml
+++ b/misconfiguration/kubernetes-pods.yaml
@@ -2,7 +2,7 @@ id: kubernetes-pods-api
 
 info:
   name: Kubernetes Pods API
-  author: ilovebinbash & geeknik & 0xtavian
+  author: ilovebinbash,geeknik,0xtavian
   severity: critical
   description: When the service port is available, anyone can execute commands inside the container. See https://github.com/officialhocc/Kubernetes-Kubelet-RCE for inspiration.
   reference: https://blog.binaryedge.io/2018/12/06/kubernetes-being-hijacked-worldwide/
diff --git a/misconfiguration/server-status-localhost.yaml b/misconfiguration/server-status-localhost.yaml
index 8716739acf..38755bb670 100644
--- a/misconfiguration/server-status-localhost.yaml
+++ b/misconfiguration/server-status-localhost.yaml
@@ -2,7 +2,7 @@ id: server-status-localhost
 
 info:
   name: Server Status Disclosure
-  author: pdteam & geeknik
+  author: pdteam,geeknik
   severity: low
   tags: apache,debug
 
diff --git a/misconfiguration/shell-history.yaml b/misconfiguration/shell-history.yaml
index 5164b96a20..50fe75707c 100644
--- a/misconfiguration/shell-history.yaml
+++ b/misconfiguration/shell-history.yaml
@@ -2,7 +2,7 @@ id: shell-history
 
 info:
   name: Shell History
-  author: pentest_swissky & geeknik
+  author: pentest_swissky,geeknik
   severity: low
   description: Discover history for bash, ksh, sh, and zsh
   tags: config
diff --git a/misconfiguration/springboot/springboot-configprops.yaml b/misconfiguration/springboot/springboot-configprops.yaml
index ae33a1407f..69b658ca6c 100644
--- a/misconfiguration/springboot/springboot-configprops.yaml
+++ b/misconfiguration/springboot/springboot-configprops.yaml
@@ -2,7 +2,7 @@ id: springboot-configprops
 
 info:
   name: Detect Springboot Configprops Actuator
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   description: Sensitive environment variables may not be masked
   tags: springboot,disclosure
diff --git a/misconfiguration/springboot/springboot-env.yaml b/misconfiguration/springboot/springboot-env.yaml
index 986eb3f633..b2853af31a 100644
--- a/misconfiguration/springboot/springboot-env.yaml
+++ b/misconfiguration/springboot/springboot-env.yaml
@@ -2,7 +2,7 @@ id: springboot-env
 
 info:
   name: Detect Springboot Env Actuator
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   description: Sensitive environment variables may not be masked
   tags: springboot,disclosure
diff --git a/misconfiguration/springboot/springboot-heapdump.yaml b/misconfiguration/springboot/springboot-heapdump.yaml
index cd65105506..cd3f7fb857 100644
--- a/misconfiguration/springboot/springboot-heapdump.yaml
+++ b/misconfiguration/springboot/springboot-heapdump.yaml
@@ -2,7 +2,7 @@ id: springboot-heapdump
 
 info:
   name: Detect Springboot Heapdump Actuator
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: critical
   description: Environment variables and HTTP requests can be found in the HPROF
   tags: springboot,disclosure
diff --git a/misconfiguration/springboot/springboot-httptrace.yaml b/misconfiguration/springboot/springboot-httptrace.yaml
index 6a76cb46bb..8462163df7 100644
--- a/misconfiguration/springboot/springboot-httptrace.yaml
+++ b/misconfiguration/springboot/springboot-httptrace.yaml
@@ -2,7 +2,7 @@ id: springboot-httptrace
 
 info:
   name: Detect Springboot httptrace
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   description: View recent HTTP requests and responses
   tags: springboot,disclosure
diff --git a/misconfiguration/springboot/springboot-loggers.yaml b/misconfiguration/springboot/springboot-loggers.yaml
index b5fa03e536..53faae08ca 100644
--- a/misconfiguration/springboot/springboot-loggers.yaml
+++ b/misconfiguration/springboot/springboot-loggers.yaml
@@ -2,7 +2,7 @@ id: springboot-loggers
 
 info:
   name: Detect Springboot Loggers
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   tags: springboot,disclosure
 
diff --git a/misconfiguration/springboot/springboot-mappings.yaml b/misconfiguration/springboot/springboot-mappings.yaml
index 69630a8584..0b6d91a852 100644
--- a/misconfiguration/springboot/springboot-mappings.yaml
+++ b/misconfiguration/springboot/springboot-mappings.yaml
@@ -2,7 +2,7 @@ id: springboot-mappings
 
 info:
   name: Detect Springboot Mappings Actuator
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   description: Additional routes may be displayed
   tags: springboot,disclosure
diff --git a/misconfiguration/springboot/springboot-trace.yaml b/misconfiguration/springboot/springboot-trace.yaml
index 334673e33c..353bb3ea4b 100644
--- a/misconfiguration/springboot/springboot-trace.yaml
+++ b/misconfiguration/springboot/springboot-trace.yaml
@@ -2,7 +2,7 @@ id: springboot-trace
 
 info:
   name: Detect Springboot Trace Actuator
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: low
   description: View recent HTTP requests and responses
   tags: springboot,disclosure
diff --git a/misconfiguration/unauthenticated-nacos-access.yaml b/misconfiguration/unauthenticated-nacos-access.yaml
index e527e64d4c..02ab564941 100644
--- a/misconfiguration/unauthenticated-nacos-access.yaml
+++ b/misconfiguration/unauthenticated-nacos-access.yaml
@@ -2,7 +2,7 @@ id: unauthenticated-nacos-access
 
 info:
   name: Unauthenticated Nacos access v1.x
-  author: taielab & @pikpikcu
+  author: taielab,pikpikcu
   severity: critical
   issues: https://github.com/alibaba/nacos/issues/4593
   tags: nacos,unauth
diff --git a/network/unauth-ftp.yaml b/network/unauth-ftp.yaml
index fc468fcbb9..1eaae23dd2 100644
--- a/network/unauth-ftp.yaml
+++ b/network/unauth-ftp.yaml
@@ -2,7 +2,7 @@ id: unauth-ftp
 
 info:
   name: FTP Anonymous Login
-  author: Celesian ( @C3l3si4n )
+  author: C3l3si4n
   severity: medium
   reference: https://tools.ietf.org/html/rfc2577
   tags: network,ftp
diff --git a/takeovers/acquia-takeover.yaml b/takeovers/acquia-takeover.yaml
index fa267bacc3..3740c22e91 100644
--- a/takeovers/acquia-takeover.yaml
+++ b/takeovers/acquia-takeover.yaml
@@ -2,7 +2,7 @@ id: acquia-takeover
 
 info:
   name: Acquia Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: info
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/aftership-takeover.yaml b/takeovers/aftership-takeover.yaml
index 6e6f5d758e..2249dbf383 100644
--- a/takeovers/aftership-takeover.yaml
+++ b/takeovers/aftership-takeover.yaml
@@ -2,7 +2,7 @@ id: aftership-takeover
 
 info:
   name: Aftership Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/agilecrm-takeover.yaml b/takeovers/agilecrm-takeover.yaml
index 9ee88f08a8..9f6a9a36d8 100644
--- a/takeovers/agilecrm-takeover.yaml
+++ b/takeovers/agilecrm-takeover.yaml
@@ -2,7 +2,7 @@ id: agilecrm-takeover
 
 info:
   name: agilecrm takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/aha-takeover.yaml b/takeovers/aha-takeover.yaml
index 869629e725..2cd6bcb83d 100644
--- a/takeovers/aha-takeover.yaml
+++ b/takeovers/aha-takeover.yaml
@@ -2,7 +2,7 @@ id: aha-takeover
 
 info:
   name: Aha Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/airee-takeover.yaml b/takeovers/airee-takeover.yaml
index 53078b06b0..e728af2d0d 100644
--- a/takeovers/airee-takeover.yaml
+++ b/takeovers/airee-takeover.yaml
@@ -2,7 +2,7 @@ id: airee-takeover
 
 info:
   name: Airee Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/anima-takeover.yaml b/takeovers/anima-takeover.yaml
index a7d7a94d41..e106afff84 100644
--- a/takeovers/anima-takeover.yaml
+++ b/takeovers/anima-takeover.yaml
@@ -2,7 +2,7 @@ id: anima-takeover
 
 info:
   name: Anima Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/aws-bucket-takeover.yaml b/takeovers/aws-bucket-takeover.yaml
index 3b9a9c02d7..c2836b743f 100644
--- a/takeovers/aws-bucket-takeover.yaml
+++ b/takeovers/aws-bucket-takeover.yaml
@@ -2,7 +2,7 @@ id: aws-bucket-takeover
 
 info:
   name: AWS Bucket Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover,aws
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/bigcartel-takeover.yaml b/takeovers/bigcartel-takeover.yaml
index cac5c744e9..c9c8ca3393 100644
--- a/takeovers/bigcartel-takeover.yaml
+++ b/takeovers/bigcartel-takeover.yaml
@@ -2,7 +2,7 @@ id: bigcartel-takeover
 
 info:
   name: Bigcartel Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/bitbucket-takeover.yaml b/takeovers/bitbucket-takeover.yaml
index c878d8a174..f9234ad7a3 100644
--- a/takeovers/bitbucket-takeover.yaml
+++ b/takeovers/bitbucket-takeover.yaml
@@ -2,7 +2,7 @@ id: bitbucket-takeover
 
 info:
   name: Bitbucket Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/brightcove-takeover.yaml b/takeovers/brightcove-takeover.yaml
index 0d6024c5c4..3692016e14 100644
--- a/takeovers/brightcove-takeover.yaml
+++ b/takeovers/brightcove-takeover.yaml
@@ -2,7 +2,7 @@ id: brightcove-takeover
 
 info:
   name: brightcove takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/campaignmonitor.yaml b/takeovers/campaignmonitor.yaml
index 1d98a0c9bd..bc88823e52 100644
--- a/takeovers/campaignmonitor.yaml
+++ b/takeovers/campaignmonitor.yaml
@@ -2,7 +2,7 @@ id: campaignmonitor-takeover
 
 info:
   name: campaignmonitor takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/canny-takeover.yaml b/takeovers/canny-takeover.yaml
index 4c6009d18c..acdb9d0e75 100644
--- a/takeovers/canny-takeover.yaml
+++ b/takeovers/canny-takeover.yaml
@@ -2,7 +2,7 @@ id: canny-takeover
 
 info:
   name: canny takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/cargo-takeover.yaml b/takeovers/cargo-takeover.yaml
index bf03a9c72d..f429fe1679 100644
--- a/takeovers/cargo-takeover.yaml
+++ b/takeovers/cargo-takeover.yaml
@@ -2,7 +2,7 @@ id: cargo-takeover
 
 info:
   name: cargo takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/cargocollective-takeover.yaml b/takeovers/cargocollective-takeover.yaml
index 94a236f525..0ad2a7413c 100644
--- a/takeovers/cargocollective-takeover.yaml
+++ b/takeovers/cargocollective-takeover.yaml
@@ -2,7 +2,7 @@ id: cargocollective-takeover
 
 info:
   name: cargocollective takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/fastly-takeover.yaml b/takeovers/fastly-takeover.yaml
index 8c08c7ad6a..4b606dfab2 100644
--- a/takeovers/fastly-takeover.yaml
+++ b/takeovers/fastly-takeover.yaml
@@ -2,7 +2,7 @@ id: fastly-takeover
 
 info:
   name: fastly takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: info
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz/issues/22
diff --git a/takeovers/feedpress-takeover.yaml b/takeovers/feedpress-takeover.yaml
index 2ffc737c29..13e8208f41 100644
--- a/takeovers/feedpress-takeover.yaml
+++ b/takeovers/feedpress-takeover.yaml
@@ -2,7 +2,7 @@ id: feedpress-takeover
 
 info:
   name: Agilecrm Takeover Detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/freshdesk-takeover.yaml b/takeovers/freshdesk-takeover.yaml
index 589f209f0e..7ad85a3e7f 100644
--- a/takeovers/freshdesk-takeover.yaml
+++ b/takeovers/freshdesk-takeover.yaml
@@ -2,7 +2,7 @@ id: freshdesk-takeover
 
 info:
   name: freshdesk takeover detection
-  author: Gal Nagli @naglinagli
+  author: naglinagli
   severity: high
   tags: takeover
   reference: https://twitter.com/ja1sharma/status/1377239265348743175
diff --git a/takeovers/frontify-takeover.yaml b/takeovers/frontify-takeover.yaml
index d15493fa50..b439ed310e 100644
--- a/takeovers/frontify-takeover.yaml
+++ b/takeovers/frontify-takeover.yaml
@@ -2,7 +2,7 @@ id: frontify-takeover
 
 info:
   name: frontify takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/gemfury-takeover.yaml b/takeovers/gemfury-takeover.yaml
index 2ce44825ce..340c66374b 100644
--- a/takeovers/gemfury-takeover.yaml
+++ b/takeovers/gemfury-takeover.yaml
@@ -2,7 +2,7 @@ id: gemfury-takeover
 
 info:
   name: gemfury takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/getresponse-takeover.yaml b/takeovers/getresponse-takeover.yaml
index 8ed01ca410..852a6d5985 100644
--- a/takeovers/getresponse-takeover.yaml
+++ b/takeovers/getresponse-takeover.yaml
@@ -2,7 +2,7 @@ id: getresponse-takeover
 
 info:
   name: getresponse takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/ghost-takeover.yaml b/takeovers/ghost-takeover.yaml
index 9c58741d56..6f529c2709 100644
--- a/takeovers/ghost-takeover.yaml
+++ b/takeovers/ghost-takeover.yaml
@@ -2,7 +2,7 @@ id: ghost-takeover
 
 info:
   name: ghost takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/github-takeover.yaml b/takeovers/github-takeover.yaml
index 4b2fa76a0d..0fb086c33d 100644
--- a/takeovers/github-takeover.yaml
+++ b/takeovers/github-takeover.yaml
@@ -2,7 +2,7 @@ id: github-takeover
 
 info:
   name: github takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/hatenablog-takeover.yaml b/takeovers/hatenablog-takeover.yaml
index 1325a9cef2..e1842d061b 100644
--- a/takeovers/hatenablog-takeover.yaml
+++ b/takeovers/hatenablog-takeover.yaml
@@ -2,7 +2,7 @@ id: hatenablog-takeover
 
 info:
   name: hatenablog takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/helpjuice-takeover.yaml b/takeovers/helpjuice-takeover.yaml
index 0aebd3c89e..c5ab27ce89 100644
--- a/takeovers/helpjuice-takeover.yaml
+++ b/takeovers/helpjuice-takeover.yaml
@@ -2,7 +2,7 @@ id: helpjuice-takeover
 
 info:
   name: helpjuice takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/helprace-takeover.yaml b/takeovers/helprace-takeover.yaml
index dd198bf2c3..8289377300 100644
--- a/takeovers/helprace-takeover.yaml
+++ b/takeovers/helprace-takeover.yaml
@@ -2,7 +2,7 @@ id: helprace-takeover
 
 info:
   name: helprace takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/helpscout-takeover.yaml b/takeovers/helpscout-takeover.yaml
index 101895d06a..548f39f325 100644
--- a/takeovers/helpscout-takeover.yaml
+++ b/takeovers/helpscout-takeover.yaml
@@ -2,7 +2,7 @@ id: helpscout-takeover
 
 info:
   name: helpscout takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/heroku-takeover.yaml b/takeovers/heroku-takeover.yaml
index 69d19de416..64115ff057 100644
--- a/takeovers/heroku-takeover.yaml
+++ b/takeovers/heroku-takeover.yaml
@@ -2,7 +2,7 @@ id: heroku-takeover
 
 info:
   name: heroku takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/hubspot-takeover.yaml b/takeovers/hubspot-takeover.yaml
index 7a4aa088f0..38d6b33e7e 100644
--- a/takeovers/hubspot-takeover.yaml
+++ b/takeovers/hubspot-takeover.yaml
@@ -2,7 +2,7 @@ id: hubspot-takeover
 
 info:
   name: hubspot takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/intercom-takeover.yaml b/takeovers/intercom-takeover.yaml
index 1f014adf34..50850fce2b 100644
--- a/takeovers/intercom-takeover.yaml
+++ b/takeovers/intercom-takeover.yaml
@@ -2,7 +2,7 @@ id: intercom-takeover
 
 info:
   name: intercom takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/jazzhr-takeover.yaml b/takeovers/jazzhr-takeover.yaml
index 433ce67268..cc2e8d6a32 100644
--- a/takeovers/jazzhr-takeover.yaml
+++ b/takeovers/jazzhr-takeover.yaml
@@ -2,7 +2,7 @@ id: jazzhr-takeover
 
 info:
   name: jazzhr takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/jetbrains-takeover.yaml b/takeovers/jetbrains-takeover.yaml
index 63320218ac..69d29867dd 100644
--- a/takeovers/jetbrains-takeover.yaml
+++ b/takeovers/jetbrains-takeover.yaml
@@ -2,7 +2,7 @@ id: jetbrains-takeover
 
 info:
   name: jetbrains takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/kinsta-takeover.yaml b/takeovers/kinsta-takeover.yaml
index b050848a13..039280c2ef 100644
--- a/takeovers/kinsta-takeover.yaml
+++ b/takeovers/kinsta-takeover.yaml
@@ -2,7 +2,7 @@ id: kinsta-takeover
 
 info:
   name: kinsta takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/landingi-takeover.yaml b/takeovers/landingi-takeover.yaml
index 37a3dcec7b..2514cf4e17 100644
--- a/takeovers/landingi-takeover.yaml
+++ b/takeovers/landingi-takeover.yaml
@@ -2,7 +2,7 @@ id: landingi-takeover
 
 info:
   name: landingi takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: info
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz/issues/117
diff --git a/takeovers/launchrock-takeover.yaml b/takeovers/launchrock-takeover.yaml
index 73de072912..b81478b063 100644
--- a/takeovers/launchrock-takeover.yaml
+++ b/takeovers/launchrock-takeover.yaml
@@ -2,7 +2,7 @@ id: launchrock-takeover
 
 info:
   name: launchrock takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/mashery-takeover.yaml b/takeovers/mashery-takeover.yaml
index b7622e8a79..e906c2cd01 100644
--- a/takeovers/mashery-takeover.yaml
+++ b/takeovers/mashery-takeover.yaml
@@ -2,7 +2,7 @@ id: mashery-takeover
 
 info:
   name: mashery takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/netlify-takeover.yaml b/takeovers/netlify-takeover.yaml
index dec37014aa..9c447ac42f 100644
--- a/takeovers/netlify-takeover.yaml
+++ b/takeovers/netlify-takeover.yaml
@@ -2,7 +2,7 @@ id: netlify-takeover
 
 info:
   name: netlify takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/ngrok-takeover.yaml b/takeovers/ngrok-takeover.yaml
index 05f8111d1f..fe7de54fd9 100644
--- a/takeovers/ngrok-takeover.yaml
+++ b/takeovers/ngrok-takeover.yaml
@@ -2,7 +2,7 @@ id: ngrok-takeover
 
 info:
   name: ngrok takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/pantheon-takeover.yaml b/takeovers/pantheon-takeover.yaml
index bcb45fa0a2..2f9438c074 100644
--- a/takeovers/pantheon-takeover.yaml
+++ b/takeovers/pantheon-takeover.yaml
@@ -2,7 +2,7 @@ id: pantheon-takeover
 
 info:
   name: pantheon takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/pingdom-takeover.yaml b/takeovers/pingdom-takeover.yaml
index 0df3fe6a37..fcc211e1b0 100644
--- a/takeovers/pingdom-takeover.yaml
+++ b/takeovers/pingdom-takeover.yaml
@@ -2,7 +2,7 @@ id: pingdom-takeover
 
 info:
   name: pingdom takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/proposify-takeover.yaml b/takeovers/proposify-takeover.yaml
index ad56ea4d6f..cd5cf09224 100644
--- a/takeovers/proposify-takeover.yaml
+++ b/takeovers/proposify-takeover.yaml
@@ -2,7 +2,7 @@ id: proposify-takeover
 
 info:
   name: proposify takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/readme-takeover.yaml b/takeovers/readme-takeover.yaml
index 27a5fa862c..0065f73839 100644
--- a/takeovers/readme-takeover.yaml
+++ b/takeovers/readme-takeover.yaml
@@ -2,7 +2,7 @@ id: readme-takeover
 
 info:
   name: readme takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/readthedocs-takeover.yaml b/takeovers/readthedocs-takeover.yaml
index 3a1060aa17..c58dd22060 100644
--- a/takeovers/readthedocs-takeover.yaml
+++ b/takeovers/readthedocs-takeover.yaml
@@ -2,7 +2,7 @@ id: readthedocs-takeover
 
 info:
   name: readthedocs takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/shopify-takeover.yaml b/takeovers/shopify-takeover.yaml
index 540a1d6951..66f65fc4ce 100644
--- a/takeovers/shopify-takeover.yaml
+++ b/takeovers/shopify-takeover.yaml
@@ -2,7 +2,7 @@ id: shopify-takeover
 
 info:
   name: shopify takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/simplebooklet-takeover.yaml b/takeovers/simplebooklet-takeover.yaml
index e1b2ae8536..997af84914 100644
--- a/takeovers/simplebooklet-takeover.yaml
+++ b/takeovers/simplebooklet-takeover.yaml
@@ -2,7 +2,7 @@ id: simplebooklet-takeover
 
 info:
   name: simplebooklet takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/smartjob-takeover.yaml b/takeovers/smartjob-takeover.yaml
index 489d944229..d95b83fcb5 100644
--- a/takeovers/smartjob-takeover.yaml
+++ b/takeovers/smartjob-takeover.yaml
@@ -2,7 +2,7 @@ id: smartjob-takeover
 
 info:
   name: smartjob takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/smartling-takeover.yaml b/takeovers/smartling-takeover.yaml
index 9f29dcc9ad..35aebde041 100644
--- a/takeovers/smartling-takeover.yaml
+++ b/takeovers/smartling-takeover.yaml
@@ -2,7 +2,7 @@ id: smartling-takeover
 
 info:
   name: smartling takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: info
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz/issues/67
diff --git a/takeovers/smugmug-takeover.yaml b/takeovers/smugmug-takeover.yaml
index 3a33c5dec6..793a6dbe49 100644
--- a/takeovers/smugmug-takeover.yaml
+++ b/takeovers/smugmug-takeover.yaml
@@ -2,7 +2,7 @@ id: smugmug-takeover
 
 info:
   name: smugmug takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/strikingly-takeover.yaml b/takeovers/strikingly-takeover.yaml
index 8e71ce2f65..a275eb44d9 100644
--- a/takeovers/strikingly-takeover.yaml
+++ b/takeovers/strikingly-takeover.yaml
@@ -2,7 +2,7 @@ id: strikingly-takeover
 
 info:
   name: strikingly takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://medium.com/@sherif0x00/takeover-subdomains-pointing-to-strikingly-5e67df80cdfd
diff --git a/takeovers/surveygizmo-takeover.yaml b/takeovers/surveygizmo-takeover.yaml
index 2244cf2b25..effe1d1d4f 100644
--- a/takeovers/surveygizmo-takeover.yaml
+++ b/takeovers/surveygizmo-takeover.yaml
@@ -2,7 +2,7 @@ id: surveygizmo-takeover
 
 info:
   name: surveygizmo takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/tave-takeover.yaml b/takeovers/tave-takeover.yaml
index 1a4e136384..856340b2cf 100644
--- a/takeovers/tave-takeover.yaml
+++ b/takeovers/tave-takeover.yaml
@@ -2,7 +2,7 @@ id: tave-takeover
 
 info:
   name: tave takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/teamwork-takeover.yaml b/takeovers/teamwork-takeover.yaml
index 1d9e9c3323..4bd80362a4 100644
--- a/takeovers/teamwork-takeover.yaml
+++ b/takeovers/teamwork-takeover.yaml
@@ -2,7 +2,7 @@ id: teamwork-takeover
 
 info:
   name: teamwork takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/tictail-takeover.yaml b/takeovers/tictail-takeover.yaml
index 9e30e88245..89c984e159 100644
--- a/takeovers/tictail-takeover.yaml
+++ b/takeovers/tictail-takeover.yaml
@@ -2,7 +2,7 @@ id: tictail-takeover
 
 info:
   name: tictail takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/tilda-takeover.yaml b/takeovers/tilda-takeover.yaml
index c24f21ae6c..025550fa04 100644
--- a/takeovers/tilda-takeover.yaml
+++ b/takeovers/tilda-takeover.yaml
@@ -2,7 +2,7 @@ id: tilda-takeover
 
 info:
   name: tilda takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz/issues/155
diff --git a/takeovers/tumblr-takeover.yaml b/takeovers/tumblr-takeover.yaml
index 47a316978c..0206e1734e 100644
--- a/takeovers/tumblr-takeover.yaml
+++ b/takeovers/tumblr-takeover.yaml
@@ -2,7 +2,7 @@ id: tumblr-takeover
 
 info:
   name: tumblr takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/uberflip-takeover.yaml b/takeovers/uberflip-takeover.yaml
index 506b4d4084..2d0a8e1d04 100644
--- a/takeovers/uberflip-takeover.yaml
+++ b/takeovers/uberflip-takeover.yaml
@@ -2,7 +2,7 @@ id: uberflip-takeover
 
 info:
   name: uberflip takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/uptimerobot-takeover.yaml b/takeovers/uptimerobot-takeover.yaml
index 923aa0c014..3f13c6bead 100644
--- a/takeovers/uptimerobot-takeover.yaml
+++ b/takeovers/uptimerobot-takeover.yaml
@@ -2,7 +2,7 @@ id: uptimerobot-takeover
 
 info:
   name: uptimerobot takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: info
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/urge-takeover.yaml b/takeovers/urge-takeover.yaml
index 39974af7cd..46534af654 100644
--- a/takeovers/urge-takeover.yaml
+++ b/takeovers/urge-takeover.yaml
@@ -2,7 +2,7 @@ id: surge-takeover
 
 info:
   name: surge takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/vend-takeover.yaml b/takeovers/vend-takeover.yaml
index e3456c9177..5b6cf3bcaf 100644
--- a/takeovers/vend-takeover.yaml
+++ b/takeovers/vend-takeover.yaml
@@ -2,7 +2,7 @@ id: vend-takeover
 
 info:
   name: vend takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/vercel-takeover.yaml b/takeovers/vercel-takeover.yaml
index 130046a14b..c71ae5a2ab 100644
--- a/takeovers/vercel-takeover.yaml
+++ b/takeovers/vercel-takeover.yaml
@@ -2,7 +2,7 @@ id: vercel-takeover
 
 info:
   name: vercel takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/webflow-takeover.yaml b/takeovers/webflow-takeover.yaml
index 4c87bd6557..da17c4a95f 100644
--- a/takeovers/webflow-takeover.yaml
+++ b/takeovers/webflow-takeover.yaml
@@ -2,7 +2,7 @@ id: webflow-takeover
 
 info:
   name: webflow takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/wishpond-takeover.yaml b/takeovers/wishpond-takeover.yaml
index 203e4f88c6..10b6648ade 100644
--- a/takeovers/wishpond-takeover.yaml
+++ b/takeovers/wishpond-takeover.yaml
@@ -2,7 +2,7 @@ id: wishpond-takeover
 
 info:
   name: wishpond takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/wordpress-takeover.yaml b/takeovers/wordpress-takeover.yaml
index f24f949f81..4136ddbfef 100644
--- a/takeovers/wordpress-takeover.yaml
+++ b/takeovers/wordpress-takeover.yaml
@@ -2,7 +2,7 @@ id: wordpress-takeover
 
 info:
   name: WordPress takeover detection
-  author: pdcommunity & geeknik
+  author: pdteam,geeknik
   severity: high
   tags: takeover,wordpress
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/wufoo-takeover.yaml b/takeovers/wufoo-takeover.yaml
index acb94bfcd7..eae61b2336 100644
--- a/takeovers/wufoo-takeover.yaml
+++ b/takeovers/wufoo-takeover.yaml
@@ -2,7 +2,7 @@ id: wufoo-takeover
 
 info:
   name: wufoo takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/takeovers/zendesk-takeover.yaml b/takeovers/zendesk-takeover.yaml
index 930e8b1794..13c5be4d12 100644
--- a/takeovers/zendesk-takeover.yaml
+++ b/takeovers/zendesk-takeover.yaml
@@ -2,7 +2,7 @@ id: zendesk-takeover
 
 info:
   name: zendesk takeover detection
-  author: pdcommunity
+  author: pdteam
   severity: high
   tags: takeover
   reference: https://github.com/EdOverflow/can-i-take-over-xyz
diff --git a/technologies/basic-auth-detection.yaml b/technologies/basic-auth-detection.yaml
index e784861b13..66132d212e 100644
--- a/technologies/basic-auth-detection.yaml
+++ b/technologies/basic-auth-detection.yaml
@@ -2,7 +2,7 @@ id: basic-auth-detection
 
 info:
   name: Basic auth detection
-  author: "@w4cky_"
+  author: w4cky_
   severity: info
 
 requests:
diff --git a/technologies/graphql-detect.yaml b/technologies/graphql-detect.yaml
index af87f655e6..399e476c60 100644
--- a/technologies/graphql-detect.yaml
+++ b/technologies/graphql-detect.yaml
@@ -2,7 +2,7 @@ id: graphql-detect
 
 info:
   name: GraphQL API Detection
-  author: NkxxkN & ELSFA7110
+  author: NkxxkN,ELSFA7110
   severity: info
 
 requests:
diff --git a/technologies/jolokia.yaml b/technologies/jolokia.yaml
index c922719f06..f6b28ff6ad 100644
--- a/technologies/jolokia.yaml
+++ b/technologies/jolokia.yaml
@@ -2,7 +2,7 @@ id: jolokia-instance
 
 info:
   name: Jolokia Version Disclosure
-  author: mavericknerd & dwisiswant0
+  author: mavericknerd,dwisiswant0
   severity: info
 
 requests:
diff --git a/technologies/liferay-portal-detect.yaml b/technologies/liferay-portal-detect.yaml
index 136736d9fe..58d0894274 100644
--- a/technologies/liferay-portal-detect.yaml
+++ b/technologies/liferay-portal-detect.yaml
@@ -1,7 +1,7 @@
 id: liferay-portal-detect
 info:
   name: Liferay Portal Detection
-  author: organiccrap & dwisiswant0
+  author: organiccrap,dwisiswant0
   severity: info
   # CVE-2020-7961: Liferay Portal Unauthenticated RCE
   # https://github.com/mzer0one/CVE-2020-7961-POC
diff --git a/technologies/openam-detection.yaml b/technologies/openam-detection.yaml
index 61489b3749..28620e5bd8 100644
--- a/technologies/openam-detection.yaml
+++ b/technologies/openam-detection.yaml
@@ -2,7 +2,7 @@ id: openam-detection
 
 info:
   name: Detect openam
-  author: melbadry9 & xelkomy
+  author: melbadry9,xelkomy
   severity: info
   description: The vulnerability was found in the password reset feature that OpenAM provides. When a user tries to reset his password, he is asked to enter his username then the backend validates whether the user exists or not through an LDAP query before the password reset token is sent to the user’s email.
   reference: https://blog.cybercastle.io/ldap-injection-in-openam/
diff --git a/technologies/springboot-actuator.yaml b/technologies/springboot-actuator.yaml
index f93a1441df..6bc4c9e7a1 100644
--- a/technologies/springboot-actuator.yaml
+++ b/technologies/springboot-actuator.yaml
@@ -2,7 +2,7 @@ id: springboot-actuator
 
 info:
   name: Detect Springboot Actuators
-  author: that_juan_ & dwisiswant0 & wdahlenb
+  author: that_juan_,dwisiswant0,wdahlenb
   severity: info
 
 requests:
diff --git a/technologies/telerik-dialoghandler-detect.yaml b/technologies/telerik-dialoghandler-detect.yaml
index 55311b4bd0..5fd20eba4e 100644
--- a/technologies/telerik-dialoghandler-detect.yaml
+++ b/technologies/telerik-dialoghandler-detect.yaml
@@ -2,7 +2,7 @@ id: telerik-dialoghandler-detect
 
 info:
   name: Detect Telerik Web UI Dialog Handler
-  author: organiccrap & zhenwarx
+  author: organiccrap,zhenwarx
   severity: info
   reference: |
     - https://captmeelo.com/pentest/2018/08/03/pwning-with-telerik.html
diff --git a/technologies/waf-detect.yaml b/technologies/waf-detect.yaml
index 7a823f9b45..a106e71a07 100644
--- a/technologies/waf-detect.yaml
+++ b/technologies/waf-detect.yaml
@@ -2,7 +2,7 @@ id: waf-detect
 
 info:
   name: WAF Detection
-  author: dwisiswant0 & lu4nx
+  author: dwisiswant0,lu4nx
   severity: info
   reference: https://github.com/Ekultek/WhatWaf
   tags: waf,tech,misc
diff --git a/technologies/werkzeug-debugger-detect.yaml b/technologies/werkzeug-debugger-detect.yaml
index 11badfd5de..f11eac5435 100644
--- a/technologies/werkzeug-debugger-detect.yaml
+++ b/technologies/werkzeug-debugger-detect.yaml
@@ -2,7 +2,7 @@ id: werkzeug-debugger-detect
 
 info:
   name: Werkzeug debugger console
-  author: pdnuclei - projectdiscovery.io
+  author: pdteam
   severity: info
 
 requests:
diff --git a/vulnerabilities/generic/basic-xss-prober.yaml b/vulnerabilities/generic/basic-xss-prober.yaml
index 6ad90e4b83..373c1235b5 100644
--- a/vulnerabilities/generic/basic-xss-prober.yaml
+++ b/vulnerabilities/generic/basic-xss-prober.yaml
@@ -2,7 +2,7 @@ id: basic-xss-prober
 
 info:
   name: Basic XSS Prober
-  author: nadino & geeknik
+  author: nadino,geeknik
   severity: low
   tags: xss
 
diff --git a/vulnerabilities/generic/cache-poisoning.yaml b/vulnerabilities/generic/cache-poisoning.yaml
index 82886086dc..3b349afd09 100644
--- a/vulnerabilities/generic/cache-poisoning.yaml
+++ b/vulnerabilities/generic/cache-poisoning.yaml
@@ -2,7 +2,7 @@ id: cache-poisoning
 
 info:
   name: Cache Poisoning
-  author: melbadry9 & xelkomy
+  author: melbadry9,xelkomy
   severity: info
   reference: |
       - https://blog.melbadry9.xyz/fuzzing/nuclei-cache-poisoning
diff --git a/vulnerabilities/generic/crlf-injection.yaml b/vulnerabilities/generic/crlf-injection.yaml
index 4876a8a42c..7d7fe29698 100644
--- a/vulnerabilities/generic/crlf-injection.yaml
+++ b/vulnerabilities/generic/crlf-injection.yaml
@@ -2,7 +2,7 @@ id: crlf-injection
 
 info:
   name: CRLF injection
-  author: melbadry9 & nadino & xElkomy
+  author: melbadry9,nadino,xElkomy
   severity: low
   description: Improper sanitization of CRLF sequences.
   tags: crlf
diff --git a/vulnerabilities/generic/open-redirect.yaml b/vulnerabilities/generic/open-redirect.yaml
index 42b559c2d9..baef28bf45 100644
--- a/vulnerabilities/generic/open-redirect.yaml
+++ b/vulnerabilities/generic/open-redirect.yaml
@@ -2,7 +2,7 @@ id: open-redirect
 
 info:
   name: Open URL redirect detection
-  author: afaq & @melbadry9 & @Elmahdi & @pxmme1337 & @Regala_ & @andirrahmani1 & @geeknik
+  author: afaq,melbadry9,Elmahdi,pxmme1337,Regala_,andirrahmani1,geeknik
   severity: low
   description: A user-controlled input redirect users to an external website.
   tags: redirect
diff --git a/vulnerabilities/generic/top-xss-params.yaml b/vulnerabilities/generic/top-xss-params.yaml
index a420339614..677a594c29 100644
--- a/vulnerabilities/generic/top-xss-params.yaml
+++ b/vulnerabilities/generic/top-xss-params.yaml
@@ -2,7 +2,7 @@ id: top-xss-params
 
 info:
   name: Top 15 XSS Parameter Check
-  author: foulenzer & geeknik
+  author: foulenzer,geeknik
   severity: medium
   description: Searches for reflected XSS in the server response via GET-requests.
   tags: xss
diff --git a/vulnerabilities/ibm/ibm-infoprint-directory-traversal.yaml b/vulnerabilities/ibm/ibm-infoprint-directory-traversal.yaml
index 8791f6837c..307a2d8282 100644
--- a/vulnerabilities/ibm/ibm-infoprint-directory-traversal.yaml
+++ b/vulnerabilities/ibm/ibm-infoprint-directory-traversal.yaml
@@ -2,7 +2,7 @@ id: ibm-infoprint-lfi
 
 info:
   name: IBM InfoPrint 4247-Z03 Impact Matrix Printer - Directory Traversal
-  author: Harsh Bothra
+  author: harshbothra_
   severity: medium
   description: Directory traversal vulnerability on IBM InfoPrint 4247-Z03 Impact Matrix Printer.
   reference: https://www.exploit-db.com/exploits/47835
diff --git a/vulnerabilities/jenkins/jenkins-stack-trace.yaml b/vulnerabilities/jenkins/jenkins-stack-trace.yaml
index c3eec81c72..91d022d54e 100644
--- a/vulnerabilities/jenkins/jenkins-stack-trace.yaml
+++ b/vulnerabilities/jenkins/jenkins-stack-trace.yaml
@@ -2,7 +2,7 @@ id: jenkins-stack-traces
 
 info:
   name: Detect Jenkins in Debug Mode with Stack Traces Enabled
-  author: twitter.com/Dheerajmadhukar
+  author: Dheerajmadhukar
   severity: low
   description: Module identified that the affected host is running an instance of Jenkins in debug mode, as a result stack traces are enabled.
   reference: https://hackerone.com/reports/221833
diff --git a/vulnerabilities/oracle/oracle-ebs-bispgraph-file-access.yaml b/vulnerabilities/oracle/oracle-ebs-bispgraph-file-access.yaml
index aadfcf7911..0f16521c04 100644
--- a/vulnerabilities/oracle/oracle-ebs-bispgraph-file-access.yaml
+++ b/vulnerabilities/oracle/oracle-ebs-bispgraph-file-access.yaml
@@ -2,7 +2,7 @@ id: oracle-ebs-bispgrapgh-file-read
 
 info:
   name: Oracle EBS Bispgraph File Access
-  author: emenalf & tirtha_mandal & thomas_from_offensity
+  author: emenalf,tirtha_mandal,thomas_from_offensity
   severity: critical
   tags: oracle,lfi
   reference: |
diff --git a/vulnerabilities/other/symantec-messaging-gateway.yaml b/vulnerabilities/other/symantec-messaging-gateway.yaml
index 9a32bb8ebd..4bab74cd1c 100644
--- a/vulnerabilities/other/symantec-messaging-gateway.yaml
+++ b/vulnerabilities/other/symantec-messaging-gateway.yaml
@@ -2,7 +2,7 @@ id: symantec-messaging-gateway
 
 info:
   name: Symantec Messaging Gateway LFI
-  author: Random-Robbie
+  author: Random_Robbie
   severity: medium
   description: Symantec Messaging Gateway <= 10.6.1 Directory Traversal
   tags: lfi
diff --git a/vulnerabilities/rails/rails6-xss.yaml b/vulnerabilities/rails/rails6-xss.yaml
index 54d13245aa..05d14c2db1 100644
--- a/vulnerabilities/rails/rails6-xss.yaml
+++ b/vulnerabilities/rails/rails6-xss.yaml
@@ -1,7 +1,7 @@
 id: rails6-xss
 info:
   name: Rails CRLF XSS (6.0.0 < rails < 6.0.3.2)
-  author: 'ooooooo_q (Original finder), Rahul and Harsh (Template author)'
+  author: ooooooo_q,rootxharsh,iamnoooob
   severity: medium
   reference: https://hackerone.com/reports/904059
   tags: rails,xss
diff --git a/vulnerabilities/springboot/springboot-actuators-jolokia-xxe.yaml b/vulnerabilities/springboot/springboot-actuators-jolokia-xxe.yaml
index c328de1e7d..f179eeb090 100644
--- a/vulnerabilities/springboot/springboot-actuators-jolokia-xxe.yaml
+++ b/vulnerabilities/springboot/springboot-actuators-jolokia-xxe.yaml
@@ -2,7 +2,7 @@ id: springboot-actuators-jolokia-xxe
 
 info:
   name: Spring Boot Actuators (Jolokia) XXE
-  author: dwisiswant0 & ipanda
+  author: dwisiswant0,ipanda
   severity: high
   description: A vulnerability in Spring Boot Actuators's 'jolokia' endpoint allows remote attackers to preform an XML External Entities attack, include content stored on a remote server as if it was its own - this has the potential to allow the execution of arbitrary code and/or disclosure of sensitive information from the target machine.
   reference: |
diff --git a/vulnerabilities/wordpress/sassy-social-share.yaml b/vulnerabilities/wordpress/sassy-social-share.yaml
index 76d195062a..1f7d584a75 100644
--- a/vulnerabilities/wordpress/sassy-social-share.yaml
+++ b/vulnerabilities/wordpress/sassy-social-share.yaml
@@ -2,7 +2,7 @@ id: sassy-social-share-xss
 
 info:
   name: Sassy Social Share XSS
-  author: Random-Robbie
+  author: Random_Robbie
   severity: medium
   description: Sassy Social Share <= 3.3.3 - Cross-Site Scripting (XSS)
   tags: wordpress,wp-plugin
diff --git a/vulnerabilities/wordpress/w3c-total-cache-ssrf.yaml b/vulnerabilities/wordpress/w3c-total-cache-ssrf.yaml
index 5d10ad9c83..484142c509 100644
--- a/vulnerabilities/wordpress/w3c-total-cache-ssrf.yaml
+++ b/vulnerabilities/wordpress/w3c-total-cache-ssrf.yaml
@@ -1,7 +1,7 @@
 id: w3c-total-cache-ssrf
 info:
   name: Wordpress W3C Total Cache SSRF <= 0.9.4
-  author: random-robbie
+  author: random_robbie
   severity: medium
   tags: wordpress,wp-plugin
   description: The W3 Total Cache WordPress plugin was affected by an Unauthenticated Server Side Request Forgery (SSRF) security vulnerability.
diff --git a/vulnerabilities/wordpress/wordpress-accessible-wpconfig.yaml b/vulnerabilities/wordpress/wordpress-accessible-wpconfig.yaml
index d4a56ddf96..5347bbcd7a 100644
--- a/vulnerabilities/wordpress/wordpress-accessible-wpconfig.yaml
+++ b/vulnerabilities/wordpress/wordpress-accessible-wpconfig.yaml
@@ -1,7 +1,7 @@
 id: wordpress-accessible-wpconfig
 info:
   name: WordPress accessible wp-config
-  author: Kiblyn11 & zomsop82 & madrobot & geeknik & daffainfo
+  author: Kiblyn11,zomsop82,madrobot,geeknik,daffainfo
   severity: high
   tags: wordpress,backups
 
diff --git a/vulnerabilities/wordpress/wordpress-debug-log.yaml b/vulnerabilities/wordpress/wordpress-debug-log.yaml
index 25e5e05c1e..0456773ec6 100644
--- a/vulnerabilities/wordpress/wordpress-debug-log.yaml
+++ b/vulnerabilities/wordpress/wordpress-debug-log.yaml
@@ -2,7 +2,7 @@ id: wp-debug-log
 
 info:
   name: WordPress debug log
-  author: geraldino2 & @dwisiswant0
+  author: geraldino2,@dwisiswant0
   severity: low
   tags: wordpress,log
 
diff --git a/vulnerabilities/wordpress/wordpress-emails-verification-for-woocommerce.yaml b/vulnerabilities/wordpress/wordpress-emails-verification-for-woocommerce.yaml
index 309eb3983f..0eebea0e10 100644
--- a/vulnerabilities/wordpress/wordpress-emails-verification-for-woocommerce.yaml
+++ b/vulnerabilities/wordpress/wordpress-emails-verification-for-woocommerce.yaml
@@ -1,7 +1,7 @@
 id: wp-woocommerce-email-verification
 info:
   name: wordpress-emails-verification-for-woocommerce
-  author: random-robbie
+  author: random_robbie
   severity: critical
   tags: wordpress,wp-plugin
   description: Email Verification for WooCommerce < 1.8.2 - Loose Comparison to Authentication Bypass
diff --git a/vulnerabilities/wordpress/wordpress-user-enumeration.yaml b/vulnerabilities/wordpress/wordpress-user-enumeration.yaml
index c06644e07a..ac734f9935 100644
--- a/vulnerabilities/wordpress/wordpress-user-enumeration.yaml
+++ b/vulnerabilities/wordpress/wordpress-user-enumeration.yaml
@@ -2,7 +2,7 @@ id: wordpress-user-enumeration
 
 info:
   name: Wordpress user enumeration
-  author: Manas_Harsh & daffainfo
+  author: Manas_Harsh,daffainfo
   severity: info
   tags: wordpress
 
diff --git a/workflows/artica-web-proxy-workflow.yaml b/workflows/artica-web-proxy-workflow.yaml
index 558563d1e1..8fee7fe758 100644
--- a/workflows/artica-web-proxy-workflow.yaml
+++ b/workflows/artica-web-proxy-workflow.yaml
@@ -2,7 +2,7 @@ id: artica-web-proxy-workflow
 
 info:
   name: Artica Web Proxy Security Checks
-  author: dwisiswant0 & pdteam
+  author: dwisiswant0,pdteam
   description: A simple workflow that runs all Artica Web Proxy related nuclei templates on a given target.
   tags: workflow
 
diff --git a/workflows/wordpress-workflow.yaml b/workflows/wordpress-workflow.yaml
index 667e3da0a2..4153b23b39 100644
--- a/workflows/wordpress-workflow.yaml
+++ b/workflows/wordpress-workflow.yaml
@@ -1,7 +1,7 @@
 id: wordpress-workflow
 info:
   name: Wordpress Security Checks
-  author: kiblyn11 & zomsop82
+  author: kiblyn11,zomsop82
   description: A simple workflow that runs all wordpress related nuclei templates on a given target.
   tags: workflow