diff --git a/C/c_interface.c b/C/c_interface.c
index 60541b76e..a11c8022a 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -407,18 +407,18 @@ For implementation details and more information, please check term_t_slots in th
 /// @brief report the current position of the slots, assuming that they occupy the top of the stack.
 ///
 ///
-X_API handle_t     YAP_CurrentSlot(void);
+X_API yhandle_t     YAP_CurrentSlot(void);
 
 /// @brief allocate n empty new slots
 ///
 /// Return a handle to the system's default slot.
-X_API handle_t     YAP_NewSlots(int NumberOfSlots);
+X_API yhandle_t     YAP_NewSlots(int NumberOfSlots);
 
 /// @brief allocate n empty new slots
 ///
 /// Allocate  _NumberOfSlots_ from the stack and return an handle to the
 /// last one. The other handle can be obtained by decrementing the handle.
-X_API handle_t     YAP_InitSlot(YAP_Term t);
+X_API yhandle_t     YAP_InitSlot(YAP_Term t);
 
 /// @brief read from a slot.
 ///
@@ -3892,11 +3892,11 @@ YAP_Erase(void *handle)
   return 1;
 }
 
-X_API handle_t
+X_API yhandle_t
 YAP_ArgsToSlots(int n)
 {
   CACHE_REGS
-  handle_t slot = Yap_NewSlots(n PASS_REGS);
+  yhandle_t slot = Yap_NewSlots(n PASS_REGS);
   CELL *ptr0 = LCL0+slot, *ptr1=&ARG1;
   while (n--) {
     *ptr0++ = *ptr1++;
@@ -3905,7 +3905,7 @@ YAP_ArgsToSlots(int n)
 }
 
 X_API void
-YAP_SlotsToArgs(int n, handle_t slot)
+YAP_SlotsToArgs(int n, yhandle_t slot)
 {
   CACHE_REGS
   CELL *ptr0 = LCL0+slot, *ptr1=&ARG1;
@@ -3947,8 +3947,8 @@ YAP_SetYAPFlag(yap_flag_t flag, int val)
 }
 
 
-/*    handle_t  YAP_VarSlotToNumber(handle_t)  */
-handle_t YAP_VarSlotToNumber(handle_t s) {
+/*    yhandle_t  YAP_VarSlotToNumber(yhandle_t)  */
+yhandle_t YAP_VarSlotToNumber(yhandle_t s) {
   CACHE_REGS
   Term *t = (CELL *)Deref(Yap_GetFromSlot(s PASS_REGS));
   if (t < HR)
@@ -3962,7 +3962,7 @@ Term YAP_ModuleUser(void) {
 }
 
 /*    int  YAP_PredicateHasClauses()  */
-handle_t YAP_NumberOfClausesForPredicate(PredEntry *pe) {
+yhandle_t YAP_NumberOfClausesForPredicate(PredEntry *pe) {
   return pe->cs.p_code.NOfClauses;
 }
 
diff --git a/CXX/yapi.hh b/CXX/yapi.hh
index 167ad2bf6..df0280004 100644
--- a/CXX/yapi.hh
+++ b/CXX/yapi.hh
@@ -101,7 +101,7 @@ class YAPTerm {
   friend class YAPPairTerm;
   friend class YAPListTerm;
 protected:
-  handle_t t;
+  yhandle_t t;
   void mk(Term t0);
   Term gt();
   YAPTerm(Term tn) {  mk( tn ); }
@@ -336,7 +336,7 @@ private:
   ///
   /// It also communicates the array of arguments t[]  abd the array of variables
   /// back to yapquery
-  YAPPredicate(const char *s, Term **outp, handle_t& vnames );
+  YAPPredicate(const char *s, Term **outp, yhandle_t& vnames );
 
   /// Term constructor for predicates
   ///
@@ -456,7 +456,7 @@ class YAPQuery: public YAPPredicate {
   int q_flags;
   YAP_dogoalinfo q_h;
   YAPQuery *oq;
-  handle_t vnames;
+  yhandle_t vnames;
   void initQuery( Term ts[] );
   void initQuery( YAPTerm t[], arity_t arity  );
 public:
diff --git a/H/YapHandles.h b/H/YapHandles.h
index b4b0993a5..7784fc028 100755
--- a/H/YapHandles.h
+++ b/H/YapHandles.h
@@ -49,9 +49,9 @@ This section lists the main internal functions for slot management. These functi
 *************************************************************************************************/
 
 /// @brief start a new set of slots, linking them to the last active slots (who may, or not, be active).
-static inline handle_t
+static inline yhandle_t
 Yap_StartSlots( USES_REGS1 ) {
-  handle_t CurSlot = LOCAL_CurSlot;
+  yhandle_t CurSlot = LOCAL_CurSlot;
   // if (CurSlot == LCL0-(ASP+(IntOfTerm(ASP[0])+2)))
   //  return CurSlot;
   /* new slot */
@@ -65,56 +65,56 @@ Yap_StartSlots( USES_REGS1 ) {
 
 /// @brief reset slots to a well-known position in the stack
 static inline void
-Yap_CloseSlots( handle_t slot USES_REGS ) {
+Yap_CloseSlots( yhandle_t slot USES_REGS ) {
   LOCAL_CurSlot = slot;
 }
 
 /// @brief report the current position of the slots, assuming that they occupy the top of the stack.
-static inline handle_t
+static inline yhandle_t
 Yap_CurrentSlot( USES_REGS1 ) {
   return IntOfTerm(ASP[0]);
 }
 
 /// @brief read from a slot.
 static inline Term
-Yap_GetFromSlot(handle_t slot USES_REGS)
+Yap_GetFromSlot(yhandle_t slot USES_REGS)
 {
   return(Deref(LCL0[slot]));
 }
 
 /// @brief read from a slot. but does not try to dereference the slot.
 static inline Term
-Yap_GetDerefedFromSlot(handle_t slot USES_REGS)
+Yap_GetDerefedFromSlot(yhandle_t slot USES_REGS)
 {
   return LCL0[slot];
 }
 
 /// @brief read the object in a slot. but do not try to dereference the slot.
 static inline Term
-Yap_GetPtrFromSlot(handle_t slot USES_REGS)
+Yap_GetPtrFromSlot(yhandle_t slot USES_REGS)
 {
   return(LCL0[slot]);
 }
 
 /// @brief get the memory address of a slot
 static inline Term *
-Yap_AddressFromSlot(handle_t slot USES_REGS)
+Yap_AddressFromSlot(yhandle_t slot USES_REGS)
 {
   return(LCL0+slot);
 }
 
 /// @brief store  term in a slot
 static inline void
-Yap_PutInSlot(handle_t slot, Term t USES_REGS)
+Yap_PutInSlot(yhandle_t slot, Term t USES_REGS)
 {
   LCL0[slot] = t;
 }
 
 /// @brief allocate n empty new slots
-static inline handle_t
+static inline yhandle_t
 Yap_NewSlots(int n USES_REGS)
 {
-  handle_t old_slots = IntOfTerm(ASP[0]), oldn = n;
+  yhandle_t old_slots = IntOfTerm(ASP[0]), oldn = n;
   while (n > 0) {
     RESET_VARIABLE(ASP);
     ASP--;
@@ -128,7 +128,7 @@ Yap_NewSlots(int n USES_REGS)
 static inline Int
 Yap_InitSlot(Term t USES_REGS)
 {
-  handle_t old_slots = IntOfTerm(ASP[0]);
+  yhandle_t old_slots = IntOfTerm(ASP[0]);
   *ASP = t;
   ASP--;
   ASP[old_slots+2] = ASP[0] = MkIntTerm(old_slots+1);
@@ -137,9 +137,9 @@ Yap_InitSlot(Term t USES_REGS)
 
 /// @brief Succeeds if it is to recover the space allocated for $n$ contiguos slots starting at topSlot.
 static inline int
-Yap_RecoverSlots(int n, handle_t topSlot USES_REGS)
+Yap_RecoverSlots(int n, yhandle_t topSlot USES_REGS)
 {
-  handle_t old_slots = IntOfTerm(ASP[0]);
+  yhandle_t old_slots = IntOfTerm(ASP[0]);
   if (old_slots  < n) {
     return FALSE;
   }
diff --git a/H/YapTerm.h b/H/YapTerm.h
index e303a4c3b..70b91c28b 100644
--- a/H/YapTerm.h
+++ b/H/YapTerm.h
@@ -131,7 +131,7 @@ typedef UInt BITS32;
 
 typedef CELL Term;
 
-typedef Int handle_t;
+typedef Int yhandle_t;
 
 /*   */ typedef double Float;
 
diff --git a/include/YapDefs.h b/include/YapDefs.h
index b9b119c0d..47f50f866 100755
--- a/include/YapDefs.h
+++ b/include/YapDefs.h
@@ -43,7 +43,7 @@ typedef Term YAP_Module;
 
 typedef int YAP_Bool;
 
-typedef handle_t YAP_handle_t;
+typedef yhandle_t YAP_handle_t;
 
 #define YAP_PredEntryPtr struct pred_entry *