diff --git a/nano/lib/thread_roles.cpp b/nano/lib/thread_roles.cpp
index e012f990a..ab5a0a1a0 100644
--- a/nano/lib/thread_roles.cpp
+++ b/nano/lib/thread_roles.cpp
@@ -73,9 +73,6 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
 		case nano::thread_role::name::worker:
 			thread_role_name_string = "Worker";
 			break;
-		case nano::thread_role::name::bootstrap_worker:
-			thread_role_name_string = "Bootstrap work";
-			break;
 		case nano::thread_role::name::wallet_worker:
 			thread_role_name_string = "Wallet work";
 			break;
@@ -103,11 +100,23 @@ std::string nano::thread_role::get_string (nano::thread_role::name role)
 		case nano::thread_role::name::vote_generator_queue:
 			thread_role_name_string = "Voting que";
 			break;
-		case nano::thread_role::name::ascending_bootstrap:
-			thread_role_name_string = "Ascboot";
+		case nano::thread_role::name::bootstrap:
+			thread_role_name_string = "Bootstrap";
 			break;
-		case nano::thread_role::name::ascending_bootstrap_worker:
-			thread_role_name_string = "Ascboot work";
+		case nano::thread_role::name::bootstrap_database_scan:
+			thread_role_name_string = "Bootstrap db";
+			break;
+		case nano::thread_role::name::bootstrap_dependendy_walker:
+			thread_role_name_string = "Bootstrap walkr";
+			break;
+		case nano::thread_role::name::bootstrap_frontier_scan:
+			thread_role_name_string = "Bootstrap front";
+			break;
+		case nano::thread_role::name::bootstrap_cleanup:
+			thread_role_name_string = "Bootstrap clean";
+			break;
+		case nano::thread_role::name::bootstrap_worker:
+			thread_role_name_string = "Bootstrap work";
 			break;
 		case nano::thread_role::name::bootstrap_server:
 			thread_role_name_string = "Bootstrap serv";
diff --git a/nano/lib/thread_roles.hpp b/nano/lib/thread_roles.hpp
index 6f0f146bb..57c32f892 100644
--- a/nano/lib/thread_roles.hpp
+++ b/nano/lib/thread_roles.hpp
@@ -29,7 +29,6 @@ enum class name
 	confirmation_height,
 	confirmation_height_notifications,
 	worker,
-	bootstrap_worker,
 	wallet_worker,
 	election_worker,
 	request_aggregator,
@@ -39,12 +38,14 @@ enum class name
 	unchecked,
 	backlog_population,
 	vote_generator_queue,
-	bootstrap_server,
 	telemetry,
-	ascending_bootstrap,
-	ascending_bootstrap_worker,
-	bootstrap_server_requests,
-	bootstrap_server_responses,
+	bootstrap,
+	bootstrap_database_scan,
+	bootstrap_dependendy_walker,
+	bootstrap_frontier_scan,
+	bootstrap_cleanup,
+	bootstrap_worker,
+	bootstrap_server,
 	scheduler_hinted,
 	scheduler_manual,
 	scheduler_optimistic,
diff --git a/nano/node/bootstrap/bootstrap_service.cpp b/nano/node/bootstrap/bootstrap_service.cpp
index 64a4fe89d..544f814f0 100644
--- a/nano/node/bootstrap/bootstrap_service.cpp
+++ b/nano/node/bootstrap/bootstrap_service.cpp
@@ -32,7 +32,7 @@ nano::bootstrap_service::bootstrap_service (nano::node_config const & node_confi
 	scoring{ config, node_config_a.network_params.network },
 	database_limiter{ config.database_rate_limit },
 	frontiers_limiter{ config.frontier_rate_limit },
-	workers{ 1, nano::thread_role::name::ascending_bootstrap_worker }
+	workers{ 1, nano::thread_role::name::bootstrap_worker }
 {
 	block_processor.batch_processed.add ([this] (auto const & batch) {
 		{
@@ -81,7 +81,7 @@ void nano::bootstrap_service::start ()
 	if (config.enable_scan)
 	{
 		priorities_thread = std::thread ([this] () {
-			nano::thread_role::set (nano::thread_role::name::ascending_bootstrap);
+			nano::thread_role::set (nano::thread_role::name::bootstrap);
 			run_priorities ();
 		});
 	}
@@ -89,7 +89,7 @@ void nano::bootstrap_service::start ()
 	if (config.enable_database_scan)
 	{
 		database_thread = std::thread ([this] () {
-			nano::thread_role::set (nano::thread_role::name::ascending_bootstrap);
+			nano::thread_role::set (nano::thread_role::name::bootstrap_database_scan);
 			run_database ();
 		});
 	}
@@ -97,7 +97,7 @@ void nano::bootstrap_service::start ()
 	if (config.enable_dependency_walker)
 	{
 		dependencies_thread = std::thread ([this] () {
-			nano::thread_role::set (nano::thread_role::name::ascending_bootstrap);
+			nano::thread_role::set (nano::thread_role::name::bootstrap_dependendy_walker);
 			run_dependencies ();
 		});
 	}
@@ -105,13 +105,13 @@ void nano::bootstrap_service::start ()
 	if (config.enable_frontier_scan)
 	{
 		frontiers_thread = std::thread ([this] () {
-			nano::thread_role::set (nano::thread_role::name::ascending_bootstrap);
+			nano::thread_role::set (nano::thread_role::name::bootstrap_frontier_scan);
 			run_frontiers ();
 		});
 	}
 
 	timeout_thread = std::thread ([this] () {
-		nano::thread_role::set (nano::thread_role::name::ascending_bootstrap);
+		nano::thread_role::set (nano::thread_role::name::bootstrap_cleanup);
 		run_timeouts ();
 	});
 }