diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterFunKeyword.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterFunKeyword.kt.after
index 02cbc389f9cc..6820d5b8e9b8 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterFunKeyword.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterFunKeyword.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override fun foo(p: Int) {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterValKeyword.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterValKeyword.kt.after
index 38166e1c2bff..b166893a50fa 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterValKeyword.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/AfterValKeyword.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override val someVal: String?
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 }
 
 // ELEMENT_TEXT: "override val someVal: String?"
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementFunction.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementFunction.kt.after
index 02cbc389f9cc..6820d5b8e9b8 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementFunction.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementFunction.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override fun foo(p: Int) {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVal.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVal.kt.after
index 38166e1c2bff..b166893a50fa 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVal.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVal.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override val someVal: String?
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 }
 
 // ELEMENT_TEXT: "override val someVal: String?"
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVar.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVar.kt.after
index 10c11043085c..7e8ed2356501 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVar.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/ImplementVar.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override var someVar: String
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
         set(value) {}
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/basic/override/Suspend.kt.after b/plugins/kotlin/completion/tests/testData/handlers/basic/override/Suspend.kt.after
index 45b73a9b9cbf..0facc836e426 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/basic/override/Suspend.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/basic/override/Suspend.kt.after
@@ -4,7 +4,7 @@ interface I {
 
 class A : I {
     override suspend fun foo() {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after b/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
index b4f038c8adbd..2ecbae2c6a4b 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/AnonymousObjectGenericJava.kt.after
@@ -1,7 +1,7 @@
 fun<T> f(){
     JavaClass<T>(object : Comparator<T> {
         override fun compare(var1: T, var2: T): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     })
 }
diff --git a/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/ImportAnonymousObject.kt.after b/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/ImportAnonymousObject.kt.after
index 5cf25c51cd89..4fae768ddc9e 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/ImportAnonymousObject.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/multifile/smart/ImportAnonymousObject.kt.after
@@ -4,7 +4,7 @@ import test.foo.FooClass
 fun foo() {
     val x: Foo = object : FooClass() {
         override fun run() {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObject3.kt.after b/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObject3.kt.after
index f8d4edf0fbfa..db28c05c4660 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObject3.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObject3.kt.after
@@ -1,6 +1,6 @@
 var r : Runnable = object : Runnable {
     override fun run() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after b/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
index 2368557b24af..6903dc2a8a84 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/smart/AnonymousObjectInsertsImport.kt.after
@@ -2,7 +2,7 @@ import java.io.Closeable
 
 val c: java.io.Closeable = object : Closeable {
     override fun close() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/completion/tests/testData/handlers/smart/ConstructorForGenericType2.kt.after b/plugins/kotlin/completion/tests/testData/handlers/smart/ConstructorForGenericType2.kt.after
index 49b637e2db48..125d8b182921 100644
--- a/plugins/kotlin/completion/tests/testData/handlers/smart/ConstructorForGenericType2.kt.after
+++ b/plugins/kotlin/completion/tests/testData/handlers/smart/ConstructorForGenericType2.kt.after
@@ -3,7 +3,7 @@ fun registerHandler(handler: Handler<out Message>) {}
 fun test() {
     registerHandler(object : Handler<Message> {
         override fun handle(e: Message) {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     })
 }
diff --git a/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft b/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft
index db91f59e605a..861cd965bdd4 100644
--- a/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft	
+++ b/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Function Body.kt.ft	
@@ -1 +1 @@
-TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
\ No newline at end of file
+TODO("Not yet implemented")
\ No newline at end of file
diff --git a/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft b/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft
index a10ffae38af3..861cd965bdd4 100644
--- a/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft	
+++ b/plugins/kotlin/idea/resources/fileTemplates/code/New Kotlin Property Initializer.kt.ft	
@@ -1 +1 @@
-TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
\ No newline at end of file
+TODO("Not yet implemented")
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt
index 20bbf1f2ae0f..400f4e920596 100644
--- a/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt
+++ b/plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/quickfix/CommonIntentionActionsTest.kt
@@ -407,7 +407,7 @@ class CommonIntentionActionsTest : LightPlatformCodeInsightFixtureTestCase() {
         |class Foo {
         |    fun bar() {}
         |    fun baz(param0: Int): Int {
-        |        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        |        TODO("Not yet implemented")
         |    }
         |}
         """.trim().trimMargin(), true)
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
index 8948aad2a8de..c4be1a321a0a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/dataMethod.kt.after
@@ -6,6 +6,6 @@ import org.junit.runners.Parameterized
 class A {
     @Parameterized.Parameters
     fun data(): Collection<Array<Any>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
index 8d3b6f6fdeb2..79b1fdadbbe3 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/setUp.kt.after
@@ -6,6 +6,6 @@ import org.junit.Before
 class A {
     @Before
     fun setUp() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
index 9924210c27bf..fd3a8e4e482d 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/tearDown.kt.after
@@ -6,6 +6,6 @@ import org.junit.After
 class A {
     @After
     fun tearDown() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
index 801ccc3f0945..2b5c138e9df9 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/jUnit4/testMethod.kt.after
@@ -6,6 +6,6 @@ import org.junit.Test
 class A {
     @Test
     fun name() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
index f9356b267081..68d86f15ae85 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/junit3/testMethod.kt.after
@@ -4,6 +4,6 @@ import junit.framework.TestCase
 
 class A : TestCase() {
     fun testName() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
index be3ae0e09491..839fafb4df73 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/dataMethod.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @DataProvider(name = "name")
     fun name(): Array<Array<Any>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
index ee478d4b76fb..658ae50fc1fb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/setUp.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @BeforeMethod
     fun setUp() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
index 301cac33b5de..899988204660 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/tearDown.kt.after
@@ -6,6 +6,6 @@ import org.testng.annotations.Test
 @Test class A {
     @AfterMethod
     fun tearDown() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
index be6e2e54319b..836cd0bee1dd 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/generate/testFrameworkSupport/testNG/testMethod.kt.after
@@ -5,6 +5,6 @@ import org.testng.annotations.Test
 @Test class A {
     @Test
     fun testName() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
index 8296de3a8759..e8a7a55f468f 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/abstractAndNonAbstractInheritedFromInterface.kt.after
@@ -8,6 +8,6 @@ interface U {
 
 class C1 : T, U {
     override fun getFoo(): String {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
index d1ce01dd0ea7..d6b83b23f364 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/copyKDoc.kt.after
@@ -11,6 +11,6 @@ class B : A() {
      * @see TEST
      */
     override fun foo() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
index 482c3aba0e2c..584f17b7574a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/defaultValues.kt.after
@@ -4,6 +4,6 @@ interface T {
 
 class C : T {
     override fun foo(a: Int) {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
index cc15d1330cc4..3d08904a47c4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/delegatedMembers.kt.after
@@ -5,7 +5,7 @@ interface T {
 
 class C(t :T) : T by t {
     override fun bar() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun equals(other: Any?): Boolean {
@@ -13,7 +13,7 @@ class C(t :T) : T by t {
     }
 
     override fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun hashCode(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
index 4287dc0ee7eb..8b856c84c1a5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/doNotOverrideFinal.kt.after
@@ -23,7 +23,7 @@ class C : B(), I {
     }
 
     override fun g() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun hashCode(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
index 6aa7f228cb01..51cae0f3b913 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/emptyClassBodyFunctionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
index 6aa7f228cb01..51cae0f3b913 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionMethod.kt.after
@@ -5,6 +5,6 @@ interface T {
 
 class C : T {
     override fun Foo(): (String) -> Unit {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
index 455352f956a9..a8b2a72fd5ba 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionProperty.kt.after
@@ -6,7 +6,7 @@ interface A {
 fun some() : A {
     return object : A {
         override val method: () -> Unit?
-            get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+            get() = <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
index 3e645f23f55d..94d5858e2de5 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/functionWithTypeParameters.kt.after
@@ -4,6 +4,6 @@ interface Trait {
 
 class TraitImpl : Trait {
     override fun <A, B : Runnable, E : Map.Entry<A, B>> foo() where B : Cloneable, B : Comparable<B> {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
index bc85cea0b6f9..716c4864daa4 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/generateMulti.kt.after
@@ -8,14 +8,14 @@ interface Some<T> {
 
 class SomeOther<S> : Some<S> {
     override fun someFoo() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun someGenericFoo(): S {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun someOtherFoo(): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
index d217b342bfc1..4b3559b6026b 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericMethod.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC() : G<Int> {
     override fun foo(t: Int): Int {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
index a1c05cd4ba0c..e3c8e0634139 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/genericTypesSeveralMethods.kt.after
@@ -2,6 +2,6 @@
 
 class MyClass<A: Comparable<A>> : Iterable<A> {
     override fun iterator(): Iterator<A> {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
index 229b4a08bf50..a01de8f76180 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName.kt.after
@@ -7,6 +7,6 @@ class A : Runnable {
     }
 
     override fun run() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
index 5655c90c4fdf..325eeb6827fb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName2.kt.after
@@ -11,32 +11,32 @@ interface A {
 
 class Test : A {
     override fun a1() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun a2() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a3() {
     }
 
     override fun a4() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a5() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a6() {
     }
 
     override fun a7() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a8() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
index 92f234c8ad11..b3ebf309f802 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName3.kt.after
@@ -14,29 +14,29 @@ class Test : A {
     }
 
     override fun a7() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a8() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a1() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun a2() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a3() {
     }
 
     override fun a4() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a5() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
index 97ae86ffb5d0..43ac0c2d80eb 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName4.kt.after
@@ -14,28 +14,28 @@ class Test : A {
     }
 
     override fun a5() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a6() {
     }
 
     override fun a7() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a8() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a1() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun a2() {
     }
 
     override fun a3() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
index e4d773fa837e..298174b6546a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName5.kt.after
@@ -14,22 +14,22 @@ class Test : A {
     }
 
     override fun a1() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun a2() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a3() {
     }
 
     override fun a4() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a5() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     fun bar() {
@@ -39,11 +39,11 @@ class Test : A {
     }
 
     override fun a7() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a8() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     fun baz() {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
index 33fe7c0e5100..f1fee9c34296 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFromClassName6.kt.after
@@ -17,43 +17,43 @@ interface B {
 
 class Test : A, B {
     override fun a1() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun a2() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a3() {
     }
 
     override fun a4() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a5() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun b3() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun b2() {
     }
 
     override fun b1() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a6() {
     }
 
     override fun a7() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun a8() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
index bd25ba5cc6f4..9bde50067a6a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementFunctionType.kt.after
@@ -1,5 +1,5 @@
 class C : (String) -> Boolean {
     override fun invoke(p1: String): Boolean {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
index 7752567aadd3..79a125ee4e7c 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementJavaRawSubclass/foo/Impl.kt.after
@@ -3,6 +3,6 @@ import foo.B
 
 class C : A() {
     override fun foo(x: MutableList<Any?>?, y: String?): B<*> {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
index b7f113fa3328..d254161f8e4a 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/implementSamAdapters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ package foo
 
 class Impl: B {
     override fun foo(r: Runnable?) {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
index 738daafa9145..372326852913 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaInterfaceMethod/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun getFooBar(): String {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
index 5e6799fee6cf..d11be1ab1fb8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/javaParameters/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.Intf
 
 class Impl(): Intf {
     override fun fooBar(i: Int, s: Array<out String>?, foo: Any?) {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
index 5822c9a3546e..a9f3d4bb7c3e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/localClass.kt.after
@@ -7,7 +7,7 @@ fun f() {
 
     object : C<R>() {
         override fun f(a: R) {
-            <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <selection><caret>TODO("Not yet implemented")</selection>
         }
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
index e1ef045a435a..278d290f5482 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/multipleSupers.kt.after
@@ -8,7 +8,7 @@ interface B {
 
 class C : A(), B {
     override fun bar() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override fun equals(other: Any?): Boolean {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
index 968af4ef22c2..6fe8ad642d1e 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/nullableKotlinType/foo/Impl.kt.after
@@ -4,6 +4,6 @@ interface IBase {
 
 class C : IBase {
     override fun foo(): Any? {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
index 2da1da10ee82..95c68d41ccab 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExplicitFunction.kt.after
@@ -4,6 +4,6 @@ interface A {
 
 class B : A {
     override fun String.foo() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
index 6b3e4cb4faec..5626f1bc79ef 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionFunction.kt.after
@@ -6,6 +6,6 @@ open class A {
 
 class B: A() {
     override fun Int.foo(): Int {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
index 11cfc6f29d81..cedcb6f7e5ee 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideExtensionProperty.kt.after
@@ -4,5 +4,5 @@ interface A {
 
 class B : A {
     override val String.prop: Int
-        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <selection><caret>TODO("Not yet implemented")</selection>
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
index e16a55144e71..fb96ecd22ce1 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overrideMutableExtensionProperty.kt.after
@@ -4,6 +4,6 @@ interface A {
 
 class B : A {
     override var Int.foo: Double
-        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <selection><caret>TODO("Not yet implemented")</selection>
         set(value) {}
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
index adcf14f647fe..0f8e42e44a65 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/overridePrimitiveProperty.kt.after
@@ -11,19 +11,19 @@ interface T {
 
 class C : T {
     override val a1: Byte
-        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <selection><caret>TODO("Not yet implemented")</selection>
     override val a2: Short
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a3: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a4: Long
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a5: Float
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a6: Double
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a7: Char
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     override val a8: Boolean
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
index a67733048d04..7cf007fb2f08 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/platformCollectionTypes/foo/Impl.kt.after
@@ -2,6 +2,6 @@ import foo.A
 
 class B : A {
     override fun foo(): MutableList<String> {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
index 8b88b83b6a28..48aed7796617 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/privateJavaMethod/foo/Impl.kt.after
@@ -20,6 +20,6 @@ class C : A(), I {
     }
 
     override fun z() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
index 160d6580a6a9..7eecf9a3bdd6 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/property.kt.after
@@ -4,5 +4,5 @@ interface T {
 
 class GC() : T {
     override val v: Int
-        get() = <selection><caret>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <selection><caret>TODO("Not yet implemented")</selection>
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
index f3cb91a95755..2f7030f63f71 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/respectCaretPosition.kt.after
@@ -6,11 +6,11 @@ interface Test {
 class SomeTest : Test {
     val hello = 12
     override fun test() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 
     override val testProp: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 
     /**
      * test
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
index 6f5308b7b29f..1a66bc2dcbb8 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/sameTypeName/foo/Impl.kt.after
@@ -3,7 +3,7 @@ import lib.ArrayFactory
 
 public class Impl : ArrayFactory {
     override fun create(): lib.Array {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
index 6e96802793f1..140b9cbbc6ff 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/starProjections.kt.after
@@ -6,6 +6,6 @@ interface Base {
 
 class Derived : Base {
     override fun foo(c: C<*>) {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
index 788374516cb7..1c89f1c4a318 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/superPreference.kt.after
@@ -30,15 +30,15 @@ abstract class B : I2, A(), I3 {
     }
 
     override fun i() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun i1() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun i2() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun toString(): String {
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
index 6e1014cc1677..e33017d5afab 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/suspendFun.kt.after
@@ -4,6 +4,6 @@ interface I {
 
 class C : I {
     override suspend fun foo() {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
index b0e8abc8239d..ebdcbb23dbe2 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitGenericImplement.kt.after
@@ -4,6 +4,6 @@ interface G<T> {
 
 class GC<T>() : G<T> {
     override fun foo(t: T): T {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
index f431468fd457..e77c2ee74527 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/traitNullableFunction.kt.after
@@ -4,6 +4,6 @@ interface Some {
 
 class SomeOther : Some {
     override fun foo(some: Int?): Int {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
index 4a9dc974578e..6366d4954315 100644
--- a/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/codeInsight/overrideImplement/unresolvedType.kt.after
@@ -5,6 +5,6 @@ interface A<in TPipeline, out TBuilder : Any, TFeature : Any> {
 
 class X : A<String, UnresolvedType, Unit> {
     override fun install(pipeline: String, configure: UnresolvedType.() -> Unit) {
-        <selection><caret>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection><caret>TODO("Not yet implemented")</selection>
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after
index 2a488008c88e..1091c9cf84e5 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstract.kt.after
@@ -3,5 +3,5 @@ abstract class Owner {
 }
 
 fun Owner.f() {
-    <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+    <caret><selection>TODO("Not yet implemented")</selection>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after
index db4ed674edde..3e76fe7cb5c9 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/abstractProperty.kt.after
@@ -3,4 +3,4 @@ abstract class Owner {
 }
 
 val Owner.p: Int
-    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
\ No newline at end of file
+    get() = <caret><selection>TODO("Not yet implemented")</selection>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after
index 58858f026d76..0c27b579ba90 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/valWithDefaultGetter.kt.after
@@ -4,4 +4,4 @@ class Owner {
 }
 
 val Owner.p: Int
-    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+    get() = <caret><selection>TODO("Not yet implemented")</selection>
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after
index 8bf46e97d98f..b3d4f9c43228 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultGetterAndSetter.kt.after
@@ -4,7 +4,7 @@ class Owner {
 }
 
 var Owner.p: Int
-    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+    get() = <caret><selection>TODO("Not yet implemented")</selection>
     set(value) {
-        TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after
index 2571690b28b4..f2d2e8035610 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithDefaultSetter.kt.after
@@ -6,5 +6,5 @@ class Owner {
 var Owner.p: Int
     get() = 1
     set(value) {
-        <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after
index f0ec36b21e4d..28d97b832753 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithGetter.kt.after
@@ -6,5 +6,5 @@ class Owner {
 var Owner.p: Int
     get() { return 1 }
     set(value) {
-        <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after
index 7a3146bf46cb..d3eb472cd4fd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/declarations/convertMemberToExtension/varWithSetter.kt.after
@@ -5,5 +5,5 @@ class Owner {
 }
 
 var Owner.p: Int
-    get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+    get() = <caret><selection>TODO("Not yet implemented")</selection>
     set(v) {}
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClass.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClass.kt.after
index 8db5cb1cec83..14f6c8d529d1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClass.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
index 8db5cb1cec83..14f6c8d529d1 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolon.kt.after
@@ -8,6 +8,6 @@ enum class E : T<Int> {
     A, B, C;
 
     override fun foo(x: Int): Int {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
index 749cf0c03e51..410c8ae5855a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumClassWithSemicolonAndMembers.kt.after
@@ -11,6 +11,6 @@ enum class E : T<Int> {
 
     fun baz() = 2
     override fun foo(x: Int): Int {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntries.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
index 7be65e50319e..bb0333efddce 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntries.kt.after
@@ -3,15 +3,15 @@
 enum class E {
     A {
         override fun foo(x: Int): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }, B {
         override fun foo(x: Int): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }, C {
         override fun foo(x: Int): Int {
-            <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <caret><selection>TODO("Not yet implemented")</selection>
         }
     };
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
index 374f903f5784..3924ad39d49f 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/enumEntriesWithArgs.kt.after
@@ -3,15 +3,15 @@
 enum class E(n: Int) {
     A(1) {
         override fun foo(x: Int): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }, B(2) {
         override fun foo(x: Int): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }, C(3) {
         override fun foo(x: Int): Int {
-            <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+            <caret><selection>TODO("Not yet implemented")</selection>
         }
     };
 
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/implementAll.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/implementAll.kt.after
index a09e66d52783..dcf33965c14a 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/implementAll.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/function/implementAll.kt.after
@@ -6,14 +6,14 @@ interface T<X> {
 
 class U : T<String> {
     override fun foo(x: String): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
 
 class V : T<Int> {
     override fun foo(x: Int): Int {
-        <caret><selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <caret><selection>TODO("Not yet implemented")</selection>
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClass.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClass.kt.after
index 1da4bd6cfb4e..094079d7913b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClass.kt.after
@@ -8,5 +8,5 @@ enum class E : T<Int> {
     A, B, C;
 
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after
index 1da4bd6cfb4e..094079d7913b 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolon.kt.after
@@ -8,5 +8,5 @@ enum class E : T<Int> {
     A, B, C;
 
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after
index a16a276dce12..beeee18cdc01 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumClassWithSemicolonAndMembers.kt.after
@@ -11,5 +11,5 @@ enum class E : T<Int> {
 
     fun baz() = 2
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntries.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntries.kt.after
index 4616d59c80eb..51579d16b6bd 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntries.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntries.kt.after
@@ -3,13 +3,13 @@
 enum class E {
     A {
         override val foo: Int
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
     }, B {
         override val foo: Int
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
     }, C {
         override val foo: Int
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
     };
 
     abstract val foo: Int
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after
index c73195233967..db39b5c8aa04 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/enumEntriesWithArgs.kt.after
@@ -3,13 +3,13 @@
 enum class E(n: Int) {
     A(1) {
         override val foo: Int
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
     }, B(2) {
         override val foo: Int
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
     }, C(3) {
         override val foo: Int
-            get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+            get() = <caret><selection>TODO("Not yet implemented")</selection>
     };
 
     abstract val foo: Int
diff --git a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/implementAll.kt.after b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/implementAll.kt.after
index 03b2cbec74cf..f399d4de0f51 100644
--- a/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/implementAll.kt.after
+++ b/plugins/kotlin/idea/tests/testData/intentions/implementAbstractMember/property/implementAll.kt.after
@@ -6,13 +6,13 @@ interface T<X> {
 
 class U : T<String> {
     override val foo: String
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 
 }
 
 class V : T<Int> {
     override val foo: Int
-        get() = <caret><selection>TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.</selection>
+        get() = <caret><selection>TODO("Not yet implemented")</selection>
 
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt b/plugins/kotlin/idea/tests/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt
index 8a91e2ba5b08..cedb8bb000a0 100644
--- a/plugins/kotlin/idea/tests/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt
+++ b/plugins/kotlin/idea/tests/testData/multiFileIntentions/convertMemberToExtension/addImports/after/x/test.kt
@@ -4,5 +4,5 @@ interface A {
 }
 
 fun A.foo(n: Int) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunction/jvm/My.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunction/jvm/My.kt.after
index d7055408b7c3..9f7818dd836f 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunction/jvm/My.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunction/jvm/My.kt.after
@@ -3,6 +3,6 @@
 
 actual class My {
     actual fun foo(param: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunctionSameSignature/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunctionSameSignature/jvm/jvm.kt.after
index 7236bd0d2d40..1e67e21a423e 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunctionSameSignature/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classFunctionSameSignature/jvm/jvm.kt.after
@@ -7,6 +7,6 @@ actual object O {
     }
 
     actual fun <T : Any> hello(): MutableMap<String, T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classOverloadedFunction/jvm/My.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classOverloadedFunction/jvm/My.kt.after
index 7f27eefc60c1..d21ae0465521 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classOverloadedFunction/jvm/My.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classOverloadedFunction/jvm/My.kt.after
@@ -4,6 +4,6 @@
 actual class My {
     fun foo(param: String) = 42
     actual fun foo(param: Int): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classPropertyInConstructor/jvm/My.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classPropertyInConstructor/jvm/My.kt.after
index bb4b5336584f..c52b2d187cf6 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classPropertyInConstructor/jvm/My.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classPropertyInConstructor/jvm/My.kt.after
@@ -3,5 +3,5 @@
 
 actual class <caret>My(actual val name: String) {
     actual val age: String
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classSomeProperties/jvm/My.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classSomeProperties/jvm/My.kt.after
index 30308d7fe173..77f929573b00 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classSomeProperties/jvm/My.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/classSomeProperties/jvm/My.kt.after
@@ -6,7 +6,7 @@ actual class <caret>My {
 
     actual val correct = true
     actual val x: String
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     actual val pi: Double
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/membersWithIncorrectType/jvm/F.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/membersWithIncorrectType/jvm/F.kt.after
index 059b86ed55db..097b646dbb30 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/membersWithIncorrectType/jvm/F.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/membersWithIncorrectType/jvm/F.kt.after
@@ -4,11 +4,11 @@
 // DISABLE-ERRORS
 actual class <caret>F<T> {
     actual val a: List<T>
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     actual val b: T
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 
     actual fun <F> c(t: T): F {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/propertyWithIncorrectType/jvm/F.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/propertyWithIncorrectType/jvm/F.kt.after
index c000cb0ee63d..5d52e4c3134b 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/propertyWithIncorrectType/jvm/F.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/propertyWithIncorrectType/jvm/F.kt.after
@@ -4,5 +4,5 @@
 // DISABLE-ERRORS
 actual class <caret>F {
     actual val b: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/secondaryConstructorAbsence/jvm/WithSecondaryConstructor.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/secondaryConstructorAbsence/jvm/WithSecondaryConstructor.kt.after
index 1f4ec70e7e6b..fe913889e918 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/secondaryConstructorAbsence/jvm/WithSecondaryConstructor.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/addMissingActualMembers/secondaryConstructorAbsence/jvm/WithSecondaryConstructor.kt.after
@@ -7,6 +7,6 @@ actual class WithSecondaryConstructor {
     val z: Double = 3.14
 
     actual constructor(x: Int, s: String) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/abstract/js/Abstract.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/abstract/js/Abstract.kt.after
index b735d712c077..1e56aad47573 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/abstract/js/Abstract.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/abstract/js/Abstract.kt.after
@@ -1,12 +1,12 @@
 // Abstract: to be implemented
 actual abstract class <caret>Abstract {
     actual fun foo(param: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     actual abstract fun String.bar(y: Double): Boolean
     actual val isGood: Boolean
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     actual abstract var status: Int
 
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/class/jvm/My.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/class/jvm/My.kt.after
index f7cb4aa5b001..356459969479 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/class/jvm/My.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/class/jvm/My.kt.after
@@ -1,24 +1,24 @@
 // My: to be implemented
 actual class My {
     actual fun foo(param: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     actual fun String.bar(y: Double): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     actual fun baz() {
     }
 
     actual constructor(flag: Boolean) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     actual val isGood: Boolean
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
     actual var status: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
         set(value) {}
 
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/classWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/classWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
index aa2185d21e1c..e033efcbee58 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/classWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/classWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
@@ -3,6 +3,6 @@ import kotlin.random.Random
 // MyGenerator: to be implemented
 actual class MyGenerator {
     actual fun generate(): Random {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithDelegation/jvm/Constructors.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithDelegation/jvm/Constructors.kt.after
index d440022e77a4..ef8681fa7fa2 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithDelegation/jvm/Constructors.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithDelegation/jvm/Constructors.kt.after
@@ -1,6 +1,6 @@
 // Constructors: to be implemented
 actual class Constructors actual constructor(s: String) {
     actual constructor(i: Int) : this() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
index f1922acbbd03..8498c739cac7 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/constructorWithJdk/proj_jvm_dep(stdlib)/MyGenerator.kt.after
@@ -3,5 +3,5 @@ import kotlin.random.Random
 // MyGenerator: to be implemented
 actual class MyGenerator actual constructor(r: Random) {
     actual val i: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/enum/js/MyEnum.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/enum/js/MyEnum.kt.after
index 1947d7d1e6a0..84ff6dad4bbc 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/enum/js/MyEnum.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/enum/js/MyEnum.kt.after
@@ -3,6 +3,6 @@ actual enum class MyEnum {
     FIRST, SECOND, LAST;
 
     actual val num: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/function/jvm/foo.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/function/jvm/foo.kt.after
index 7270ed6e51ac..a1ee9c6b27bc 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/function/jvm/foo.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/function/jvm/foo.kt.after
@@ -1,4 +1,4 @@
 // foo: to be implemented
 actual fun foo(arg: Int): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/functionSameFile/jvm/foo.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/functionSameFile/jvm/foo.kt.after
index 1907c67287ea..bdd3233bdd8a 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/functionSameFile/jvm/foo.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/functionSameFile/jvm/foo.kt.after
@@ -2,5 +2,5 @@
 
 actual fun bar() {}
 actual fun foo(arg: Int): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/nested/jvm/WithNested.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/nested/jvm/WithNested.kt.after
index 744c503f3780..c574ec3cd6fc 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/nested/jvm/WithNested.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/nested/jvm/WithNested.kt.after
@@ -1,7 +1,7 @@
 // WithNested: to be implemented
 actual class WithNested {
     actual fun foo(): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     actual class Nested {
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/object/jvm/Object.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/object/jvm/Object.kt.after
index 841ee8e1b8a8..4a978f2dee6b 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/object/jvm/Object.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/object/jvm/Object.kt.after
@@ -1,6 +1,6 @@
 // Object: to be implemented
 actual object Object {
     actual fun foo(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/property/jvm/x.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/property/jvm/x.kt.after
index 56107daf713d..7f106c5dd222 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/property/jvm/x.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/property/jvm/x.kt.after
@@ -1,4 +1,4 @@
 // x: to be implemented
 actual var x: Int
-    get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+    get() = TODO("Not yet implemented")
     set(value) {}
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/withFakeJvm/a_jvm/foo.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/withFakeJvm/a_jvm/foo.kt.after
index 7270ed6e51ac..a1ee9c6b27bc 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/withFakeJvm/a_jvm/foo.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/createActual/withFakeJvm/a_jvm/foo.kt.after
@@ -1,4 +1,4 @@
 // foo: to be implemented
 actual fun foo(arg: Int): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementAbstractExpectMemberInheritedFromInterface/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementAbstractExpectMemberInheritedFromInterface/jvm/jvm.kt.after
index 040eb32c115f..c7470e6f763d 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementAbstractExpectMemberInheritedFromInterface/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementAbstractExpectMemberInheritedFromInterface/jvm/jvm.kt.after
@@ -3,6 +3,6 @@
 
 actual class C : I {
     actual override fun f() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInActualClassNoExpectMember/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInActualClassNoExpectMember/jvm/jvm.kt.after
index 6b2ede6d5712..18ab51795a11 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInActualClassNoExpectMember/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInActualClassNoExpectMember/jvm/jvm.kt.after
@@ -7,6 +7,6 @@ actual interface ExpInterface {
 
 actual class ExpImpl : ExpInterface {
     override fun first() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInImplClassNonImplInheritor/jvm/jvm.kt.after b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInImplClassNonImplInheritor/jvm/jvm.kt.after
index 489944c94f98..311b7fb2b40b 100644
--- a/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInImplClassNonImplInheritor/jvm/jvm.kt.after
+++ b/plugins/kotlin/idea/tests/testData/multiModuleQuickFix/other/implementMembersInImplClassNonImplInheritor/jvm/jvm.kt.after
@@ -7,6 +7,6 @@ abstract actual class Bar {
 
 class X : Bar() {
     override fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
index 09817cb6b80d..cd04e66d8e01 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/customOperationOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     infix fun foo(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
index d05d1db49ac0..0f116a8b8f2e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/greaterOrEqualOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun compareTo(t: T): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
index dfe8fc6335d9..984c2e4dc766 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/inOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun contains(t: T): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
index 2954ea3a8026..b41de618d3c4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/lessOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun compareTo(t: T): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
index cb0421780222..06902c4383bc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/notInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun contains(t: T): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
index b081813cc823..849bd3e1f401 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusAssignOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun plusAssign(t: T) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
index b9198c2a9de9..1d13e8f9924a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusExtraArgs.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     operator fun unaryPlus(): A<T> = throw Exception()
     operator fun plus(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
index 776f3a98a47c..32f17e86624b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusForAssignmentOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun plus(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
index b42bad196814..a889a05e0292 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusMissingArgs.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun plus(i: Int, s: String): A<T> = throw Exception()
     operator fun plus(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
index 1d7261f03828..9ddb45d4efcc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnLibType.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 private operator fun Int.plus(a: A<Int>): A<Int> {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
index 99f6743a1cb0..7c7d3f7c4dff 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun plus(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
index 9bccf4e337c4..0f33222a74d6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/plusOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun plus(i: Int): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
index 9d8302c1b600..0135e7f97f6c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/quotedName.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 private infix fun Int.`!u00A0`(i: Int): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/typeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/typeMismatch.kt.after
index 7b7eb5769940..d10b86fd39b9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/typeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/typeMismatch.kt.after
@@ -8,5 +8,5 @@ fun test() {
 }
 
 private operator fun A.times(s: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
index 537f14c10460..7083d287207d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun contains(t: T): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
index 5fa2cd9a378f..f508173c1d0a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/binaryOperations/whenNotInOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun contains(t: T): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
index bcfa44dd5e72..2fad16ef3049 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateAnonymousObjectRuntime.kt.after
@@ -8,5 +8,5 @@ fun main(args: Array<String>) {
 }
 
 private fun <E> List<E>.foo(function: () -> A) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
index 7251a5ab54b6..1c4c076ac21e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/approximateLocalClassRuntime.kt.after
@@ -10,5 +10,5 @@ fun main(args: Array<String>) {
 }
 
 private fun <E> List<E>.foo(function: () -> A) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
index 9c6ba74bfd3f..532c1c8d9f6e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/argumentTypeMismatch.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 fun foo(n: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
index 512763242882..f0b947b59fb9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callInStringTemplateRuntime.kt.after
@@ -5,5 +5,5 @@ fun test() {
 }
 
 fun foo(): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after
index bd0356c4b181..d9df75d3bfd5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithClassLiteral.kt.after
@@ -10,5 +10,5 @@ fun main(args: Array<String>) {
 }
 
 fun checkProperty(kClass: KClass<out String>) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
index a63e1feb665b..13c693fb0095 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArg.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T, s: String, function: (T) -> T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
index 1ea04a5e83fe..6d9463824d0d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/callWithLambdaArgOnly.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(function: (T) -> T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
index 5bf898109114..3ed7b89b7e2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/doNotStripPrefix.kt.after
@@ -5,6 +5,6 @@ fun isModified(settings: Settings, c: C) = c.foo(settings)
 
 class C {
     fun foo(settings: Settings): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
index 32225c0e2d44..c7622f93fdf6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionFunction.kt.after
@@ -10,5 +10,5 @@ fun A.test() {
 }
 
 private fun A.foo(n: Int): Boolean {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
index f2b9f9c37d3f..7bb1a536c744 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionLambda.kt.after
@@ -13,5 +13,5 @@ fun test() {
 }
 
 private fun A.foo(n: Int): Boolean {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
index 7c0d6995d2a4..258f3d67308d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertyGetter.kt.after
@@ -1,6 +1,6 @@
 private val A.foo: Boolean
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 // "Create extension property 'A.foo'" "true"
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
index 90897833aff2..c0c394b36b8c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionByExtensionReceiver/extensionPropertySetter.kt.after
@@ -1,6 +1,6 @@
 private var A.foo: Boolean
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
     set() {}
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
index d36eb259e372..8ba89d10fbaf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnGroovyType.after.kt
@@ -6,5 +6,5 @@ fun test(): Int {
 }
 
 private fun A.foo(): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
index 073ef0269e95..19afb02e2bfc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnJavaType.after.kt
@@ -6,5 +6,5 @@ fun test(): Int? {
 }
 
 private fun A.foo(i: Int, s: String): Int? {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
index f1ce12d3513f..aa256bbf345b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTrait.kt.after
@@ -7,5 +7,5 @@ fun test(t: T) {
 }
 
 private fun T.foo(s: String, i: Int): Boolean {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
index da7905495985..ee943ca87b3c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/extensionFunOnTypeFromAnotherPackage.after.kt
@@ -11,5 +11,5 @@ class X {
 }
 
 private fun package2.A.foo() {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
index 6263bb5c379f..35682154cf32 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funExtraArgs.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun foo(a: Int): A<T> = throw Exception()
     fun foo(a: T, s: String): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineInternalFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineInternalFun.kt.after
index 4fc99604501b..c5bd242181f5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineInternalFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineInternalFun.kt.after
@@ -5,6 +5,6 @@ class C {
     }
 
     private fun g() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePrivateFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePrivateFun.kt.after
index c358f5647dab..7cbfb04be187 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePrivateFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePrivateFun.kt.after
@@ -5,6 +5,6 @@ class C {
     }
 
     private fun g() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineProtectedFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineProtectedFun.kt.after
index b318156d463a..a22cdd9606fa 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineProtectedFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlineProtectedFun.kt.after
@@ -5,6 +5,6 @@ class C {
     }
 
     protected fun g() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePublicFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePublicFun.kt.after
index f74afbddc304..ffecef4e73a3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePublicFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funInInlinePublicFun.kt.after
@@ -5,6 +5,6 @@ class C {
     }
 
     fun g() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
index ab771a0f5757..3cc6f0770923 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funMissingArgs.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<T> = throw Exception()
     fun foo(i: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
index ad74836f3062..1453e1a929eb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnClassObject.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     companion object {
         fun foo(i: Int): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
 
     }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass.kt.after
index a16123e04c9b..235403bc9edf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass.kt.after
@@ -7,6 +7,6 @@ enum class Bar {
     BAZ;
 
     fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass2.kt.after
index a16123e04c9b..235403bc9edf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnEnumClass2.kt.after
@@ -7,6 +7,6 @@ enum class Bar {
     BAZ;
 
     fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
index dc9e31f22509..df0e2d14827e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibObject.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 private fun Unit.foo(i: Int): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
index d7711e865e62..18f253b4a8ef 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnLibType.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 private fun Int.foo(a: A<Int>): A<Int> {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
index 289010a1406c..f34a3d240e9f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnTrait.kt.after
@@ -2,7 +2,7 @@
 
 interface T {
     fun foo(s: String, i: Int): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
index afb7e43e8c21..c697130a1259 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserObject.kt.after
@@ -2,7 +2,7 @@
 
 object A {
     fun foo(i: Int): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
index 809ef3c29b3f..59756fd78cc7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
index 50f254721563..c617c7f249d5 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithDeclarations.kt.after
@@ -5,7 +5,7 @@ class F {
     }
 
     fun foo(i: Int, s: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
index 03ec451c5527..29ad5a322f87 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(u: T): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
index f6fda652afd5..d96142cc4983 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funPlacement.kt.after
@@ -8,7 +8,7 @@ class A {
     }
 
     private fun foo(): A {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     fun bar() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
index e1e532cfd1aa..f3df7bb7465f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithExplicitParamNamesOnUserType.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     fun foo(abc: T, ghi: A<T>, def: String): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
index 79e5ba8498d3..64bf990644f2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableParamType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T?): A<Int> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
index 2cc12cca10f0..db4abb6131c1 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<T>? {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
index 7b56ef251ab3..74c96d6d6b1f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithNullableTypeParameter.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(t: T): A<String> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
index e7f4bf13f022..59929c655b47 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/funWithPackageName.kt.after
@@ -7,5 +7,5 @@ fun test() {
 }
 
 fun foo(i: Int, s: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
index 2e9e9484e865..e81980cb577b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalType.kt.after
@@ -5,5 +5,5 @@ fun foo(block: (Int) -> String) {
 }
 
 fun bar(block: (Int) -> String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
index 91af8e2822b6..8f4d2bccad36 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/functionalTypeInReceiver.kt.after
@@ -5,5 +5,5 @@ fun foo(block: (Int) -> String) {
 }
 
 private fun <P1, R> ((P1) -> R).bar() {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunBlockWithExpectedType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunBlockWithExpectedType.kt.after
index 1e08b27a1390..473a1c73f17e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunBlockWithExpectedType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunBlockWithExpectedType.kt.after
@@ -9,5 +9,5 @@ fun foo(l: A<String>): A<Int> {
 }
 
 fun bar(it: String): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunExprWithExpectedType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunExprWithExpectedType.kt.after
index ae1ca8fc2af3..dea820c69162 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunExprWithExpectedType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inAnonymousFunExprWithExpectedType.kt.after
@@ -10,5 +10,5 @@ fun foo(l: A<String>): A<Int> {
 }
 
 fun bar(it: String): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
index 80c6cbcf9ba6..a765da24fed9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambda.kt.after
@@ -8,5 +8,5 @@ fun test() {
 }
 
 fun foo(): Any {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambdaWithExpectedType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambdaWithExpectedType.kt.after
index 28b2047ea358..8c4627dab09d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambdaWithExpectedType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inLambdaWithExpectedType.kt.after
@@ -10,5 +10,5 @@ fun foo(l: A<String>): A<Int> {
 }
 
 fun bar(it: String): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
index 8f6dfe86fb34..1c26f2f219a4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/inconsistentTypes.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     fun foo(s: String, t: T): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/insideIfCondition.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/insideIfCondition.kt.after
index 76bf79f0edaa..6709f5b80819 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/insideIfCondition.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/insideIfCondition.kt.after
@@ -4,5 +4,5 @@ fun bar() {
 }
 
 fun foo(): Boolean {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
index 3e05bc43eb0e..47cb5f08ba0c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/localFunNoReceiver.kt.after
@@ -2,7 +2,7 @@
 
 fun test() {
     fun foo(i: Int, s: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     fun nestedTest(): Int {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
index 16f5b8ad58bf..92499de0063e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberFunNoReceiver.kt.after
@@ -7,7 +7,7 @@ class A {
         }
 
         private fun foo(i: Int, s: String): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
index 21ba43063202..665c3a63a693 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberValDelegateRuntime.kt.after
@@ -6,6 +6,6 @@ class A<T>(val t: T) {
     val x: A<Int> by foo(t, "")
 
     private fun foo(t: T, s: String): ReadOnlyProperty<A<T>, A<Int>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
index 928fdad58ccb..9675de410d02 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/memberVarDelegateRuntime.kt.after
@@ -6,6 +6,6 @@ class A<T>(val t: T) {
     var x: A<Int> by foo(t, "")
 
     private fun foo(t: T, s: String): ReadWriteProperty<A<T>, A<Int>> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/nullableReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/nullableReceiver.kt.after
index 68581acacd16..0fad2439126b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/nullableReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/nullableReceiver.kt.after
@@ -4,5 +4,5 @@ fun context(p: String?) {
 }
 
 private fun String?.notExistingFun() {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
index c7e71553b85a..6f07ab6b6710 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/objectMemberFunNoReceiver.kt.after
@@ -7,7 +7,7 @@ class A {
         }
 
         private fun foo(i: Int, s: String): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
index 13bc0da3702d..481b4fe01047 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/privateForMembers.kt.after
@@ -5,6 +5,6 @@ class A {
     }
 
     private fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
index ffa1f7caa63f..840a3e9f6e73 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/qualifiedCallInStringTemplateRuntime.kt.after
@@ -2,7 +2,7 @@
 
 class A {
     fun foo(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/receiverWithSmartCast.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/receiverWithSmartCast.kt.after
index c04e19e8b260..cf03ab71fe52 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/receiverWithSmartCast.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/receiverWithSmartCast.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'SomeObj.doSomething'" "true"
 class SomeObj {
     fun doSomething() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
index f303d54fbc78..5097ac355a33 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithIs.kt.after
@@ -5,5 +5,5 @@ fun test(o: Any) {
 }
 
 fun foo(o: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
index 656dff6fb345..f43d752bb431 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/smartCastWithNullCheck.kt.after
@@ -6,5 +6,5 @@ fun test(s: String?) {
 }
 
 fun foo(s: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
index 6749ece5ccd6..4b81f4307de0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/stripPrefix.kt.after
@@ -5,6 +5,6 @@ fun isModified(setOptions: SetOptions, c: C) = c.foo(setOptions)
 
 class C {
     fun foo(options: SetOptions): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
index 8dae9264e640..bce50aed150a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInClass.kt.after
@@ -6,6 +6,6 @@ class A<T>(val n: T) {
     }
 
     private fun foo(i: Int, s: String): A<Int> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
index 2736a4299138..a7a806000d9c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInExtension.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     fun foo(i: Int, s: String): A<Int> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
index 4f4d88331096..187c83c6ac54 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass1.kt.after
@@ -7,7 +7,7 @@ class A<T>(val n: T) {
         }
 
         private fun foo(i: Int, s: String): A<Int> {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
index 8a93f9c27b5b..499f36cdbcf4 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/thisInNestedClass2.kt.after
@@ -8,6 +8,6 @@ class A<T>(val n: T) {
     }
 
     private fun foo(i: Int, s: String): A<Int> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
index 96a94cac9ac1..e03c05458b2c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunNoReceiver.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun foo(i: Int, s: String): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
index 135e17671be9..c17e99a8b39e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/topLevelFunPlacement.kt.after
@@ -7,7 +7,7 @@ fun test() {
 }
 
 fun foo(): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
 
 fun bar() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
index 6e24ed17482b..60c996c7ac34 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/callWithStarProjection.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T> foo(i: Int, t: T): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
index a50b6631fe3c..345652b5e142 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMember.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U, V> foo(u: U, v: V): U {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberInFunctionLiteralWithReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberInFunctionLiteralWithReceiver.kt.after
index 3b9b10c2ffd3..38b5d6fcd00d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberInFunctionLiteralWithReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberInFunctionLiteralWithReceiver.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'T.bar'" "true"
 open class X {
     fun bar() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
index 02b70bad814f..3dae8b9967cc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberPartialSubstitution.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U> foo(i: Int, u: U): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
index a50b6631fe3c..345652b5e142 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/classMemberWithReceiverArg.kt.after
@@ -2,7 +2,7 @@
 
 class B<T>(val t: T) {
     fun <U, V> foo(u: U, v: V): U {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
index 10e9092ab067..02e5fc994e22 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extension.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 private fun <E, T, U> List<E>.foo(t: T, u: U): T {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
index f5bef78f55e8..1fa36b8dd643 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionPartialSubstitution.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 private fun <E, T> List<E>.foo(t: T, s: String): T {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
index 10e9092ab067..02e5fc994e22 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithReceiverArg.kt.after
@@ -8,5 +8,5 @@ class A<T>(val items: List<T>) {
 }
 
 private fun <E, T, U> List<E>.foo(t: T, u: U): T {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
index cbcc1fbf12a2..1c07d2641a02 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/extensionWithTypeParameterAsReceiver.kt.after
@@ -4,5 +4,5 @@ fun <T> foo(t: T) {
 }
 
 private fun <T> T.bar() {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
index 777c5a8e839d..a5ce08dc0075 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiver.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U> foo(u: U, t: T): U {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
index 6711ba917d55..9ca7ad473bbb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverExtraArgs.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U, V> foo(u: U, t: T): U {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
index 777c5a8e839d..a5ce08dc0075 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverLongName.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T, U> foo(u: U, t: T): U {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
index 486f2c110bdf..d95d3a212fb2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/typeArguments/noReceiverPartialSubstitution.kt.after
@@ -5,5 +5,5 @@ fun test(): Int {
 }
 
 fun <T> foo(t: T, s: String): T {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
index 0baf8e7f28eb..198705957939 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unitFun.kt.after
@@ -5,5 +5,5 @@ fun test() {
 }
 
 fun foo(i: Int, s: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
index 52cbb8e2923b..ea7a16c204c7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unknownType.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     fun foo(s: Any, t: T): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
index a95f4484d16d..abeb2f542966 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/call/unresolvedSupertype.kt.after
@@ -3,7 +3,7 @@
 
 class A: B {
     fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
index 0fdc6a1c701e..b05bd90b4578 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionNoReceiverInCallableRef.kt.after
@@ -5,7 +5,7 @@ fun consume(s: String) {}
 
 fun test() {
     fun foo(i: Int): String {
-        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("Not yet implemented")</selection>
     }
     consume(1.map(::foo))
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
index e0ce404bfb7d..8bf6f1a8f617 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/extensionWithReceiverInCallableRef.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 private fun Int.foo(): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
index b01beaca77c8..f1ad621cb39f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/noExpectedReturnType.kt.after
@@ -3,7 +3,7 @@ fun <T, U> T.map(f: (T) -> U) = f(this)
 
 fun test() {
     fun foo(i: Int): Any {
-        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("Not yet implemented")</selection>
     }
     1.map(::foo)
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
index 002d1fc00f0d..76deb08290c2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/nonExtensionWithReceiverInCallableRef.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 private fun Int.foo(): String {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
index 30dbe9eea150..ab6c831605f8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/callableReferences/withExpectedReturnType.kt.after
@@ -5,7 +5,7 @@ fun consume(s: String) {}
 
 fun test() {
     fun foo(i: Int): String {
-        <selection>TODO("not implemented") //To change body of created functions use File | Settings | File Templates.</selection>
+        <selection>TODO("Not yet implemented")</selection>
     }
     consume(1.map(::foo))
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
index 393b00932db4..d051c848264f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage1.kt.after
@@ -3,7 +3,7 @@ class Foo<T> {
     operator fun component1(): Int { return 0 }
     operator fun component2(): Int { return 0 }
     operator fun component3(): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 fun foo() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
index e58a93e74c22..3c533fbc188c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage2.kt.after
@@ -3,7 +3,7 @@ class Foo<T> {
     operator fun component1(): Int { return 0 }
     operator fun component2(): Int { return 0 }
     operator fun component3(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 fun foo() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
index 34e4b402fe31..15dae3bdd6a3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/component/createComponentFromUsage3.kt.after
@@ -19,5 +19,5 @@ fun foo() {
 }
 
 private operator fun Any.component2(): Int {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVal.kt.after
index 788d88101414..fbe3e90fc578 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVal.kt.after
@@ -6,5 +6,5 @@ fun x(parameters: String) {
 }
 
 private operator fun String.getValue(nothing: Nothing?, property: KProperty<*>): Any {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVar.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVar.kt.after
index b97ffc8ea5b7..d16143870ebd 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVar.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/localVar.kt.after
@@ -6,9 +6,9 @@ fun x(parameters: String) {
 }
 
 private operator fun String.setValue(nothing: Nothing?, property: KProperty<*>, any: Any) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
 
 private operator fun String.getValue(nothing: Nothing?, property: KProperty<*>): Any {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
index 46d0dd03d886..cb807b09c9dc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/val.kt.after
@@ -3,7 +3,7 @@ import kotlin.reflect.KProperty
 // "Create member function 'F.getValue'" "true"
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
index 416ab5e9f540..6d0213e5b961 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/var.kt.after
@@ -3,11 +3,11 @@ import kotlin.reflect.KProperty
 // "Create member function 'F.getValue', function 'F.setValue'" "true"
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     operator fun setValue(x: X, property: KProperty<*>, i: Int) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
index 89620ef6380a..6e7c48061d04 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingGet.kt.after
@@ -4,7 +4,7 @@ import kotlin.reflect.KProperty
 class F {
     operator fun setValue(x: X, property: KProperty<*>, i: Int) { }
     operator fun getValue(x: X, property: KProperty<*>): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
index 3f9e96d34261..9eb25bc89b42 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/delegateAccessors/varMissingSet.kt.after
@@ -4,7 +4,7 @@ import kotlin.reflect.KProperty
 class F {
     operator fun getValue(x: X, property: KProperty<*>): Int = 1
     operator fun setValue(x: X, property: KProperty<*>, i: Int) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/classMember.after.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/classMember.after.Dependency.kt
index e9ff13191a88..df3ce83bea7c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/classMember.after.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/classMember.after.Dependency.kt
@@ -1,6 +1,6 @@
 class K {
     fun foo(i: Int, s: String): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/companionMember.after.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/companionMember.after.Dependency.kt
index 117a207b18cb..19dc23de0b58 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/companionMember.after.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/companionMember.after.Dependency.kt
@@ -2,7 +2,7 @@ class K {
     companion object {
         @JvmStatic
         fun foo(i: Int, s: String): Boolean {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/nullType.after.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/nullType.after.Dependency.kt
index 519b1a1c5dc2..95fb4aa7326e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/nullType.after.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/nullType.after.Dependency.kt
@@ -1,5 +1,5 @@
 class Dep {
     fun foo(): Any? {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/topLevel.after.Dependency.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/topLevel.after.Dependency.kt
index 349691ba628f..99f447658c7e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/topLevel.after.Dependency.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/fromJava/topLevel.after.Dependency.kt
@@ -3,5 +3,5 @@
 fun test() {}
 
 fun foo(i: Int, s: String): Boolean {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
index 295c54adaeca..464a83b8f429 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage1.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
index 4c56327e8d43..b50fd847b48f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage10.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String, w: T): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
index b35e9e1d3ed5..0d39c7f5602e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage11.kt.after
@@ -2,7 +2,7 @@
 
 class Foo<T> {
     operator fun get(s: String, w: T): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
index a506f22361fb..138aedf662c3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage12.kt.after
@@ -2,7 +2,7 @@
 
 class Foo<T> {
     operator fun get(s: String, w: T): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
index cd7e6a3fc9f8..7c719d79f77f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage13.kt.after
@@ -10,6 +10,6 @@ class Foo<T> {
     }
 
     private operator fun <V> get(s: String, w: ArrayList<V>): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
index 98d024f4524b..b598c841a63d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage2.kt.after
@@ -6,5 +6,5 @@ fun x (y: Any) {
 }
 
 private operator fun Any.get(s: String): Any {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
index fe59141de0c6..cc85f50aa919 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage3.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
index 6ab64dba583d..fde01ac70add 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage4.kt.after
@@ -6,6 +6,6 @@ class Foo<T, S: Iterable<T>> {
     }
 
     private operator fun get(s: String): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
index 0bdc764ab9eb..8393ef8cb8a2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage5.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun <V> get(s: String, w: Iterable<V>): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
index 9b5b0f7a1ffa..a1ccf396888d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage7.kt.after
@@ -8,6 +8,6 @@ class Foo<T> {
     }
 
     private operator fun <V, T1> get(s: String, w: ArrayList<V>, v: T1): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
index d93272dcb60b..d86d58770839 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage8.kt.after
@@ -8,6 +8,6 @@ class Foo<T> {
     }
 
     private operator fun get(s: String, w: T): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
index f56cf3104c99..25b81720bb2b 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/createGetFromUsage9.kt.after
@@ -8,6 +8,6 @@ class Foo<S> {
     }
 
     private operator fun get(s: String, w: S): S {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/typeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/typeMismatch.kt.after
index 6ce87dc96e94..056a59d03725 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/typeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/get/typeMismatch.kt.after
@@ -8,5 +8,5 @@ fun test() {
 }
 
 private operator fun A.get(s: String) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
index 1944d27ac0df..c8cd419632a2 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage1.kt.after
@@ -5,7 +5,7 @@ class FooIterator<T> {
     }
 
     operator fun hasNext(): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class Foo<T> {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
index bd18e6b64bd6..76d6e962464a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/hasNext/createHasNextFromUsage2.kt.after
@@ -5,7 +5,7 @@ class FooIterator<T> {
     }
 
     operator fun hasNext(): Boolean {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class Foo<T> {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
index cda1ad4f442d..90efd552ad70 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnLibType.kt.after
@@ -8,5 +8,5 @@ fun test(): A<String> {
 }
 
 private operator fun Int.invoke(i: Int, s: String): A<String> {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
index 1d0f2b4edfb8..dcc9601a8060 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun invoke(t: T, s: String): B<String> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
index aa4a1bc6bf24..97735e9f5e2d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun <V> invoke(u: T, s: String): B<V> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
index f9e0fde6b703..66018cd157a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/invokeWithExplicitParamNamesOnUserType.kt.after
@@ -3,7 +3,7 @@
 
 class A<T>(val n: T) {
     operator fun invoke(abc: T, ghi: A<T>, def: String): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after
index 48bbcd7bf52c..70f64b900eb0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/invoke/lambdaArgument.kt.after
@@ -9,5 +9,5 @@ fun test() {
 }
 
 private operator fun Test.invoke(function: () -> Unit) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
index ea47bd3abcc5..12ab07d25610 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage1.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'Foo.iterator'" "true"
 class Foo<T> {
     operator fun iterator(): Iterator<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
index 494d9c68a8eb..0503d7423f72 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage2.kt.after
@@ -1,7 +1,7 @@
 // "Create member function 'Foo.iterator'" "true"
 class Foo<T> {
     operator fun iterator(): Iterator<String> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
index 897907ef74ea..1a74e49d078f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/iterator/createIteratorFromUsage3.kt.after
@@ -2,7 +2,7 @@
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
     operator fun next(): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class Foo<T> {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
index 4f1b44454983..887d3d1a8511 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage1.kt.after
@@ -2,7 +2,7 @@
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
     operator fun next(): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class Foo<T> {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
index 26118ae3ce5b..fd3bbc81336a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/next/createNextFromUsage2.kt.after
@@ -2,7 +2,7 @@
 class FooIterator<T> {
     operator fun hasNext(): Boolean { return false }
     operator fun next(): T {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class Foo<T> {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
index 77eafb372bc3..a54cb7c614e3 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage1.kt.after
@@ -6,6 +6,6 @@ class Foo<T> {
     }
 
     private operator fun set(s: String, w: T, value: T) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
index a62bb47c066a..dbececafe84d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/createSetFromUsage2.kt.after
@@ -10,5 +10,5 @@ class Foo<T> {
 }
 
 private operator fun <T> Any.set(s: String, w: ArrayList<T>, value: ArrayList<T>) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
index e957be1cedc8..e45ba0f61d8f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/setterForIncrement.kt.after
@@ -2,7 +2,7 @@
 class A {
     operator fun get(s: String): Int = 1
     operator fun set(s: String, value: Int) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/typeMismatch.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/typeMismatch.kt.after
index 50fbdb4630ee..cc1dad3a3690 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/typeMismatch.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/set/typeMismatch.kt.after
@@ -10,5 +10,5 @@ fun test() {
 }
 
 private operator fun A.set(s: String, value: Int) {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
index 948c3a8bc8eb..e2b2ee871d59 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/incOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun inc(): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
index 930114d1dfa2..c31569ddd86f 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusMissingArgs.kt.after
@@ -3,7 +3,7 @@
 class A<T>(val n: T) {
     operator fun minus(n: Int): A<T> = throw Exception()
     operator fun unaryMinus(): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
index 5e0a83e177e8..fd7b55467501 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnLibType.kt.after
@@ -6,5 +6,5 @@ fun test() {
 }
 
 private operator fun Boolean.unaryMinus(): Any {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
index c2f2c899214c..ab696377b1e6 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserType.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun unaryMinus(): Any {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
index afac2a8cc43b..7861a0be06f9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createFunction/unaryOperations/minusOnUserTypeWithTypeParams.kt.after
@@ -2,7 +2,7 @@
 
 class A<T>(val n: T) {
     operator fun unaryMinus(): A<T> {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
index 254349b56ae8..5cc1c1e44bf7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionPropertyOnTypeFromAnotherPackage.after.kt
@@ -5,7 +5,7 @@ import package1.A
 
 private val package2.A.foo: Any
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 class X {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
index 50d00e1bc0d2..1ec06b94b719 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnGroovyType.after.kt
@@ -3,7 +3,7 @@
 
 private val A.foo: String?
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 fun test(): String? {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
index 50d00e1bc0d2..1ec06b94b719 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionValOnJavaType.after.kt
@@ -3,7 +3,7 @@
 
 private val A.foo: String?
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 fun test(): String? {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
index 625af8b58cd2..c344ae0f0ddb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/extensionWithTypeParameterAsReceiver.kt.after
@@ -1,6 +1,6 @@
 private val <T> T.bar: Int
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 // "Create extension property 'T.bar'" "true"
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/nullableReceiver.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/nullableReceiver.kt.after
index 9a6fc482d18a..802acde1144e 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/nullableReceiver.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/nullableReceiver.kt.after
@@ -1,6 +1,6 @@
 private val String?.notExistingVal: Int
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 // "Create extension property 'String?.notExistingVal'" "true"
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
index 8ed87ae73bb8..9a6df14a158c 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibObject.kt.after
@@ -3,7 +3,7 @@
 
 private val Unit.foo: Int
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 fun test() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
index e646bc4ede9c..57b84e018e7d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/valOnLibType.kt.after
@@ -3,7 +3,7 @@
 
 private val Int.foo: A<Int>
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
 class A<T>(val n: T)
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
index 338ab244bd93..fc3f4e5163bc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/createFromUsage/createVariable/property/varOnLibType.kt.after
@@ -3,7 +3,7 @@
 
 private var Int.foo: A<String>
     get() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
     set() {}
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/declarationCantBeInlined/inInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/declarationCantBeInlined/inInterface.kt.after
index 0472973ca3a2..97f1caa446a9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/declarationCantBeInlined/inInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/declarationCantBeInlined/inInterface.kt.after
@@ -4,5 +4,5 @@ interface B {
 }
 
 inline fun B.foo() {
-    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    TODO("Not yet implemented")
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
index 5e50e8ad98b6..608b72782636 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/abstract.kt.after
@@ -10,10 +10,10 @@ private abstract class Base {
 
 private class BaseImpl : Base() {
     override var x: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
         set(value) {}
 
     override fun toInt(arg: String): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddExpectForVal.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddExpectForVal.kt.after
index 53a4aca2dc30..e265923556a9 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddExpectForVal.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddExpectForVal.kt.after
@@ -12,9 +12,9 @@ expect interface InterfaceWithVals {
 
 class ChildOfInterface : InterfaceWithVals{
     override fun funInInterface() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override val importantVal: Int
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddHeader.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddHeader.kt.after
index 6877b34b8932..6624412d6319 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddHeader.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/doNotAddHeader.kt.after
@@ -10,6 +10,6 @@ expect interface InterfaceWithFuns {
 
 class ChildOfInterface : InterfaceWithFuns{
     override fun funInInterface() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
index 83535db97ecd..74c7ab5af3fc 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/inner.kt.after
@@ -9,7 +9,7 @@ class Container {
 
     inner class BaseImpl : Base() {
         override fun foo(): String {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
index 8a022ab5dbcf..35952ab527f7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/interface.kt.after
@@ -10,6 +10,6 @@ interface Base {
 
 class BaseImpl : Base {
     override fun foo(x: Int): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
index 4c63b30047a9..5c7c6bcef5da 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nested.kt.after
@@ -17,10 +17,10 @@ class Container {
 
 class BaseImpl : Container.Base {
     override val x: Boolean
-        get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+        get() = TODO("Not yet implemented")
 
     override fun bar(z: Int): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
index 8c9f05a34b51..33fcb7e0df94 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/nestedPrivateInterface.kt.after
@@ -9,7 +9,7 @@ class Container {
 
     class BaseImpl : Base {
         override var z: Double
-            get() = TODO("not implemented") //To change initializer of created properties use File | Settings | File Templates.
+            get() = TODO("Not yet implemented")
             set(value) {}
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
index c2e37d06e840..b380f48a2cfb 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealed.kt.after
@@ -6,7 +6,7 @@ sealed class Base {
     abstract fun foo(): Int
     class BaseImpl : Base() {
         override fun foo(): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
index 8dcd81dfea5c..bbe48e11cb9d 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/implement/sealedWithConflict.kt.after
@@ -11,7 +11,7 @@ sealed class Base {
 
     class BaseImpl1 : Base() {
         override fun foo(): Int {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameter.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameter.after.kt
index e1040b782ca0..df769c834fda 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameter.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameter.after.kt
@@ -2,6 +2,6 @@
 // DISABLE-ERRORS
 class A(private val name: String) : JavaInterface {
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPrivate.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPrivate.after.kt
index f7efb35acb36..7ceb3b20d6c7 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPrivate.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPrivate.after.kt
@@ -2,6 +2,6 @@
 // DISABLE-ERRORS
 class A(private val name: String) : JavaInterface {
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasProtected.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasProtected.after.kt
index e1040b782ca0..df769c834fda 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasProtected.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasProtected.after.kt
@@ -2,6 +2,6 @@
 // DISABLE-ERRORS
 class A(private val name: String) : JavaInterface {
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPublic.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPublic.after.kt
index e1040b782ca0..df769c834fda 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPublic.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/parameterHasPublic.after.kt
@@ -2,6 +2,6 @@
 // DISABLE-ERRORS
 class A(private val name: String) : JavaInterface {
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/property.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/property.after.kt
index 9be708fa3f80..e88ec2802448 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/property.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/property.after.kt
@@ -3,6 +3,6 @@
 class B : JavaClass() {
     private val name: String = ""
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.after.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.after.kt
index a4b883e61aff..42b33e7d56a8 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.after.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.after.kt
@@ -2,10 +2,10 @@
 // DISABLE-ERRORS
 class A(private var name: String) : JavaInterface {
     override fun setName(name: String?) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.before.Main.kt b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.before.Main.kt
index 29f3b93b104a..491ddfa6ed7a 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.before.Main.kt
+++ b/plugins/kotlin/idea/tests/testData/quickfix/makePrivateAndOverrideMember/setter.before.Main.kt
@@ -2,6 +2,6 @@
 // DISABLE-ERRORS
 class A(<caret>var name: String) : JavaInterface {
     override fun getName(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/implementMember.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/implementMember.kt.after
index 154ccd2b23d0..ba820ab1e7bf 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/implementMember.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/implementMember.kt.after
@@ -6,6 +6,6 @@ interface I {
 
 class A : I {
     override fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/implementMemberFromAbstractClass.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
index d549b5684a37..f3b79b8082e0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/implementMemberFromAbstractClass.kt.after
@@ -6,6 +6,6 @@ abstract class A {
 
 class B : A() {
     override fun foo() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after
index e7b6edf404ee..175d56e311e0 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/override/nothingToOverride/addFunctionNonUnitReturnType.kt.after
@@ -2,7 +2,7 @@
 // WITH_RUNTIME
 open class A {
     open fun f(): Int {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
 class B : A() {
diff --git a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
index 5af7155d8114..c0f253ad5961 100644
--- a/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
+++ b/plugins/kotlin/idea/tests/testData/quickfix/typeMismatch/letClassImplementInterface.kt.after
@@ -15,6 +15,6 @@ interface A {
 }
 class B : A {
     override fun gav() {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        TODO("Not yet implemented")
     }
 }
\ No newline at end of file
diff --git a/plugins/kotlin/live-templates/tests/testData/anonymous_1.exp.kt b/plugins/kotlin/live-templates/tests/testData/anonymous_1.exp.kt
index 292e4969fc81..2349d4dad4d4 100644
--- a/plugins/kotlin/live-templates/tests/testData/anonymous_1.exp.kt
+++ b/plugins/kotlin/live-templates/tests/testData/anonymous_1.exp.kt
@@ -3,7 +3,7 @@ import javax.swing.SwingUtilities
 fun main(args : Array<String>) {
     SwingUtilities.invokeLater(object : Runnable {
         override fun run() {
-            TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+            TODO("Not yet implemented")
         }
     })
 }