Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml
===================================================================
diff -u -r51202 -r51212
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestVanRaemdonck.cls.xml	(.../TestVanRaemdonck.cls.xml)	(revision 51212)
@@ -9,9 +9,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPersonalityId">
-<ReturnType>DOM.common.enu.Personality</ReturnType>
-<Implementation><![CDATA[	Quit ..PersonalityId.VanRaemdonck
+<Method name="GeefPersonality">
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.VanRaemdonckPersonality).Instance()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml
===================================================================
diff -u -r51202 -r51212
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestKisch.cls.xml	(.../TestKisch.cls.xml)	(revision 51212)
@@ -9,9 +9,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPersonalityId">
-<ReturnType>DOM.common.enu.Personality</ReturnType>
-<Implementation><![CDATA[	Quit ..PersonalityId.Kisch
+<Method name="GeefPersonality">
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.KischPersonality).Instance()
 ]]></Implementation>
 </Method>
 
Index: WSimpl/Unishop/Login/KortingBewaarder.cls.xml
===================================================================
diff -u -r51202 -r51212
--- WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 51202)
+++ WSimpl/Unishop/Login/KortingBewaarder.cls.xml	(.../KortingBewaarder.cls.xml)	(revision 51212)
@@ -155,7 +155,7 @@
 <FormalSpec>Personality:DOM.common.Personality,Variant:DOM.PM.enu.Variant</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim KortingSpecificatie As DOM.VKP.dto.KortingSpecificaties = ..KortingSpecificatieFactory.Maak(Variant, Personality.GeefID(), ..KlantSessieData.KlantID)
+	#dim KortingSpecificatie As DOM.VKP.dto.KortingSpecificaties = ..KortingSpecificatieFactory.Maak(Variant, Personality, ..KlantSessieData.KlantID)
 	#dim Korting As %String = ..KlantSessieData.Korting
 	#dim KortingPercentage As TECH.Percentage
 	
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml
===================================================================
diff -u -r51202 -r51212
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestDaro.cls.xml	(.../TestDaro.cls.xml)	(revision 51212)
@@ -9,9 +9,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPersonalityId">
-<ReturnType>DOM.common.enu.Personality</ReturnType>
-<Implementation><![CDATA[	Quit ..PersonalityId.Daro
+<Method name="GeefPersonality">
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.DaroPersonality).Instance()
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml
===================================================================
diff -u -r51202 -r51212
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestBase.cls.xml	(.../TestBase.cls.xml)	(revision 51212)
@@ -9,11 +9,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="PersonalityId">
-<Type>DOM.common.enu.Personality.AutoComplete</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="AssertBewaarCorrecteKorting">
 <FormalSpec>Ref:%String,DataOpt:%String,VerwachteKorting:TECH.Percentage</FormalSpec>
 <Implementation><![CDATA[
@@ -22,9 +17,9 @@
 	#dim DummyKortingSpecificatieTbx As DOM.VKP.dto.KortingSpecificaties = ##class(DOM.VKP.dto.KortingSpecificaties).%New()
 	
 	#dim KortingSpecificatieFactoryMock As vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory = ##class(vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory).%New()
-	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.LegraboxPure, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieLbx)
-	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.Taorbox, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTax)
-	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.TandemboxAntaro, ..GeefPersonalityId(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTbx)
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.LegraboxPure, ..GeefPersonality(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieLbx)
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.Taorbox, ..GeefPersonality(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTax)
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", ..Variant.TandemboxAntaro, ..GeefPersonality(), "DummyKlantID").ExactAantalKeer(1).DanReturn(DummyKortingSpecificatieTbx)
 	
 	#dim KortingServiceMock As vhTest.Mock.DOM.VKP.KortingService = ##class(vhTest.Mock.DOM.VKP.KortingService).%New()
 	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", DummyKortingSpecificatieLbx, VerwachteKorting).ExactAantalKeer(1)
@@ -43,7 +38,7 @@
 <FormalSpec>Ref:%String,DataOpt:%String</FormalSpec>
 <Implementation><![CDATA[
 	#dim KortingSpecificatieFactoryMock As vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory = ##class(vhTest.Mock.DOM.VKP.dto.KortingSpecificatieFactory).%New()
-	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", $$$ElkeWaarde, ..GeefPersonalityId(), "DummyKlantID").Nooit()
+	Do KortingSpecificatieFactoryMock.VerwachtMethodCall("Maak", $$$ElkeWaarde, ..GeefPersonality(), "DummyKlantID").Nooit()
 	
 	#dim KortingServiceMock As vhTest.Mock.DOM.VKP.KortingService = ##class(vhTest.Mock.DOM.VKP.KortingService).%New()
 	Do KortingServiceMock.VerwachtMethodCall("StelInKorting", $$$ElkeWaarde, $$$ElkeWaarde).Nooit()
@@ -61,9 +56,9 @@
 <ReturnType>%String</ReturnType>
 </Method>
 
-<Method name="GeefPersonalityId">
+<Method name="GeefPersonality">
 <Abstract>1</Abstract>
-<ReturnType>DOM.common.enu.Personality</ReturnType>
+<ReturnType>DOM.common.Personality</ReturnType>
 </Method>
 </Class>
 
Index: vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml
===================================================================
diff -u -r51202 -r51212
--- vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml	(.../TestHaefeleBe.cls.xml)	(revision 51202)
+++ vhUnitTest/WSimpl/Unishop/Login/KortingBewaarder/TestHaefeleBe.cls.xml	(.../TestHaefeleBe.cls.xml)	(revision 51212)
@@ -9,9 +9,9 @@
 ]]></Implementation>
 </Method>
 
-<Method name="GeefPersonalityId">
-<ReturnType>DOM.common.enu.Personality</ReturnType>
-<Implementation><![CDATA[	Quit ..PersonalityId.HaefeleBE
+<Method name="GeefPersonality">
+<ReturnType>DOM.common.Personality</ReturnType>
+<Implementation><![CDATA[	Quit ##class(DOM.common.HaefeleBEPersonality).Instance()
 ]]></Implementation>
 </Method>