diff --git a/.github/workflows/yamale.yml b/.github/workflows/yamale.yml
index 4a8d1c0..313f88b 100644
--- a/.github/workflows/yamale.yml
+++ b/.github/workflows/yamale.yml
@@ -1,4 +1,4 @@
-name: Validate DFIQ Components' YAML
+name: Validate DFIQ YAML
 
 on:
   [push]
@@ -19,3 +19,6 @@ jobs:
     - name: Validate Scenarios YAML
       run: |
         yamale -s utils/scenario_spec.yaml ./data/scenarios
+        yamale -s utils/facet_spec.yaml ./data/facets
+        yamale -s utils/question_spec.yaml ./data/questions
+        yamale -s utils/approach_spec.yaml ./data/approaches
\ No newline at end of file
diff --git a/data/scenarios/S1001.yaml b/data/scenarios/S1001.yaml
index 0f5295b..d16696a 100644
--- a/data/scenarios/S1001.yaml
+++ b/data/scenarios/S1001.yaml
@@ -19,7 +19,7 @@ description: >
   An employee is suspected of unauthorized copying of sensitive data (code,
   trade secrets, etc) from internal systems to those outside of the company's
   control.
-id: S1001xxx
+id: S1001
 dfiq_version: 1.0.0
 tags:
   - Insider