Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj
===================================================================
diff -u -r744dddd3de29815084e3baceb9a2dea13a5f12b9 -r5f934418fb04f8ed56487912354a2d6db39d6a28
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj	(.../AutomatedSystemTests.csproj)	(revision 744dddd3de29815084e3baceb9a2dea13a5f12b9)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTests.csproj	(.../AutomatedSystemTests.csproj)	(revision 5f934418fb04f8ed56487912354a2d6db39d6a28)
@@ -3556,7 +3556,9 @@
       <id>f9b54cc6-cbb7-406e-99ab-c3c41eee8d0e</id>
       <recordtableid>a653ace9-5ee8-4659-932a-53a321bc6e32</recordtableid>
     </None>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <id>14b2a372-352c-4eee-bc41-d6a7a001dff5</id>
+    </None>
     <None Include="ReportDeltaresStyle\howToEnableMozillaFirefoxToOpenReportStap1Van2.png">
       <id>33bfacb4-10d7-4c99-ab52-0f94bd94b857</id>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs
===================================================================
diff -u -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 -r5f934418fb04f8ed56487912354a2d6db39d6a28
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.cs	(.../AutomatedSystemTestsRepository.cs)	(revision 5f934418fb04f8ed56487912354a2d6db39d6a28)
@@ -3249,7 +3249,7 @@
             /// Creates a new FM_ResultView  folder.
             /// </summary>
             public FM_ResultViewFolder(RepoGenBaseFolder parentFolder) :
