diff --git a/agents/grpc/src/grpc_agent.cc b/agents/grpc/src/grpc_agent.cc
index be0593b9fde..6aaa1cf0932 100644
--- a/agents/grpc/src/grpc_agent.cc
+++ b/agents/grpc/src/grpc_agent.cc
@@ -704,6 +704,7 @@ int GrpcAgent::start_heap_snapshot_from_js(
     return;
   }
 
+  USE(uv_thread_setname("NSolidGrpcAgent"));
   agent->do_start();
   do {
     ASSERT_EQ(0, uv_run(&agent->loop_, UV_RUN_DEFAULT));
diff --git a/agents/otlp/src/otlp_agent.cc b/agents/otlp/src/otlp_agent.cc
index 96cdee1244f..4aed131b18a 100644
--- a/agents/otlp/src/otlp_agent.cc
+++ b/agents/otlp/src/otlp_agent.cc
@@ -241,6 +241,7 @@ int OTLPAgent::config(const nlohmann::json& config) {
 
 
 /*static*/ void OTLPAgent::run_(nsuv::ns_thread*, OTLPAgent* agent) {
+  USE(uv_thread_setname("NSolidOTLPAgent"));
   agent->do_start();
   do {
     ASSERT_EQ(0, uv_run(&agent->loop_, UV_RUN_DEFAULT));
diff --git a/agents/statsd/src/statsd_agent.cc b/agents/statsd/src/statsd_agent.cc
index 4f09cabfbf5..418b84a51d3 100644
--- a/agents/statsd/src/statsd_agent.cc
+++ b/agents/statsd/src/statsd_agent.cc
@@ -580,6 +580,7 @@ void StatsDAgent::do_stop() {
 }
 
 void StatsDAgent::run_(nsuv::ns_thread*, WeakStatsDAgent agent_wp) {
+  USE(uv_thread_setname("NSolidStatsDAgent"));
   SharedStatsDAgent agent = agent_wp.lock();
   if (agent == nullptr) {
     return;
diff --git a/agents/zmq/src/zmq_agent.cc b/agents/zmq/src/zmq_agent.cc
index 09287b9843b..32c19deb1c7 100644
--- a/agents/zmq/src/zmq_agent.cc
+++ b/agents/zmq/src/zmq_agent.cc
@@ -809,6 +809,7 @@ const string_vector ZmqAgent::metrics_fields = {"/interval",
                                                 "/pauseMetrics"};
 
 void ZmqAgent::run(nsuv::ns_thread*, ZmqAgent* agent) {
+  USE(uv_thread_setname("NSolidZmqAgent"));
   agent->do_start();
   do {
     ASSERT_EQ(0, uv_run(&agent->loop_, UV_RUN_DEFAULT));
diff --git a/src/nsolid/nsolid_api.cc b/src/nsolid/nsolid_api.cc
index 484d0420b2e..aa94947bcd5 100644
--- a/src/nsolid/nsolid_api.cc
+++ b/src/nsolid/nsolid_api.cc
@@ -1645,6 +1645,7 @@ void EnvList::removed_env_cb_(ns_async*, EnvList* envlist) {
 
 void EnvList::env_list_routine_(ns_thread*, EnvList* envlist) {
   int er;
+  USE(uv_thread_setname("NSolidThread"));
   er = envlist->blocked_loop_timer_.start(
       blocked_loop_timer_cb_, blocked_loop_interval, blocked_loop_interval);
   CHECK_EQ(er, 0);