diff --git a/aux/broker b/aux/broker
index 1656c9c874..0d04bf4313 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 1656c9c8744241b58b48eaa17ed159bf55fc1b2a
+Subproject commit 0d04bf43131ade7000506711cbe43c068dab2471
diff --git a/scripts/base/frameworks/cluster/main.zeek b/scripts/base/frameworks/cluster/main.zeek
index c8ff1ce159..1f39a7f7cf 100644
--- a/scripts/base/frameworks/cluster/main.zeek
+++ b/scripts/base/frameworks/cluster/main.zeek
@@ -298,12 +298,12 @@ function local_node_type(): NodeType
 
 function node_topic(name: string): string
 	{
-	return node_topic_prefix + name;
+	return node_topic_prefix + name + "/";
 	}
 
 function nodeid_topic(id: string): string
 	{
-	return node_topic_prefix + id;
+	return nodeid_topic_prefix + id + "/";
 	}
 
 event Cluster::hello(name: string, id: string) &priority=10
diff --git a/scripts/base/frameworks/cluster/pools.zeek b/scripts/base/frameworks/cluster/pools.zeek
index 9c21c3188d..1be7b336d8 100644
--- a/scripts/base/frameworks/cluster/pools.zeek
+++ b/scripts/base/frameworks/cluster/pools.zeek
@@ -172,7 +172,7 @@ function hrw_topic(pool: Pool, key: any): string
 
 	local site = HashHRW::get_site(pool$hrw_pool, key);
 	local pn: PoolNode = site$user_data;
-	return node_topic_prefix + pn$name;
+	return Cluster::node_topic(pn$name);
 	}
 
 function rr_topic(pool: Pool, key: string): string
@@ -198,7 +198,7 @@ function rr_topic(pool: Pool, key: string): string
 
 		if ( pn$alive )
 			{
-			rval = node_topic_prefix + pn$name;
+			rval = Cluster::node_topic(pn$name);
 			break;
 			}
 
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout
index 788b3699dd..c8bea42b2d 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_exclusivity/manager-1..stdout
@@ -1,101 +1,101 @@
 1st stuff
-hrw, 0, zeek/cluster/node/proxy-1
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
-hrw, 1, zeek/cluster/node/proxy-1
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
-hrw, 2, zeek/cluster/node/proxy-1
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
-hrw, 3, zeek/cluster/node/proxy-1
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
-hrw, 13, zeek/cluster/node/proxy-1
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-1
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-1
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-1
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-hrw, 0, zeek/cluster/node/proxy-1
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
-hrw, 1, zeek/cluster/node/proxy-1
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
-hrw, 2, zeek/cluster/node/proxy-1
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
-hrw, 3, zeek/cluster/node/proxy-1
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
-hrw, 13, zeek/cluster/node/proxy-1
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-1
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-1
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-1
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
+hrw, 13, zeek/cluster/node/proxy-1/
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-1/
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-1/
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
+hrw, 13, zeek/cluster/node/proxy-1/
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-1/
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-1/
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 2nd stuff
 hrw, 0, 
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, 
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, 
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
 hrw, 3, 
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, 
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, 
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, 
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
 hrw, 101, 
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 hrw, 0, 
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, 
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, 
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
 hrw, 3, 
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, 
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, 
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, 
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
 hrw, 101, 
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 no stuff
 hrw, 0, 
 hrw (custom pool), 0, 
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
index 310df794f0..015d95ee9d 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.custom_pool_limits/manager-1..stdout
@@ -1,101 +1,101 @@
 1st stuff
