diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
index 07f5a2dc2..a162b9051 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
@@ -19,8 +19,8 @@
           href="FlowRelationship_id-4484f60919b34d4d89780f2d37f21d33.xml#id-4484f60919b34d4d89780f2d37f21d33"/>
     </sourceConnections>
     <bounds
-        x="1310"
-        y="510"
+        x="1140"
+        y="300"
         width="201"
         height="61"/>
     <archimateElement
@@ -50,8 +50,8 @@
           href="RealizationRelationship_id-ff36ddb8-f5bc-4bc3-a01a-087983ff5546.xml#id-ff36ddb8-f5bc-4bc3-a01a-087983ff5546"/>
     </sourceConnections>
     <bounds
-        x="50"
-        y="540"
+        x="40"
+        y="200"
         width="201"
         height="61"/>
     <archimateElement
@@ -118,8 +118,8 @@
           href="FlowRelationship_id-c2b7e1f0ca60490d836e7067de502652.xml#id-c2b7e1f0ca60490d836e7067de502652"/>
     </sourceConnections>
     <bounds
-        x="1040"
-        y="410"
+        x="890"
+        y="200"
         width="201"
         height="61"/>
     <archimateElement
@@ -140,8 +140,8 @@
           href="RealizationRelationship_id-fd26ff37-fdb9-474e-a746-5b9590021570.xml#id-fd26ff37-fdb9-474e-a746-5b9590021570"/>
     </sourceConnections>
     <bounds
-        x="720"
-        y="620"
+        x="620"
+        y="40"
         width="201"
         height="61"/>
     <archimateElement
@@ -153,8 +153,8 @@
       id="id-2a320bb9eb414d8a9518dfbe1a977825"
       targetConnections="id-0a0c5e17e8424624ae4d816b39f9bda3 id-e999563c65b4441a9f5af3c551f01a17 id-6ce244e5e7784f20926396cdf2e3c9ca">
     <bounds
-        x="410"
-        y="620"
+        x="370"
+        y="40"
         width="201"
         height="61"/>
     <archimateElement
@@ -193,8 +193,8 @@
           href="RealizationRelationship_id-e0909f8b3cb7427386f6d6b015fc964f.xml#id-e0909f8b3cb7427386f6d6b015fc964f"/>
     </sourceConnections>
     <bounds
-        x="50"
-        y="340"
+        x="40"
+        y="40"
         width="201"
         height="61"/>
     <archimateElement
@@ -206,8 +206,8 @@
       id="id-f545e635327d456ba11f1c48d6434880"
       targetConnections="id-fa5034ceee10451690668d6bb82dee3c id-c0fe3789da5c4b20a4758c1cbad6126b">
     <bounds
-        x="410"
-        y="230"
+        x="370"
+        y="140"
         width="201"
         height="61"/>
     <archimateElement
@@ -228,8 +228,8 @@
           href="RealizationRelationship_id-e800a4e8a86d4d089accccdf7d1560e2.xml#id-e800a4e8a86d4d089accccdf7d1560e2"/>
     </sourceConnections>
     <bounds
-        x="720"
-        y="230"
+        x="620"
+        y="140"
         width="201"
         height="61"/>
     <archimateElement
@@ -241,8 +241,8 @@
       id="id-e5419fbbbdad46dbb51221b998a61068"
       targetConnections="id-8101b51a5e1641ffbe726e46772a2e4c id-a4c446bb7db448538a4c4e74506d0583 id-573538626cbf41d3a3c4642d3127036e">
     <bounds
-        x="410"
-        y="450"
+        x="370"
+        y="340"
         width="201"
         height="61"/>
     <archimateElement
@@ -272,8 +272,8 @@
           href="RealizationRelationship_id-f04956dfb82b4546b3e740f7b712c98e.xml#id-f04956dfb82b4546b3e740f7b712c98e"/>
     </sourceConnections>
     <bounds
-        x="50"
-        y="440"
+        x="40"
+        y="340"
         width="201"
         height="61"/>
     <archimateElement
@@ -294,8 +294,8 @@
           href="RealizationRelationship_id-054c0b38-d91e-404c-a95a-cd9c81f149b9.xml#id-054c0b38-d91e-404c-a95a-cd9c81f149b9"/>
     </sourceConnections>
     <bounds
-        x="720"
-        y="450"
+        x="620"
+        y="340"
         width="201"
         height="61"/>
     <archimateElement
