diff --git a/C/cdmgr.c b/C/cdmgr.c
index e50593761..646420e09 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -515,7 +515,6 @@ static Int  p_call_count_info( USES_REGS1 );
 static Int  p_call_count_set( USES_REGS1 );
 static Int  p_call_count_reset( USES_REGS1 );
 static Int  p_toggle_static_predicates_in_use( USES_REGS1 );
-static Atom  YapConsultingFile( USES_REGS1 );
 static Int  PredForCode(yamop *, Atom *, UInt *, Term *);
 static void  kill_first_log_iblock(LogUpdIndex *, LogUpdIndex *, PredEntry *);
 static LogUpdIndex *find_owner_log_index(LogUpdIndex *, yamop *);
@@ -2033,7 +2032,7 @@ not_was_reconsulted(PredEntry *p, Term t, int mode)
 	!(p->PredFlags & MultiFileFlag)) /* we are in reconsult mode */ {
       retract_all(p, static_in_use(p,TRUE));
     }
-    p->src.OwnerFile = YapConsultingFile( PASS_REGS1 );
+    p->src.OwnerFile = Yap_ConsultingFile( PASS_REGS1 );
   }
   return TRUE;		/* careful */
 }
@@ -2363,7 +2362,7 @@ addclause(Term t, yamop *cp, int mode, Term mod, Term *t4ref)
   if (pflags & MultiFileFlag) {
     /* add Info on new clause for multifile predicates to the DB */
     Term t[5], tn;
-    t[0] = MkAtomTerm(YapConsultingFile( PASS_REGS1 ));
+    t[0] = MkAtomTerm(Yap_ConsultingFile( PASS_REGS1 ));
     t[1] = MkAtomTerm(at);
     t[2] = MkIntegerTerm(Arity);
     t[3] = mod;
@@ -2571,8 +2570,8 @@ p_compile_dynamic( USES_REGS1 )
   return TRUE;
 }
 
-static Atom
-YapConsultingFile ( USES_REGS1 )
+Atom
+Yap_ConsultingFile ( USES_REGS1 )
 {
   if (LOCAL_consult_level == 0) {
     return(AtomUser);
@@ -2581,13 +2580,6 @@ YapConsultingFile ( USES_REGS1 )
   }
 }
 
-Atom
-Yap_ConsultingFile ( void )
-{
-  CACHE_REGS
-  return YapConsultingFile( PASS_REGS1 );
-}
-
 /* consult file *file*, *mode* may be one of either consult or reconsult */
 static void
 init_consult(int mode, char *file)
@@ -2992,7 +2984,7 @@ p_new_multifile( USES_REGS1 )
     /* static */
     pe->PredFlags |= (SourcePredFlag|CompiledPredFlag);
   }
-  pe->src.OwnerFile = YapConsultingFile( PASS_REGS1 );
+  pe->src.OwnerFile = Yap_ConsultingFile( PASS_REGS1 );
   UNLOCKPE(43,pe);
   return (TRUE);
 }
@@ -3101,7 +3093,7 @@ p_mk_d( USES_REGS1 )
   if (pe->OpcodeOfPred == UNDEF_OPCODE) {
     pe->OpcodeOfPred = FAIL_OPCODE;
   }
-  pe->src.OwnerFile = YapConsultingFile( PASS_REGS1 );
+  pe->src.OwnerFile = Yap_ConsultingFile( PASS_REGS1 );
   UNLOCKPE(50,pe);
   return TRUE;
 }
diff --git a/C/init.c b/C/init.c
index fb2e0abf1..1c7c7a951 100755
--- a/C/init.c
+++ b/C/init.c
@@ -477,6 +477,7 @@ Yap_InitCPred(char *Name, unsigned long int Arity, CPredicate code, UInt flags)
   }
   pe->CodeOfPred = p_code;
   pe->PredFlags = flags | StandardPredFlag | CPredFlag;
+  pe->src.OwnerFile = Yap_ConsultingFile( PASS_REGS1 );
   pe->cs.f_code = code;
   if (!(flags & SafePredFlag)) {
     p_code->opc = Yap_opcode(_allocate);