-hrw, 0, zeek/cluster/node/proxy-1
-hrw (custom pool), 0, zeek/cluster/node/proxy-1
-hrw, 1, zeek/cluster/node/proxy-1
-hrw (custom pool), 1, zeek/cluster/node/proxy-1
-hrw, 2, zeek/cluster/node/proxy-1
-hrw (custom pool), 2, zeek/cluster/node/proxy-1
-hrw, 3, zeek/cluster/node/proxy-1
-hrw (custom pool), 3, zeek/cluster/node/proxy-1
-hrw, 13, zeek/cluster/node/proxy-1
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-1
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-1
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-1
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-1
-rr (custom pool), zeek/cluster/node/proxy-2
-hrw, 0, zeek/cluster/node/proxy-1
-hrw (custom pool), 0, zeek/cluster/node/proxy-1
-hrw, 1, zeek/cluster/node/proxy-1
-hrw (custom pool), 1, zeek/cluster/node/proxy-1
-hrw, 2, zeek/cluster/node/proxy-1
-hrw (custom pool), 2, zeek/cluster/node/proxy-1
-hrw, 3, zeek/cluster/node/proxy-1
-hrw (custom pool), 3, zeek/cluster/node/proxy-1
-hrw, 13, zeek/cluster/node/proxy-1
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-1
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-1
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-1
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-1/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-1/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw (custom pool), 2, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-1/
+hrw, 13, zeek/cluster/node/proxy-1/
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-1/
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-1/
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-1/
+rr (custom pool), zeek/cluster/node/proxy-2/
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw (custom pool), 0, zeek/cluster/node/proxy-1/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw (custom pool), 1, zeek/cluster/node/proxy-1/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw (custom pool), 2, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw (custom pool), 3, zeek/cluster/node/proxy-1/
+hrw, 13, zeek/cluster/node/proxy-1/
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-1/
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-1/
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-1/
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 2nd stuff
 hrw, 0, 
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, 
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, 
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
 hrw, 3, 
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, 
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, 
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, 
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
 hrw, 101, 
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 rr, 
-rr (custom pool), zeek/cluster/node/proxy-2
+rr (custom pool), zeek/cluster/node/proxy-2/
 hrw, 0, 
-hrw (custom pool), 0, zeek/cluster/node/proxy-2
+hrw (custom pool), 0, zeek/cluster/node/proxy-2/
 hrw, 1, 
-hrw (custom pool), 1, zeek/cluster/node/proxy-2
+hrw (custom pool), 1, zeek/cluster/node/proxy-2/
 hrw, 2, 
-hrw (custom pool), 2, zeek/cluster/node/proxy-2
+hrw (custom pool), 2, zeek/cluster/node/proxy-2/
 hrw, 3, 
-hrw (custom pool), 3, zeek/cluster/node/proxy-2
+hrw (custom pool), 3, zeek/cluster/node/proxy-2/
 hrw, 13, 
-hrw (custom pool), 13, zeek/cluster/node/proxy-2
+hrw (custom pool), 13, zeek/cluster/node/proxy-2/
 hrw, 37, 
-hrw (custom pool), 37, zeek/cluster/node/proxy-2
+hrw (custom pool), 37, zeek/cluster/node/proxy-2/
 hrw, 42, 
-hrw (custom pool), 42, zeek/cluster/node/proxy-2
+hrw (custom pool), 42, zeek/cluster/node/proxy-2/
 hrw, 101, 
-hrw (custom pool), 101, zeek/cluster/node/proxy-2
+hrw (custom pool), 101, zeek/cluster/node/proxy-2/
 no stuff
 hrw, 0, 
 hrw (custom pool), 0, 
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.log_distribution/logger-2.test.log b/testing/btest/Baseline/scripts.base.frameworks.cluster.log_distribution/logger-10.test.log
similarity index 100%
rename from testing/btest/Baseline/scripts.base.frameworks.cluster.log_distribution/logger-2.test.log
rename to testing/btest/Baseline/scripts.base.frameworks.cluster.log_distribution/logger-10.test.log
diff --git a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
index 3b5dd7bad4..5ef98205eb 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.cluster.topic_distribution/manager-1..stdout
@@ -1,53 +1,53 @@
 1st stuff
