diff --git a/.github/workflows/build-credentials-list.yml b/.github/workflows/build-credentials-list.yml
index 686e51d..17215b1 100644
--- a/.github/workflows/build-credentials-list.yml
+++ b/.github/workflows/build-credentials-list.yml
@@ -28,5 +28,5 @@ jobs:
            git config --global user.name "github-actions"
            git config --global user.email "actions@github.com"
            git add _generated/credentials.json
-           git commit -m "Auto update credentials type list" || echo "No changes"
+           git commit -m "Auto update credential type list [skip ci]" || echo "No changes"
            git push
\ No newline at end of file
diff --git a/.github/workflows/build-credentials.yml b/.github/workflows/build-credentials.yml
index 5c654ac..8ad6c40 100644
--- a/.github/workflows/build-credentials.yml
+++ b/.github/workflows/build-credentials.yml
@@ -1,15 +1,14 @@
 name: Build credentials data
 
 on:
-  push:
-    paths:
-      - "**/translations/en.json"
-      - "**/credential-types.json"
-      - "**/user-consent/user-consent-map.json"
-      - "**/user-consent/consent-groups.json"
+    workflow_run:
+      workflows: ["Update credential types list"]
+      types:
+        - completed
 
 jobs:
   build:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -24,5 +23,5 @@ jobs:
           git config --global user.name "github-actions"
           git config --global user.email "actions@github.com"
           git add _generated/credentials.json
-          git commit -m "Auto update credentials data" || echo "No changes"
+          git commit -m "Auto update credentials data [skip ci]" || echo "No changes"
           git push
\ No newline at end of file
diff --git a/boarding-pass-certificate/v1/translations/en.json b/boarding-pass-certificate/v1/translations/en.json
deleted file mode 100644
index a473be6..0000000
--- a/boarding-pass-certificate/v1/translations/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "credential": {
-        "title": "Boarding Pass Certificate"
-    }
-}
\ No newline at end of file
diff --git a/boarding-pass-certificate/README.md b/boarding-pass/README.md
similarity index 72%
rename from boarding-pass-certificate/README.md
rename to boarding-pass/README.md
index b5fff7e..85d6c5b 100644
--- a/boarding-pass-certificate/README.md
+++ b/boarding-pass/README.md
@@ -1,10 +1,10 @@
-# Boarding Pass Certificate
+# Boarding Pass
 
-This folder contains all technical assets related to the **Boarding Pass Certificate**.  
+This folder contains all technical assets related to the **Boarding Pass**.  
 It includes credential schemas, field definitions, mappings, and translation files used for credential generation and validation.
 
 ## Available Versions
 
 Choose a version of the credential type to view its specification. Currently, the latest version is:
 
-- [`v1`](v1/) – the first version of the Boarding Pass Certificate.
+- [`v1`](v1/) – the first version of the Boarding Pass.
diff --git a/visa-certificate/v1/README.md b/boarding-pass/v1/README.md
similarity index 89%
rename from visa-certificate/v1/README.md
rename to boarding-pass/v1/README.md
index 7445dd6..3e3771d 100644
--- a/visa-certificate/v1/README.md
+++ b/boarding-pass/v1/README.md
@@ -1,6 +1,6 @@
-# Visa Certificate (v1)
+# Boarding Pass (v1)
 
-This folder defines the structure and resources for the v1 implementation of **Visa Certificate**.
+This folder defines the structure and resources for the v1 implementation of **Boarding Pass**.
 
 ## Contents
 
diff --git a/boarding-pass-certificate/v1/edc/README.md b/boarding-pass/v1/edc/README.md
similarity index 78%
rename from boarding-pass-certificate/v1/edc/README.md
rename to boarding-pass/v1/edc/README.md
index 2cf9083..65d6570 100644
--- a/boarding-pass-certificate/v1/edc/README.md
+++ b/boarding-pass/v1/edc/README.md
@@ -1,9 +1,9 @@
 # EDC
 
-This folder contains resources related to the **European Digital Credentials (EDC)** format, a serialization of the ELM ontology, used for Boarding Pass Certificate.
+This folder contains resources related to the **European Digital Credentials (EDC)** format, a serialization of the ELM ontology, used for Boarding Pass.
 
 ## Contents
 
