diff --git a/relayer/src/worker.rs b/relayer/src/worker.rs
index 78c2930e9b..db9bb5e412 100644
--- a/relayer/src/worker.rs
+++ b/relayer/src/worker.rs
@@ -105,7 +105,7 @@ pub fn spawn_worker_tasks<ChainA: ChainHandle + 'static, ChainB: ChainHandle + '
                 );
                 task_handles.push(packet_task);
 
-                let link_task = packet::spawn_link_worker(path.clone(), link);
+                let link_task = packet::spawn_packet_worker(path.clone(), link);
                 task_handles.push(link_task);
             }
         }
diff --git a/relayer/src/worker/channel.rs b/relayer/src/worker/channel.rs
index 478a3e0d8d..db85adcb21 100644
--- a/relayer/src/worker/channel.rs
+++ b/relayer/src/worker/channel.rs
@@ -22,7 +22,7 @@ pub fn spawn_channel_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandle +
     let mut resume_handshake = true;
 
     spawn_background_task(
-        "channel_worker".to_string(),
+        format!("ChannelWorker({})", channel.short_name()),
         Some(Duration::from_millis(200)),
         move || {
             if let Ok(cmd) = cmd_rx.try_recv() {
diff --git a/relayer/src/worker/client.rs b/relayer/src/worker/client.rs
index 55458ec474..eef216082d 100644
--- a/relayer/src/worker/client.rs
+++ b/relayer/src/worker/client.rs
@@ -20,7 +20,7 @@ pub fn spawn_refresh_client<ChainA: ChainHandle + 'static, ChainB: ChainHandle +
     mut client: ForeignClient<ChainA, ChainB>,
 ) -> TaskHandle {
     spawn_background_task(
-        "refresh_client".to_string(),
+        format!("RefreshClientWorker({})", client),
         Some(Duration::from_secs(1)),
         move || -> Result<(), TaskError<ForeignClientError>> {
             let res = client.refresh().map_err(|e| {
@@ -56,7 +56,7 @@ pub fn detect_misbehavior_task<ChainA: ChainHandle + 'static, ChainB: ChainHandl
     }
 
     let handle = spawn_background_task(
-        "detect_misbehavior".to_string(),
+        format!("DetectMisbehaviorWorker({})", client),
         Some(Duration::from_millis(600)),
         move || -> Result<(), TaskError<TryRecvError>> {
             if let Ok(cmd) = receiver.try_recv() {
diff --git a/relayer/src/worker/connection.rs b/relayer/src/worker/connection.rs
index 384959c53d..9b3d4f87e0 100644
--- a/relayer/src/worker/connection.rs
+++ b/relayer/src/worker/connection.rs
@@ -22,7 +22,7 @@ pub fn spawn_connection_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandl
     let mut resume_handshake = true;
 
     spawn_background_task(
-        "connection_worker".to_string(),
+        format!("ConnectionWorker({})", connection.short_name()),
         Some(Duration::from_millis(200)),
         move || {
             if let Ok(cmd) = cmd_rx.try_recv() {
diff --git a/relayer/src/worker/error.rs b/relayer/src/worker/error.rs
index 65b9e00e5d..1005bed0fb 100644
--- a/relayer/src/worker/error.rs
+++ b/relayer/src/worker/error.rs
@@ -27,7 +27,7 @@ define_error! {
         Retry
             { retries: retry::Error<u64> }
             | e | {
-                format_args!("Packet worker failed after {} retries",
+                format_args!("Worker failed after {} retries",
                     e.retries)
             },
 
diff --git a/relayer/src/worker/packet.rs b/relayer/src/worker/packet.rs
index 495a441a14..74ee0a1e84 100644
--- a/relayer/src/worker/packet.rs
+++ b/relayer/src/worker/packet.rs
@@ -42,7 +42,7 @@ pub fn spawn_packet_cmd_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandl
 ) -> TaskHandle {
     let mut is_first_run: bool = true;
     spawn_background_task(
-        "packet_worker".to_string(),
+        format!("PacketCmdWorker({})", link.a_to_b),
         Some(Duration::from_millis(200)),
         move || {
             if let Ok(cmd) = cmd_rx.try_recv() {
@@ -65,12 +65,12 @@ pub fn spawn_packet_cmd_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandl
     )
 }
 
-pub fn spawn_link_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandle + 'static>(
+pub fn spawn_packet_worker<ChainA: ChainHandle + 'static, ChainB: ChainHandle + 'static>(
     path: Packet,
     link: Arc<Link<ChainA, ChainB>>,
 ) -> TaskHandle {
     spawn_background_task(
-        "link_worker".to_string(),
+        format!("PacketWorker({})", link.a_to_b),
         Some(Duration::from_millis(500)),
         move || {
             link.a_to_b