diff --git a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java
index 78787135e295..143b2606eb7c 100644
--- a/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java
+++ b/java/testFramework/src/com/intellij/testFramework/LightTestMigration.java
@@ -49,7 +49,7 @@ class LightTestMigration {
   private static LightTestMigration ourPrevious;
 
   static {
-    Runtime.getRuntime().addShutdownHook(new Thread(LightTestMigration::flush));
+    Runtime.getRuntime().addShutdownHook(new Thread(LightTestMigration::flush, "LightTestMigration flusher"));
   }
 
   private Path myBaseDir;
diff --git a/platform/lang-impl/src/com/intellij/internal/retype/RetypeSession.kt b/platform/lang-impl/src/com/intellij/internal/retype/RetypeSession.kt
index c56d1723860f..8ece277ef0c0 100644
--- a/platform/lang-impl/src/com/intellij/internal/retype/RetypeSession.kt
+++ b/platform/lang-impl/src/com/intellij/internal/retype/RetypeSession.kt
@@ -152,7 +152,7 @@ class RetypeSession(
 
   var retypePaused: Boolean = false
 
-  private val timerThread = Thread(::runLoop)
+  private val timerThread = Thread(::runLoop, "RetypeSession loop")
   private var stopTimer = false
 
   init {
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java
index a39e9ed27c1b..17c711b5f38f 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/GlobalMenuLinux.java
@@ -171,7 +171,7 @@ public class GlobalMenuLinux implements GlobalMenuLib.EventHandler, Disposable {
         PlatformImpl.startup(()->ourLib.startWatchDbus(ourGLogger, ourOnAppmenuServiceAppeared, ourOnAppmenuServiceVanished));
       } catch (Throwable e) {
         LOG.info("can't start main loop via javaFX (will run it manualy): " + e.getMessage());
-        final Thread glibMain = new Thread(()->ourLib.runMainLoop(ourGLogger, ourOnAppmenuServiceAppeared, ourOnAppmenuServiceVanished));
+        final Thread glibMain = new Thread(()->ourLib.runMainLoop(ourGLogger, ourOnAppmenuServiceAppeared, ourOnAppmenuServiceVanished), "GlobalMenuLinux loop");
         glibMain.start();
       }
     } else {
diff --git a/plugins/gradle/java/src/util/GradleAttachSourcesProvider.java b/plugins/gradle/java/src/util/GradleAttachSourcesProvider.java
index 4a9e0b061055..b419a918960a 100644
--- a/plugins/gradle/java/src/util/GradleAttachSourcesProvider.java
+++ b/plugins/gradle/java/src/util/GradleAttachSourcesProvider.java
@@ -101,7 +101,7 @@ public class GradleAttachSourcesProvider implements AttachSourcesProvider {
         try {
           sourcesLocationFile = new File(FileUtil.createTempDirectory("sources", "loc"), "path.tmp");
           sourcesLocationFilePath = StringUtil.escapeBackSlashes(sourcesLocationFile.getCanonicalPath());
-          Runtime.getRuntime().addShutdownHook(new Thread(() -> FileUtil.delete(sourcesLocationFile)));
+          Runtime.getRuntime().addShutdownHook(new Thread(() -> FileUtil.delete(sourcesLocationFile), "GradleAttachSourcesProvider cleanup"));
         }
         catch (IOException e) {
           GradleLog.LOG.warn(e);
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
index e16be3b6a029..687a2cd1e067 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/execution/GradleExecutionHelper.java
@@ -260,7 +260,7 @@ public class GradleExecutionHelper {
         final File scriptFile = new File(wrapperFilesLocation, "gradlew");
         final File pathToProperties = new File(wrapperFilesLocation, "path.tmp");
 
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> FileUtil.delete(wrapperFilesLocation)));
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> FileUtil.delete(wrapperFilesLocation), "GradleExecutionHelper cleanup"));
         final String[] lines = {
           "",
           "gradle.projectsEvaluated { gr ->",