@@ -307,8 +307,8 @@
       id="id-553f6da920fa4f6b8e794dd6c36cfce5"
       targetConnections="id-14d5f184fd68446fb96b9c0dc37beb6b id-760ca7c3437b4bd9b65a7ad55c21e055 id-f21d71d3861f4c0a827cce8b24e3be43">
     <bounds
-        x="410"
-        y="330"
+        x="370"
+        y="240"
         width="201"
         height="61"/>
     <archimateElement
@@ -329,8 +329,8 @@
           href="RealizationRelationship_id-1494374158384f9a9a5f72ee2d6c10ec.xml#id-1494374158384f9a9a5f72ee2d6c10ec"/>
     </sourceConnections>
     <bounds
-        x="721"
-        y="328"
+        x="621"
+        y="238"
         width="200"
         height="61"/>
     <archimateElement
@@ -352,9 +352,9 @@
           href="FlowRelationship_id-89e0ff6a27de439bac16bebdd6fe9119.xml#id-89e0ff6a27de439bac16bebdd6fe9119"/>
     </sourceConnections>
     <bounds
-        x="1320"
-        y="310"
-        width="141"
+        x="1150"
+        y="100"
+        width="191"
         height="61"/>
     <archimateElement
         xsi:type="archimate:ApplicationComponent"
@@ -365,7 +365,7 @@
       value="6a9cf0cc-78b0-4766-aeef-ec7836521be7"/>
   <properties
       key="Publiceren"
-      value="Niet"/>
+      value="GEMMA Online en redactie"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
diff --git a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-a3daf770884b48dcbcdfa4d9b2f29231.xml b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-a3daf770884b48dcbcdfa4d9b2f29231.xml
index e6f05116f..0770a8612 100644
--- a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-a3daf770884b48dcbcdfa4d9b2f29231.xml
+++ b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-a3daf770884b48dcbcdfa4d9b2f29231.xml
@@ -11,7 +11,7 @@
       value="Standaard"/>
   <properties
       key="Compliancy"
-      value="Groene Vink"/>
+      value="Validatiemodule"/>
   <properties
       key="Compliancy URL"
       value="https://www.istandaarden.nl/modules/modules"/>
diff --git a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-b3b4ac9fbdba4d56a42da7e86f485515.xml b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-b3b4ac9fbdba4d56a42da7e86f485515.xml
index b392da9a7..30af01d45 100644
--- a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-b3b4ac9fbdba4d56a42da7e86f485515.xml
+++ b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/25e7248e-0950-4ad0-99cc-ca33b07ba8d0/Constraint_id-b3b4ac9fbdba4d56a42da7e86f485515.xml
@@ -11,7 +11,7 @@
       value="Standaard"/>
   <properties
       key="Compliancy"
-      value="Groene Vink"/>
+      value="Validatiemodule"/>
   <properties
       key="Compliancy URL"
       value="https://www.istandaarden.nl/modules/modules"/>
diff --git a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c64e650-3cd5-11e4-67ab-0050568a6153.xml b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c64e650-3cd5-11e4-67ab-0050568a6153.xml
index 92ed1923f..695133ea1 100644
--- a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c64e650-3cd5-11e4-67ab-0050568a6153.xml
+++ b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c64e650-3cd5-11e4-67ab-0050568a6153.xml
@@ -14,7 +14,7 @@
       value="Groene Vink"/>
   <properties
       key="Compliancy URL"
-      value="https://www.istandaarden.nl/modules/modules"/>
+      value="https://www.istandaarden.nl/modules/groene-vink"/>
   <properties
       key="Beheerder"
       value="Zorginstituut Nederland"/>
diff --git a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c70cd30-3cd5-11e4-67ab-0050568a6153.xml b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c70cd30-3cd5-11e4-67ab-0050568a6153.xml
index 21b44913d..75cd6b563 100644
--- a/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c70cd30-3cd5-11e4-67ab-0050568a6153.xml
+++ b/model/motivation/e1faa22e-5690-413d-849c-0eff770d6c30/id-54c47266f4694ff2b876aeadb383d2ec/Constraint_id-6c70cd30-3cd5-11e4-67ab-0050568a6153.xml
@@ -14,7 +14,7 @@
       value="Groene Vink"/>
   <properties
       key="Compliancy URL"
-      value="https://www.istandaarden.nl/modules/modules"/>
+      value="https://www.istandaarden.nl/modules/groene-vink"/>
   <properties
       key="Beheerder"
       value="Zorginstituut Nederland"/>