diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
index bb42de5bbda739f5a1a7d54dc968d8cca9d9edad..e52df687f8d77d5f8d309d6766e8b9f89f791a14 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
@@ -451,7 +451,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
         S4 += w * sHit.S4;
       }
 
-    } while (NotEmpty(Dmax > fvec(0.)));
+    } while (NotEmptyFvec(Dmax > fvec(0.)));
 
 
 #ifdef PRINT_TIMING
@@ -501,7 +501,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
 #ifdef PRINT_TIMING
     GetTimer("Ring finding: Store ring").Start(0);
 #endif  // PRINT_TIMING
-    if (ISUNLIKELY(Empty(validRing))) continue;
+    if (ISUNLIKELY(EmptyFvec(validRing))) continue;
 
       ///////////
 #if 0   // TODO 1
diff --git a/reco/L1/vectors/P4_F32vec4.h b/reco/L1/vectors/P4_F32vec4.h
index 8480de2c532bc6c9fb5e574546e1fb37f20dcc80..bef74fab6687542423cf0d10d089885f15bf9048 100644
--- a/reco/L1/vectors/P4_F32vec4.h
+++ b/reco/L1/vectors/P4_F32vec4.h
@@ -163,8 +163,8 @@ public:
 
 #define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c))  // analog (a) ? b : c
 
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
   // bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
   // bool    Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
   friend F32vec4 bool2int(const F32vec4& a) {  // mask returned
diff --git a/reco/L1/vectors/P4_F64vec2.h b/reco/L1/vectors/P4_F64vec2.h
index dcef1d6e727a6668392f9e8da983dd18631bb69e..22ffc90a08ec9b3ec271bb1afd116390e1768c3d 100644
--- a/reco/L1/vectors/P4_F64vec2.h
+++ b/reco/L1/vectors/P4_F64vec2.h
@@ -152,8 +152,8 @@ public:
 
 #define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c))  // analog (a) ? b : c
 
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
   // bool NotEmpty(const F64vec2 &a) { return a[0]||a[1]||a[2]||a[3]; }
   // bool    Empty(const F64vec2 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
   friend F64vec2 bool2int(const F64vec2& a) {  // mask returned
diff --git a/reco/L1/vectors/PSEUDO_F32vec1.h b/reco/L1/vectors/PSEUDO_F32vec1.h
index 146678b8dc0874ba2a4f2b05f0d6f6d4f68c7ac1..28badead0747b3a8ceb9b83fb18f6ad214acaed7 100644
--- a/reco/L1/vectors/PSEUDO_F32vec1.h
+++ b/reco/L1/vectors/PSEUDO_F32vec1.h
@@ -112,8 +112,8 @@ public:
     return z;
   }
 
-#define NotEmpty(a) bool((a)[0])
-#define Empty(a) !(bool((a)[0]))
+#define NotEmptyFvec(a) bool((a)[0])
+#define EmptyFvec(a) !(bool((a)[0]))
   friend F32vec1 bool2int(const F32vec1& a) {  // mask returned
     return if3(a, 1, 0);
   }
diff --git a/reco/L1/vectors/PSEUDO_F32vec4.h b/reco/L1/vectors/PSEUDO_F32vec4.h
index cda7ac4b9eb5b0c33b75424ac3679e87796e75b1..606fc3dc9f48bc98d2935290818ee103efafc1b3 100644
--- a/reco/L1/vectors/PSEUDO_F32vec4.h
+++ b/reco/L1/vectors/PSEUDO_F32vec4.h
@@ -115,8 +115,8 @@ public:
     return z;
   }
 
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
   // bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
   // bool    Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
   friend F32vec4 bool2int(const F32vec4& a) {  // mask returned