Index: WSimpl/PM/Maatwerk/MaatwerkService/DotNet/ClassnameFromJsonNaarDomConverter.cls.xml
===================================================================
diff -u -r63264 -r63266
--- WSimpl/PM/Maatwerk/MaatwerkService/DotNet/ClassnameFromJsonNaarDomConverter.cls.xml	(.../ClassnameFromJsonNaarDomConverter.cls.xml)	(revision 63264)
+++ WSimpl/PM/Maatwerk/MaatwerkService/DotNet/ClassnameFromJsonNaarDomConverter.cls.xml	(.../ClassnameFromJsonNaarDomConverter.cls.xml)	(revision 63266)
@@ -24,12 +24,9 @@
 <FormalSpec>HalffabItemParsedFromJson:APPS.PM.Maatwerk.dto.DotNet.HalffabItemParsedFromJson</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim CacheClassname As %String = ""
-	#dim KlasseNaamInfo As %String = HalffabItemParsedFromJson.KlasseNaamInfo
-	Set CacheClassname = ##class(TECH.StringUtils).GetLastPart($Piece(KlasseNaamInfo,",",1),".")
+	#dim CacheClassname As %String = ..ExtractClassnameFromJson(HalffabItemParsedFromJson.KlasseNaamInfo)
 	
-	Set CacheClassname = ##class(TECH.StringUtils).Append(..PackageVoorDomLaag_".HF", CacheClassname, ".")
-	Quit CacheClassname
+	Quit ..GeefVolledigeKlasseNaam(..PackageVoorDomLaag_".HF", CacheClassname)
 ]]></Implementation>
 </Method>
 
@@ -39,35 +36,46 @@
 <Implementation><![CDATA[
 	#dim CacheClassname As %String = ""
 	#dim PackageVoorHalffab As %String = ""
-	#dim KlasseNaamInfo As %String = HalffabDtoParsedFromJson.KlasseNaamInfo
+	
 	#dim KlasseNaamVanDotNetHalffab As %String = HalffabDtoParsedFromJson.Klassenaam
-
 	If KlasseNaamVanDotNetHalffab = "Halffab" {
-		Set CacheClassname = ##class(TECH.StringUtils).GetLastPart($Piece(KlasseNaamInfo,",",1),".")
+		Set CacheClassname = ..ExtractClassnameFromJson(HalffabDtoParsedFromJson.KlasseNaamInfo)
 		Set PackageVoorHalffab = ..PackageVoorDomLaag_".HF"
 	}
 	Else {
 		Set CacheClassname = ##class(TECH.StringUtils).Replace(KlasseNaamVanDotNetHalffab, "MVX_", "")   ; voorlopig fixed code voor MVX 
 		Set PackageVoorHalffab  = "DOM.PM.Maatwerk.Calc.HF.impl.MVX.Halffab"                             ; voorlopig fixed code voor MVX 
 	}
-	Set CacheClassname = ##class(TECH.StringUtils).Append(PackageVoorHalffab, CacheClassname, ".")
 	
-	Quit CacheClassname
+	Quit ..GeefVolledigeKlasseNaam(PackageVoorHalffab, CacheClassname)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefCacheClassnameVoorKostItem">
 <FormalSpec>KostItemParsedFromJson:APPS.PM.Maatwerk.dto.DotNet.KostItemParsedFromJson</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim CacheClassname As %String = ""
-	#dim KlasseNaamInfo As %String = KostItemParsedFromJson.KlasseNaamInfo 
-	Set CacheClassname = $Piece($Piece(KlasseNaamInfo,",",1),".",8)
+	#dim CacheClassname As %String = ..ExtractClassnameFromJson(KostItemParsedFromJson.KlasseNaamInfo)
 	
-	Set CacheClassname = ##class(TECH.StringUtils).Append(..PackageVoorDomLaag_".Kost", CacheClassname, ".")
-	Quit CacheClassname
+	Quit ..GeefVolledigeKlasseNaam(..PackageVoorDomLaag_".Kost", CacheClassname, ".")
 ]]></Implementation>
 </Method>
+
+<Method name="ExtractClassnameFromJson">
+<FormalSpec>KlasseNaamInfo:%String</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).GetLastPart($Piece(KlasseNaamInfo,",",1),".")
+]]></Implementation>
+</Method>
+
+<Method name="GeefVolledigeKlasseNaam">
+<FormalSpec>PackageNaam:%String,KlasseNaam</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.StringUtils).Append(PackageNaam, KlasseNaam, ".")
+]]></Implementation>
+</Method>
 </Class>