diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
index df9c4446488..b446a750583 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
@@ -53,7 +53,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
         kotlinInternalModeOriginalValue = KotlinInternalMode.enabled
         KotlinInternalMode.enabled = true
 
-        getProject().getComponent(javaClass<EditorTracker>())?.projectOpened()
+        getProject().getComponent(EditorTracker::class.java)?.projectOpened()
 
         invalidateLibraryCache(project)
 
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
index 185465ba848..37e0c5f8a4b 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
@@ -30,7 +30,7 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
             val offset = text.indexOf("<caret>")
 
             if (offset >= 0) {
-                text.delete(offset, offset + "<caret>".length())
+                text.delete(offset, offset + "<caret>".length)
                 doc.setText(text.toString())
             }
 
diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
index 3f5e0704cac..52d70037a7a 100644
--- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
+++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
@@ -96,7 +96,7 @@ public fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: RunnableWit
 
     // Base tearDown() invalidates builtins and std-lib files. Restore them with brute force.
     fun unInvalidateFile(file: PsiFileImpl) {
-        val field = javaClass<PsiFileImpl>().getDeclaredField("myInvalidated")!!
+        val field = PsiFileImpl::class.java.getDeclaredField("myInvalidated")!!
         field.setAccessible(true)
         field.set(file, false)
     }
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
index 84b20446e20..4d002d6f9d2 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
@@ -129,7 +129,7 @@ private fun Int.skipDriveOnWin(line: String): Int {
 private fun addMessage(message: Any?, messages: MutableList<Any>): Boolean {
     if (message == null) return false
     var duplicatesPrevious = false
-    val messageCount = messages.size()
+    val messageCount = messages.size
     if (messageCount > 0) {
         val lastMessage = messages.get(messageCount - 1)
         duplicatesPrevious = lastMessage == message
diff --git a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
index 20bcc5c0cb6..344c7c65577 100644
--- a/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
+++ b/idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
 import org.jetbrains.kotlin.psi.KtExpression
 
 fun getReferenceExpression(element: PsiElement?): KtSimpleNameExpression? {
-    return PsiTreeUtil.getParentOfType<KtSimpleNameExpression>(element, javaClass<KtSimpleNameExpression>())
+    return PsiTreeUtil.getParentOfType<KtSimpleNameExpression>(element, KtSimpleNameExpression::class.java)
 }
 
 // given 'R.a.b' returns info for all three parts of the expression 'a', 'b', 'R'