diff --git a/exposed-tokens/generic/credentials-disclosure.yaml b/exposed-tokens/generic/credentials-disclosure.yaml
index 8b1abf976c..8b6e1cb008 100644
--- a/exposed-tokens/generic/credentials-disclosure.yaml
+++ b/exposed-tokens/generic/credentials-disclosure.yaml
@@ -5,10 +5,15 @@ id: credentials-disclosure
 # Severity is not fixed in this case, it varies from none to critical depending upon impact of disclosed key/tokes.
 # Regex count:- 687
 
+# Notes:-
+# This template requires manual inspection once found valid match.
+# Generic token could be anything matching below regex.
+# Impact of leaked token depends on validation of leaked token.
+
 info:
   name: Credentials Disclosure Check
   author: Sy3Omda
-  severity: medium
+  severity: info
   description: Look for multiple keys/tokens/passwords in the page response.
 
 requests:
diff --git a/exposed-tokens/generic/general-tokens.yaml b/exposed-tokens/generic/general-tokens.yaml
index 3923983575..2fbd5e12ea 100644
--- a/exposed-tokens/generic/general-tokens.yaml
+++ b/exposed-tokens/generic/general-tokens.yaml
@@ -1,15 +1,20 @@
-id: general-tokens
+id: generic-tokens
 
 info:
-  name: General Tokens
+  name: Generic Tokens
   author: nadino
-  severity: medium
+  severity: info
 
 requests:
   - method: GET
     path:
       - '{{BaseURL}}'
 
+# Notes:-
+# This template requires manual inspection once found valid match.
+# Generic token could be anything matching below regex.
+# Impact of leaked token depends on validation of leaked token.
+
     matchers-condition: and
     matchers:
       - type: dsl
diff --git a/exposed-tokens/generic/http-username-password.yaml b/exposed-tokens/generic/http-username-password.yaml
index 1c7f4d253f..774dfb8497 100644
--- a/exposed-tokens/generic/http-username-password.yaml
+++ b/exposed-tokens/generic/http-username-password.yaml
@@ -1,13 +1,15 @@
 id: http-username-password
 
 # Extract something like https://username:password@vulnerable.com
-# can be improved
 
 info:
   name: Http usernamme password
   author: nadino
   severity: info
 
+# Notes:-
+# This template requires manual inspection once found valid match.
+
 requests:
   - method: GET
     path:
diff --git a/exposures/apis/swagger-api.yaml b/exposures/apis/swagger-api.yaml
index 8692b19eae..1c064f5792 100644
--- a/exposures/apis/swagger-api.yaml
+++ b/exposures/apis/swagger-api.yaml
@@ -1,4 +1,4 @@
-id: swagger-apis
+id: swagger-api
 
 info:
   name: Swagger API Panel
diff --git a/misconfiguration/unauthenticated-nacos-access.yaml b/misconfiguration/unauthenticated-nacos-access.yaml
index e3f7ffd68d..516f1b6254 100644
--- a/misconfiguration/unauthenticated-nacos-access.yaml
+++ b/misconfiguration/unauthenticated-nacos-access.yaml
@@ -20,9 +20,9 @@ requests:
     matchers:
       - type: regex
         regex:
-          - "username"
-          - "password"
-          - "totalCount"
+          - '"username":'
+          - '"password":'
+          - '"totalCount":'
         condition: and
         part: body
       - type: status