From ed250198d83713cb5f17c5a8dfe83d26d6ae51af Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 20 Sep 2013 21:55:23 +0400
Subject: [PATCH] Revert replacing "NUMBER" to "INVOCATION_COUNT" and replace
 "TIME" to "INVOCATION_COUNT"

---
 .../completion/basic/common/BeforeDotInCall.kt     |  2 +-
 .../basic/common/DoNotCompleteForErrorReceivers.kt |  4 ++--
 .../common/DoNotCompleteForErrorReceiversForce.kt  |  4 ++--
 .../basic/common/ExtensionForProperty.kt           |  2 +-
 .../basic/common/ExtensionFunReceiver.kt           |  2 +-
 .../basic/common/ExtensionFunReceiverForce.kt      |  2 +-
 .../basic/common/ExtensionInsideFunction.kt        |  2 +-
 .../completion/basic/common/InMiddleOfPackage.kt   |  2 +-
 .../completion/basic/common/InPackageBegin.kt      |  2 +-
 .../completion/basic/common/InParametersTypes.kt   |  2 +-
 .../basic/common/InParametersTypesForce.kt         |  2 +-
 .../basic/common/NoClassNameDuplication.kt         |  4 ++--
 .../basic/common/NoObjectInTypePosition.kt         |  2 +-
 .../common/OnlyScopedClassesWithoutExplicit.kt     |  2 +-
 .../completion/basic/common/OverloadFunctions.kt   |  2 +-
 .../basic/common/StandardJetArrayFirst.kt          |  2 +-
 .../basic/common/StandardJetDoubleFirst.kt         |  2 +-
 .../common/VisibilityClassMembersFromExternal.kt   |  2 +-
 .../VisibilityClassMembersFromExternalForce.kt     |  2 +-
 .../basic/common/VisibilityInSubclass.kt           |  2 +-
 .../basic/common/VisibilityInSubclassForce.kt      |  2 +-
 .../completion/basic/java/AutoForceCompletion.kt   |  2 +-
 .../basic/java/ExtensionFromStandardLibrary.kt     |  4 ++--
 .../completion/basic/java/JavaClassNames.kt        |  2 +-
 .../java/NoClassNameDuplicationForRuntimeClass.kt  |  4 ++--
 .../basic/java/NoImportedJavaClassDuplication.kt   |  4 ++--
 .../completion/basic/java/PropertyMetadata.kt      |  4 ++--
 .../completion/basic/js/AutoForceCompletion.kt     |  2 +-
 .../multifile/DoNotCompleteWithConstraints-1.kt    |  2 +-
 .../multifile/ExtensionFunctionOnUnresolved-1.kt   |  2 +-
 .../basic/multifile/ExtensionOnNullable-1.kt       |  2 +-
 .../basic/multifile/ExtensionProperty-1.kt         |  2 +-
 .../multifile/NotImportedExtensionFunction-1.kt    |  2 +-
 .../completion/injava/ClassFromNamespace.java      |  2 +-
 idea/testData/completion/injava/JetSubpackage.java |  2 +-
 .../completion/keywords/InClassBeforeFun.kt        |  2 +-
 idea/testData/completion/keywords/InClassScope.kt  |  2 +-
 .../jet/completion/ExpectedCompletionUtils.java    | 14 +++++++-------
 .../JetFixtureCompletionBaseTestCase.java          |  4 ++--
 39 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/idea/testData/completion/basic/common/BeforeDotInCall.kt b/idea/testData/completion/basic/common/BeforeDotInCall.kt
index faafd3e035c..cbb4602e09d 100644
--- a/idea/testData/completion/basic/common/BeforeDotInCall.kt
+++ b/idea/testData/completion/basic/common/BeforeDotInCall.kt
@@ -15,5 +15,5 @@ class TestSample() {
     }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testVar, testFun, testTop
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt
index a93c88cab5f..5a9f02a0716 100644
--- a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt
+++ b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceivers.kt
@@ -4,5 +4,5 @@ fun anyfun() {
     a.b.c.d.e.f.<caret>
 }
 
