diff --git a/pkg/leakybucket/tests/simple-leaky-blackhole/bucket.yaml b/pkg/leakybucket/tests/simple-leaky-blackhole/bucket.yaml
index ed199b2a0..0b460f4c2 100644
--- a/pkg/leakybucket/tests/simple-leaky-blackhole/bucket.yaml
+++ b/pkg/leakybucket/tests/simple-leaky-blackhole/bucket.yaml
@@ -1,7 +1,7 @@
 # ssh bruteforce
 type: leaky
 debug: true
-name: test/simple-leaky
+name: test/simple-leaky-blackhole
 description: "Simple leaky"
 filter: "evt.Line.Labels.type =='testlog'"
 leakspeed: "10s"
diff --git a/pkg/leakybucket/tests/simple-leaky-blackhole/test.json b/pkg/leakybucket/tests/simple-leaky-blackhole/test.json
index 97691b836..68670a5d2 100644
--- a/pkg/leakybucket/tests/simple-leaky-blackhole/test.json
+++ b/pkg/leakybucket/tests/simple-leaky-blackhole/test.json
@@ -91,7 +91,7 @@
           }
         },
         "Alert" : {
-          "scenario": "test/simple-leaky",
+          "scenario": "test/simple-leaky-blackhole",
           "events_count": 2
           
         }
@@ -108,7 +108,7 @@
           }
         },
         "Alert" : {
-          "scenario": "test/simple-leaky",
+          "scenario": "test/simple-leaky-blackhole",
           "events_count": 2
           
         }
diff --git a/pkg/leakybucket/tests/simple-leaky-overflow/bucket.yaml b/pkg/leakybucket/tests/simple-leaky-overflow/bucket.yaml
index 8c94d2c2e..e27548c86 100644
--- a/pkg/leakybucket/tests/simple-leaky-overflow/bucket.yaml
+++ b/pkg/leakybucket/tests/simple-leaky-overflow/bucket.yaml
@@ -1,6 +1,6 @@
 type: leaky
 debug: true
-name: test/simple-leaky
+name: test/simple-leaky-ovfl
 description: "Simple leaky"
 filter: "evt.Line.Labels.type =='testlog'"
 leakspeed: "10s"
diff --git a/pkg/leakybucket/tests/simple-leaky-overflow/test.json b/pkg/leakybucket/tests/simple-leaky-overflow/test.json
index 2d3f813c8..9b652b753 100644
--- a/pkg/leakybucket/tests/simple-leaky-overflow/test.json
+++ b/pkg/leakybucket/tests/simple-leaky-overflow/test.json
@@ -36,7 +36,7 @@
           }
         },
         "Alert" : {
-        "scenario": "test/simple-leaky",
+        "scenario": "test/simple-leaky-ovfl",
         "events_count": 2
         }
       }
diff --git a/pkg/leakybucket/tests/simple-leaky-underflow/bucket.yaml b/pkg/leakybucket/tests/simple-leaky-underflow/bucket.yaml
index 531766632..aa2597692 100644
--- a/pkg/leakybucket/tests/simple-leaky-underflow/bucket.yaml
+++ b/pkg/leakybucket/tests/simple-leaky-underflow/bucket.yaml
@@ -1,7 +1,7 @@
 # ssh bruteforce
 type: leaky
 debug: true
-name: test/simple-leaky
+name: test/simple-leaky-underflow
 description: "Simple leaky"
 filter: "evt.Line.Labels.type =='testlog'"
 leakspeed: "0.5s"
diff --git a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/bucket.yaml b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/bucket.yaml
index 4fca336f9..47e48b942 100644
--- a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/bucket.yaml
+++ b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/bucket.yaml
@@ -1,7 +1,7 @@
 # ssh bruteforce
 type: leaky
 debug: true
-name: test/simple-leaky
+name: test/simple-leaky-state
 description: "Simple leaky"
 filter: "evt.Line.Labels.type =='testlog'"
 leakspeed: "10s"
diff --git a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/in-buckets_state.json b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/in-buckets_state.json
index dee5f242d..d2a04c425 100644
--- a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/in-buckets_state.json
+++ b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/in-buckets_state.json
@@ -1,6 +1,6 @@
 {
- "cdf58e6ae48e79ac3ae0f006e1a2e627eccd8b63": {
-  "Name": "test/simple-leaky",
+ "4fccb3db1e4c2e1c94bdb747336c8749bbc470ef": {
+  "Name": "test/simple-leaky-state",
   "Mode": 1,
   "SerializedState": {
    "Limit": 0.1,
@@ -74,7 +74,7 @@
   },
   "Capacity": 3,
   "CacheSize": 0,
-  "Mapkey": "cdf58e6ae48e79ac3ae0f006e1a2e627eccd8b63",
+  "Mapkey": "4fccb3db1e4c2e1c94bdb747336c8749bbc470ef",
   "Reprocess": false,
   "Uuid": "dark-bush",
   "First_ts": "2020-01-01T10:00:04Z",
diff --git a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/test.json b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/test.json
index e01689883..6da57f70d 100644
--- a/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/test.json
+++ b/pkg/leakybucket/tests/simple-leaky-uniq-w-buckets_state/test.json
@@ -52,7 +52,7 @@
           }
         },
         "Alert" : {
-        "scenario": "test/simple-leaky",
+        "scenario": "test/simple-leaky-state",
         "events_count": 4
         }
        
diff --git a/pkg/leakybucket/tests/simple-leaky-uniq/bucket.yaml b/pkg/leakybucket/tests/simple-leaky-uniq/bucket.yaml
index b9692e10e..24a3f17bc 100644
--- a/pkg/leakybucket/tests/simple-leaky-uniq/bucket.yaml
+++ b/pkg/leakybucket/tests/simple-leaky-uniq/bucket.yaml
@@ -1,7 +1,7 @@
 # ssh bruteforce
 type: leaky
 debug: true
-name: test/simple-leaky
+name: test/simple-leaky-uniq
 description: "Simple leaky"
 filter: "evt.Line.Labels.type =='testlog'"
 leakspeed: "10s"
diff --git a/pkg/leakybucket/tests/simple-leaky-uniq/test.json b/pkg/leakybucket/tests/simple-leaky-uniq/test.json
index 07a89bb8a..709b9d2e3 100644
--- a/pkg/leakybucket/tests/simple-leaky-uniq/test.json
+++ b/pkg/leakybucket/tests/simple-leaky-uniq/test.json
@@ -52,7 +52,7 @@
           }
         },
         "Alert" : {
-        "scenario": "test/simple-leaky",
+        "scenario": "test/simple-leaky-uniq",
         "events_count": 2
         }