diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/async/CoroutineUtil.kt b/platform/collaboration-tools/src/com/intellij/collaboration/async/CoroutineUtil.kt
index bd1600960470..38741b05abff 100644
--- a/platform/collaboration-tools/src/com/intellij/collaboration/async/CoroutineUtil.kt
+++ b/platform/collaboration-tools/src/com/intellij/collaboration/async/CoroutineUtil.kt
@@ -20,10 +20,6 @@ import org.jetbrains.annotations.ApiStatus
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.EmptyCoroutineContext
 
-
-inline fun <reified T> T.classAsCoroutineName() = CoroutineName(T::class.java.name)
-inline fun <reified T> classAsCoroutineName() = CoroutineName(T::class.java.name)
-
 /**
  * Prefer creating a service to supply a parent scope
  */
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHRepositoryConnectionManager.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHRepositoryConnectionManager.kt
index 066b8c269a52..b8a7fb47a630 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHRepositoryConnectionManager.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHRepositoryConnectionManager.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.util.serviceGet
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
@@ -26,7 +25,7 @@ import org.jetbrains.plugins.github.util.GHHostedRepositoriesManager
 @Service(Service.Level.PROJECT)
 internal class GHRepositoryConnectionManager(project: Project, parentCs: CoroutineScope) :
   SingleHostedGitRepositoryConnectionManager<GHGitRepositoryMapping, GithubAccount, GHRepositoryConnection> {
-  private val cs = parentCs.childScope(this.classAsCoroutineName().name)
+  private val cs = parentCs.childScope(javaClass.name)
 
   private val dataContextRepository = project.serviceGet<GHPRDataContextRepository>()
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRDetailsDataProviderImpl.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRDetailsDataProviderImpl.kt
index be9418d61ba4..ac23b13a6f74 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRDetailsDataProviderImpl.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/data/provider/GHPRDetailsDataProviderImpl.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.plugins.github.pullrequest.data.provider
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.util.CollectionDelta
 import com.intellij.platform.util.coroutines.childScope
 import com.intellij.util.messages.MessageBus
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRCompactReviewThreadViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRCompactReviewThreadViewModel.kt
index 96d836734f93..6f6b099c7b80 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRCompactReviewThreadViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRCompactReviewThreadViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest.ui.comment
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.combineStateIn
 import com.intellij.collaboration.async.mapDataToModel
 import com.intellij.collaboration.async.mapState
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRThreadsViewModels.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRThreadsViewModels.kt
index 3c24c61af230..d2fb6116c9f1 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRThreadsViewModels.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/comment/GHPRThreadsViewModels.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest.ui.comment
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.mapDataToModel
 import com.intellij.collaboration.async.transformConsecutiveSuccesses
 import com.intellij.collaboration.util.getOrNull
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRReviewThreadDiffViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRReviewThreadDiffViewModel.kt
index 76a63b93460f..603f7e54e05b 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRReviewThreadDiffViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/diff/GHPRReviewThreadDiffViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest.ui.diff
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.stateInNow
 import com.intellij.collaboration.ui.codereview.diff.DiffLineLocation
 import com.intellij.platform.util.coroutines.childScope
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/editor/GHPRReviewFileEditorThreadViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/editor/GHPRReviewFileEditorThreadViewModel.kt
index 323dd1f208c5..ee7c20f98506 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/editor/GHPRReviewFileEditorThreadViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/editor/GHPRReviewFileEditorThreadViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest.ui.editor
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.stateInNow
 import com.intellij.platform.util.coroutines.childScope
 import kotlinx.coroutines.CoroutineScope
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/review/GHPRBranchWidgetViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/review/GHPRBranchWidgetViewModel.kt
index d5ca6b0008f1..fab97c674b31 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/review/GHPRBranchWidgetViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/review/GHPRBranchWidgetViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.github.pullrequest.ui.review
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.stateInNow
 import com.intellij.collaboration.util.ComputedResult
 import com.intellij.platform.util.coroutines.childScope
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/create/GHPRCreateViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/create/GHPRCreateViewModel.kt
index 78c00a513c90..b3cdb6a3d435 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/create/GHPRCreateViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/create/GHPRCreateViewModel.kt
@@ -118,7 +118,7 @@ internal class GHPRCreateViewModelImpl(
   private val dataContext: GHPRDataContext,
   private val projectVm: GHPRToolWindowProjectViewModel,
 ) : GHPRCreateViewModel, Disposable {
-  private val cs = parentCs.childScope(classAsCoroutineName())
+  private val cs = parentCs.childScope(javaClass.name)
   override val avatarIconsProvider: GHAvatarIconsProvider = dataContext.avatarIconsProvider
   private val repoData = dataContext.repositoryDataService
 
diff --git a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRInfoViewModel.kt b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRInfoViewModel.kt
index 1abbf2d1d40b..0d784a472daf 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRInfoViewModel.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/pullrequest/ui/toolwindow/model/GHPRInfoViewModel.kt
@@ -25,7 +25,7 @@ class GHPRInfoViewModel internal constructor(
   private val dataContext: GHPRDataContext,
   private val dataProvider: GHPRDataProvider
 ) : GHPRDetailsLoadingViewModel {
-  private val cs = parentCs.childScope()
+  private val cs = parentCs.childScope(javaClass.name)
 
   val pullRequest: GHPRIdentifier = dataProvider.id
   var pullRequestUrl: String? = null
diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/diff/GitLabMergeRequestDiffReviewViewModel.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/diff/GitLabMergeRequestDiffReviewViewModel.kt
index 2cf063c65c2e..a1a4ac72f299 100644
--- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/diff/GitLabMergeRequestDiffReviewViewModel.kt
+++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/mergerequest/ui/diff/GitLabMergeRequestDiffReviewViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.gitlab.mergerequest.ui.diff
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.stateInNow
 import com.intellij.collaboration.ui.codereview.diff.DiffLineLocation
 import com.intellij.collaboration.ui.codereview.diff.DiscussionsViewOption
diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/comment/GitLabNoteViewModel.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/comment/GitLabNoteViewModel.kt
index c6835e6c3c12..1cb606ddab9c 100644
--- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/comment/GitLabNoteViewModel.kt
+++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/ui/comment/GitLabNoteViewModel.kt
@@ -1,7 +1,6 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.plugins.gitlab.ui.comment
 
-import com.intellij.collaboration.async.classAsCoroutineName
 import com.intellij.collaboration.async.mapStateInNow
 import com.intellij.collaboration.async.stateInNow
 import com.intellij.openapi.project.Project