diff --git a/C/load_dl.c b/C/load_dl.c
index 605c94344..9c94eb904 100755
--- a/C/load_dl.c
+++ b/C/load_dl.c
@@ -142,6 +142,7 @@ Yap_LoadForeignFile(char *file, int flags)
     dlflag |= RTLD_LOCAL;
 #endif
   if (!Yap_TrueFileName(file, LOCAL_FileNameBuf, true)){
+  if (!Yap_locateFile(file, LOCAL_FileNameBuf, true)){
     /* use LD_LIBRARY_PATH */
     strncpy(LOCAL_FileNameBuf,file, YAP_FILENAME_MAX-1);
     strncat(LOCAL_FileNameBuf,".", YAP_FILENAME_MAX-1);
@@ -194,7 +195,7 @@ LoadForeign(StringList ofiles, StringList libs,
   CACHE_REGS
 
   while (libs) {
-    if (!Yap_TrueFileName((char *)AtomName(libs->name), LOCAL_FileNameBuf, true)) {
+    if (!Yap_locateFile((char *)AtomName(libs->name), LOCAL_FileNameBuf, true)) {
       /* use LD_LIBRARY_PATH */
       strncpy(LOCAL_FileNameBuf, (char *)AtomName(libs->name), YAP_FILENAME_MAX);
     }
@@ -218,7 +219,6 @@ LoadForeign(StringList ofiles, StringList libs,
      other routines */
 
     /* dlopen wants to follow the LD_CONFIG_PATH */
-    if (!Yap_TrueFileName((char *)AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE)) {
       strcpy(LOCAL_ErrorSay, "%% Trying to open unexisting file in LoadForeign");
       return LOAD_FAILLED;
     }
diff --git a/C/load_dll.c b/C/load_dll.c
index dbb232480..6ec4c2ddb 100755
--- a/C/load_dll.c
+++ b/C/load_dll.c
@@ -82,7 +82,7 @@ LoadForeign(StringList ofiles, StringList libs,
   while (ofiles) {
     HINSTANCE handle;
 
-    if (Yap_TrueFileName(AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE) &&
+    if (Yap_locateFile(AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE) &&
 	(handle=LoadLibrary(LOCAL_FileNameBuf)) != 0)
       {
 	LOCAL_ErrorSay[0]=~'\0';
diff --git a/C/load_dyld.c b/C/load_dyld.c
index 1daf568c7..565612c85 100755
--- a/C/load_dyld.c
+++ b/C/load_dyld.c
@@ -158,7 +158,7 @@ LoadForeign(StringList ofiles, StringList libs,
     void *handle;
 
     /* mydlopen wants to follow the LD_CONFIG_PATH */
-    if (!Yap_TrueFileName(AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE)) {
+    if (!Yap_locateFile(AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE)) {
       strcpy(LOCAL_ErrorSay, "%% Trying to open unexisting file in LoadForeign");
       return LOAD_FAILLED;
     }
diff --git a/C/load_shl.c b/C/load_shl.c
index dadd04a9f..19e17cc3e 100644
--- a/C/load_shl.c
+++ b/C/load_shl.c
@@ -61,7 +61,7 @@ LoadForeign( StringList ofiles, StringList libs,
     int valid_fname;
 
     /* shl_load wants to follow the LD_CONFIG_PATH */
-    valid_fname = Yap_TrueFileName( AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE );
+    valid_fname = Yap_locateFile( AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE );
 
     if( !valid_fname ) {
       strcpy( LOCAL_ErrorSay, "%% Trying to open non-existing file in LoadForeign" );
diff --git a/C/save.c b/C/save.c
index ef7713d02..0d99f80a9 100755
--- a/C/save.c
+++ b/C/save.c
@@ -1400,7 +1400,7 @@ commit_to_saved_state(char *s, CELL *Astate, CELL *ATrail, CELL *AStack, CELL *A
   LOCAL_PrologMode = BootMode;
   if (Yap_HeapBase) {
     if (falseGlobalPrologFlag( HALT_AFTER_CONSULT_FLAG ) && !silentMode( )) {
-      Yap_AbsoluteFileInBuffer(s,LOCAL_FileNameBuf2, YAP_FILENAME_MAX, true);
+      Yap_locateFile(s,LOCAL_FileNameBuf2, YAP_FILENAME_MAX);
       fprintf(stderr, "%% Restoring file %s\n", LOCAL_FileNameBuf2);
     }
     Yap_CloseStreams(TRUE);
@@ -1442,7 +1442,8 @@ OpenRestore(char *inpf, char *YapLibDir, CELL *Astate, CELL *ATrail, CELL *AStac
   int mode;
   char fname[PATH_MAX+1];
   
-  if (!Yap_AbsoluteFileInBuffer( inpf, fname, PATH_MAX, true))
+
+  if (!Yap_findFile( inpf, YAP_STARTUP, YapLibDir, fname, true, YAP_SAVED_STATE, true, true))
     return false;
   if (fname[0] &&
       (mode = try_open(fname,Astate,ATrail,AStack,AHeap,streamp)) != FAIL_RESTORE) {