-                    base("FM_ResultView", "container[@controlname='FailureMechanismResultView']", parentFolder, 10000, null, true, "9f847d0f-b605-48f5-b38e-9eb9bbefddb9", "")
+                    base("FM_ResultView", "container[@controlname~'FailureMechanismResultView']", parentFolder, 10000, null, true, "9f847d0f-b605-48f5-b38e-9eb9bbefddb9", "")
             {
                 _table = new AutomatedSystemTestsRepositoryFolders.TableFolder2(this);
                 _assemblywithprob = new AutomatedSystemTestsRepositoryFolders.AssemblyWithProbFolder(this);
@@ -4879,7 +4879,7 @@
             /// Creates a new ScenariosView  folder.
             /// </summary>
             public ScenariosViewFolder(RepoGenBaseFolder parentFolder) :
-                    base("ScenariosView", "container[@controlname='ScenariosView']", parentFolder, 30000, null, false, "8d70b984-d778-4632-99c5-59000fa3b167", "")
+                    base("ScenariosView", "container[@controlname~'ScenariosView']", parentFolder, 30000, null, false, "8d70b984-d778-4632-99c5-59000fa3b167", "")
             {
                 _listsectionsnames = new AutomatedSystemTestsRepositoryFolders.ListSectionsNamesFolder(this);
                 _table = new AutomatedSystemTestsRepositoryFolders.TableFolder4(this);
@@ -8177,7 +8177,7 @@
             RepoItemInfo _genereercalculationandscenariosInfo;
             RepoItemInfo _genericitemincontextmenuInfo;
             RepoItemInfo _importerenInfo;
-            RepoItemInfo _isrelevantInfo;
+            RepoItemInfo _inassemblageInfo;
             RepoItemInfo _koppelaandatabaseInfo;
             RepoItemInfo _maptoevoegenInfo;
             RepoItemInfo _mapleegmakenInfo;
@@ -8217,7 +8217,7 @@
                 _genereercalculationandscenariosInfo = new RepoItemInfo(this, "GenereerCalculationAndScenarios", "menuitem[@accessiblename>'Genereer']", 30000, null, "17056c41-6629-4a0e-8ab2-93470db9fa27");
                 _genericitemincontextmenuInfo = new RepoItemInfo(this, "GenericItemInContextMenu", "menuitem[@accessiblename>$nameOfItem]", 30000, null, "39eb92d8-2056-4218-88eb-8b21c0ab477e");
                 _importerenInfo = new RepoItemInfo(this, "Importeren", "menuitem[@accessiblename='Importeren...']", 30000, null, "34965857-9328-4216-9d99-86afbd395e38");
-                _isrelevantInfo = new RepoItemInfo(this, "IsRelevant", "menuitem[@accessiblename='Is relevant']", 30000, null, "561b2d91-62ad-4174-97e3-b9f7420df49a");
+                _inassemblageInfo = new RepoItemInfo(this, "InAssemblage", "menuitem[@accessiblename='In assemblage']", 30000, null, "561b2d91-62ad-4174-97e3-b9f7420df49a");
                 _koppelaandatabaseInfo = new RepoItemInfo(this, "KoppelAanDatabase", "menuitem[@accessiblename='Koppel aan database...']", 30000, null, "b67d9db7-c97a-44ee-9cc6-3cac1b3aa092");
                 _maptoevoegenInfo = new RepoItemInfo(this, "MapToevoegen", "menuitem[@accessiblename='Map toevoegen']", 30000, null, "bb08d163-934b-43d2-b55e-ba2f9cd39c14");
                 _mapleegmakenInfo = new RepoItemInfo(this, "MapLeegmaken", "menuitem[@accessiblename='Map leegmaken...']", 30000, null, "ca583eef-300b-420e-8edd-95c3ffd4cb61");
@@ -8622,26 +8622,26 @@
             }
 
             /// <summary>
-            /// The IsRelevant item.
+            /// The InAssemblage item.
             /// </summary>
             [RepositoryItem("561b2d91-62ad-4174-97e3-b9f7420df49a")]
-            public virtual Ranorex.MenuItem IsRelevant
+            public virtual Ranorex.MenuItem InAssemblage
             {
                 get
                 {
-                    return _isrelevantInfo.CreateAdapter<Ranorex.MenuItem>(true);
+                    return _inassemblageInfo.CreateAdapter<Ranorex.MenuItem>(true);
                 }
             }
 
             /// <summary>
-            /// The IsRelevant item info.
+            /// The InAssemblage item info.
             /// </summary>
             [RepositoryItemInfo("561b2d91-62ad-4174-97e3-b9f7420df49a")]
-            public virtual RepoItemInfo IsRelevantInfo
+            public virtual RepoItemInfo InAssemblageInfo
             {
                 get
                 {
-                    return _isrelevantInfo;
+                    return _inassemblageInfo;
                 }
             }
 
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep
===================================================================
diff -u -r2456d3ee1f8ffed2750239a463dfc2dec6cc0538 -r5f934418fb04f8ed56487912354a2d6db39d6a28
--- System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 2456d3ee1f8ffed2750239a463dfc2dec6cc0538)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/AutomatedSystemTestsRepository.rxrep	(.../AutomatedSystemTestsRepository.rxrep)	(revision 5f934418fb04f8ed56487912354a2d6db39d6a28)
@@ -640,7 +640,7 @@
 							name="SimpleAssessmentTypeRowNth"
 							refimgid="8ee7eb94-dd16-4546-91bb-40a19b98fb87"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Eenvoudige toets Row ']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Eenvoudige toets Row ']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -649,7 +649,7 @@
 							name="DetailedAsssessmentTypeRowNth"
 							refimgid="8ee7eb94-dd16-4546-91bb-40a19b98fb87"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vak Row ']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vak Row ']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -658,7 +658,7 @@
 							name="DetailedAssessmentValueRowNth"
 							refimgid="983a5938-6ce7-43b5-a464-67fcec65e0f6"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vakfaalkans Row ']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vakfaalkans Row ']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -667,7 +667,7 @@
 							name="CustomAsssessmentTypeRowNth"
 							refimgid="8ee7eb94-dd16-4546-91bb-40a19b98fb87"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename='Toets op maat Row '+$rowIndex]
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename='Toets op maat Row '+$rowIndex]
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -676,7 +676,7 @@
 							name="CustomAssessmentValueRowNth"
 							refimgid="983a5938-6ce7-43b5-a464-67fcec65e0f6"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toets op maatfaalkans Row ']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toets op maatfaalkans Row ']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -685,7 +685,7 @@
 							name="DetailedAssessmentValueCategories"
 							refimgid="d5e7cd57-012e-45dc-a780-ed3166ba405c"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelgedetailleerde']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelgedetailleerde']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -694,7 +694,7 @@
 							name="DetailedAssessmentTypeCategoryIv"
 							refimgid="39de783d-7558-4f5e-9fdb-05f8989ba096"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens Iv']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens Iv']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -703,7 +703,7 @@
 							name="DetailedAssessmentTypeCategoryIIv"
 							refimgid="2aa90b9d-fda2-459a-be90-da306a333eed"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IIv']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IIv']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -712,7 +712,7 @@
 							name="DetailedAssessmentTypeCategoryIIIv"
 							refimgid="d0fa67ad-25dd-4ca8-8494-1a42898951ab"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IIIv']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IIIv']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -721,7 +721,7 @@
 							name="DetailedAssessmentTypeCategoryIVv"
 							refimgid="642ac44d-2681-4e71-9031-94963114ca9e"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IVv']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens IVv']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -730,7 +730,7 @@
 							name="DetailedAssessmentTypeCategoryVv"
 							refimgid="12bba804-248e-47cb-a6c3-fb6f2cfd7206"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens Vv']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toetsper vakcategoriegrens Vv']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -739,7 +739,7 @@
 							name="DetailedAssessmentValuePerSection"
 							refimgid="d7e79c29-a957-4625-8c4e-34e7f02b5c5f"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelgedetailleerde']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelgedetailleerde']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -748,7 +748,7 @@
 							name="DetailedAssessmentTypePerSection"
 							refimgid="ee631e46-3cea-46d3-9674-172b07516265"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vak']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Gedetailleerde toets per vak']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -757,7 +757,7 @@
 							name="ManualAssessmentCheckbox"
 							refimgid="b46c7af8-2afc-4f3e-a087-bc1a4342b3c0"
 							searchtimeout="10000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Overschrijftoetsoordeel']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Overschrijftoetsoordeel']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -766,7 +766,7 @@
 							name="ManualAssessmentProbability"
 							refimgid="9de06033-118b-4cb0-b892-d8d4ba07a7c9"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
 							</item>
 							<item
 							addcaps="combobox,control,nativewindow"
