diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
similarity index 99%
rename from idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
rename to idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
index 75e4c513457..3398227ccb5 100644
--- a/idea/src/org/jetbrains/jet/plugin/codeInsight/TipsManager.kt
+++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt
@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude
 import org.jetbrains.jet.plugin.util.extensionsUtils.isExtensionCallable
 
-public object TipsManager{
+public object ReferenceVariantsHelper {
 
     public fun getReferenceVariants(
             expression: JetSimpleNameExpression,
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
index 975fe939891..aaf165908ff 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.*
 import org.jetbrains.jet.lang.resolve.BindingContext
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
 import org.jetbrains.jet.plugin.caches.resolve.*
-import org.jetbrains.jet.plugin.codeInsight.TipsManager
+import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.jet.plugin.completion.smart.SmartCompletion
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies
@@ -66,7 +66,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess
     protected val boldImmediateLookupElementFactory: LookupElementFactory = run {
         if (jetReference != null) {
             val expression = jetReference.expression
-            val receivers = TipsManager.getReferenceVariantsReceivers(expression, bindingContext!!)
+            val receivers = ReferenceVariantsHelper.getReferenceVariantsReceivers(expression, bindingContext!!)
             val dataFlowInfo = bindingContext.getDataFlowInfo(expression)
             val receiverTypes = receivers.flatMap {
                 SmartCastUtils.getSmartCastVariantsWithLessSpecificExcluded(it, bindingContext, dataFlowInfo)
@@ -112,7 +112,7 @@ abstract class CompletionSessionBase(protected val configuration: CompletionSess
     protected abstract fun doComplete()
 
     protected fun getReferenceVariants(kindFilter: DescriptorKindFilter): Collection<DeclarationDescriptor> {
-        return TipsManager.getReferenceVariants(jetReference!!.expression,
+        return ReferenceVariantsHelper.getReferenceVariants(jetReference!!.expression,
                                                 bindingContext!!,
                                                 kindFilter,
                                                 prefixMatcher.asNameFilter(),
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt
index 141c80b4a01..333d76bf291 100644
--- a/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt
+++ b/idea/src/org/jetbrains/jet/plugin/completion/PackageDirectiveCompletion.kt
@@ -25,7 +25,7 @@ import com.intellij.util.ProcessingContext
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.lang.psi.JetPackageDirective
 import org.jetbrains.jet.plugin.caches.resolve.*
-import org.jetbrains.jet.plugin.codeInsight.TipsManager
+import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper
 import org.jetbrains.jet.plugin.references.JetSimpleNameReference
 
 /**
@@ -53,7 +53,7 @@ object PackageDirectiveCompletion {
             val resolveSession = ref.expression.getLazyResolveSession()
             val bindingContext = resolveSession.resolveToElement(ref.expression)
 
-            val variants = TipsManager.getPackageReferenceVariants(ref.expression, bindingContext, prefixMatcher.asNameFilter())
+            val variants = ReferenceVariantsHelper.getPackageReferenceVariants(ref.expression, bindingContext, prefixMatcher.asNameFilter())
             for (variant in variants) {
                 val lookupElement = LookupElementFactory.DEFAULT.createLookupElement(resolveSession, variant)
                 if (!lookupElement.getLookupString().contains(DUMMY_IDENTIFIER)) {
diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
index 5c1d72da145..09f7cfda4b8 100644
--- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
@@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
-import org.jetbrains.jet.plugin.codeInsight.TipsManager;
+import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper;
 import org.jetbrains.jet.plugin.project.ResolveSessionForBodies;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
 
@@ -409,7 +409,7 @@ public class JetFunctionParameterInfoHandler implements ParameterInfoHandlerWith
                 return name.equals(refName);
             }
         };
-        Collection<DeclarationDescriptor> variants = TipsManager.INSTANCE$.getReferenceVariants(
+        Collection<DeclarationDescriptor> variants = ReferenceVariantsHelper.INSTANCE$.getReferenceVariants(
                 callNameExpression, bindingContext, new DescriptorKindFilter(DescriptorKindFilter.FUNCTIONS_MASK | DescriptorKindFilter.CLASSIFIERS_MASK, Collections.<DescriptorKindExclude>emptyList()), nameFilter, visibilityFilter);
 
         Collection<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>> itemsToShow = new ArrayList<Pair<? extends DeclarationDescriptor, ResolveSessionForBodies>>();