-hrw, 0, zeek/cluster/node/proxy-1
-hrw, 1, zeek/cluster/node/proxy-1
-hrw, 2, zeek/cluster/node/proxy-1
-hrw, 3, zeek/cluster/node/proxy-1
-hrw, 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-1
-rr, zeek/cluster/node/proxy-2
-hrw, 0, zeek/cluster/node/proxy-1
-hrw, 1, zeek/cluster/node/proxy-1
-hrw, 2, zeek/cluster/node/proxy-1
-hrw, 3, zeek/cluster/node/proxy-1
-hrw, 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-2
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw, 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-1/
+rr, zeek/cluster/node/proxy-2/
+hrw, 0, zeek/cluster/node/proxy-1/
+hrw, 1, zeek/cluster/node/proxy-1/
+hrw, 2, zeek/cluster/node/proxy-1/
+hrw, 3, zeek/cluster/node/proxy-1/
+hrw, 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-2/
 2nd stuff
-hrw, 0, zeek/cluster/node/proxy-2
-hrw, 1, zeek/cluster/node/proxy-2
-hrw, 2, zeek/cluster/node/proxy-2
-hrw, 3, zeek/cluster/node/proxy-2
-hrw, 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-rr, zeek/cluster/node/proxy-2
-hrw, 0, zeek/cluster/node/proxy-2
-hrw, 1, zeek/cluster/node/proxy-2
-hrw, 2, zeek/cluster/node/proxy-2
-hrw, 3, zeek/cluster/node/proxy-2
-hrw, 13, zeek/cluster/node/proxy-2
-hrw, 37, zeek/cluster/node/proxy-2
-hrw, 42, zeek/cluster/node/proxy-2
-hrw, 101, zeek/cluster/node/proxy-2
+hrw, 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-2/
+hrw, 2, zeek/cluster/node/proxy-2/
+hrw, 3, zeek/cluster/node/proxy-2/
+hrw, 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+rr, zeek/cluster/node/proxy-2/
+hrw, 0, zeek/cluster/node/proxy-2/
+hrw, 1, zeek/cluster/node/proxy-2/
+hrw, 2, zeek/cluster/node/proxy-2/
+hrw, 3, zeek/cluster/node/proxy-2/
+hrw, 13, zeek/cluster/node/proxy-2/
+hrw, 37, zeek/cluster/node/proxy-2/
+hrw, 42, zeek/cluster/node/proxy-2/
+hrw, 101, zeek/cluster/node/proxy-2/
 no stuff
 hrw, 0, 
 hrw, 1, 
diff --git a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
index 101e61b154..5e04c70d13 100644
--- a/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/log_distribution.zeek
@@ -3,13 +3,16 @@
 # @TEST-PORT: BROKER_PORT3
 # @TEST-PORT: BROKER_PORT4
 #
+# Note: the logger names are chosen on purpose such that one is a prefix of the
+# other to help verify that the node-specific Cluster topics are able to
+# uniquely target a particular node.
 # @TEST-EXEC: btest-bg-run logger-1 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-1 zeek %INPUT
-# @TEST-EXEC: btest-bg-run logger-2 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-2 zeek %INPUT
+# @TEST-EXEC: btest-bg-run logger-10 ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=logger-10 zeek %INPUT
 # @TEST-EXEC: btest-bg-run manager ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=manager zeek %INPUT
 # @TEST-EXEC: btest-bg-run worker-1  ZEEKPATH=$ZEEKPATH:.. CLUSTER_NODE=worker-1 zeek %INPUT
 # @TEST-EXEC: btest-bg-wait 45
 # @TEST-EXEC: btest-diff logger-1/test.log
-# @TEST-EXEC: btest-diff logger-2/test.log
+# @TEST-EXEC: btest-diff logger-10/test.log
 
 @TEST-START-FILE cluster-layout.zeek
 redef Cluster::manager_is_logger = F;
@@ -18,7 +21,7 @@ redef Cluster::nodes = {
     ["manager"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
     ["worker-1"] = [$node_type=Cluster::WORKER,   $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager", $interface="eth0"],
     ["logger-1"] = [$node_type=Cluster::LOGGER,   $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager"],
-    ["logger-2"] = [$node_type=Cluster::LOGGER,   $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager"]
+    ["logger-10"] = [$node_type=Cluster::LOGGER,   $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4")), $manager="manager"]
 };
 
 @TEST-END-FILE