diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
index 45840212df8..22a696089ff 100644
--- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt
@@ -34,7 +34,7 @@ class Converter private(private val elementToConvert: PsiElement,
                         val settings: ConverterSettings,
                         val conversionScope: ConversionScope,
                         val referenceSearcher: ReferenceSearcher,
-                        val lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?,
+                        val resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?,
                         private val postProcessor: PostProcessor?,
                         private val commonState: Converter.CommonState,
                         private val personalState: Converter.PersonalState) {
@@ -61,16 +61,16 @@ class Converter private(private val elementToConvert: PsiElement,
 
     class object {
         public fun create(elementToConvert: PsiElement, settings: ConverterSettings, conversionScope: ConversionScope,
-                          referenceSearcher: ReferenceSearcher, lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?, postProcessor: PostProcessor?,
+                          referenceSearcher: ReferenceSearcher, resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?, postProcessor: PostProcessor?,
                           usageProcessingsCollector: (UsageProcessing) -> Unit): Converter {
-            return Converter(elementToConvert, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, CommonState(usageProcessingsCollector), PersonalState(null))
+            return Converter(elementToConvert, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, CommonState(usageProcessingsCollector), PersonalState(null))
         }
     }
 
     public fun withSpecialContext(context: PsiElement): Converter = withState(PersonalState(context))
 
     private fun withState(state: PersonalState): Converter
-            = Converter(elementToConvert, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, commonState, state)
+            = Converter(elementToConvert, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, commonState, state)
 
     private fun createDefaultCodeConverter() = CodeConverter(this, DefaultExpressionConverter(), DefaultStatementConverter(), null)
 
diff --git a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt
index fb9b007a9f4..955f4012083 100644
--- a/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/JavaToKotlinConverter.kt
@@ -48,7 +48,7 @@ public class JavaToKotlinConverter(private val project: Project,
                                    private val settings: ConverterSettings,
                                    private val conversionScope: ConversionScope /*TODO: drop this parameter*/,
                                    private val referenceSearcher: ReferenceSearcher,
-                                   private val lazyResolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?) {
+                                   private val resolveSessionGetter: ((JetElement) -> KotlinCodeAnalyzer)?) {
     private val LOG = Logger.getInstance("#org.jetbrains.jet.j2k.JavaToKotlinConverter")
 
     public fun elementsToKotlin(psiElementsAndProcessors: List<Pair<PsiElement, PostProcessor?>>): List<String> {
@@ -61,7 +61,7 @@ public class JavaToKotlinConverter(private val project: Project,
                 usageProcessings.put(usageProcessing.targetElement, usageProcessing)
             }
             for ((psiElement, postProcessor) in psiElementsAndProcessors) {
-                val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, lazyResolveSessionGetter, postProcessor, usageProcessingCollector)
+                val converter = Converter.create(psiElement, settings, conversionScope, referenceSearcher, resolveSessionGetter, postProcessor, usageProcessingCollector)
                 val result = converter.convert()
                 intermediateResults.add(result)
             }
diff --git a/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt
index f24f28ad2d4..bd4a0fd1cc7 100644
--- a/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/TypeConverter.kt
@@ -370,7 +370,7 @@ class TypeConverter(val converter: Converter) {
         override fun fromAnnotations(owner: PsiModifierListOwner): Mutability {
             if (owner is KotlinLightElement<*, *>) {
                 val jetDeclaration = owner.origin as? JetCallableDeclaration ?: return Mutability.Default
-                val codeAnalyzer = converter.lazyResolveSessionGetter?.invoke(jetDeclaration)
+                val codeAnalyzer = converter.resolveSessionGetter?.invoke(jetDeclaration)
                 val descriptor = codeAnalyzer?.resolveToDescriptor(jetDeclaration)
                                          as? CallableDescriptor ?: return Mutability.Default
                 val type = descriptor.getReturnType() ?: return Mutability.Default