-- [schema](schema.json) - JSON Schema definition of the EDC Boarding Pass Certificate.
-- [input-fields-to-credential-map](input-fields-to-credential-map.json) - Mapping between user-friendly input fields and the EDC Boarding Pass Certificate fields.
+- [schema](schema.json) - JSON Schema definition of the EDC Boarding Pass.
+- [input-fields-to-credential-map](input-fields-to-credential-map.json) - Mapping between user-friendly input fields and the EDC Boarding Pass fields.
   
\ No newline at end of file
diff --git a/boarding-pass-certificate/v1/edc/input-fields-to-credential-map.json b/boarding-pass/v1/edc/input-fields-to-credential-map.json
similarity index 100%
rename from boarding-pass-certificate/v1/edc/input-fields-to-credential-map.json
rename to boarding-pass/v1/edc/input-fields-to-credential-map.json
diff --git a/boarding-pass-certificate/v1/edc/schema.json b/boarding-pass/v1/edc/schema.json
similarity index 100%
rename from boarding-pass-certificate/v1/edc/schema.json
rename to boarding-pass/v1/edc/schema.json
diff --git a/boarding-pass-certificate/v1/input-fields/README.md b/boarding-pass/v1/input-fields/README.md
similarity index 100%
rename from boarding-pass-certificate/v1/input-fields/README.md
rename to boarding-pass/v1/input-fields/README.md
diff --git a/boarding-pass-certificate/v1/input-fields/example.json b/boarding-pass/v1/input-fields/example.json
similarity index 100%
rename from boarding-pass-certificate/v1/input-fields/example.json
rename to boarding-pass/v1/input-fields/example.json
diff --git a/boarding-pass-certificate/v1/input-fields/schema.json b/boarding-pass/v1/input-fields/schema.json
similarity index 100%
rename from boarding-pass-certificate/v1/input-fields/schema.json
rename to boarding-pass/v1/input-fields/schema.json
diff --git a/boarding-pass-certificate/v1/input-fields/translations/en.json b/boarding-pass/v1/input-fields/translations/en.json
similarity index 100%
rename from boarding-pass-certificate/v1/input-fields/translations/en.json
rename to boarding-pass/v1/input-fields/translations/en.json
diff --git a/boarding-pass/v1/translations/en.json b/boarding-pass/v1/translations/en.json
new file mode 100644
index 0000000..49c2516
--- /dev/null
+++ b/boarding-pass/v1/translations/en.json
@@ -0,0 +1,5 @@
+{
+    "credential": {
+        "title": "Boarding Pass"
+    }
+}
\ No newline at end of file
diff --git a/boarding-pass-certificate/v1/user-consent/user-consent-map.json b/boarding-pass/v1/user-consent/user-consent-map.json
similarity index 100%
rename from boarding-pass-certificate/v1/user-consent/user-consent-map.json
rename to boarding-pass/v1/user-consent/user-consent-map.json
diff --git a/visa-certificate/v1/translations/en.json b/visa-certificate/v1/translations/en.json
deleted file mode 100644
index d27d4be..0000000
--- a/visa-certificate/v1/translations/en.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "credential": {
-        "title": "Visa Certificate"
-    }
-}
\ No newline at end of file
diff --git a/visa-certificate/README.md b/visa/README.md
similarity index 75%
rename from visa-certificate/README.md
rename to visa/README.md
index cfcd531..fa8a674 100644
--- a/visa-certificate/README.md
+++ b/visa/README.md
@@ -1,6 +1,6 @@
-# Visa Certificate
+# Visa
 
-This folder contains all technical assets related to the **Visa Certificate**.  
+This folder contains all technical assets related to the **Visa**.  
 It includes credential schemas, field definitions, mappings, and translation files used for credential generation and validation.
 
 ## Available Versions
