diff --git a/TODO.md b/TODO.md
index 7ed79f2..bbaf194 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,6 @@
 
 ## High priority
 
-* Only return peers when AnnounceEvent != Stopped
 * Do new udp load test round
 * Release new version
 
diff --git a/aquatic_http/src/lib.rs b/aquatic_http/src/lib.rs
index 8b82c4f..72a9656 100644
--- a/aquatic_http/src/lib.rs
+++ b/aquatic_http/src/lib.rs
@@ -64,7 +64,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
             config.swarm_workers,
             WorkerIndex::SocketWorker(i),
         )?;
-        let builder = LocalExecutorBuilder::new(placement).name("socket");
+        let builder = LocalExecutorBuilder::new(placement).name(&format!("socket-{:02}", i + 1));
 
         let executor = builder
             .spawn(move || async move {
@@ -96,7 +96,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
             config.swarm_workers,
             WorkerIndex::SwarmWorker(i),
         )?;
-        let builder = LocalExecutorBuilder::new(placement).name("request");
+        let builder = LocalExecutorBuilder::new(placement).name(&format!("swarm-{:02}", i + 1));
 
         let executor = builder
             .spawn(move || async move {
diff --git a/aquatic_ws/src/lib.rs b/aquatic_ws/src/lib.rs
index d8b6cd0..a7c2e83 100644
--- a/aquatic_ws/src/lib.rs
+++ b/aquatic_ws/src/lib.rs
@@ -80,7 +80,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
             config.swarm_workers,
             WorkerIndex::SocketWorker(i),
         )?;
-        let builder = LocalExecutorBuilder::new(placement).name("socket");
+        let builder = LocalExecutorBuilder::new(placement).name(&format!("socket-{:02}", i + 1));
 
         let executor = builder
             .spawn(move || async move {
@@ -118,7 +118,7 @@ pub fn run(config: Config) -> ::anyhow::Result<()> {
             config.swarm_workers,
             WorkerIndex::SwarmWorker(i),
         )?;
-        let builder = LocalExecutorBuilder::new(placement).name("request");
+        let builder = LocalExecutorBuilder::new(placement).name(&format!("swarm-{:02}", i + 1));
 
         let executor = builder
             .spawn(move || async move {