diff --git a/javascript/enumeration/pgsql/pgsql-file-read.yaml b/javascript/enumeration/pgsql/pgsql-file-read.yaml
index b16c5978f5..440b716b37 100644
--- a/javascript/enumeration/pgsql/pgsql-file-read.yaml
+++ b/javascript/enumeration/pgsql/pgsql-file-read.yaml
@@ -1,4 +1,4 @@
-id: postgresql-file-read
+id: pgsql-file-read
 
 info:
   name: PostgreSQL File Read
@@ -45,4 +45,4 @@ javascript:
       - type: json
         json:
           - '.Rows[].pg_ls_dir'
-# digest: 4a0a00473045022100b6a67073677ce62de92d8f1b512df26d6a72070825e67013aa2c8b33dc552c70022079606bcf388173437f77e0005077a2da82a4b6b2eb52667cb4e9619f27ad261e:922c64590222798bb761d5b6d8e72950
\ No newline at end of file
+# digest: 4a0a00473045022100b6a67073677ce62de92d8f1b512df26d6a72070825e67013aa2c8b33dc552c70022079606bcf388173437f77e0005077a2da82a4b6b2eb52667cb4e9619f27ad261e:922c64590222798bb761d5b6d8e72950
diff --git a/javascript/enumeration/pgsql/pgsql-list-database.yaml b/javascript/enumeration/pgsql/pgsql-list-database.yaml
index 128fff50b8..2f6716f0e6 100644
--- a/javascript/enumeration/pgsql/pgsql-list-database.yaml
+++ b/javascript/enumeration/pgsql/pgsql-list-database.yaml
@@ -1,4 +1,4 @@
-id: postgresql-list-database
+id: pgsql-list-database
 
 info:
   name: PostgreSQL List Database
@@ -46,4 +46,4 @@ javascript:
       - type: json
         json:
           - '.Rows[].datname'
-# digest: 4a0a0047304502203031b028966e2139f57c1175b753001a3f1e34b0e8997994db3a4f4c6b2696b302210081533ae19bf2ed233488ee86fba7f9d8cae8570ad63fa7a0db828f76d1e01e98:922c64590222798bb761d5b6d8e72950
\ No newline at end of file
+# digest: 4a0a0047304502203031b028966e2139f57c1175b753001a3f1e34b0e8997994db3a4f4c6b2696b302210081533ae19bf2ed233488ee86fba7f9d8cae8570ad63fa7a0db828f76d1e01e98:922c64590222798bb761d5b6d8e72950
diff --git a/javascript/enumeration/pgsql/pgsql-list-password-hashes.yaml b/javascript/enumeration/pgsql/pgsql-list-password-hashes.yaml
index 75fd260bba..98b378379d 100644
--- a/javascript/enumeration/pgsql/pgsql-list-password-hashes.yaml
+++ b/javascript/enumeration/pgsql/pgsql-list-password-hashes.yaml
@@ -1,4 +1,4 @@
-id: pgsql-exec
+id: pgsql-list-password-hashes
 
 info:
   name: PostgreSQL List Password Hashes
@@ -47,4 +47,4 @@ javascript:
       - type: json
         json:
           - '.Rows[] | "\(.usename) : \(.passwd)"'
-# digest: 4a0a00473045022100b700cc8c5c9563ba0b0f0dd5a1b62b73818f8357b7a1759d46b94f735991b6c60220236a88a21e79fd1f0b0c545cfed89cd6de6f4e044fb2c717336b08a8c455a9f9:922c64590222798bb761d5b6d8e72950
\ No newline at end of file
+# digest: 4a0a00473045022100b700cc8c5c9563ba0b0f0dd5a1b62b73818f8357b7a1759d46b94f735991b6c60220236a88a21e79fd1f0b0c545cfed89cd6de6f4e044fb2c717336b08a8c455a9f9:922c64590222798bb761d5b6d8e72950
diff --git a/javascript/misconfiguration/pgsql/postgresql-empty-password.yaml b/javascript/misconfiguration/pgsql/pgsql-empty-password.yaml
similarity index 90%
rename from javascript/misconfiguration/pgsql/postgresql-empty-password.yaml
rename to javascript/misconfiguration/pgsql/pgsql-empty-password.yaml
index 069215a9f8..c03b6cc345 100644
--- a/javascript/misconfiguration/pgsql/postgresql-empty-password.yaml
+++ b/javascript/misconfiguration/pgsql/pgsql-empty-password.yaml
@@ -1,4 +1,4 @@
-id: postgresql-empty-password
+id: pgsql-empty-password
 
 info:
   name: Postgresql Empty Password - Detect
@@ -32,4 +32,4 @@ javascript:
           - "success == true"
           - "response == true"
         condition: and
-# digest: 490a004630440220538dc891e334a92a87ed69dc657a9906b8c70e18bd9d92c01c88165cf76416ad0220560867521ce6635eb8758da53dbff4bd9f2cc1642d7b5fb99eaa3b627d6260ba:922c64590222798bb761d5b6d8e72950
\ No newline at end of file
+# digest: 490a004630440220538dc891e334a92a87ed69dc657a9906b8c70e18bd9d92c01c88165cf76416ad0220560867521ce6635eb8758da53dbff4bd9f2cc1642d7b5fb99eaa3b627d6260ba:922c64590222798bb761d5b6d8e72950