diff --git a/C/absmi.c b/C/absmi.c
index d655b18b6..009d3410e 100755
--- a/C/absmi.c
+++ b/C/absmi.c
@@ -936,7 +936,7 @@ interrupt_execute( USES_REGS1 )
     return v;
   }
   PP  = P->y_u.pp.p0;
-  if ((PP->ExtraPredFlags & (NoDebugPredFlag|HiddenPredFlag)) && Yap_only_has_signal(YAP_CREEP_SIGNAL)) {
+  if ((PP->ExtraPredFlags & (NoTracePredFlag|HiddenPredFlag)) && Yap_only_has_signal(YAP_CREEP_SIGNAL)) {
     UNLOCK(LOCAL_SignalLock);
     return 2;
   }
@@ -968,7 +968,7 @@ interrupt_call( USES_REGS1 )
   }
   PP = P->y_u.Osbpp.p0;
   if (Yap_only_has_signal(YAP_CREEP_SIGNAL) &&
-      (PP->ExtraPredFlags & (NoDebugPredFlag|HiddenPredFlag)) ) {
+      (PP->ExtraPredFlags & (NoTracePredFlag|HiddenPredFlag)) ) {
     UNLOCK(LOCAL_SignalLock);
     return 2;
   }
@@ -1258,7 +1258,7 @@ interrupt_dexecute( USES_REGS1 )
   pe = P->y_u.pp.p;
   LOCK(LOCAL_SignalLock);
   if (Yap_has_signal(YAP_CREEP_SIGNAL) &&
-      (PP->ExtraPredFlags & (NoDebugPredFlag|HiddenPredFlag))) {
+      (PP->ExtraPredFlags & (NoTracePredFlag|HiddenPredFlag))) {
     UNLOCK(LOCAL_SignalLock);
     return 2;
   }
@@ -7595,7 +7595,7 @@ Yap_absmi(int inp)
       BOp(call_cpred, Osbpp);
       check_trail(TR);
       if (!(PREG->y_u.Osbpp.p->PredFlags & (SafePredFlag)) &&
-	  !(PREG->y_u.Osbpp.p0->ExtraPredFlags & (NoDebugPredFlag|HiddenPredFlag))) {
+	  !(PREG->y_u.Osbpp.p0->ExtraPredFlags & (NoTracePredFlag|HiddenPredFlag))) {
 	CACHE_Y_AS_ENV(YREG);
 	check_stack(NoStackCCall, HR);
 	ENDCACHE_Y_AS_ENV();
diff --git a/C/adtdefs.c b/C/adtdefs.c
index a400a1b84..f6709e6f1 100755
--- a/C/adtdefs.c
+++ b/C/adtdefs.c
@@ -854,7 +854,7 @@ Yap_NewPredPropByFunctor(FunctorEntry *fe, Term cur_mod)
     }
   }
   if (LOCAL_PL_local_data_p== NULL || !truePrologFlag(PLFLAG_DEBUGINFO)) {
-    p->ExtraPredFlags |= NoDebugPredFlag;
+    p->ExtraPredFlags |= NoTracePredFlag;
   }
   p->FunctorOfPred = fe;
   if (fe->PropsOfFE) {
@@ -943,7 +943,7 @@ Yap_NewThreadPred(PredEntry *ap USES_REGS)
   p->FunctorOfPred = ap->FunctorOfPred;
   Yap_inform_profiler_of_clause(&(p->OpcodeOfPred), &(p->OpcodeOfPred)+1, p, GPROF_NEW_PRED_THREAD);
   if (LOCAL_PL_local_data_p== NULL || !truePrologFlag(PLFLAG_DEBUGINFO)) {
-    p->ExtraPredFlags |= NoDebugPredFlag;
+    p->ExtraPredFlags |= (NoSpyPredFlag|NoTracePredFlag);
   }
   if (!(p->PredFlags & (CPredFlag|AsmPredFlag))) {
     Yap_inform_profiler_of_clause(&(p->cs.p_code.ExpandCode), &(p->cs.p_code.ExpandCode)+1, p, GPROF_NEW_PRED_THREAD);
@@ -1014,7 +1014,7 @@ Yap_NewPredPropByAtom(AtomEntry *ae, Term cur_mod)
   p0 = AbsPredProp(p);
   p->FunctorOfPred = (Functor)AbsAtom(ae);
   if (LOCAL_PL_local_data_p== NULL || !truePrologFlag(PLFLAG_DEBUGINFO)) {
-    p->ExtraPredFlags |= NoDebugPredFlag;
+    p->ExtraPredFlags |= (NoTracePredFlag|NoSpyPredFlag);
   }
   WRITE_UNLOCK(ae->ARWLock);
   {
diff --git a/H/Yatom.h b/H/Yatom.h
index 48dc9845a..7ab9dcc44 100755
--- a/H/Yatom.h
+++ b/H/Yatom.h
@@ -657,8 +657,8 @@ typedef enum
 {
   DiscontiguousPredFlag = ((UInt)0x00000010 << EXTRA_FLAG_BASE),	/* predicates whose clauses may be all-over the place.. */
   SysExportPredFlag = ((UInt)0x00000008 << EXTRA_FLAG_BASE),		/* reuse export list to prolog module. */
-  NoDebugPredFlag = ((UInt)0x00000004 << EXTRA_FLAG_BASE),		/* cannot trace this preducate */
-  NoTracePredFlag = ((UInt)0x00000002 << EXTRA_FLAG_BASE),		/* cannot trace this preducate */
+  NoTracePredFlag = ((UInt)0x00000004 << EXTRA_FLAG_BASE),		/* cannot trace this predicate */
+  NoSpyPredFlag = ((UInt)0x00000002 << EXTRA_FLAG_BASE),		/* cannot spy this predicate */
   QuasiQuotationPredFlag = ((UInt)0x00000001 << EXTRA_FLAG_BASE),		/* SWI-like quasi quotations */
   MegaClausePredFlag =   (UInt)0x80000000, /* predicate is implemented as a mega-clause */
   ThreadLocalPredFlag = (UInt)0x40000000,	/* local to a thread */
diff --git a/H/qly.h b/H/qly.h
index 00fc6d268..273a757ad 100644
--- a/H/qly.h
+++ b/H/qly.h
@@ -102,7 +102,7 @@ typedef enum {
 } qlf_tag_t;
 
 #define STATIC_PRED_FLAGS (SourcePredFlag|DynamicPredFlag|LogUpdatePredFlag|CompiledPredFlag|MultiFileFlag|TabledPredFlag|MegaClausePredFlag|CountPredFlag|ProfiledPredFlag|ThreadLocalPredFlag|AtomDBPredFlag|ModuleTransparentPredFlag|NumberDBPredFlag|MetaPredFlag|SyncPredFlag|BackCPredFlag)
-#define EXTRA_PRED_FLAGS (QuasiQuotationPredFlag|NoTracePredFlag|NoDebugPredFlag)
+#define EXTRA_PRED_FLAGS (QuasiQuotationPredFlag|NoTracePredFlag|NoSpyPredFlag)
 
 #define SYSTEM_PRED_FLAGS (BackCPredFlag|UserCPredFlag|CArgsPredFlag|AsmPredFlag|CPredFlag|BinaryPredFlag)