@@ -775,7 +775,7 @@
 							name="ManualAssessmentCategory"
 							refimgid="8fdb0378-b350-43ef-9d97-28b858f41157"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row '+$rowIndex]/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
 							</item>
 							<item
 							addcaps="button,accessible"
@@ -784,7 +784,7 @@
 							name="ColumnRight"
 							refimgid="421f3d5c-1450-41c9-847d-0bc97f067c1b"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/scrollbar[@controltypename='HScrollBar']/button[@accessiblename='Column right']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/scrollbar[@controltypename='HScrollBar']/button[@accessiblename='Column right']
 							</item>
 							<item
 							addcaps="button,accessible"
@@ -793,7 +793,7 @@
 							name="ColumnLeft"
 							refimgid="1c2085e3-641d-48b4-bbd7-51575a0f4d91"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/scrollbar[@controltypename='HScrollBar']/button[@accessiblename='Column left']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/scrollbar[@controltypename='HScrollBar']/button[@accessiblename='Column left']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -802,7 +802,7 @@
 							name="OverruleAssessmentRow0"
 							refimgid="7b8559f2-cd61-4440-89ca-581e6e55833f"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Overschrijftoetsoordeel']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Overschrijftoetsoordeel']
 							</item>
 							<item
 							addcaps="cell,accessible"
@@ -811,10 +811,10 @@
 							name="ManualAssessmentRow0"
 							refimgid="f9774423-647d-4236-9bf2-6caa9c0236d7"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Toetsoordeelhandmatig']
 							</item>
 							<basepath>
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container/table[@controlname='dataGridView']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container/table[@controlname='dataGridView']
 							</basepath>
 						</folder>
 						<folder
