Index: BL/Flow/Factuur/Doc.cls.xml
===================================================================
diff -u -r48854 -r73454
--- BL/Flow/Factuur/Doc.cls.xml	(.../Doc.cls.xml)	(revision 48854)
+++ BL/Flow/Factuur/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -639,6 +639,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -672,7 +674,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)   ; ,FactType)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -681,15 +683,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath=DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -708,8 +710,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  ;d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  ;d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/PrijsLijst/Doc.cls.xml
===================================================================
diff -u -r29059 -r73454
--- BL/Flow/PrijsLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 29059)
+++ BL/Flow/PrijsLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -978,6 +978,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -1011,7 +1013,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -1020,15 +1022,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ;The returned 'Dir' can be local path to FOP;the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ;optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -1047,8 +1049,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ;Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/Order/Doc.cls.xml
===================================================================
diff -u -r48225 -r73454
--- BL/Flow/Order/Doc.cls.xml	(.../Doc.cls.xml)	(revision 48225)
+++ BL/Flow/Order/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -366,6 +366,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -400,7 +402,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -409,15 +411,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -436,8 +438,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/TransportLijst/Doc.cls.xml
===================================================================
diff -u -r66472 -r73454
--- BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 66472)
+++ BL/Flow/TransportLijst/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -315,6 +315,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -348,7 +350,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -357,15 +359,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -384,8 +386,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/Toelevering/Doc.cls.xml
===================================================================
diff -u -r46882 -r73454
--- BL/Flow/Toelevering/Doc.cls.xml	(.../Doc.cls.xml)	(revision 46882)
+++ BL/Flow/Toelevering/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -320,6 +320,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -353,7 +355,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -362,15 +364,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -389,8 +391,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/Offerte/Doc.cls.xml
===================================================================
diff -u -r48272 -r73454
--- BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 48272)
+++ BL/Flow/Offerte/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -534,6 +534,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -568,7 +570,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr,BronType)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -577,15 +579,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD($H,8)_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -604,8 +606,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
Index: BL/Flow/Rappel/Doc.cls.xml
===================================================================
diff -u -r55993 -r73454
--- BL/Flow/Rappel/Doc.cls.xml	(.../Doc.cls.xml)	(revision 55993)
+++ BL/Flow/Rappel/Doc.cls.xml	(.../Doc.cls.xml)	(revision 73454)
@@ -309,13 +309,6 @@
 	Set FilePath=$G(FileURL)
 	Do ..BuildFileData("FileWWW", .FName,.Dir,.FilePath, KLNr,RappelDatum,Exemplaar,$G(RappelType))
 	Do ..BuildFileData("FileWWWUrl", FName, ,.FileURL)
- /*
-	Set FName=##class(%File).GetFilename($G(FileURL))
-	Set:(FName="") FName="Rappel_"_KLNr_"_"_$ZD(RappelDatum,8)_$S(Exemplaar'="E":"_"_Exemplaar_"-"_RappelType, 1:"_E")_".pdf"
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
-	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
-	Set FileURL=$$$FOPInetPubURL_$$$SubDirURL_FName
- */
 	Quit ..RenderAndFileDoc(.KLNr,.RappelDatum,.Exemplaar,.RappelType,blnIncRappel,FilePath)
 ]]></Implementation>
 </Method>
@@ -632,6 +625,8 @@
 	Else  Do
 	. Set DocNr=DocRef
 	
+	Set DocBaseDirectoryUtils = ##class(BL.Sys.FOP.DocBaseDirectoryUtils).%New()
+	
 	Do:(Target="File"      ) bfdSetFile()
 	Do:(Target="FileWWW"   ) bfdSetFileWWW()
 	Do:(Target="FileWWWUrl") bfdSetFileWWWUrl()
@@ -665,7 +660,7 @@
 	// INPUT : FilePath (can be a FullPath, incomplete or empty)
 	//         Dir fixed
 	// OUTPUT: FName,Dir,FilePath
-	Set Dir=$$$FOPInetPubDir_$$$SubDir
+	Set Dir= DocBaseDirectoryUtils.GeefFOPInetPubDir() _$$$SubDir
 	Set FName=##class(%File).GetFilename($G(FilePath))
 	Set:(FName="") FName=..DefaultPDFName(DocNr)
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
@@ -674,15 +669,15 @@
 	// INPUT : FName
 	//         Dir fixed
 	// OUTPUT: FilePath
-	Set FilePath=$$$FOPInetPubURL_$$$SubDirURL_FName
+	Set FilePath= DocBaseDirectoryUtils.GeefFOPInetPubURL() _$$$SubDirURL_FName
 	Quit
 	
 bfdSetTempFTP()
 	// INPUT : FName or empty
 	//         Dir fixed
 	// OUTPUT: FilePath      ; The returned 'Dir' can be local path to FOP; the 'Dir in the FilePath' is the network-converted 'Dir'
 	Set Dir="E:\FOP\PDFTemp"
-	Set FtpSrcDir=$$$CvtFopE2Ntw(Dir)
+	Set FtpSrcDir = DocBaseDirectoryUtils.ConvertFopLocalDirToNetworkPath(Dir)
 	;Set Dir=FtpSrcDir   ; optional: use same value (network path) to address file from both servers (FOP and Caché0x)
 	Set:($G(FName)="") FName=..#DocCode_"_"_DocNr_"_"_$ZD(RappelDatum,8)_$S(Exemplaar'="E":"_"_Exemplaar_"-"_RappelType, 1:"_E")_".pdf"
 	Set FilePath=##class(%File).NormalizeDirectory(FtpSrcDir)_FName
@@ -701,8 +696,7 @@
 	// OPM: FilePath wordt zowel gebruikt bij RenderToFile (WS) en LoadFile (WS) in FOP, als bij DeleteFile from Caché-task 
 	  d WL^vhDBG("BuildFileData IN ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))
 	If $G(Dir)="" Do
-	. Set Dir=$$$PDFMailDirNtw   
-	. ;Set Dir=$$$PDFMailDir    ; Set Dir=$$$CvtFopE2Ntw(Dir)
+	. Set Dir=DocBaseDirectoryUtils.GeefPDFMailDirNtw()
 	Do bfdSetMail
 	Set FilePath=##class(%File).NormalizeDirectory(Dir)_FName
 	  d WL^vhDBG("BuildFileData OUT ("_Target_"): "_$G(FName)_" - "_$G(Dir)_" - "_$G(FilePath))