diff --git a/boarding-pass-certificate/v1/README.md b/visa/v1/README.md
similarity index 86%
rename from boarding-pass-certificate/v1/README.md
rename to visa/v1/README.md
index 8c3d212..79b54eb 100644
--- a/boarding-pass-certificate/v1/README.md
+++ b/visa/v1/README.md
@@ -1,6 +1,6 @@
-# Boarding Pass Certificate (v1)
+# Visa (v1)
 
-This folder defines the structure and resources for the v1 implementation of **Boarding Pass Certificate**.
+This folder defines the structure and resources for the v1 implementation of **Visa**.
 
 ## Contents
 
diff --git a/visa-certificate/v1/edc/README.md b/visa/v1/edc/README.md
similarity index 83%
rename from visa-certificate/v1/edc/README.md
rename to visa/v1/edc/README.md
index 56f7b63..70145b3 100644
--- a/visa-certificate/v1/edc/README.md
+++ b/visa/v1/edc/README.md
@@ -1,9 +1,9 @@
 # EDC
 
-This folder contains resources related to the **European Digital Credentials (EDC)** format, a serialization of the ELM ontology, used for Visa Certificate.
+This folder contains resources related to the **European Digital Credentials (EDC)** format, a serialization of the ELM ontology, used for Visa.
 
 ## Contents
 
-- [schema](schema.json) - JSON Schema definition of the EDC Visa Certificate.
-- [input-fields-to-credential-map](input-fields-to-credential-map.json) - Mapping between user-friendly input fields and the EDC Visa Certificate fields.
+- [schema](schema.json) - JSON Schema definition of the EDC Visa.
+- [input-fields-to-credential-map](input-fields-to-credential-map.json) - Mapping between user-friendly input fields and the EDC Visa fields.
   
\ No newline at end of file
diff --git a/visa-certificate/v1/edc/input-fields-to-credential-map.json b/visa/v1/edc/input-fields-to-credential-map.json
similarity index 100%
rename from visa-certificate/v1/edc/input-fields-to-credential-map.json
rename to visa/v1/edc/input-fields-to-credential-map.json
diff --git a/visa-certificate/v1/edc/schema.json b/visa/v1/edc/schema.json
similarity index 100%
rename from visa-certificate/v1/edc/schema.json
rename to visa/v1/edc/schema.json
diff --git a/visa-certificate/v1/input-fields/README.md b/visa/v1/input-fields/README.md
similarity index 100%
rename from visa-certificate/v1/input-fields/README.md
rename to visa/v1/input-fields/README.md
diff --git a/visa-certificate/v1/input-fields/example.json b/visa/v1/input-fields/example.json
similarity index 100%
rename from visa-certificate/v1/input-fields/example.json
rename to visa/v1/input-fields/example.json
diff --git a/visa-certificate/v1/input-fields/schema.json b/visa/v1/input-fields/schema.json
similarity index 99%
rename from visa-certificate/v1/input-fields/schema.json
rename to visa/v1/input-fields/schema.json
index f70ad4f..f9f94fa 100644
--- a/visa-certificate/v1/input-fields/schema.json
+++ b/visa/v1/input-fields/schema.json
@@ -11,7 +11,7 @@
             "patternProperties": {
                 "^[a-z]{2}$": {
                 "type": "string",
-                "description": "A string value for a specific language code."
+                "description": "A string value for a specific language code. "
                 }
             },
             "additionalProperties": false
diff --git a/visa-certificate/v1/input-fields/translations/en.json b/visa/v1/input-fields/translations/en.json
similarity index 100%
rename from visa-certificate/v1/input-fields/translations/en.json
rename to visa/v1/input-fields/translations/en.json
diff --git a/visa/v1/translations/en.json b/visa/v1/translations/en.json
new file mode 100644
index 0000000..858ef71
--- /dev/null
+++ b/visa/v1/translations/en.json
@@ -0,0 +1,5 @@
+{
+    "credential": {
+        "title": "Visa"
+    }
+}
\ No newline at end of file
diff --git a/visa-certificate/v1/user-consent/user-consent-map.json b/visa/v1/user-consent/user-consent-map.json
similarity index 100%
rename from visa-certificate/v1/user-consent/user-consent-map.json
rename to visa/v1/user-consent/user-consent-map.json