@@ -832,7 +832,7 @@
 							name="Label"
 							refimgid="cff20c4c-f968-4e52-8f56-b83181df4a04"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='GroupPanel']/text/text
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='GroupPanel']/text/text
 							</item>
 							<item
 							addcaps="text,accessible"
@@ -841,10 +841,10 @@
 							name="Probability"
 							refimgid="25125f59-3167-4e83-964d-f177d497aa21"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='probabilityPanel']/text/text
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']/container[@controlname='probabilityPanel']/text/text
 							</item>
 							<basepath>
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container[@controlname='FailureMechanismAssemblyControl']
 							</basepath>
 						</folder>
 						<item
@@ -854,7 +854,7 @@
 						name="LabelNoProb"
 						refimgid="4d180fc1-d7b8-4306-a023-4b409260a1d2"
 						searchtimeout="30000ms">
-							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container/container/text/text
+							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/container/container/text/text
 						</item>
 						<item
 						addcaps="unknown,nativewindow"
@@ -863,10 +863,10 @@
 						name="WarningIconManualAssessment"
 						refimgid="ba2b1d7c-7101-4d21-9ed7-8d3a045b9113"
 						searchtimeout="30000ms">
-							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/element
+							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']/container[@controlname='TableLayoutPanel']/element
 						</item>
 						<basepath>
-							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='FailureMechanismResultView']
+							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'FailureMechanismResultView']
 						</basepath>
 					</folder>
 					<folder
@@ -1130,10 +1130,10 @@
 							id="f3f7de84-f41c-4188-9eff-d19414f68a60"
 							name="GenericSection"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']/container/container/?/list/list/listitem[@index=$indexSection]
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/?/list/list/listitem[@index=$indexSection]
 							</item>
 							<basepath>
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']/container/container/?/list/list
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/?/list/list
 							</basepath>
 						</folder>
 						<folder
@@ -1153,22 +1153,22 @@
 							searchtimeout="30000ms"
 							usecache="False">
 								<basepath>
-									/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']/container/container/container/container/table/row[@accessiblename='Row '+$indexRow]/cell[@accessiblename&gt;'In oordeel']
+									/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/table/row[@accessiblename='Row '+$indexRow]/cell[@accessiblename&gt;'In oordeel']
 								</basepath>
 							</folder>
 							<item
 							capname="cell"
 							id="3476c0a3-36a4-4281-90a3-065844674eb8"
 							name="GenericRowContribution"
 							searchtimeout="30000ms">
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']/container/container/container/container/table/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Bijdrage aanscenario[%]']
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/table/row[@accessiblename='Row 0']/cell[@accessiblename&gt;'Bijdrage aanscenario[%]']
 							</item>
 							<basepath>
-								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']/container/container/container/container/table
+								/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']/container/container/container/container/table
 							</basepath>
 						</folder>
 						<basepath>
-							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname='ScenariosView']
+							/form[@automationid='RiskeerMainWindow']/container/container[4]/container/container[@instance='1' and @controltypename='WinFormsAdapter']/container[@controlname~'ScenariosView']
 						</basepath>
 					</folder>
 					<folder
@@ -2269,11 +2269,10 @@
 			addcaps="menuitem,accessible"
 			capname="menuitem"
 			id="561b2d91-62ad-4174-97e3-b9f7420df49a"
-			name="IsRelevant"
+			name="InAssemblage"
 			refimgid="6c6af78e-afc4-4f5f-af81-b20852597810"
-			refpath="/contextmenu[@processname='Riskeer']/menuitem[@accessiblename='Is relevant']"
 			searchtimeout="30000ms">