-// TIME: 1
-// INVOCATION_COUNT: 0
\ No newline at end of file
+// INVOCATION_COUNT: 1
+// NUMBER: 0
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt
index 195e54cf0be..1e9a3d898b3 100644
--- a/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt
+++ b/idea/testData/completion/basic/common/DoNotCompleteForErrorReceiversForce.kt
@@ -4,5 +4,5 @@ fun anyfun() {
     a.b.c.d.e.f.<caret>
 }
 
-// TIME: 2
-// INVOCATION_COUNT: 0
\ No newline at end of file
+// INVOCATION_COUNT: 2
+// NUMBER: 0
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/ExtensionForProperty.kt b/idea/testData/completion/basic/common/ExtensionForProperty.kt
index e943ea36aed..2cc6f43a8ad 100644
--- a/idea/testData/completion/basic/common/ExtensionForProperty.kt
+++ b/idea/testData/completion/basic/common/ExtensionForProperty.kt
@@ -2,7 +2,7 @@ class Test {
     val St<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
 // EXIST_JAVA_ONLY: StringBuilder
diff --git a/idea/testData/completion/basic/common/ExtensionFunReceiver.kt b/idea/testData/completion/basic/common/ExtensionFunReceiver.kt
index d92e9701351..f6bebafaa79 100644
--- a/idea/testData/completion/basic/common/ExtensionFunReceiver.kt
+++ b/idea/testData/completion/basic/common/ExtensionFunReceiver.kt
@@ -3,7 +3,7 @@ fun testing() {}
 fun S<caret>
 
 // Should complete types for receiver after explicit basic completion call
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String
 // EXIST_JAVA_ONLY: StringBuffer
 // EXIST: Set
diff --git a/idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt b/idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt
index e58e0b8ff6b..0847eeba5e9 100644
--- a/idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt
+++ b/idea/testData/completion/basic/common/ExtensionFunReceiverForce.kt
@@ -2,7 +2,7 @@ class Test {
     val St<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
 // EXIST: StringBuilder
diff --git a/idea/testData/completion/basic/common/ExtensionInsideFunction.kt b/idea/testData/completion/basic/common/ExtensionInsideFunction.kt
index 0abe4c1c584..61f36bf7114 100644
--- a/idea/testData/completion/basic/common/ExtensionInsideFunction.kt
+++ b/idea/testData/completion/basic/common/ExtensionInsideFunction.kt
@@ -12,7 +12,7 @@ class StrMore {
   class StrAbsent
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: String~(jet)
 // EXIST: StrSome
 // EXIST: StrMore
diff --git a/idea/testData/completion/basic/common/InMiddleOfPackage.kt b/idea/testData/completion/basic/common/InMiddleOfPackage.kt
index cda80afcea2..55b048140d8 100644
--- a/idea/testData/completion/basic/common/InMiddleOfPackage.kt
+++ b/idea/testData/completion/basic/common/InMiddleOfPackage.kt
@@ -7,4 +7,4 @@ class Test {
 }
 
 // EXIST: util
-// INVOCATION_COUNT: 1
+// NUMBER: 1
diff --git a/idea/testData/completion/basic/common/InPackageBegin.kt b/idea/testData/completion/basic/common/InPackageBegin.kt
index d6ad5e84a65..145e0f062cb 100644
--- a/idea/testData/completion/basic/common/InPackageBegin.kt
+++ b/idea/testData/completion/basic/common/InPackageBegin.kt
@@ -2,4 +2,4 @@ package kttesting<caret>.util
 
 // Test that there won't be package with completion fake suffix
 
-// INVOCATION_COUNT: 0
\ No newline at end of file
+// NUMBER: 0
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/InParametersTypes.kt b/idea/testData/completion/basic/common/InParametersTypes.kt
index 30e9c5ff74d..103ad8e798c 100644
--- a/idea/testData/completion/basic/common/InParametersTypes.kt
+++ b/idea/testData/completion/basic/common/InParametersTypes.kt
@@ -4,7 +4,7 @@ class SomeClass {
   fun some(a : S<caret>)
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: SomeClass, SomeInternal
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
diff --git a/idea/testData/completion/basic/common/InParametersTypesForce.kt b/idea/testData/completion/basic/common/InParametersTypesForce.kt
index 3494cd6674a..121b67fdeeb 100644
--- a/idea/testData/completion/basic/common/InParametersTypesForce.kt
+++ b/idea/testData/completion/basic/common/InParametersTypesForce.kt
@@ -4,7 +4,7 @@ class SomeClass {
   fun some(a : S<caret>)
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: SomeClass, SomeInternal
 // EXIST: String~(jet)
 // EXIST: IllegalStateException
diff --git a/idea/testData/completion/basic/common/NoClassNameDuplication.kt b/idea/testData/completion/basic/common/NoClassNameDuplication.kt
index a8e55fb06da..05b09457aba 100644
--- a/idea/testData/completion/basic/common/NoClassNameDuplication.kt
+++ b/idea/testData/completion/basic/common/NoClassNameDuplication.kt
@@ -7,6 +7,6 @@ fun firstFun() {
     Testin<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: Testing
-// INVOCATION_COUNT: 1
\ No newline at end of file
+// NUMBER: 1
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/NoObjectInTypePosition.kt b/idea/testData/completion/basic/common/NoObjectInTypePosition.kt
index 4b790d52618..947dd133ad1 100644
--- a/idea/testData/completion/basic/common/NoObjectInTypePosition.kt
+++ b/idea/testData/completion/basic/common/NoObjectInTypePosition.kt
@@ -4,5 +4,5 @@ fun test() {
   val a : Named<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // ABSENT: NamedObject
diff --git a/idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt b/idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt
index f6ce087c2ae..0dd3c454b9e 100644
--- a/idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt
+++ b/idea/testData/completion/basic/common/OnlyScopedClassesWithoutExplicit.kt
@@ -4,6 +4,6 @@ fun firstFun() {
   val a = In<caret>
 }
 
-// TIME: 0
+// INVOCATION_COUNT: 0
 // EXIST: Int~(jet)
 // ABSENT: Int~(jet.runtime.SharedVar)
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/OverloadFunctions.kt b/idea/testData/completion/basic/common/OverloadFunctions.kt
index 1eda5fe6bd4..df91ec7b5f9 100644
--- a/idea/testData/completion/basic/common/OverloadFunctions.kt
+++ b/idea/testData/completion/basic/common/OverloadFunctions.kt
@@ -21,4 +21,4 @@ fun testMy() {
 }
 
 // EXIST: testOther
-// INVOCATION_COUNT: 3
\ No newline at end of file
+// NUMBER: 3
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/StandardJetArrayFirst.kt b/idea/testData/completion/basic/common/StandardJetArrayFirst.kt
index 3975218b443..2d98b01914e 100644
--- a/idea/testData/completion/basic/common/StandardJetArrayFirst.kt
+++ b/idea/testData/completion/basic/common/StandardJetArrayFirst.kt
@@ -2,7 +2,7 @@ fun main(args: Array<String>) {
     Array<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // WITH_ORDER: 1
 // EXIST: Array~(jet)
 // EXIST_JAVA_ONLY: Array~(java.sql)
diff --git a/idea/testData/completion/basic/common/StandardJetDoubleFirst.kt b/idea/testData/completion/basic/common/StandardJetDoubleFirst.kt
index 49aaa47e695..ec9b925d6ec 100644
--- a/idea/testData/completion/basic/common/StandardJetDoubleFirst.kt
+++ b/idea/testData/completion/basic/common/StandardJetDoubleFirst.kt
@@ -1,7 +1,7 @@
 fun some(a: Double<caret>) {
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // WITH_ORDER: 1
 // EXIST: Double~(jet)
 // EXIST_JAVA_ONLY: Double~(java.lang)
diff --git a/idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt
index f86a35eadf6..662f3d61895 100644
--- a/idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt
+++ b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternal.kt
@@ -9,7 +9,7 @@ fun test() {
     Some().<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: testPublic, testPackage
 // ABSENT: testPrivate, testProtected
 
diff --git a/idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt
index 50d16bb1690..35f95856c41 100644
--- a/idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt
+++ b/idea/testData/completion/basic/common/VisibilityClassMembersFromExternalForce.kt
@@ -9,5 +9,5 @@ fun test() {
     Some().<caret>
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testPublic, testProtected, testPrivate, testPackage
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/VisibilityInSubclass.kt b/idea/testData/completion/basic/common/VisibilityInSubclass.kt
index a401f4b76e6..302008b9955 100644
--- a/idea/testData/completion/basic/common/VisibilityInSubclass.kt
+++ b/idea/testData/completion/basic/common/VisibilityInSubclass.kt
@@ -11,6 +11,6 @@ class SomeSubclass : Some() {
     }
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: testPublic, testProtected, testPackage
 // ABSENT: testPrivate
\ No newline at end of file
diff --git a/idea/testData/completion/basic/common/VisibilityInSubclassForce.kt b/idea/testData/completion/basic/common/VisibilityInSubclassForce.kt
index 66f468b854b..5f7ea4af444 100644
--- a/idea/testData/completion/basic/common/VisibilityInSubclassForce.kt
+++ b/idea/testData/completion/basic/common/VisibilityInSubclassForce.kt
@@ -11,5 +11,5 @@ class SomeSubclass : Some() {
     }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: testPublic, testProtected, testPackage, testPrivate
diff --git a/idea/testData/completion/basic/java/AutoForceCompletion.kt b/idea/testData/completion/basic/java/AutoForceCompletion.kt
index 8737bea6d24..79439b1f978 100644
--- a/idea/testData/completion/basic/java/AutoForceCompletion.kt
+++ b/idea/testData/completion/basic/java/AutoForceCompletion.kt
@@ -1,4 +1,4 @@
 fun some(a : Statement<caret>)
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: Statement@Statement~(java.sql)
\ No newline at end of file
diff --git a/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt b/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt
index 75e5c5941c8..c9020d8199c 100644
--- a/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt
+++ b/idea/testData/completion/basic/java/ExtensionFromStandardLibrary.kt
@@ -7,6 +7,6 @@ fun firstFun() {
   a.toLinke<caret>
 }
 
-// TIME: 1
-// EXIST: toLinkedList@toLinkedList()~for jet.Iterable<T> in kotlin
 // INVOCATION_COUNT: 1
+// EXIST: toLinkedList@toLinkedList()~for jet.Iterable<T> in kotlin
+// NUMBER: 1
diff --git a/idea/testData/completion/basic/java/JavaClassNames.kt b/idea/testData/completion/basic/java/JavaClassNames.kt
index 82d4f9010c1..678d30d87dd 100644
--- a/idea/testData/completion/basic/java/JavaClassNames.kt
+++ b/idea/testData/completion/basic/java/JavaClassNames.kt
@@ -7,6 +7,6 @@ class Hello() {
    }
 }
 
-// TIME: 2
+// INVOCATION_COUNT: 2
 // EXIST: SortedMap, Short, Socket
 // ABSENT: hashSetOf
\ No newline at end of file
diff --git a/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt b/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt
index 5a7c6ef73d3..f93550aec1e 100644
--- a/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt
+++ b/idea/testData/completion/basic/java/NoClassNameDuplicationForRuntimeClass.kt
@@ -1,5 +1,5 @@
 val x = LineIterator<caret>
 
-// TIME: 1
-// EXIST: LineIterator~(kotlin.io)
 // INVOCATION_COUNT: 1
+// EXIST: LineIterator~(kotlin.io)
+// NUMBER: 1
diff --git a/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt b/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt
index 6360ee6f1a4..4557055bdb7 100644
--- a/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt
+++ b/idea/testData/completion/basic/java/NoImportedJavaClassDuplication.kt
@@ -2,6 +2,6 @@ import java.io.InputStreamReader
 
 val x = InputStreamReader<caret>
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: InputStreamReader~(java.io)
-// INVOCATION_COUNT: 1
\ No newline at end of file
+// NUMBER: 1
\ No newline at end of file
diff --git a/idea/testData/completion/basic/java/PropertyMetadata.kt b/idea/testData/completion/basic/java/PropertyMetadata.kt
index 40c0439f6c9..6de2bf054b4 100644
--- a/idea/testData/completion/basic/java/PropertyMetadata.kt
+++ b/idea/testData/completion/basic/java/PropertyMetadata.kt
@@ -5,7 +5,7 @@ fun firstFun() {
   val a = PropertyM<caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: PropertyMetadata@PropertyMetadata~(jet)
 // EXIST: PropertyMetadataImpl@PropertyMetadataImpl~(jet)
-// INVOCATION_COUNT: 2
+// NUMBER: 2
diff --git a/idea/testData/completion/basic/js/AutoForceCompletion.kt b/idea/testData/completion/basic/js/AutoForceCompletion.kt
index 1caa404a088..0e5afc8925a 100644
--- a/idea/testData/completion/basic/js/AutoForceCompletion.kt
+++ b/idea/testData/completion/basic/js/AutoForceCompletion.kt
@@ -1,4 +1,4 @@
 fun some(a : HTMLStyle<caret>)
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 // EXIST: HTMLStyleElement
diff --git a/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt b/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt
index 20b7ee4a494..2bc456b90ab 100644
--- a/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt
+++ b/idea/testData/completion/basic/multifile/DoNotCompleteWithConstraints-1.kt
@@ -12,4 +12,4 @@ fun firstFun() {
 // EXIST: testingExpectedFunction
 // ABSENT: testingUnexpectedFunction
 
-// INVOCATION_COUNT: 2
\ No newline at end of file
+// NUMBER: 2
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt b/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt
index 26634510535..784ac599a7a 100644
--- a/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt
+++ b/idea/testData/completion/basic/multifile/ExtensionFunctionOnUnresolved-1.kt
@@ -8,4 +8,4 @@ fun firstFun() {
 // ABSENT: helloFun
 // ABSENT: helloFunPreventAutoInsert
 // ABSENT: helloWithParams
-// INVOCATION_COUNT: 0
\ No newline at end of file
+// NUMBER: 0
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt
index 889c2a7e8a3..66e065edf74 100644
--- a/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt
+++ b/idea/testData/completion/basic/multifile/ExtensionOnNullable-1.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: helloFunPreventAutoInsert
 // EXIST: helloWithParams
 // ABSENT: helloFake
-// INVOCATION_COUNT: 3
\ No newline at end of file
+// NUMBER: 3
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt b/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt
index 86a839df13c..45b5e8b4acc 100644
--- a/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt
+++ b/idea/testData/completion/basic/multifile/ExtensionProperty-1.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: someProperty
 // EXIST: someOtherProperty
 // EXIST: someSelfProperty
-// INVOCATION_COUNT: 3
\ No newline at end of file
+// NUMBER: 3
\ No newline at end of file
diff --git a/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt b/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt
index 3c5c80a9227..dda68250d5e 100644
--- a/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt
+++ b/idea/testData/completion/basic/multifile/NotImportedExtensionFunction-1.kt
@@ -9,4 +9,4 @@ fun firstFun() {
 // EXIST: helloFunPreventAutoInsert
 // EXIST: helloWithParams
 // ABSENT: helloFake
-// INVOCATION_COUNT: 3
\ No newline at end of file
+// NUMBER: 3
\ No newline at end of file
diff --git a/idea/testData/completion/injava/ClassFromNamespace.java b/idea/testData/completion/injava/ClassFromNamespace.java
index 895b6fee5ec..632afe633cc 100644
--- a/idea/testData/completion/injava/ClassFromNamespace.java
+++ b/idea/testData/completion/injava/ClassFromNamespace.java
@@ -6,4 +6,4 @@ public class Testing {
 
 // EXIST: ClassFromJet
 // EXIST: SomePackage
-// INVOCATION_COUNT: 2
+// NUMBER: 2
diff --git a/idea/testData/completion/injava/JetSubpackage.java b/idea/testData/completion/injava/JetSubpackage.java
index 8cd7b98ddc3..cd7a9fe9f01 100644
--- a/idea/testData/completion/injava/JetSubpackage.java
+++ b/idea/testData/completion/injava/JetSubpackage.java
@@ -8,4 +8,4 @@ public class Testing {
 // ABSENT: jet2
 
 // Only two proposals expected
-// INVOCATION_COUNT: 1
+// NUMBER: 1
diff --git a/idea/testData/completion/keywords/InClassBeforeFun.kt b/idea/testData/completion/keywords/InClassBeforeFun.kt
index 28e107fae8e..1e180828fcc 100644
--- a/idea/testData/completion/keywords/InClassBeforeFun.kt
+++ b/idea/testData/completion/keywords/InClassBeforeFun.kt
@@ -7,7 +7,7 @@ public class Test {
     }
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 
 // EXIST:  abstract
 /* // ABSENT: annotation */
diff --git a/idea/testData/completion/keywords/InClassScope.kt b/idea/testData/completion/keywords/InClassScope.kt
index b05d22abacb..c8793d80321 100644
--- a/idea/testData/completion/keywords/InClassScope.kt
+++ b/idea/testData/completion/keywords/InClassScope.kt
@@ -2,7 +2,7 @@ class TestClass {
     <caret>
 }
 
-// TIME: 1
+// INVOCATION_COUNT: 1
 
 // EXIST:  abstract
 // ABSENT: annotation
diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
index cc8f61aae0a..3a57a262d71 100644
--- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
+++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java
@@ -104,11 +104,11 @@ public class ExpectedCompletionUtils {
     private static final String EXIST_JAVA_ONLY_LINE_PREFIX = "EXIST_JAVA_ONLY:";
     private static final String EXIST_JS_ONLY_LINE_PREFIX = "EXIST_JS_ONLY:";
 
-    private static final String NUMBER_LINE_PREFIX = "INVOCATION_COUNT:";
-    private static final String NUMBER_JS_LINE_PREFIX = "INVOCATION_COUNT_JS:";
-    private static final String NUMBER_JAVA_LINE_PREFIX = "INVOCATION_COUNT_JAVA:";
+    private static final String NUMBER_LINE_PREFIX = "NUMBER:";
+    private static final String NUMBER_JS_LINE_PREFIX = "NUMBER_JS:";
+    private static final String NUMBER_JAVA_LINE_PREFIX = "NUMBER_JAVA:";
 
-    private static final String EXECUTION_TIME_PREFIX = "TIME:";
+    private static final String INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:";
     private static final String WITH_ORDER_PREFIX = "WITH_ORDER:";
 
     public static final List<String> KNOWN_PREFIXES = ImmutableList.of(
@@ -121,7 +121,7 @@ public class ExpectedCompletionUtils {
             NUMBER_LINE_PREFIX,
             NUMBER_JS_LINE_PREFIX,
             NUMBER_JAVA_LINE_PREFIX,
-            EXECUTION_TIME_PREFIX,
+            INVOCATION_COUNT_PREFIX,
             WITH_ORDER_PREFIX);
 
     @NotNull
@@ -201,8 +201,8 @@ public class ExpectedCompletionUtils {
     }
 
     @Nullable
-    public static Integer getExecutionTime(String fileText) {
-        return InTextDirectivesUtils.getPrefixedInt(fileText, EXECUTION_TIME_PREFIX);
+    public static Integer getInvocationCount(String fileText) {
+        return InTextDirectivesUtils.getPrefixedInt(fileText, INVOCATION_COUNT_PREFIX);
     }
 
     public static boolean isWithOrder(String fileText) {
diff --git a/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java b/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
index 15e06753342..d30a9d760cf 100644
--- a/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
+++ b/idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java
@@ -47,9 +47,9 @@ public abstract class JetFixtureCompletionBaseTestCase extends LightCodeInsightF
 
         String fileText = myFixture.getFile().getText();
 
-        Integer completionTime = ExpectedCompletionUtils.getExecutionTime(fileText);
+        Integer invocationCount = ExpectedCompletionUtils.getInvocationCount(fileText);
 
-        myFixture.complete(CompletionType.BASIC, completionTime == null ? 0 : completionTime);
+        myFixture.complete(CompletionType.BASIC, invocationCount == null ? 0 : invocationCount);
 
         ExpectedCompletionUtils.assertDirectivesValid(fileText);