Index: APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml
===================================================================
diff -u -r73559 -r73568
--- APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 73559)
+++ APPS/PM/Maatwerk/impl/VhConfig/Converter/HalffabItemsBoom.cls.xml	(.../HalffabItemsBoom.cls.xml)	(revision 73568)
@@ -291,32 +291,16 @@
 ]]></Implementation>
 </Method>
 
-<Method name="IsGekoppeldeMat">
-<FormalSpec>RolNaam:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit RolNaam = "Mat"
-]]></Implementation>
-</Method>
-
-<Method name="IsGekoppeldeSST">
-<FormalSpec>RolNaam:%String</FormalSpec>
-<Private>1</Private>
-<ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).StartsWith(RolNaam, "SST")
-]]></Implementation>
-</Method>
-
 <Method name="GeefRolnaamVanGekoppeldKenmerk">
 <FormalSpec>RolNaam:%String</FormalSpec>
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim RolNaamGekoppeldKenmerk As %String = ""
 		
-	If (..IsGekoppeldeMat()) {
+	If (..IsGekoppeldeMat(RolNaam)) {
 		Set RolNaamGekoppeldKenmerk = "MAT_Standaard_MatX"
-	} ElseIf (..IsGekoppeldeSST()) {
+	} ElseIf (..IsGekoppeldeSST(RolNaam)) {
 		Set RolNaamGekoppeldKenmerk = "SpaceStep_SpaceStep"
 	} Else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Rolnaam voor gekoppeld kenmerk kan niet bepaald worden voor rol '" _ RolNaam _ "'"))	
@@ -325,6 +309,22 @@
 	Quit RolNaamGekoppeldKenmerk
 ]]></Implementation>
 </Method>
+
+<Method name="IsGekoppeldeMat">
+<FormalSpec>RolNaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit RolNaam = "Mat"
+]]></Implementation>
+</Method>
+
+<Method name="IsGekoppeldeSST">
+<FormalSpec>RolNaam:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).StartsWith(RolNaam, "SST")
+]]></Implementation>
+</Method>
 </Class>