-				/contextmenu[@processname='Riskeer']/menuitem[@accessiblename='Is relevant']
+				/contextmenu[@processname='Riskeer']/menuitem[@accessiblename='In assemblage']
 			</item>
 			<item
 			addcaps="menuitem,accessible"
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.UserCode.cs
===================================================================
diff -u -r8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba -r5f934418fb04f8ed56487912354a2d6db39d6a28
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.UserCode.cs	(.../SetRelevanceFMInProjectExplorer.UserCode.cs)	(revision 8c0fd817cdf78fb65cc9c72d6c2588d39b23e7ba)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/Set_Assign/SetRelevanceFMInProjectExplorer.UserCode.cs	(.../SetRelevanceFMInProjectExplorer.UserCode.cs)	(revision 5f934418fb04f8ed56487912354a2d6db39d6a28)
@@ -48,7 +48,7 @@
             	Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item" + treeitemInfo + ".", treeitemInfo);
             	fmObjectAdapter.Click(System.Windows.Forms.MouseButtons.Right);
             	Report.Log(ReportLevel.Info, "Mouse", "Mouse Right Click item IsRelevant.", treeitemInfo);
-            	repo.ContextMenu.IsRelevant.Click();
+            	repo.ContextMenu.InAssemblage.Click();
             	Report.Log(ReportLevel.Info, "Info", "Relevance set to value: " + fmShouldBeRelevant, treeitemInfo);
             }
             
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst
===================================================================
diff -u -r1bbff0dc763992cedf6a20ed6858e9ef0723d764 -r5f934418fb04f8ed56487912354a2d6db39d6a28
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst	(.../Script06.rxtst)	(revision 1bbff0dc763992cedf6a20ed6858e9ef0723d764)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script06.rxtst	(.../Script06.rxtst)	(revision 5f934418fb04f8ed56487912354a2d6db39d6a28)
@@ -2973,7 +2973,7 @@
 				<parameters>
 					<param
 					name="substringInFmName"
-					value="Duinwaterkering - Duinafslag">
+					value="Duinafslag">
 					</param>
 					<param
 					name="fmShouldBeRelevant"
@@ -3398,7 +3398,7 @@
 				<parameters>
 					<param
 					name="substringInFmName"
-					value="Duinwaterkering - Duinafslag">
+					value="Duinafslag">
 					</param>
 					<param
 					name="fmShouldBeRelevant"
@@ -5255,7 +5255,7 @@
 						STPH
 					</td>
 					<td>
-						Dijken en dammen - Piping
+						@STPH
 					</td>
 					<td>
 						True
@@ -5272,7 +5272,7 @@
 						GEKB
 					</td>
 					<td>
-						Dijken en dammen - Grasbekleding erosie kruin en binnentalud
+						@GEKB
 					</td>
 					<td>
 						True
@@ -5289,7 +5289,7 @@
 						STBI
 					</td>
 					<td>
-						Dijken en dammen - Macrostabiliteit binnenwaarts
+						@STBI
 					</td>
 					<td>
 						True
@@ -5306,7 +5306,7 @@
 						ZST
 					</td>
 					<td>
-						Dijken en dammen - Stabiliteit steenzetting
+						@ZST
 					</td>
 					<td>
 						False
@@ -5323,7 +5323,7 @@
 						AGK
 					</td>
 					<td>
-						Dijken en dammen - Golfklappen op asfaltbekleding
+						@AGK
 					</td>
 					<td>
 						False
@@ -5340,7 +5340,7 @@
 						GEBU
 					</td>
 					<td>
-						Dijken en dammen - Grasbekleding erosie buitentalud
+						@GEBU
 					</td>
 					<td>
 						False
@@ -5357,7 +5357,7 @@
 						HTKW
 					</td>
 					<td>
-						Kunstwerken - Hoogte kunstwerk
+						@HTKW
 					</td>
 					<td>
 						True
@@ -5374,7 +5374,7 @@
 						BSKW
 					</td>
 					<td>
-						Kunstwerken - Betrouwbaarheid sluiting kunstwerk
+						@BSKW
 					</td>
 					<td>
 						True
@@ -5391,7 +5391,7 @@
 						STKWp
 					</td>
 					<td>
-						Kunstwerken - Sterkte en stabiliteit puntconstructies
+						@STKWp
 					</td>
 					<td>
 						True
@@ -5408,7 +5408,7 @@
 						DA
 					</td>
 					<td>
-						Duinwaterkering - Duinafslag
+						@DA
 					</td>
 					<td>
 						False