diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
index 87916de4be1..ae46a076ef4 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt
@@ -85,7 +85,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics(
             }
         }
 
-        @signatures
+        signatures@
         for ((rawSignature, origins) in groupedBySignature.entrySet()) {
             if (origins.size() <= 1) continue
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
index 0c791b8a605..44147e7fe63 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/CommentBinders.kt
@@ -33,7 +33,7 @@ object PrecedingCommentsBinder : WhitespacesAndCommentsBinder {
 
         // 2. bind plain comments
         var result = tokens.size()
-        @tokens for (idx in tokens.indices.reversed()) {
+        tokens@ for (idx in tokens.indices.reversed()) {
             val tokenType = tokens[idx]
             when (tokenType) {
                 JetTokens.WHITE_SPACE -> if (StringUtil.getLineBreakCount(getter[idx]) > 1) break@tokens
@@ -72,7 +72,7 @@ object TrailingCommentsBinder : WhitespacesAndCommentsBinder {
         if (tokens.isEmpty()) return 0
 
         var result = 0
-        @tokens for (idx in tokens.indices) {
+        tokens@ for (idx in tokens.indices) {
             val tokenType = tokens[idx]
             when (tokenType) {
                 JetTokens.WHITE_SPACE -> if (StringUtil.containsLineBreak(getter[idx])) break@tokens
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt
index 36b73cfdcfc..5468b5088c9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt
@@ -71,7 +71,7 @@ object DescriptorEquivalenceForOverrides {
 
         if (!ownersEquivalent(a, b, {x, y -> false})) return false
 
-        val overridingUtil = OverridingUtil.createWithEqualityAxioms @eq {
+        val overridingUtil = OverridingUtil.createWithEqualityAxioms eq@ {
             c1, c2 ->
             if (c1 == c2) return@eq true
 
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
index 633f88e15e6..086b7474a74 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt
@@ -46,7 +46,7 @@ public class LazyJavaPackageFragmentProvider(
                 else null
             }
 
-    private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues @lambda {
+    private val topLevelClasses = c.storageManager.createMemoizedFunctionWithNullableValues lambda@ {
         jClass: JavaClass ->
         val fqName = jClass.getFqName()
         if (fqName == null) return@lambda null
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
index ce9c59698fe..3e8d3cbe7f3 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
@@ -268,7 +268,7 @@ class LazyJavaTypeResolver(
             return (descriptor as ClassDescriptor).getMemberScope(getArguments())
         }
 
-        private val nullable = c.storageManager.createLazyValue @l {
+        private val nullable = c.storageManager.createLazyValue l@ {
             when (attr.flexibility) {
                 FLEXIBLE_LOWER_BOUND -> return@l false
                 FLEXIBLE_UPPER_BOUND -> return@l true
diff --git a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
index e7277ea081c..79610d0eef0 100644
--- a/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
+++ b/eval4j/src/org/jetbrains/eval4j/interpreterLoop.kt
@@ -136,7 +136,7 @@ public fun interpreterLoop(
     }
 
     try {
-        @loop while (true) {
+        loop@ while (true) {
             val insnOpcode = currentInsn.getOpcode()
             val insnType = currentInsn.getType()
 
diff --git a/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt b/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
index 7b3cf92fed6..370a0d37786 100644
--- a/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
+++ b/eval4j/test/org/jetbrains/eval4j/jdi/test/jdiTest.kt
@@ -56,7 +56,7 @@ fun suite(): TestSuite {
 
     Thread {
         val eventQueue = vm.eventQueue()
-        @mainLoop while (true) {
+        mainLoop@ while (true) {
             val eventSet = eventQueue.remove()
             for (event in eventSet.eventIterator()) {
                 when (event) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
index 4f0f39bceb1..63a96465908 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
@@ -90,7 +90,7 @@ private fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFil
 
     val orderEntries = projectFileIndex.getOrderEntriesForFile(virtualFile)
 
-    @entries for (orderEntry in orderEntries) {
+    entries@ for (orderEntry in orderEntries) {
         when (orderEntry) {
             is LibraryOrderEntry -> {
                 val library = orderEntry.getLibrary() ?: continue@entries
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
index 639251944f6..e9e6e479a67 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/CompletionUtils.kt
@@ -299,7 +299,7 @@ private fun createKeywordWithLabelElement(keyword: String, label: String?): Look
 fun breakOrContinueExpressionItems(position: JetElement, breakOrContinue: String): Collection<LookupElement> {
     val result = ArrayList<LookupElement>()
 
-    @parentsLoop
+    parentsLoop@
     for (parent in position.parents()) {
         when (parent) {
             is JetLoopExpression -> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
index b8f3222c9fb..996a9088e0d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/SynteticKotlinBlock.kt
@@ -57,7 +57,7 @@ public class SyntheticKotlinBlock(
         var child = subBlocks.first()
         var treeNode: ASTNode? = null
 
-        @loop
+        loop@
         while (treeNode == null) when (child) {
             is AbstractBlock -> {
                 treeNode = (child as AbstractBlock).getNode()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index fada60b517c..17c1979d26e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -505,7 +505,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
                     var lineBreaksPresent: Int = 0
                     var neighbor: PsiElement? = null
 
-                    @siblingsLoop
+                    siblingsLoop@
                     for (sibling in decl.siblings(forward = after, withItself = false)) {
                         when (sibling) {
                             is PsiWhiteSpace -> lineBreaksPresent += (sibling.getText() ?: "").count { it == '\n' }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
index 7d80b5e3861..605fe4556e7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
@@ -91,7 +91,7 @@ public fun processDuplicates(
 
     var showAll = false
 
-    @duplicateReplacersLoop
+    duplicateReplacersLoop@
     for ((i, entry) in duplicateReplacers.entrySet().withIndex()) {
         val (pattern, replacer) = entry
         if (!pattern.isValid()) continue
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
index f637995da51..7e8f28b49a3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
@@ -159,7 +159,7 @@ fun ExtractableCodeDescriptor.findDuplicates(): List<DuplicateInfo> {
         if (valueCount == 1) {
             matchValues(controlFlow.outputValues.first(), newControlFlow.outputValues.first())
         } else {
-            @outer
+            outer@
             for (currentValue in controlFlow.outputValues)
                 for (newValue in newControlFlow.outputValues) {
                     if ((currentValue is ExpressionValue) != (newValue is ExpressionValue)) continue
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
index 4f11e029d24..f7ced1e9f9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
@@ -608,7 +608,7 @@ public class JetPsiUnifier(
             val delegationInfo2 = getDelegationOrderInfo(decl2)
 
             if (delegationInfo1.orderInsensitive.size() != delegationInfo2.orderInsensitive.size()) return UNMATCHED
-            @outer
+            outer@
             for (specifier1 in delegationInfo1.orderInsensitive) {
                 for (specifier2 in delegationInfo2.orderInsensitive) {
                     if (doUnify(specifier1, specifier2) != UNMATCHED) continue@outer
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
index a0fb108f650..d61f4ef9533 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/DocCommentConverter.kt
@@ -34,7 +34,7 @@ object DocCommentConverter {
         val html = StringBuilder {
             appendJavadocElements(docComment.getDescriptionElements())
 
-            @tagsLoop
+            tagsLoop@
             for (tag in docComment.getTags()) {
                 when (tag.getName()) {
                     "deprecated" -> continue@tagsLoop
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
index c68655a7c61..92fcc995f5e 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -255,7 +255,7 @@ public class JavaToKotlinConverter(private val project: Project,
 
     private fun processUsages(refs: Collection<ReferenceInfo>) {
         for (fileRefs in refs.groupBy { it.file }.values()) { // group by file for faster sorting
-            @ReferenceLoop
+            ReferenceLoop@
             for ((reference, target, file, processings) in fileRefs.sortBy(ReferenceComparator)) {
                 val processors = when (reference.getElement().getLanguage()) {
                     JavaLanguage.INSTANCE -> processings.map { it.javaCodeProcessor }.filterNotNull()
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/OverloadReducer.kt b/j2k/src/org/jetbrains/kotlin/j2k/OverloadReducer.kt
index 97a1f9ac88a..5e249a1a5a2 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/OverloadReducer.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/OverloadReducer.kt
@@ -145,7 +145,7 @@ class OverloadReducer(
                 .map { it.key }
                 .sortBy { -it.getParameterList().getParametersCount() } // we will try to drop them starting from ones with more parameters
 
-        @DropCandidatesLoop
+        DropCandidatesLoop@
         for (method in dropCandidates) {
             val paramCount = method.getParameterList().getParametersCount()
             val targetInfo = equivalenceMap[method]!!
diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
index 372fd4c4494..337ade0890c 100644
--- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
+++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/invocationUtils.kt
@@ -44,7 +44,7 @@ public fun getSimpleName(call: JsInvocation): JsName? {
 public fun getSimpleIdent(call: JsInvocation): String? {
     var qualifier: JsExpression? = call.getQualifier()
 
-    @qualifiers while (qualifier != null) {
+    qualifiers@ while (qualifier != null) {
         when (qualifier) {
             is JsInvocation -> {
                 val callableQualifier = qualifier as JsInvocation