From 3bd7f87d2b1662374847f8bb95f0e9b1ebfa101c Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 2 Nov 2015 18:22:52 +0100
Subject: [PATCH] rename "Jet" from names of IDE classes; consistently use Kt
 prefix for PSI elements and classes directly related to specific PSI elements

---
 .../CliLightClassGenerationSupport.kt         |  10 +-
 .../cli/jvm/compiler/KotlinCoreEnvironment.kt |   4 +-
 .../kotlin/asJava/FakeFileForLightClass.kt    |   2 +-
 .../FakeLightClassForFileOfPackage.java       |   8 +-
 .../kotlin/asJava/JavaElementFinder.java      |   4 +-
 .../{KotlinLightClass.kt => KtLightClass.kt}  |   2 +-
 ... KtLightClassForAnonymousDeclaration.java} |   6 +-
 ...umEntry.kt => KtLightClassForEnumEntry.kt} |   4 +-
 ... => KtLightClassForExplicitDeclaration.kt} |  30 ++--
 ...sForFacade.kt => KtLightClassForFacade.kt} |  26 ++--
 ...> KtLightClassForInterfaceDefaultImpls.kt} |   6 +-
 ...otlinLightElement.kt => KtLightElement.kt} |   2 +-
 .../{KotlinLightField.kt => KtLightField.kt}  |  28 ++--
 ...{KotlinLightMethod.kt => KtLightMethod.kt} |  42 ++---
 ...fierList.java => KtLightModifierList.java} |   4 +-
 ...nLightPackage.java => KtLightPackage.java} |   6 +-
 ...htParameter.java => KtLightParameter.java} |  10 +-
 ...rameter.java => KtLightTypeParameter.java} |  14 +-
 ...htClass.java => KtWrappingLightClass.java} |  10 +-
 .../jetbrains/kotlin/asJava/LightClassUtil.kt |  10 +-
 .../asJava/LightParameterListBuilder.java     |   6 +-
 .../asJava/duplicateJvmSignatureUtil.kt       |   4 +-
 .../kotlin/asJava/lightClassUtils.kt          |   4 +-
 .../asJava/KotlinLightClassCoherenceTest.java |   6 +-
 .../asJava/LightClassAnnotationsTest.java     |   2 +-
 .../kotlin/asJava/LightClassTestCommon.kt     |   4 +-
 .../jvm/compiler/KotlinClassFinderTest.kt     |   4 +-
 .../{JetBundle.java => KotlinBundle.java}     |   6 +-
 ...dle.properties => KotlinBundle.properties} |   0
 ...java => KotlinDescriptorIconProvider.java} |   6 +-
 ...nProvider.java => KotlinIconProvider.java} |  18 +--
 ...NamesCache.kt => KotlinShortNamesCache.kt} |  20 +--
 .../resolve/IDELightClassGenerationSupport.kt |  26 ++--
 ...> KtLightClassForDecompiledDeclaration.kt} |  12 +-
 .../idea/caches/resolve/getModuleInfo.kt      |  12 +-
 ...ver.kt => KotlinFileReferencesResolver.kt} |  17 +-
 ...ager.java => KotlinModuleTypeManager.java} |   6 +-
 ...mpiler.kt => KotlinClassFileDecompiler.kt} |   4 +-
 .../decompiler/KotlinJavascriptMetaFile.kt    |   5 +-
 .../{JetClsFile.kt => KtClsFile.kt}           |   3 +-
 ...{KotlinClsFileBase.kt => KtClsFileBase.kt} |   2 +-
 .../decompiler/kotlinFileViewProviders.kt     |  12 +-
 .../navigation/DecompiledNavigationUtils.java |  10 +-
 .../KotlinDeclarationNavigationPolicyImpl.kt  |   4 +-
 ...elper.java => SourceNavigationHelper.java} |  26 ++--
 ...rovider.kt => KotlinFindUsagesProvider.kt} |   3 +-
 .../idea/highlighter/DebugInfoAnnotator.java  |   6 +-
 .../DuplicateJvmSignatureAnnotator.java       |   2 +-
 .../FunctionsHighlightingVisitor.java         |  18 +--
 .../idea/highlighter/JetHighlighter.java      |  98 ------------
 .../idea/highlighter/KotlinHighlighter.java   |  98 ++++++++++++
 ...ors.java => KotlinHighlightingColors.java} |   4 +-
 ...exer.java => KotlinHighlightingLexer.java} |   4 +-
 .../{JetPsiChecker.kt => KotlinPsiChecker.kt} |   4 +-
 ...va => KotlinSyntaxHighlighterFactory.java} |   4 +-
 .../LabelsHighlightingVisitor.java            |   2 +-
 .../PropertiesHighlightingVisitor.java        |  11 +-
 .../SoftKeywordsHighlightingVisitor.java      |  12 +-
 .../TypeKindHighlightingVisitor.java          |  20 +--
 .../VariablesHighlightingVisitor.java         |  14 +-
 .../inspections/IntentionBasedInspection.kt   |   8 +-
 .../intentions/OperatorToFunctionIntention.kt |   2 +-
 ...Intention.kt => SelfTargetingIntention.kt} |  16 +-
 .../idea/kdoc/KDocHighlightingVisitor.kt      |   4 +-
 .../idea/project/ResolveElementCache.kt       |   8 +-
 ...ry.kt => KotlinIntentionActionsFactory.kt} |   2 +-
 .../quickfix/KotlinSuppressIntentionAction.kt |  10 +-
 .../kotlin/idea/quickfix/QuickFixes.kt        |   8 +-
 .../KotlinReadWriteAccessDetector.kt          |   4 +-
 .../KotlinReferencesSearcher.kt               |  16 +-
 .../kotlin/idea/search/usagesSearch/utils.kt  |   4 +-
 .../KotlinInheritedMembersNodeProvider.kt     |   4 +-
 .../KotlinStructureElementPresentation.java   |   4 +-
 ...t.java => KotlinStructureViewElement.java} |  10 +-
 ...y.java => KotlinStructureViewFactory.java} |   4 +-
 ...del.java => KotlinStructureViewModel.java} |   6 +-
 ...t => KtClsStructureViewBuilderProvider.kt} |  12 +-
 .../idea/stubindex/IdeStubIndexService.java   |  48 +++---
 .../kotlin/idea/stubindex/IndexUtils.kt       |   4 +-
 ...Index.java => KotlinAnnotationsIndex.java} |  12 +-
 ...ex.java => KotlinClassShortNameIndex.java} |  12 +-
 ...dex.java => KotlinExactPackagesIndex.java} |  12 +-
 ...=> KotlinFileFacadeClassByPackageIndex.kt} |  10 +-
 ...ndex.kt => KotlinFileFacadeFqNameIndex.kt} |  10 +-
 ...x.kt => KotlinFileFacadeShortNameIndex.kt} |  11 +-
 ...meIndex.kt => KotlinFilePartClassIndex.kt} |  11 +-
 ...dex.java => KotlinFullClassNameIndex.java} |  12 +-
 ...java => KotlinFunctionShortNameIndex.java} |  12 +-
 ...ex.kt => KotlinMultifileClassPartIndex.kt} |  10 +-
 ...robablyNothingFunctionShortNameIndex.java} |  12 +-
 ...robablyNothingPropertyShortNameIndex.java} |  12 +-
 ...java => KotlinPropertyShortNameIndex.java} |  12 +-
 ...cope.java => KotlinSourceFilterScope.java} |  20 +--
 ...sIndex.java => KotlinSuperClassIndex.java} |  12 +-
 ...=> KotlinTopLevelClassByPackageIndex.java} |  12 +-
 ...nTopLevelExtensionsByReceiverTypeIndex.kt} |   9 +-
 ...KotlinTopLevelFunctionByPackageIndex.java} |  12 +-
 ...> KotlinTopLevelFunctionFqnNameIndex.java} |  12 +-
 ...KotlinTopLevelPropertyByPackageIndex.java} |  12 +-
 ...> KotlinTopLevelPropertyFqnNameIndex.java} |  12 +-
 .../kotlin/idea/stubindex/PackageIndexUtil.kt |   6 +-
 .../idea/stubindex/StaticFacadeIndexUtil.kt   |   4 +-
 .../idea/stubindex/SubpackagesIndexService.kt |   2 +-
 ...PluginDeclarationProviderFactoryService.kt |   4 +-
 ...ubBasedPackageMemberDeclarationProvider.kt |  24 +--
 ...JetPsiPrecedences.kt => PsiPrecedences.kt} |   9 +-
 .../idea/completion/AllClassesCompletion.kt   |   4 +-
 .../completion/BasicLookupElementFactory.kt   |   8 +-
 .../idea/completion/OverridesCompletion.kt    |   4 +-
 .../ParameterNameAndTypeCompletion.kt         |   4 +-
 .../handlers/KotlinFunctionInsertHandler.kt   |   4 +-
 .../smart/MultipleArgumentsItemProvider.kt    |   6 +-
 .../AbstractCompletionHandlerTests.kt         |   4 +-
 .../kotlin/idea/core/KotlinIndicesHelper.kt   |  18 +--
 ...ings.java => KotlinCodeStyleSettings.java} |  12 +-
 .../ImplementMembersHandler.kt                |   6 +-
 .../kotlin/idea/core/psiClassToDescriptor.kt  |   6 +-
 .../util/DescriptorMemberChooserObject.kt     |   6 +-
 .../jetbrains/kotlin/idea/test/testUtils.kt   |  10 +-
 idea/resources/liveTemplates/Kotlin.xml       |  36 ++---
 idea/src/META-INF/plugin.xml                  | 146 +++++++++---------
 idea/src/META-INF/testng-j.xml                |   2 +-
 .../kotlin/idea/ExtraSteppingFilter.kt        |   6 +-
 ...JetCommenter.java => KotlinCommenter.java} |   2 +-
 ...actory.java => KotlinFileTypeFactory.java} |   2 +-
 ...va => KotlinGotoTargetRenderProvider.java} |  10 +-
 ....java => KotlinModuleTypeManagerImpl.java} |   4 +-
 ...airMatcher.java => KotlinPairMatcher.java} |   2 +-
 .../kotlin/idea/KotlinPluginUpdater.kt        |   4 +-
 ...tPluginUtil.java => KotlinPluginUtil.java} |   8 +-
 .../idea/KotlinQuickDocumentationProvider.kt  |   4 +-
 .../idea/actions/KotlinAddImportAction.kt     |   8 +-
 .../idea/actions/NewKotlinFileAction.java     |   6 +-
 ...r.java => KotlinGotoClassContributor.java} |  10 +-
 ....java => KotlinGotoSymbolContributor.java} |  18 +--
 .../codeInsight/GotoSuperActionHandler.java   |  10 +-
 ...ava => KotlinTypeDeclarationProvider.java} |   2 +-
 ... => KtFunctionPsiElementCellRenderer.java} |   2 +-
 .../surroundWith/KotlinSurrounderUtils.java   |   6 +-
 .../KotlinRuntimeTypeCastSurrounder.kt        |   4 +-
 .../KotlinStringTemplateSurrounder.java       |   4 +-
 .../expression/KotlinWhenSurrounder.java      |   4 +-
 .../KotlinFunctionLiteralSurrounder.java      |   4 +-
 .../unwrap/KotlinUnwrapRemoveBase.java        |   4 +-
 ...er.java => AbstractKotlinUpDownMover.java} |   4 +-
 ...Mover.java => KotlinDeclarationMover.java} |   2 +-
 ...nMover.java => KotlinExpressionMover.java} |   4 +-
 ...anager.java => KotlinCompilerManager.java} |   8 +-
 .../KotlinCompilerConfigurableTab.java        |   6 +-
 ...KotlinAndroidGradleModuleConfigurator.java |   4 +-
 .../KotlinGradleModuleConfigurator.java       |   6 +-
 .../KotlinMavenConfigurator.java              |   4 +-
 .../KotlinWithLibraryConfigurator.java        |   9 +-
 .../copy/ConvertJavaCopyPastePostProcessor.kt |   4 +-
 .../copy/KotlinPasteFromJavaDialog.java       |   4 +-
 ...ionManager.kt => KotlinPositionManager.kt} |   6 +-
 ...java => KotlinPositionManagerFactory.java} |   4 +-
 .../KotlinFieldBreakpointPropertiesPanel.kt   |   8 +-
 .../breakpoints/KotlinFieldBreakpointType.kt  |  16 +-
 .../dialog/fieldBreakpointDialogUtil.kt       |   8 +-
 .../kotlin/idea/debugger/debuggerUtil.kt      |   2 +-
 .../evaluate/KotlinCodeFragmentFactory.kt     |   4 +-
 .../idea/editor/KotlinBackspaceHandler.java   |   4 +-
 ...rOptions.java => KotlinEditorOptions.java} |  10 +-
 ...a => KotlinEditorOptionsConfigurable.java} |   6 +-
 .../idea/editor/KotlinTypedHandler.java       |   6 +-
 ...tTypingUtils.java => LtGtTypingUtils.java} |   4 +-
 ...Filter.java => KotlinExceptionFilter.java} |   4 +-
 ...java => KotlinExceptionFilterFactory.java} |   4 +-
 .../idea/findUsages/JetUsageTypeProvider.kt   | 114 --------------
 ...kt => KotlinElementDescriptionProvider.kt} |   2 +-
 ...ngRule.kt => KotlinImportFilteringRule.kt} |   2 +-
 .../findUsages/KotlinUsageTypeProvider.kt     | 114 ++++++++++++++
 .../dialogs/KotlinFindClassUsagesDialog.java  |  12 +-
 .../KotlinFindFunctionUsagesDialog.java       |  10 +-
 .../KotlinFindPropertyUsagesDialog.java       |  10 +-
 .../handlers/KotlinFindClassUsagesHandler.kt  |   4 +-
 .../idea/formatter/ImportSettingsPanel.kt     |  12 +-
 .../{JetBlock.java => KotlinBlock.java}       |  12 +-
 ...a => KotlinCodeStyleSettingsProvider.java} |   6 +-
 ...java => KotlinFormattingModelBuilder.java} |   4 +-
 ...linLanguageCodeStyleSettingsProvider.java} |  26 ++--
 .../idea/formatter/kotlinSpacingRules.kt      |   4 +-
 .../KotlinTypeHierarchyProvider.java          |  14 +-
 .../KotlinCalleeMethodsTreeStructure.java     |   6 +-
 .../KotlinOverrideHierarchyBrowser.kt         |   8 +-
 .../highlighter/KotlinColorSettingsPage.kt    | 106 ++++++-------
 ...tlinPsiCheckerAndHighlightingUpdater.java} |   2 +-
 .../KotlinTestRunLineMarkerContributor.kt     |   4 +-
 .../markers/OverridenFunctionMarker.kt        |   4 +-
 .../markers/OverridenPropertyMarker.kt        |  14 +-
 .../markers/SuperDeclarationMarker.kt         |  10 +-
 .../idea/imports/KotlinImportOptimizer.kt     |   4 +-
 .../idea/inspections/AddModifierFixFactory.kt |   4 +-
 .../idea/inspections/AddReflectionQuickFix.kt |   8 +-
 .../ConflictingExtensionPropertyInspection.kt |   4 +-
 .../DeprecatedObjectInstanceFieldReference.kt |   6 +-
 .../DeprecatedUsageOfStaticField.kt           |  12 +-
 .../inspections/KotlinCleanupInspection.kt    |   4 +-
 .../UnusedReceiverParameterInspection.kt      |   6 +-
 .../inspections/UnusedSymbolInspection.kt     |   4 +-
 .../idea/intentions/AddBracesIntention.kt     |   2 +-
 .../intentions/AddForLoopIndicesIntention.kt  |   2 +-
 .../intentions/AddNameToArgumentIntention.kt  |   2 +-
 .../AddOperatorModifierIntention.kt           |   2 +-
 .../ChangeVisibilityModifierIntention.kt      |   2 +-
 .../ConvertAssertToIfWithThrowIntention.kt    |   2 +-
 .../ConvertForEachToForLoopIntention.kt       |   2 +-
 .../ConvertFunctionToPropertyIntention.kt     |   2 +-
 .../ConvertIfWithThrowToAssertIntention.kt    |   2 +-
 .../ConvertNegatedBooleanSequenceIntention.kt |   2 +-
 ...atedExpressionWithDemorgansLawIntention.kt |   2 +-
 .../ConvertParameterToReceiverIntention.kt    |   2 +-
 .../ConvertPropertyToFunctionIntention.kt     |   2 +-
 .../ConvertReceiverToParameterIntention.kt    |   2 +-
 .../intentions/ConvertToBlockBodyIntention.kt |   2 +-
 .../ConvertToConcatenatedStringIntention.kt   |   2 +-
 .../ConvertToExpressionBodyIntention.kt       |   2 +-
 .../ConvertToForEachFunctionCallIntention.kt  |   2 +-
 .../ConvertToStringTemplateIntention.kt       |   2 +-
 ...precatedCallableAddReplaceWithIntention.kt |   2 +-
 .../idea/intentions/IfNullToElvisIntention.kt |   2 +-
 .../InfixCallToOrdinaryIntention.kt           |   2 +-
 .../InsertCurlyBracesToTemplateIntention.kt   |   2 +-
 .../InsertExplicitTypeArgumentsIntention.kt   |   2 +-
 .../IntroduceBackingPropertyIntention.kt      |   6 +-
 .../intentions/InvertIfConditionIntention.kt  |   2 +-
 .../intentions/IterateExpressionIntention.kt  |   2 +-
 .../MoveAssignmentToInitializerIntention.kt   |   2 +-
 .../MoveLambdaInsideParenthesesIntention.kt   |   2 +-
 .../MoveLambdaOutsideParenthesesIntention.kt  |   2 +-
 .../ObjectLiteralToLambdaIntention.kt         |   2 +-
 .../ReconstructTypeInCastOrIsIntention.kt     |   2 +-
 .../intentions/RemoveArgumentNameIntention.kt |   2 +-
 .../idea/intentions/RemoveBracesIntention.kt  |   2 +-
 .../RemoveCurlyBracesFromTemplateIntention.kt |   2 +-
 ...veExplicitLambdaParameterTypesIntention.kt |   2 +-
 .../RemoveExplicitSuperQualifierIntention.kt  |   2 +-
 .../RemoveExplicitTypeArgumentsIntention.kt   |   2 +-
 .../intentions/RemoveExplicitTypeIntention.kt |   2 +-
 .../RemoveForLoopIndicesIntention.kt          |   2 +-
 .../RemoveUnnecessaryParenthesesIntention.kt  |   2 +-
 ...thExplicitFunctionLiteralParamIntention.kt |   2 +-
 .../ReplaceWithOperatorAssignmentIntention.kt |   2 +-
 .../ReplaceWithOrdinaryAssignmentIntention.kt |   2 +-
 .../SimplifyBooleanWithConstantsIntention.kt  |   2 +-
 ...implifyNegatedBinaryExpressionIntention.kt |   2 +-
 ...SpecifyExplicitLambdaSignatureIntention.kt |   2 +-
 .../SpecifyTypeExplicitlyIntention.kt         |   2 +-
 .../idea/intentions/SplitIfIntention.kt       |   2 +-
 .../SwapBinaryExpressionIntention.kt          |  12 +-
 .../idea/intentions/ToInfixCallIntention.kt   |   2 +-
 .../UsePropertyAccessSyntaxIntention.kt       |   2 +-
 .../intentions/DoubleBangToIfThenIntention.kt |   4 +-
 .../EliminateWhenSubjectIntention.kt          |   4 +-
 .../intentions/ElvisToIfThenIntention.kt      |   4 +-
 .../intentions/FlattenWhenIntention.kt        |   4 +-
 .../intentions/FoldIfToAssignmentIntention.kt |   4 +-
 .../FoldIfToReturnAsymmetricallyIntention.kt  |   4 +-
 .../intentions/FoldIfToReturnIntention.kt     |   4 +-
 .../FoldWhenToAssignmentIntention.kt          |   4 +-
 .../intentions/FoldWhenToReturnIntention.kt   |   4 +-
 .../intentions/IfThenToDoubleBangIntention.kt |   4 +-
 .../intentions/IfThenToElvisIntention.kt      |   4 +-
 .../intentions/IfThenToSafeAccessIntention.kt |   4 +-
 .../intentions/IfToWhenIntention.kt           |   4 +-
 .../IntroduceWhenSubjectIntention.kt          |   4 +-
 .../intentions/MergeWhenIntention.kt          |   4 +-
 .../intentions/SafeAccessToIfThenIntention.kt |   4 +-
 .../UnfoldAssignmentToIfIntention.kt          |   4 +-
 .../UnfoldAssignmentToWhenIntention.kt        |   4 +-
 .../intentions/UnfoldPropertyToIfIntention.kt |   4 +-
 .../UnfoldPropertyToWhenIntention.kt          |   4 +-
 .../intentions/UnfoldReturnToIfIntention.kt   |   4 +-
 .../intentions/UnfoldReturnToWhenIntention.kt |   4 +-
 .../intentions/WhenToIfIntention.kt           |   4 +-
 .../ReplaceCallWithBinaryOperatorIntention.kt |   2 +-
 .../ReplaceCallWithUnaryOperatorIntention.kt  |   4 +-
 .../ReplaceContainsIntention.kt               |   2 +-
 .../ReplaceGetOrSetIntention.kt               |   4 +-
 .../ReplaceInvokeIntention.kt                 |   4 +-
 .../ConvertMemberToExtensionIntention.kt      |   4 +-
 .../SplitPropertyDeclarationIntention.kt      |   4 +-
 .../kotlin/idea/j2k/J2kPostProcessings.kt     |   4 +-
 ....java => KotlinLiveTemplatesProvider.java} |   2 +-
 ...pe.java => KotlinTemplateContextType.java} |  16 +-
 ...usSuperMacro.kt => AnonymousSuperMacro.kt} |   4 +-
 ...riableMacro.java => AnyVariableMacro.java} |   6 +-
 ...acro.java => BaseKotlinVariableMacro.java} |   4 +-
 ...acro.java => FunctionParametersMacro.java} |   6 +-
 ...eMacro.java => IterableVariableMacro.java} |   6 +-
 ...esult.java => KotlinPsiElementResult.java} |   4 +-
 ...cro.java => SuggestVariableNameMacro.java} |   6 +-
 ...nDefaultNamedDeclarationPresentation.java} |   8 +-
 ...ssPresenter.java => KtClassPresenter.java} |   4 +-
 ...resenter.java => KtFunctionPresenter.java} |   4 +-
 ...java => KtLightClassListCellRenderer.java} |  10 +-
 ...tPresenter.java => KtObjectPresenter.java} |   4 +-
 ...esenter.java => KtParameterPresenter.java} |   4 +-
 ...resenter.java => KtPropertyPresenter.java} |   4 +-
 .../idea/project/PluginJetFilesProvider.java  |  10 +-
 ...er.java => KotlinProjectViewProvider.java} |  12 +-
 ...ewUtil.java => KotlinProjectViewUtil.java} |   8 +-
 ...Node.java => KtClassOrObjectTreeNode.java} |  16 +-
 ...eeNode.java => KtDeclarationTreeNode.java} |  10 +-
 ...tFileTreeNode.java => KtFileTreeNode.java} |   8 +-
 .../idea/quickfix/AddConstModifierFix.kt      |   6 +-
 .../idea/quickfix/AddFunctionBodyFix.java     |  10 +-
 .../quickfix/AddFunctionToSupertypeFix.kt     |   2 +-
 .../idea/quickfix/AddGenericUpperBoundFix.kt  |   2 +-
 .../kotlin/idea/quickfix/AddLoopLabelFix.kt   |   2 +-
 .../kotlin/idea/quickfix/AddModifierFix.kt    |   8 +-
 .../idea/quickfix/AddNameToArgumentFix.kt     |   2 +-
 ...ddOverrideToEqualsHashCodeToStringFix.java |  10 +-
 .../idea/quickfix/AddStarProjectionsFix.java  |  12 +-
 .../AddTypeToLHSOfCallableReferenceFix.kt     |   2 +-
 .../idea/quickfix/AddWhenElseBranchFix.java   |  10 +-
 .../kotlin/idea/quickfix/AutoImportFix.kt     |  16 +-
 .../idea/quickfix/CastExpressionFix.java      |  14 +-
 .../idea/quickfix/ChangeAccessorTypeFix.java  |  10 +-
 .../ChangeFunctionLiteralReturnTypeFix.java   |  11 +-
 .../quickfix/ChangeFunctionReturnTypeFix.java |  36 ++---
 .../ChangeMemberFunctionSignatureFix.kt       |   2 +-
 .../idea/quickfix/ChangeParameterTypeFix.java |   9 +-
 .../ChangePrivateTopLevelToInternalFix.kt     |   2 +-
 .../ChangeToFunctionInvocationFix.java        |  10 +-
 .../quickfix/ChangeToStarProjectionFix.java   |  10 +-
 .../kotlin/idea/quickfix/ChangeTypeFix.java   |  10 +-
 .../quickfix/ChangeVariableMutabilityFix.kt   |   6 +-
 .../idea/quickfix/ChangeVariableTypeFix.java  |  15 +-
 .../quickfix/ChangeVisibilityModifierFix.java |  10 +-
 .../DeprecatedFunctionConventionFix.kt        |   2 +-
 .../kotlin/idea/quickfix/ExclExclCallFixes.kt |  12 +-
 .../quickfix/InsertDelegationCallQuickfix.kt  |   8 +-
 .../KotlinAddOrderEntryActionFactory.kt       |   2 +-
 ...otlinIntentionActionFactoryWithDelegate.kt |   2 +-
 ... => KotlinSingleIntentionActionFactory.kt} |   2 +-
 .../MakeClassAnAnnotationClassFix.java        |  10 +-
 .../quickfix/MakeOverriddenMemberOpenFix.kt   |   2 +-
 .../quickfix/MissingConstructorKeywordFix.kt  |   4 +-
 .../MoveTypeParameterConstraintFix.kt         |   2 +-
 .../idea/quickfix/MoveWhenElseBranchFix.java  |  10 +-
 .../QuickFixFactoryForTypeMismatchError.java  |   2 +-
 .../kotlin/idea/quickfix/QuickFixRegistrar.kt |   2 +-
 .../idea/quickfix/RemoveFunctionBodyFix.java  |  10 +-
 .../kotlin/idea/quickfix/RemoveModifierFix.kt |  16 +-
 .../RemoveNameFromFunctionExpressionFix.kt    |   2 +-
 .../idea/quickfix/RemoveNullableFix.java      |  14 +-
 .../quickfix/RemovePartsFromPropertyFix.java  |  10 +-
 .../quickfix/RemovePsiElementSimpleFix.java   |  30 ++--
 .../RemoveRightPartOfBinaryExpressionFix.java |  14 +-
 .../idea/quickfix/RemoveSupertypeFix.java     |  10 +-
 .../RemoveUnusedFunctionParameterFix.kt       |   2 +-
 .../RemoveValVarFromParameterFix.java         |  10 +-
 ...meParameterToMatchOverriddenMethodFix.java |  10 +-
 .../idea/quickfix/RenameUnderscoreFix.kt      |   2 +-
 .../kotlin/idea/quickfix/ReplaceCallFix.kt    |   8 +-
 .../idea/quickfix/ReplaceInfixCallFix.kt      |   2 +-
 ...aceJavaAnnotationPositionedArgumentsFix.kt |   2 +-
 .../quickfix/ReplaceObsoleteLabelSyntaxFix.kt |   4 +-
 ...ReplaceOperationInBinaryExpressionFix.java |   4 +-
 .../idea/quickfix/SuperClassNotInitialized.kt |   2 +-
 .../createFromUsage/CreateFromUsageFixBase.kt |   4 +-
 .../createClass/createClassUtils.kt           |   4 +-
 .../CreateLocalVariableActionFactory.kt       |   8 +-
 .../migration/MigrateTypeParameterListFix.kt  |   4 +-
 .../quickfix/quickfixUtil/quickfixUtil.kt     |   4 +-
 .../replaceWith/DeprecatedSymbolUsageFix.kt   |   4 +-
 .../DeprecatedSymbolUsageInWholeProjectFix.kt |   8 +-
 .../idea/refactoring/CallableRefactoring.kt   |  10 +-
 .../idea/refactoring/JetRefactoringUtil.java  |  14 +-
 .../changeSignature/JetChangeSignatureData.kt |   4 +-
 .../JetChangeSignatureUsageProcessor.kt       |  10 +-
 .../ExtractableCodeDescriptor.kt              |   4 +-
 .../extractionEngine/ExtractionData.kt        |   8 +-
 .../extractionEngine/duplicateUtil.kt         |  10 +-
 .../extractionEngine/extractorUtil.kt         |  14 +-
 .../KotlinIntroduceParameterHandler.kt        |  16 +-
 .../KotlinIntroduceVariableHandler.java       |  15 +-
 .../idea/refactoring/jetRefactoringUtil.kt    |   4 +-
 .../memberInfo/KotlinMemberSelectionTable.kt  |   4 +-
 .../changePackage/ChangePackageIntention.kt   |   4 +-
 .../ChangePackageToMatchDirectoryIntention.kt |   4 +-
 ...FileToPackageMatchingDirectoryIntention.kt |   4 +-
 .../MoveDeclarationToSeparateFileIntention.kt |   4 +-
 ...MoveKotlinTopLevelDeclarationsProcessor.kt |  10 +-
 .../kotlin/idea/refactoring/move/moveUtils.kt |   4 +-
 .../refactoring/pullUp/KotlinPullUpHelper.kt  |   6 +-
 .../rename/AutomaticOverloadsRenamer.kt       |   6 +-
 .../rename/RenameKotlinClassProcessor.kt      |  18 +--
 .../rename/RenameKotlinFunctionProcessor.kt   |   8 +-
 .../safeDelete/KotlinOverridingDialog.java    |  12 +-
 .../safeDelete/KotlinSafeDeleteProcessor.kt   |   4 +-
 .../kotlin/idea/run/JetRunConfiguration.java  |  10 +-
 ...=> KotlinTestNgConfigurationProducer.java} |   2 +-
 .../KotlinAnnotatedElementsSearcher.kt        |   4 +-
 .../KotlinDefinitionsSearcher.java            |   6 +-
 .../KotlinDirectInheritorsSearcher.kt         |  12 +-
 ...inOverridingMethodsWithGenericsSearcher.kt |  10 +-
 ...tor.kt => KotlinTargetElementEvaluator.kt} |   5 +-
 .../KotlinCreateTestIntention.kt              |   8 +-
 .../idea/testIntegration/KotlinTestFinder.kt  |   6 +-
 .../idea/util/ImportInsertHelperImpl.kt       |   6 +-
 .../{JetPsiRange.kt => KotlinPsiRange.kt}     |  34 ++--
 .../{JetPsiUnifier.kt => KotlinPsiUnifier.kt} | 119 +++++---------
 .../versions/KotlinRuntimeLibraryUtil.java    |   4 +-
 .../versions/KotlinUpdatePluginComponent.kt   |   6 +-
 .../OutdatedKotlinRuntimeNotification.java    |   4 +-
 .../jetbrains/kotlin/AbstractImportsTest.kt   |   4 +-
 .../LightClassesClasspathSortingTest.kt       |   6 +-
 .../formatter/AbstractJetFormatterTest.java   |   4 +-
 .../AbstractJetTypingIndentationTestBase.java |   2 +-
 ...tingsUtil.java => FormatSettingsUtil.java} |   8 +-
 .../codeInsight/LiveTemplatesContextTest.kt   |  18 +--
 .../moveUpDown/AbstractCodeMoverTest.java     |   8 +-
 ...ractJavaToKotlinCopyPasteConversionTest.kt |  12 +-
 .../AbstractJetPositionManagerTest.java       |   4 +-
 .../idea/debugger/KotlinDebuggerTestCase.java |   6 +-
 .../AbstractNavigateToLibrarySourceTest.kt    |   4 +-
 .../NavigateFromLibrarySourcesTest.kt         |   4 +-
 .../NavigateToDecompiledLibraryTest.java      |   6 +-
 .../textBuilder/AbstractDecompiledTextTest.kt |   4 +-
 .../DecompiledTextForWrongAbiVersionTest.kt   |   4 +-
 ...nterTest.java => KotlinCommenterTest.java} |   2 +-
 ...erTest.kt => KotlinExceptionFilterTest.kt} |   4 +-
 .../idea/javaFacade/JetJavaFacadeTest.java    |  10 +-
 .../lightClasses/LightClassEqualsTest.java    |  14 +-
 .../JetChangeSignatureTest.java               |  19 +--
 .../kotlin/idea/run/RunConfigurationTest.kt   |  10 +-
 .../AbstractJetPsiUnifierTest.kt              |   4 +-
 .../kotlin/j2k/ExpressionConverter.kt         |   8 +-
 .../org/jetbrains/kotlin/j2k/TypeConverter.kt |   4 +-
 .../org/jetbrains/kotlin/j2k/ast/Imports.kt   |   4 +-
 .../jetbrains/kotlin/j2k/propertyDetection.kt |   4 +-
 434 files changed, 1867 insertions(+), 1924 deletions(-)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClass.kt => KtLightClass.kt} (89%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClassForAnonymousDeclaration.java => KtLightClassForAnonymousDeclaration.java} (90%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClassForEnumEntry.kt => KtLightClassForEnumEntry.kt} (87%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClassForExplicitDeclaration.kt => KtLightClassForExplicitDeclaration.kt} (93%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClassForFacade.kt => KtLightClassForFacade.kt} (87%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightClassForInterfaceDefaultImpls.kt => KtLightClassForInterfaceDefaultImpls.kt} (87%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightElement.kt => KtLightElement.kt} (90%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightField.kt => KtLightField.kt} (81%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightMethod.kt => KtLightMethod.kt} (81%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightModifierList.java => KtLightModifierList.java} (91%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightPackage.java => KtLightPackage.java} (85%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightParameter.java => KtLightParameter.java} (90%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinLightTypeParameter.java => KtLightTypeParameter.java} (87%)
 rename compiler/light-classes/src/org/jetbrains/kotlin/asJava/{KotlinWrappingLightClass.java => KtWrappingLightClass.java} (91%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{JetBundle.java => KotlinBundle.java} (95%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{JetBundle.properties => KotlinBundle.properties} (100%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{JetDescriptorIconProvider.java => KotlinDescriptorIconProvider.java} (97%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/{JetIconProvider.java => KotlinIconProvider.java} (89%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/{JetShortNamesCache.kt => KotlinShortNamesCache.kt} (84%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/{KotlinLightClassForDecompiledDeclaration.kt => KtLightClassForDecompiledDeclaration.kt} (79%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/{JetFileReferencesResolver.kt => KotlinFileReferencesResolver.kt} (87%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/{JetModuleTypeManager.java => KotlinModuleTypeManager.java} (85%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/{JetClassFileDecompiler.kt => KotlinClassFileDecompiler.kt} (86%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/{JetClsFile.kt => KtClsFile.kt} (88%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/{KotlinClsFileBase.kt => KtClsFileBase.kt} (96%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/{JetSourceNavigationHelper.java => SourceNavigationHelper.java} (95%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/{JetFindUsagesProvider.kt => KotlinFindUsagesProvider.kt} (94%)
 delete mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java
 create mode 100644 idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/{JetHighlightingColors.java => KotlinHighlightingColors.java} (99%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/{JetHighlightingLexer.java => KotlinHighlightingLexer.java} (91%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/{JetPsiChecker.kt => KotlinPsiChecker.kt} (98%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/{JetSyntaxHighlighterFactory.java => KotlinSyntaxHighlighterFactory.java} (87%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/{JetSelfTargetingIntention.kt => SelfTargetingIntention.kt} (91%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/{JetIntentionActionsFactory.kt => KotlinIntentionActionsFactory.kt} (97%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/{JetStructureViewElement.java => KotlinStructureViewElement.java} (91%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/{JetStructureViewFactory.java => KotlinStructureViewFactory.java} (91%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/{JetStructureViewModel.java => KotlinStructureViewModel.java} (88%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/{JetClsStructureViewBuilderProvider.kt => KtClsStructureViewBuilderProvider.kt} (83%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetAnnotationsIndex.java => KotlinAnnotationsIndex.java} (76%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetClassShortNameIndex.java => KotlinClassShortNameIndex.java} (74%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetExactPackagesIndex.java => KotlinExactPackagesIndex.java} (74%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFileFacadeClassByPackageIndex.kt => KotlinFileFacadeClassByPackageIndex.kt} (67%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFileFacadeShortNameIndex.kt => KotlinFileFacadeFqNameIndex.kt} (72%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFilePartClassIndex.kt => KotlinFileFacadeShortNameIndex.kt} (69%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFileFacadeFqNameIndex.kt => KotlinFilePartClassIndex.kt} (73%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFullClassNameIndex.java => KotlinFullClassNameIndex.java} (74%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetFunctionShortNameIndex.java => KotlinFunctionShortNameIndex.java} (73%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetMultifileClassPartIndex.kt => KotlinMultifileClassPartIndex.kt} (68%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetProbablyNothingFunctionShortNameIndex.java => KotlinProbablyNothingFunctionShortNameIndex.java} (69%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetProbablyNothingPropertyShortNameIndex.java => KotlinProbablyNothingPropertyShortNameIndex.java} (70%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetPropertyShortNameIndex.java => KotlinPropertyShortNameIndex.java} (73%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetSourceFilterScope.java => KotlinSourceFilterScope.java} (84%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetSuperClassIndex.java => KotlinSuperClassIndex.java} (75%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelClassByPackageIndex.java => KotlinTopLevelClassByPackageIndex.java} (72%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelExtensionsByReceiverTypeIndex.kt => KotlinTopLevelExtensionsByReceiverTypeIndex.kt} (75%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelFunctionByPackageIndex.java => KotlinTopLevelFunctionByPackageIndex.java} (71%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelFunctionFqnNameIndex.java => KotlinTopLevelFunctionFqnNameIndex.java} (73%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelPropertyByPackageIndex.java => KotlinTopLevelPropertyByPackageIndex.java} (71%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/{JetTopLevelPropertyFqnNameIndex.java => KotlinTopLevelPropertyFqnNameIndex.java} (72%)
 rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/{JetPsiPrecedences.kt => PsiPrecedences.kt} (92%)
 rename idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/{JetCodeStyleSettings.java => KotlinCodeStyleSettings.java} (86%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetCommenter.java => KotlinCommenter.java} (96%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetFileFactory.java => KotlinFileTypeFactory.java} (93%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetGotoTargetRenderProvider.java => KotlinGotoTargetRenderProvider.java} (78%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetModuleTypeManagerImpl.java => KotlinModuleTypeManagerImpl.java} (89%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetPairMatcher.java => KotlinPairMatcher.java} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/{JetPluginUtil.java => KotlinPluginUtil.java} (87%)
 rename idea/src/org/jetbrains/kotlin/idea/caches/{JetGotoClassContributor.java => KotlinGotoClassContributor.java} (84%)
 rename idea/src/org/jetbrains/kotlin/idea/caches/{JetGotoSymbolContributor.java => KotlinGotoSymbolContributor.java} (68%)
 rename idea/src/org/jetbrains/kotlin/idea/codeInsight/{JetTypeDeclarationProvider.java => KotlinTypeDeclarationProvider.java} (96%)
 rename idea/src/org/jetbrains/kotlin/idea/codeInsight/{JetFunctionPsiElementCellRenderer.java => KtFunctionPsiElementCellRenderer.java} (94%)
 rename idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/{AbstractJetUpDownMover.java => AbstractKotlinUpDownMover.java} (98%)
 rename idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/{JetDeclarationMover.java => KotlinDeclarationMover.java} (99%)
 rename idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/{JetExpressionMover.java => KotlinExpressionMover.java} (99%)
 rename idea/src/org/jetbrains/kotlin/idea/compiler/{JetCompilerManager.java => KotlinCompilerManager.java} (92%)
 rename idea/src/org/jetbrains/kotlin/idea/debugger/{JetPositionManager.kt => KotlinPositionManager.kt} (98%)
 rename idea/src/org/jetbrains/kotlin/idea/debugger/{JetPositionManagerFactory.java => KotlinPositionManagerFactory.java} (87%)
 rename idea/src/org/jetbrains/kotlin/idea/editor/{JetEditorOptions.java => KotlinEditorOptions.java} (87%)
 rename idea/src/org/jetbrains/kotlin/idea/editor/{JetSettingEditorConfigurable.java => KotlinEditorOptionsConfigurable.java} (81%)
 rename idea/src/org/jetbrains/kotlin/idea/editor/{JetLtGtTypingUtils.java => LtGtTypingUtils.java} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/filters/{JetExceptionFilter.java => KotlinExceptionFilter.java} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/filters/{JetExceptionFilterFactory.java => KotlinExceptionFilterFactory.java} (87%)
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt
 rename idea/src/org/jetbrains/kotlin/idea/findUsages/{JetElementDescriptionProvider.kt => KotlinElementDescriptionProvider.kt} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/findUsages/{JetImportFilteringRule.kt => KotlinImportFilteringRule.kt} (94%)
 create mode 100644 idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
 rename idea/src/org/jetbrains/kotlin/idea/formatter/{JetBlock.java => KotlinBlock.java} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/formatter/{JetCodeStyleSettingsProvider.java => KotlinCodeStyleSettingsProvider.java} (92%)
 rename idea/src/org/jetbrains/kotlin/idea/formatter/{JetFormattingModelBuilder.java => KotlinFormattingModelBuilder.java} (95%)
 rename idea/src/org/jetbrains/kotlin/idea/formatter/{JetLanguageCodeStyleSettingsProvider.java => KotlinLanguageCodeStyleSettingsProvider.java} (85%)
 rename idea/src/org/jetbrains/kotlin/idea/highlighter/{JetPsiCheckerAndHighlightingUpdater.java => KotlinPsiCheckerAndHighlightingUpdater.java} (96%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/{JetLiveTemplatesProvider.java => KotlinLiveTemplatesProvider.java} (92%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/{JetTemplateContextType.java => KotlinTemplateContextType.java} (91%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetAnonymousSuperMacro.kt => AnonymousSuperMacro.kt} (97%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetAnyVariableMacro.java => AnyVariableMacro.java} (87%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{BaseJetVariableMacro.java => BaseKotlinVariableMacro.java} (98%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetFunctionParametersMacro.java => FunctionParametersMacro.java} (93%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetIterableVariableMacro.java => IterableVariableMacro.java} (88%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetPsiElementResult.java => KotlinPsiElementResult.java} (87%)
 rename idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/{JetSuggestVariableNameMacro.java => SuggestVariableNameMacro.java} (88%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetDefaultNamedDeclarationPresentation.java => KotlinDefaultNamedDeclarationPresentation.java} (83%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetClassPresenter.java => KtClassPresenter.java} (85%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetFunctionPresenter.java => KtFunctionPresenter.java} (95%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetLightClassListCellRenderer.java => KtLightClassListCellRenderer.java} (75%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetObjectPresenter.java => KtObjectPresenter.java} (85%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetParameterPresenter.java => KtParameterPresenter.java} (85%)
 rename idea/src/org/jetbrains/kotlin/idea/presentation/{JetPropertyPresenter.java => KtPropertyPresenter.java} (85%)
 rename idea/src/org/jetbrains/kotlin/idea/projectView/{JetProjectViewProvider.java => KotlinProjectViewProvider.java} (90%)
 rename idea/src/org/jetbrains/kotlin/idea/projectView/{JetProjectViewUtil.java => KotlinProjectViewUtil.java} (90%)
 rename idea/src/org/jetbrains/kotlin/idea/projectView/{JetClassOrObjectTreeNode.java => KtClassOrObjectTreeNode.java} (78%)
 rename idea/src/org/jetbrains/kotlin/idea/projectView/{JetDeclarationTreeNode.java => KtDeclarationTreeNode.java} (89%)
 rename idea/src/org/jetbrains/kotlin/idea/projectView/{JetFileTreeNode.java => KtFileTreeNode.java} (83%)
 rename idea/src/org/jetbrains/kotlin/idea/quickfix/{JetSingleIntentionActionFactory.kt => KotlinSingleIntentionActionFactory.kt} (91%)
 rename idea/src/org/jetbrains/kotlin/idea/run/{JetTestNgConfigurationProducer.java => KotlinTestNgConfigurationProducer.java} (99%)
 rename idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/{JetTargetElementEvaluator.kt => KotlinTargetElementEvaluator.kt} (92%)
 rename idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/{JetPsiRange.kt => KotlinPsiRange.kt} (81%)
 rename idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/{JetPsiUnifier.kt => KotlinPsiUnifier.kt} (92%)
 rename idea/tests/org/jetbrains/kotlin/formatter/{JetFormatSettingsUtil.java => FormatSettingsUtil.java} (89%)
 rename idea/tests/org/jetbrains/kotlin/idea/editor/{JetCommenterTest.java => KotlinCommenterTest.java} (96%)
 rename idea/tests/org/jetbrains/kotlin/idea/filters/{JetExceptionFilterTest.kt => KotlinExceptionFilterTest.kt} (97%)

diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
index f6847888e2d..3d239f42617 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
@@ -25,8 +25,8 @@ import com.intellij.util.Function
 import com.intellij.util.SmartList
 import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.annotations.TestOnly
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.LightClassConstructionContext
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -139,7 +139,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
     }
 
     override fun getPsiClass(classOrObject: KtClassOrObject): PsiClass? {
-        return KotlinLightClassForExplicitDeclaration.create(psiManager, classOrObject)
+        return KtLightClassForExplicitDeclaration.create(psiManager, classOrObject)
     }
 
     override fun resolveClassToDescriptor(classOrObject: KtClassOrObject): ClassDescriptor? {
@@ -151,7 +151,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
         if (filesForFacade.isEmpty()) return emptyList()
 
         return emptyOrSingletonList<PsiClass>(
-                KotlinLightClassForFacade.createForFacade(psiManager, facadeFqName, scope, filesForFacade))
+                KtLightClassForFacade.createForFacade(psiManager, facadeFqName, scope, filesForFacade))
     }
 
     override fun findFilesForFacade(facadeFqName: FqName, scope: GlobalSearchScope): Collection<KtFile> {
@@ -216,7 +216,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
     override fun getFacadeClassesInPackage(packageFqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
         return PackagePartClassUtils.getFilesWithCallables(findFilesForPackage(packageFqName, scope)).groupBy {
             JvmFileClassUtil.getFileClassInfoNoResolve(it).facadeClassFqName
-        }.map { KotlinLightClassForFacade.createForFacade(psiManager, it.key, scope, it.value) }.filterNotNull()
+        }.map { KtLightClassForFacade.createForFacade(psiManager, it.key, scope, it.value) }.filterNotNull()
     }
 
     override fun getFacadeNames(packageFqName: FqName, scope: GlobalSearchScope): Collection<String> {
diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
index b8b5b163136..ed0a7ecec26 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
@@ -50,7 +50,7 @@ import com.intellij.psi.stubs.BinaryFileStubBuilders
 import com.intellij.psi.util.JavaClassSupers
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.asJava.JavaElementFinder
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 import org.jetbrains.kotlin.asJava.LightClassGenerationSupport
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.CliModuleVisibilityManagerImpl
@@ -370,7 +370,7 @@ public class KotlinCoreEnvironment private constructor(
             with (projectEnvironment.getProject()) {
                 registerService(javaClass<JetScriptDefinitionProvider>(), JetScriptDefinitionProvider())
                 registerService(javaClass<KotlinJavaPsiFacade>(), KotlinJavaPsiFacade(this))
-                registerService(javaClass<KotlinLightClassForFacade.FacadeStubCache>(), KotlinLightClassForFacade.FacadeStubCache(this))
+                registerService(javaClass<KtLightClassForFacade.FacadeStubCache>(), KtLightClassForFacade.FacadeStubCache(this))
             }
         }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeFileForLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeFileForLightClass.kt
index 58d3ac4ec8a..3bb1ef352de 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeFileForLightClass.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeFileForLightClass.kt
@@ -45,7 +45,7 @@ open class FakeFileForLightClass(
         private val packageFqName: FqName,
         virtualFile: VirtualFile,
         psiManager: PsiManager,
-        private val lightClass: KotlinLightClass,
+        private val lightClass: KtLightClass,
         private val stub: () -> PsiClassHolderFileStub<*>
 ) : ClsFileImpl(ClassFileViewProvider(psiManager, virtualFile)) {
     override fun getPackageName() = packageFqName.asString()
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
index 6c6bbda683b..8b7d6a3a5d5 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java
@@ -32,17 +32,17 @@ import org.jetbrains.kotlin.psi.KtFile;
 /**
  * This class serves as a workaround for usages of {@link JavaElementFinder#findClasses} which eventually only need names of files
  * containing the class. When queried for a package class (e.g. test/TestPackage), {@code findClasses} along with a
- * {@link KotlinLightClassForFacade} would also return multiple instances of this class for each file present in the package. The client
+ * {@link KtLightClassForFacade} would also return multiple instances of this class for each file present in the package. The client
  * code can make use of every file in the package then, since {@code getContainingFile} of these instances will represent the whole package.
  * <p/>
  * See {@link LineBreakpoint#findClassCandidatesInSourceContent} for the primary usage this was introduced
  */
-public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KotlinLightClass, JetJavaMirrorMarker {
-    private final KotlinLightClassForFacade delegate;
+public class FakeLightClassForFileOfPackage extends AbstractLightClass implements KtLightClass, JetJavaMirrorMarker {
+    private final KtLightClassForFacade delegate;
     private final KtFile file;
 
     public FakeLightClassForFileOfPackage(
-            @NotNull PsiManager manager, @NotNull KotlinLightClassForFacade delegate, @NotNull KtFile file
+            @NotNull PsiManager manager, @NotNull KtLightClassForFacade delegate, @NotNull KtFile file
     ) {
         super(manager);
         this.delegate = delegate;
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
index 6899d1b1a03..403665e81a6 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java
@@ -189,7 +189,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
         // allScope() because the contract says that the whole project
         GlobalSearchScope allScope = GlobalSearchScope.allScope(project);
         if (lightClassGenerationSupport.packageExists(fqName, allScope)) {
-            return new KotlinLightPackage(psiManager, fqName, allScope);
+            return new KtLightPackage(psiManager, fqName, allScope);
         }
 
         return null;
@@ -205,7 +205,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM
         Collection<PsiPackage> answer = Collections2.transform(subpackages, new Function<FqName, PsiPackage>() {
             @Override
             public PsiPackage apply(@Nullable FqName input) {
-                return new KotlinLightPackage(psiManager, input, scope);
+                return new KtLightPackage(psiManager, input, scope);
             }
         });
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
similarity index 89%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
index ea64f628587..da6e0fe0b65 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClass.kt
@@ -20,6 +20,6 @@ import com.intellij.psi.PsiClass;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-public interface KotlinLightClass : PsiClass, KotlinLightElement<KtClassOrObject, PsiClass> {
+public interface KtLightClass : PsiClass, KtLightElement<KtClassOrObject, PsiClass> {
     public fun getFqName(): FqName
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForAnonymousDeclaration.java
similarity index 90%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForAnonymousDeclaration.java
index 55df4405ad4..127ab6cf09e 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForAnonymousDeclaration.java
@@ -32,12 +32,12 @@ import org.jetbrains.kotlin.types.KotlinType;
 
 import java.util.Collection;
 
-class KotlinLightClassForAnonymousDeclaration extends KotlinLightClassForExplicitDeclaration implements PsiAnonymousClass {
-    private static final Logger LOG = Logger.getInstance(KotlinLightClassForAnonymousDeclaration.class);
+class KtLightClassForAnonymousDeclaration extends KtLightClassForExplicitDeclaration implements PsiAnonymousClass {
+    private static final Logger LOG = Logger.getInstance(KtLightClassForAnonymousDeclaration.class);
 
     private SoftReference<PsiClassType> cachedBaseType = null;
 
-    KotlinLightClassForAnonymousDeclaration(@NotNull PsiManager manager, @NotNull FqName name, @NotNull KtClassOrObject classOrObject) {
+    KtLightClassForAnonymousDeclaration(@NotNull PsiManager manager, @NotNull FqName name, @NotNull KtClassOrObject classOrObject) {
         super(manager, name, classOrObject);
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForEnumEntry.kt
similarity index 87%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForEnumEntry.kt
index c71af52f92d..00aae7db0ac 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForEnumEntry.kt
@@ -22,11 +22,11 @@ import org.jetbrains.kotlin.psi.KtEnumEntry
 import com.intellij.psi.PsiEnumConstantInitializer
 import com.intellij.psi.PsiEnumConstant
 
-internal class KotlinLightClassForEnumEntry(
+internal class KtLightClassForEnumEntry(
         psiManager: PsiManager,
         fqName: FqName,
         enumEntry: KtEnumEntry,
         private val enumConstant: PsiEnumConstant
-): KotlinLightClassForAnonymousDeclaration(psiManager, fqName, enumEntry), PsiEnumConstantInitializer {
+): KtLightClassForAnonymousDeclaration(psiManager, fqName, enumEntry), PsiEnumConstantInitializer {
     override fun getEnumConstant(): PsiEnumConstant = enumConstant
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
similarity index 93%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
index cf16c003b61..b638ec9f59c 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
@@ -47,11 +47,11 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import javax.swing.Icon
 
-public open class KotlinLightClassForExplicitDeclaration(
+public open class KtLightClassForExplicitDeclaration(
         manager: PsiManager,
         protected val classFqName: FqName, // FqName of (possibly inner) class
         protected val classOrObject: KtClassOrObject)
-: KotlinWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
+: KtWrappingLightClass(manager), JetJavaMirrorMarker, StubBasedPsiElement<KotlinClassOrObjectStub<out KtClassOrObject>> {
     private var delegate: PsiClass? = null
 
     private fun getLocalClassParent(): PsiElement? {
@@ -64,8 +64,8 @@ public open class KotlinLightClassForExplicitDeclaration(
 
             var createWrapper = forceMethodWrapping
             // Use PsiClass wrapper instead of package light class to avoid names like "FooPackage" in Type Hierarchy and related views
-            if (containingClass is KotlinLightClassForFacade) {
-                containingClass = object : LightClass(containingClass as KotlinLightClassForFacade, KotlinLanguage.INSTANCE) {
+            if (containingClass is KtLightClassForFacade) {
+                containingClass = object : LightClass(containingClass as KtLightClassForFacade, KotlinLanguage.INSTANCE) {
                     override fun getName(): String? {
                         return currentFileName
                     }
@@ -138,7 +138,7 @@ public open class KotlinLightClassForExplicitDeclaration(
     override fun getFqName(): FqName = classFqName
 
     override fun copy(): PsiElement {
-        return KotlinLightClassForExplicitDeclaration(manager, classFqName, classOrObject.copy() as KtClassOrObject)
+        return KtLightClassForExplicitDeclaration(manager, classFqName, classOrObject.copy() as KtClassOrObject)
     }
 
     override fun getDelegate(): PsiClass {
@@ -216,7 +216,7 @@ public open class KotlinLightClassForExplicitDeclaration(
         if (this === o) return true
         if (o == null || javaClass != o.javaClass) return false
 
-        val aClass = o as KotlinLightClassForExplicitDeclaration
+        val aClass = o as KtLightClassForExplicitDeclaration
 
         if (classFqName != aClass.classFqName) return false
 
@@ -245,9 +245,9 @@ public open class KotlinLightClassForExplicitDeclaration(
     override fun getQualifiedName(): String = classFqName.asString()
 
     private val _modifierList : PsiModifierList by lazy {
-        object : KotlinLightModifierList(this.manager, computeModifiers()) {
+        object : KtLightModifierList(this.manager, computeModifiers()) {
             override fun getDelegate(): PsiModifierList {
-                return this@KotlinLightClassForExplicitDeclaration.getDelegate().modifierList!!
+                return this@KtLightClassForExplicitDeclaration.getDelegate().modifierList!!
             }
         }
     }
@@ -333,7 +333,7 @@ public open class KotlinLightClassForExplicitDeclaration(
 
     override fun isInheritor(baseClass: PsiClass, checkDeep: Boolean): Boolean {
         val qualifiedName: String?
-        if (baseClass is KotlinLightClassForExplicitDeclaration) {
+        if (baseClass is KtLightClassForExplicitDeclaration) {
             val baseDescriptor = baseClass.getDescriptor()
             qualifiedName = if (baseDescriptor != null) DescriptorUtils.getFqName(baseDescriptor).asString() else null
         }
@@ -353,10 +353,10 @@ public open class KotlinLightClassForExplicitDeclaration(
 
     override fun toString(): String {
         try {
-            return javaClass<KotlinLightClass>().simpleName + ":" + qualifiedName
+            return javaClass<KtLightClass>().simpleName + ":" + qualifiedName
         }
         catch (e: Throwable) {
-            return javaClass<KotlinLightClass>().simpleName + ":" + e.toString()
+            return javaClass<KtLightClass>().simpleName + ":" + e.toString()
         }
 
     }
@@ -390,7 +390,7 @@ public open class KotlinLightClassForExplicitDeclaration(
                 manager: PsiManager,
                 classOrObject: KtClassOrObject,
                 psiClass: PsiClass? = null
-        ): KotlinLightClassForExplicitDeclaration? {
+        ): KtLightClassForExplicitDeclaration? {
             if (LightClassUtil.belongsToKotlinBuiltIns(classOrObject.getContainingJetFile())) {
                 return null
             }
@@ -398,17 +398,17 @@ public open class KotlinLightClassForExplicitDeclaration(
             val fqName = predictFqName(classOrObject) ?: return null
 
             if (classOrObject is KtObjectDeclaration && classOrObject.isObjectLiteral()) {
-                return KotlinLightClassForAnonymousDeclaration(manager, fqName, classOrObject)
+                return KtLightClassForAnonymousDeclaration(manager, fqName, classOrObject)
             }
 
             if (classOrObject.hasInterfaceDefaultImpls) {
                 val implsFqName = fqName.defaultImplsChild()
                 if (implsFqName.asString() == psiClass?.qualifiedName) {
-                    return KotlinLightClassForInterfaceDefaultImpls(manager, implsFqName, classOrObject)
+                    return KtLightClassForInterfaceDefaultImpls(manager, implsFqName, classOrObject)
                 }
             }
 
-            return KotlinLightClassForExplicitDeclaration(manager, fqName, classOrObject)
+            return KtLightClassForExplicitDeclaration(manager, fqName, classOrObject)
         }
 
         private fun predictFqName(classOrObject: KtClassOrObject): FqName? {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt
similarity index 87%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt
index 9b4590f825a..0d046da3be4 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForFacade.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForFacade.kt
@@ -35,14 +35,14 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
 import javax.swing.Icon
 
-public class KotlinLightClassForFacade private constructor(
+public class KtLightClassForFacade private constructor(
         manager: PsiManager,
         private val facadeClassFqName: FqName,
         private val searchScope: GlobalSearchScope,
         private val lightClassDataCache: CachedValue<KotlinFacadeLightClassData>,
         files: Collection<KtFile>,
         private val deprecated: Boolean
-) : KotlinWrappingLightClass(manager), JetJavaMirrorMarker {
+) : KtWrappingLightClass(manager), JetJavaMirrorMarker {
 
     private data class StubCacheKey(val fqName: FqName, val searchScope: GlobalSearchScope)
 
@@ -124,19 +124,19 @@ public class KotlinLightClassForFacade private constructor(
     override fun getImplementsListTypes() = PsiClassType.EMPTY_ARRAY
 
     // TODO: Find a way to return just Object
-    override fun getExtendsList() = super<KotlinWrappingLightClass>.getExtendsList()
+    override fun getExtendsList() = super<KtWrappingLightClass>.getExtendsList()
 
     // TODO see getExtendsList()
-    override fun getExtendsListTypes() = super<KotlinWrappingLightClass>.getExtendsListTypes()
+    override fun getExtendsListTypes() = super<KtWrappingLightClass>.getExtendsListTypes()
 
     // TODO see getExtendsList()
-    override fun getSuperClass(): PsiClass? = super<KotlinWrappingLightClass>.getSuperClass()
+    override fun getSuperClass(): PsiClass? = super<KtWrappingLightClass>.getSuperClass()
 
     // TODO see getExtendsList()
-    override fun getSupers(): Array<PsiClass> = super<KotlinWrappingLightClass>.getSupers()
+    override fun getSupers(): Array<PsiClass> = super<KtWrappingLightClass>.getSupers()
 
     // TODO see getExtendsList()
-    override fun getSuperTypes() = super<KotlinWrappingLightClass>.getSuperTypes()
+    override fun getSuperTypes() = super<KtWrappingLightClass>.getSuperTypes()
 
     override fun getInterfaces() = PsiClass.EMPTY_ARRAY
 
@@ -158,7 +158,7 @@ public class KotlinLightClassForFacade private constructor(
 
     override fun isValid() = files.all { it.isValid() }
 
-    override fun copy() = KotlinLightClassForFacade(getManager(), facadeClassFqName, searchScope, lightClassDataCache, files, deprecated)
+    override fun copy() = KtLightClassForFacade(getManager(), facadeClassFqName, searchScope, lightClassDataCache, files, deprecated)
 
     override fun getDelegate(): PsiClass {
         val psiClass = LightClassUtil.findClass(facadeClassFqName, lightClassDataCache.value.javaFileStub)
@@ -188,7 +188,7 @@ public class KotlinLightClassForFacade private constructor(
             return false
         }
 
-        val lightClass = other as KotlinLightClassForFacade
+        val lightClass = other as KtLightClassForFacade
         if (this === other) return true
 
         if (this.hashCode != lightClass.hashCode) return false
@@ -201,10 +201,10 @@ public class KotlinLightClassForFacade private constructor(
 
     override fun toString(): String {
         try {
-            return javaClass<KotlinLightClassForFacade>().getSimpleName() + ":" + getQualifiedName()
+            return javaClass<KtLightClassForFacade>().getSimpleName() + ":" + getQualifiedName()
         }
         catch (e: Throwable) {
-            return javaClass<KotlinLightClassForFacade>().getSimpleName() + ":" + e.toString()
+            return javaClass<KtLightClassForFacade>().getSimpleName() + ":" + e.toString()
         }
     }
 
@@ -214,7 +214,7 @@ public class KotlinLightClassForFacade private constructor(
                 facadeClassFqName: FqName,
                 searchScope: GlobalSearchScope,
                 files: Collection<KtFile>
-        ): KotlinLightClassForFacade? {
+        ): KtLightClassForFacade? {
             if (files.any { LightClassUtil.belongsToKotlinBuiltIns(it) }) {
                 return null
             }
@@ -222,7 +222,7 @@ public class KotlinLightClassForFacade private constructor(
             assert(files.isNotEmpty()) { "No files for facade $facadeClassFqName" }
 
             val lightClassDataCache = FacadeStubCache.getInstance(manager.project).get(facadeClassFqName, searchScope)
-            return KotlinLightClassForFacade(manager, facadeClassFqName, searchScope, lightClassDataCache, files, false)
+            return KtLightClassForFacade(manager, facadeClassFqName, searchScope, lightClassDataCache, files, false)
         }
     }
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForInterfaceDefaultImpls.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForInterfaceDefaultImpls.kt
similarity index 87%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForInterfaceDefaultImpls.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForInterfaceDefaultImpls.kt
index 5c73719b858..6560bfdb8d0 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForInterfaceDefaultImpls.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForInterfaceDefaultImpls.kt
@@ -21,14 +21,14 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-public open class KotlinLightClassForInterfaceDefaultImpls(
+public open class KtLightClassForInterfaceDefaultImpls(
         manager: PsiManager,
         classFqName: FqName,
         classOrObject: KtClassOrObject)
-: KotlinLightClassForExplicitDeclaration(manager, classFqName, classOrObject){
+: KtLightClassForExplicitDeclaration(manager, classFqName, classOrObject){
 
     override fun copy(): PsiElement {
-        return KotlinLightClassForInterfaceDefaultImpls(manager, classFqName, classOrObject.copy() as KtClassOrObject)
+        return KtLightClassForInterfaceDefaultImpls(manager, classFqName, classOrObject.copy() as KtClassOrObject)
     }
 
     override fun getTypeParameterList(): PsiTypeParameterList? = null
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElement.kt
similarity index 90%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElement.kt
index fa378ea35bd..dbe85a4c4ce 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightElement.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightElement.kt
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 
-public interface KotlinLightElement<T : KtDeclaration, D : PsiElement> : PsiNamedElement {
+public interface KtLightElement<T : KtDeclaration, D : PsiElement> : PsiNamedElement {
     public fun getOrigin(): T?
 
     public fun getDelegate(): D
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt
similarity index 81%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt
index 808092aa6df..d5a495d86c2 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightField.kt
@@ -26,14 +26,14 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtEnumEntry
 
-public interface KotlinLightField : PsiField, KotlinLightElement<KtDeclaration, PsiField>
+public interface KtLightField : PsiField, KtLightElement<KtDeclaration, PsiField>
 
 // Copied from com.intellij.psi.impl.light.LightField
-sealed class KotlinLightFieldImpl(
+sealed class KtLightFieldImpl(
         private val origin: KtDeclaration?,
         private val delegate: PsiField,
-        private val containingClass: KotlinLightClass
-) : LightElement(delegate.manager, KotlinLanguage.INSTANCE), KotlinLightField {
+        private val containingClass: KtLightClass
+) : LightElement(delegate.manager, KotlinLanguage.INSTANCE), KtLightField {
     @Throws(IncorrectOperationException::class)
     override fun setInitializer(initializer: PsiExpression?) = throw IncorrectOperationException("Not supported")
 
@@ -84,7 +84,7 @@ sealed class KotlinLightFieldImpl(
     override fun getNavigationElement() = origin ?: super.getNavigationElement()
 
     override fun isEquivalentTo(another: PsiElement?): Boolean {
-        if (another is KotlinLightField && origin == another.getOrigin() && delegate == another.getDelegate()) {
+        if (another is KtLightField && origin == another.getOrigin() && delegate == another.getDelegate()) {
             return true
         }
         return super.isEquivalentTo(another)
@@ -94,12 +94,12 @@ sealed class KotlinLightFieldImpl(
 
     override fun copy() = Factory.create(origin?.copy() as? KtDeclaration, delegate, containingClass)
 
-    class KotlinLightEnumConstant(
+    class KtLightEnumConstant(
             origin: KtEnumEntry?,
             enumConstant: PsiEnumConstant,
-            containingClass: KotlinLightClass,
+            containingClass: KtLightClass,
             private val initializingClass: PsiEnumConstantInitializer?
-    ) : KotlinLightFieldImpl(origin, enumConstant, containingClass), PsiEnumConstant {
+    ) : KtLightFieldImpl(origin, enumConstant, containingClass), PsiEnumConstant {
         override fun getDelegate() = super.getDelegate() as PsiEnumConstant
 
         // NOTE: we don't use "delegation by" because the compiler would generate method calls to ALL of PsiEnumConstant members,
@@ -115,22 +115,22 @@ sealed class KotlinLightFieldImpl(
         override fun resolveMethodGenerics() = getDelegate().resolveMethodGenerics()
     }
 
-    public class KotlinLightFieldForDeclaration(origin: KtDeclaration?, delegate: PsiField, containingClass: KotlinLightClass)
-    : KotlinLightFieldImpl(origin, delegate, containingClass)
+    public class KtLightFieldForDeclaration(origin: KtDeclaration?, delegate: PsiField, containingClass: KtLightClass)
+    : KtLightFieldImpl(origin, delegate, containingClass)
 
     companion object Factory {
-        fun create(origin: KtDeclaration?, delegate: PsiField, containingClass: KotlinLightClass): KotlinLightField {
+        fun create(origin: KtDeclaration?, delegate: PsiField, containingClass: KtLightClass): KtLightField {
             when (delegate) {
                 is PsiEnumConstant -> {
                     val kotlinEnumEntry = origin as? KtEnumEntry
                     val initializingClass = if (kotlinEnumEntry != null && kotlinEnumEntry.declarations.isNotEmpty()) {
                         val enumConstantFqName = FqName(containingClass.getFqName().asString() + "." + kotlinEnumEntry.name)
-                        KotlinLightClassForEnumEntry(delegate.manager, enumConstantFqName, kotlinEnumEntry, delegate)
+                        KtLightClassForEnumEntry(delegate.manager, enumConstantFqName, kotlinEnumEntry, delegate)
                     }
                     else null
-                    return KotlinLightEnumConstant(kotlinEnumEntry, delegate, containingClass, initializingClass)
+                    return KtLightEnumConstant(kotlinEnumEntry, delegate, containingClass, initializingClass)
                 }
-                else -> return KotlinLightFieldForDeclaration(origin, delegate, containingClass)
+                else -> return KtLightFieldForDeclaration(origin, delegate, containingClass)
             }
         }
     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt
similarity index 81%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt
index 821e5194e87..13fa0720708 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethod.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightMethod.kt
@@ -25,14 +25,14 @@ import com.intellij.util.IncorrectOperationException
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.psi.*
 
-public interface KotlinLightMethod: PsiMethod, KotlinLightElement<KtDeclaration, PsiMethod>
+public interface KtLightMethod : PsiMethod, KtLightElement<KtDeclaration, PsiMethod>
 
-sealed class KotlinLightMethodImpl(
+sealed class KtLightMethodImpl(
         private val delegate: PsiMethod,
         private val origin: KtDeclaration?,
-        containingClass: KotlinLightClass
-): LightMethod(delegate.manager, delegate, containingClass), KotlinLightMethod {
-    override fun getContainingClass(): KotlinLightClass = super.getContainingClass() as KotlinLightClass
+        containingClass: KtLightClass
+): LightMethod(delegate.manager, delegate, containingClass), KtLightMethod {
+    override fun getContainingClass(): KtLightClass = super.getContainingClass() as KtLightClass
 
     private val paramsList: CachedValue<PsiParameterList> by lazy {
         val cacheManager = CachedValuesManager.getManager(delegate.project)
@@ -40,7 +40,7 @@ sealed class KotlinLightMethodImpl(
             val parameterBuilder = LightParameterListBuilder(manager, KotlinLanguage.INSTANCE, this)
 
             for ((index, parameter) in delegate.parameterList.parameters.withIndex()) {
-                parameterBuilder.addParameter(KotlinLightParameter(parameter, index, this))
+                parameterBuilder.addParameter(KtLightParameter(parameter, index, this))
             }
 
             CachedValueProvider.Result.create(parameterBuilder, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
@@ -57,7 +57,7 @@ sealed class KotlinLightMethodImpl(
                 delegate.typeParameterList
             }
             else {
-                LightClassUtil.buildLightTypeParameterList(this@KotlinLightMethodImpl, origin)
+                LightClassUtil.buildLightTypeParameterList(this@KtLightMethodImpl, origin)
             }
             CachedValueProvider.Result.create(list, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
         }, false)
@@ -123,7 +123,7 @@ sealed class KotlinLightMethodImpl(
     }
 
     override fun isEquivalentTo(another: PsiElement?): Boolean {
-        if (another is KotlinLightMethod && origin == another.getOrigin() && delegate == another.getDelegate()) {
+        if (another is KtLightMethod && origin == another.getOrigin() && delegate == another.getDelegate()) {
             return true
         }
 
@@ -131,7 +131,7 @@ sealed class KotlinLightMethodImpl(
     }
 
     override fun equals(other: Any?): Boolean =
-            other is KotlinLightMethod &&
+            other is KtLightMethod &&
             name == other.name &&
             origin == other.getOrigin() &&
             containingClass == other.containingClass &&
@@ -141,39 +141,39 @@ sealed class KotlinLightMethodImpl(
 
     override fun toString(): String = "${this.javaClass.simpleName}:$name"
 
-    private class KotlinLightMethodForDeclaration(
-            delegate: PsiMethod, origin: KtDeclaration?, containingClass: KotlinLightClass
-    ) : KotlinLightMethodImpl(delegate, origin, containingClass)
+    private class KtLightMethodForDeclaration(
+            delegate: PsiMethod, origin: KtDeclaration?, containingClass: KtLightClass
+    ) : KtLightMethodImpl(delegate, origin, containingClass)
 
-    private class KotlinLightAnnotationMethod(
+    private class KtLightAnnotationMethod(
             delegate: PsiAnnotationMethod,
             origin: KtDeclaration?,
-            containingClass: KotlinLightClass
-    ) : KotlinLightMethodImpl(delegate, origin, containingClass), PsiAnnotationMethod {
+            containingClass: KtLightClass
+    ) : KtLightMethodImpl(delegate, origin, containingClass), PsiAnnotationMethod {
         override fun getDefaultValue() = getDelegate().defaultValue
         override fun getDelegate() = super.getDelegate() as PsiAnnotationMethod
     }
 
     companion object Factory {
         fun create(
-                delegate: PsiMethod, origin: KtDeclaration?, containingClass: KotlinLightClass
-        ): KotlinLightMethodImpl {
+                delegate: PsiMethod, origin: KtDeclaration?, containingClass: KtLightClass
+        ): KtLightMethodImpl {
             return when (delegate) {
-                is PsiAnnotationMethod -> KotlinLightAnnotationMethod(delegate, origin, containingClass)
-                else -> KotlinLightMethodForDeclaration(delegate, origin, containingClass)
+                is PsiAnnotationMethod -> KtLightAnnotationMethod(delegate, origin, containingClass)
+                else -> KtLightMethodForDeclaration(delegate, origin, containingClass)
             }
         }
     }
 }
 
-fun KotlinLightMethod.isTraitFakeOverride(): Boolean {
+fun KtLightMethod.isTraitFakeOverride(): Boolean {
     val methodOrigin = this.getOrigin()
     if (!(methodOrigin is KtNamedFunction || methodOrigin is KtPropertyAccessor || methodOrigin is KtProperty)) {
         return false
     }
 
     val parentOfMethodOrigin = PsiTreeUtil.getParentOfType(methodOrigin, KtClassOrObject::class.java)
-    val thisClassDeclaration = (this.containingClass as KotlinLightClass).getOrigin()
+    val thisClassDeclaration = (this.containingClass as KtLightClass).getOrigin()
 
     // Method was generated from declaration in some other trait
     return (parentOfMethodOrigin != null && thisClassDeclaration !== parentOfMethodOrigin && KtPsiUtil.isTrait(parentOfMethodOrigin))
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.java
similarity index 91%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.java
index e25015c30ae..fe527702972 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.java
@@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
 
-public abstract class KotlinLightModifierList extends LightModifierList {
-    public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
+public abstract class KtLightModifierList extends LightModifierList {
+    public KtLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
         super(psiManager, KotlinLanguage.INSTANCE, modifiers);
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightPackage.java
similarity index 85%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightPackage.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightPackage.java
index e8b08644f04..94c48ffc038 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightPackage.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightPackage.java
@@ -23,12 +23,12 @@ import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.name.FqName;
 
-public class KotlinLightPackage extends PsiPackageImpl {
+public class KtLightPackage extends PsiPackageImpl {
 
     private final FqName fqName;
     private final GlobalSearchScope scope;
 
-    public KotlinLightPackage(PsiManager manager, FqName qualifiedName, GlobalSearchScope scope) {
+    public KtLightPackage(PsiManager manager, FqName qualifiedName, GlobalSearchScope scope) {
         super(manager, qualifiedName.asString());
         this.fqName = qualifiedName;
         this.scope = scope;
@@ -37,7 +37,7 @@ public class KotlinLightPackage extends PsiPackageImpl {
     @NotNull
     @Override
     public PsiElement copy() {
-        return new KotlinLightPackage(getManager(), fqName, scope);
+        return new KtLightPackage(getManager(), fqName, scope);
     }
 
     @Override
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java
similarity index 90%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java
index c8367813b31..a2f4b60b742 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightParameter.java
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
 
 import java.util.List;
 
-public class KotlinLightParameter extends LightParameter implements KotlinLightElement<KtParameter, PsiParameter> {
+public class KtLightParameter extends LightParameter implements KtLightElement<KtParameter, PsiParameter> {
     private static String getName(PsiParameter delegate, int index) {
         String name = delegate.getName();
         return name != null ? name : "p" + index;
@@ -40,16 +40,16 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
     private final PsiModifierList modifierList;
     private final PsiParameter delegate;
     private final int index;
-    private final KotlinLightMethod method;
+    private final KtLightMethod method;
 
-    public KotlinLightParameter(final PsiParameter delegate, int index, KotlinLightMethod method) {
+    public KtLightParameter(final PsiParameter delegate, int index, KtLightMethod method) {
         super(getName(delegate, index), delegate.getType(), method, KotlinLanguage.INSTANCE);
 
         this.delegate = delegate;
         this.index = index;
         this.method = method;
 
-        this.modifierList = new KotlinLightModifierList(method.getManager(), ArrayUtil.EMPTY_STRING_ARRAY) {
+        this.modifierList = new KtLightModifierList(method.getManager(), ArrayUtil.EMPTY_STRING_ARRAY) {
             @Override
             public PsiAnnotationOwner getDelegate() {
                 return delegate.getModifierList();
@@ -132,7 +132,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE
         return origin != null ? origin.getUseScope() : GlobalSearchScope.EMPTY_SCOPE;
     }
 
-    public KotlinLightMethod getMethod() {
+    public KtLightMethod getMethod() {
         return method;
     }
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightTypeParameter.java
similarity index 87%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightTypeParameter.java
index 3c0f937b5ec..61e87945862 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightTypeParameter.java
@@ -26,13 +26,13 @@ import org.jetbrains.kotlin.idea.KotlinLanguage;
 import org.jetbrains.kotlin.psi.KtTypeParameter;
 import org.jetbrains.kotlin.psi.KtTypeParameterListOwner;
 
-public class KotlinLightTypeParameter
-        extends AbstractLightClass implements PsiTypeParameter, KotlinLightElement<KtTypeParameter, PsiTypeParameter> {
+public class KtLightTypeParameter
+        extends AbstractLightClass implements PsiTypeParameter, KtLightElement<KtTypeParameter, PsiTypeParameter> {
     private final PsiTypeParameterListOwner owner;
     private final int index;
     private final String name;
 
-    protected KotlinLightTypeParameter(
+    protected KtLightTypeParameter(
             @NotNull PsiTypeParameterListOwner owner,
             int index,
             @NotNull String name) {
@@ -59,15 +59,15 @@ public class KotlinLightTypeParameter
 
     @NotNull
     private PsiTypeParameterListOwner getOwnerDelegate() {
-        if (owner instanceof KotlinLightClass) return ((KotlinLightClass) owner).getDelegate();
-        if (owner instanceof KotlinLightMethod) return ((KotlinLightMethod) owner).getDelegate();
+        if (owner instanceof KtLightClass) return ((KtLightClass) owner).getDelegate();
+        if (owner instanceof KtLightMethod) return ((KtLightMethod) owner).getDelegate();
         return owner;
     }
 
     @NotNull
     @Override
     public PsiElement copy() {
-        return new KotlinLightTypeParameter(owner, index, name);
+        return new KtLightTypeParameter(owner, index, name);
     }
 
     @Override
@@ -145,6 +145,6 @@ public class KotlinLightTypeParameter
     @Override
     public boolean equals(Object obj) {
         if (obj == this) return true;
-        return obj instanceof KotlinLightTypeParameter && getOrigin().equals(((KotlinLightTypeParameter) obj).getOrigin());
+        return obj instanceof KtLightTypeParameter && getOrigin().equals(((KtLightTypeParameter) obj).getOrigin());
     }
 }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtWrappingLightClass.java
similarity index 91%
rename from compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
rename to compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtWrappingLightClass.java
index 09ae32b5275..808c60ce5e4 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtWrappingLightClass.java
@@ -33,16 +33,14 @@ import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
-import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
 
 import java.util.List;
 
-public abstract class KotlinWrappingLightClass extends AbstractLightClass implements KotlinLightClass, PsiExtensibleClass {
+public abstract class KtWrappingLightClass extends AbstractLightClass implements KtLightClass, PsiExtensibleClass {
     private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
 
-    protected KotlinWrappingLightClass(PsiManager manager) {
+    protected KtWrappingLightClass(PsiManager manager) {
         super(manager, KotlinLanguage.INSTANCE);
     }
 
@@ -122,7 +120,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
             @Override
             public PsiField fun(PsiField field) {
                 KtDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(field);
-                return KotlinLightFieldImpl.Factory.create(declaration, field, KotlinWrappingLightClass.this);
+                return KtLightFieldImpl.Factory.create(declaration, field, KtWrappingLightClass.this);
             }
         });
     }
@@ -138,7 +136,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
                     declaration = PsiTreeUtil.getParentOfType(declaration, KtProperty.class);
                 }
 
-                return KotlinLightMethodImpl.Factory.create(method, declaration, KotlinWrappingLightClass.this);
+                return KtLightMethodImpl.Factory.create(method, declaration, KtWrappingLightClass.this);
             }
         });
     }
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
index 49007608200..42a4e8b4b2e 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt
@@ -144,7 +144,7 @@ public object LightClassUtil {
         val outerPsiClass = getWrappingClass(companionObject, true)
         if (outerPsiClass != null) {
             for (fieldOfParent in outerPsiClass.fields) {
-                if ((fieldOfParent is KotlinLightElement<*, *>) && fieldOfParent.getOrigin() === companionObject) {
+                if ((fieldOfParent is KtLightElement<*, *>) && fieldOfParent.getOrigin() === companionObject) {
                     return fieldOfParent
                 }
             }
@@ -165,7 +165,7 @@ public object LightClassUtil {
     private fun getLightClassBackingField(declaration: KtDeclaration): PsiField? {
         var psiClass: PsiClass = getWrappingClass(declaration, true) ?: return null
 
-        if (psiClass is KotlinLightClass) {
+        if (psiClass is KtLightClass) {
             val origin = psiClass.getOrigin()
             if (origin is KtObjectDeclaration && origin.isCompanion()) {
                 val containingClass = PsiTreeUtil.getParentOfType(origin, KtClass::class.java)
@@ -179,7 +179,7 @@ public object LightClassUtil {
         }
 
         for (field in psiClass.fields) {
-            if (field is KotlinLightField && field.getOrigin() === declaration) {
+            if (field is KtLightField && field.getOrigin() === declaration) {
                 return field
             }
         }
@@ -208,7 +208,7 @@ public object LightClassUtil {
         val methods = SmartList<PsiMethod>()
         for (method in psiClasses.flatMap { it.methods.asList() }) {
             try {
-                if (method is KotlinLightMethod && method.getOrigin() === declaration) {
+                if (method is KtLightMethod && method.getOrigin() === declaration) {
                     methods.add(method)
                     if (!collectAll) {
                         return methods
@@ -332,7 +332,7 @@ public object LightClassUtil {
                 val jetTypeParameter = parameters.get(i)
                 val name = jetTypeParameter.name
                 val safeName = name ?: "__no_name__"
-                builder.addParameter(KotlinLightTypeParameter(owner, i, safeName))
+                builder.addParameter(KtLightTypeParameter(owner, i, safeName))
             }
         }
         return builder
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java
index 3558d124eed..e14ba18364b 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightParameterListBuilder.java
@@ -27,10 +27,10 @@ import java.util.List;
 // Copy of com.intellij.psi.impl.light.LightParameterListBuilder
 public class LightParameterListBuilder extends LightElement implements PsiParameterList {
     private final List<PsiParameter> myParameters = new ArrayList<PsiParameter>();
-    private final KotlinLightMethod parent;
+    private final KtLightMethod parent;
     private PsiParameter[] myCachedParameters;
 
-    public LightParameterListBuilder(PsiManager manager, Language language, KotlinLightMethod parent) {
+    public LightParameterListBuilder(PsiManager manager, Language language, KtLightMethod parent) {
         super(manager, language);
         this.parent = parent;
     }
@@ -41,7 +41,7 @@ public class LightParameterListBuilder extends LightElement implements PsiParame
     }
 
     @Override
-    public KotlinLightMethod getParent() {
+    public KtLightMethod getParent() {
         return parent;
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
index ed678584ca8..3c65f1c5514 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
@@ -33,13 +33,13 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm
 public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Diagnostics, moduleScope: GlobalSearchScope): Diagnostics? {
     fun getDiagnosticsForFileFacade(file: KtFile): Diagnostics? {
         val project = file.project
-        val cache = KotlinLightClassForFacade.FacadeStubCache.getInstance(project)
+        val cache = KtLightClassForFacade.FacadeStubCache.getInstance(project)
         val facadeFqName = NoResolveFileClassesProvider.getFileClassInfo(file).facadeClassFqName
         return cache[facadeFqName, moduleScope].getValue()?.extraDiagnostics
     }
 
     fun getDiagnosticsForClass(ktClassOrObject: KtClassOrObject): Diagnostics {
-        return KotlinLightClassForExplicitDeclaration.getLightClassData(ktClassOrObject).extraDiagnostics
+        return KtLightClassForExplicitDeclaration.getLightClassData(ktClassOrObject).extraDiagnostics
     }
 
     fun doGetDiagnostics(): Diagnostics? {
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
index b8efcca9505..cf7af579cfd 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/lightClassUtils.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.singletonList
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import java.util.*
 
-public fun KtClassOrObject.toLightClass(): KotlinLightClass? = LightClassUtil.getPsiClass(this) as KotlinLightClass?
+public fun KtClassOrObject.toLightClass(): KtLightClass? = LightClassUtil.getPsiClass(this) as KtLightClass?
 
 public fun KtDeclaration.toLightElements(): List<PsiNamedElement> =
         when (this) {
@@ -97,7 +97,7 @@ public fun KtTypeParameter.toPsiTypeParameters(): List<PsiTypeParameter> {
 
 // Returns original declaration if given PsiElement is a Kotlin light element, and element itself otherwise
 public val PsiElement.unwrapped: PsiElement?
-    get() = if (this is KotlinLightElement<*, *>) getOrigin() else this
+    get() = if (this is KtLightElement<*, *>) getOrigin() else this
 
 public val PsiElement.namedUnwrappedElement: PsiNamedElement?
     get() = unwrapped?.getNonStrictParentOfType<PsiNamedElement>()
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java
index cf1d8481e07..6abe02a8d08 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java
@@ -49,7 +49,7 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
 
     @NotNull
     protected PsiClass doTest(String qualifiedName) {
-        KotlinLightClass psiClass = (KotlinLightClass) finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject()));
+        KtLightClass psiClass = (KtLightClass) finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject()));
         assertNotNull("Class not found: " + qualifiedName, psiClass);
 
         Asserter asserter = new Asserter();
@@ -76,7 +76,7 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
             }
         }
 
-        public void assertModifiersCoherent(KotlinLightClass lightClass) {
+        public void assertModifiersCoherent(KtLightClass lightClass) {
             PsiClass delegate = lightClass.getDelegate();
             for (String modifier : PsiModifier.MODIFIERS) {
                 assertEquals("Incoherent modifier: " + modifier,
@@ -85,7 +85,7 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
             }
         }
 
-        public void assertPropertyCoherent(KotlinLightClass lightClass, String methodName) {
+        public void assertPropertyCoherent(KtLightClass lightClass, String methodName) {
             Class<?> reflect = PsiClass.class;
             try {
                 Method method = reflect.getMethod(methodName);
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java
index e0b9cf2e9b8..3b6542322b2 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java
@@ -52,7 +52,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase {
 
     private void doTest(@NotNull String fqName) {
         PsiClass psiClass = finder.findClass(fqName, GlobalSearchScope.allScope(getProject()));
-        if (!(psiClass instanceof KotlinLightClass)) {
+        if (!(psiClass instanceof KtLightClass)) {
             throw new IllegalStateException("Not a light class: " + psiClass + " (" + fqName + ")");
         }
 
diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
index 1504988bdd8..8e5c8eebb50 100644
--- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
+++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt
@@ -48,9 +48,9 @@ object LightClassTestCommon {
         if (lightClass == null) {
             return "<not generated>"
         }
-        TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KotlinLightClass)
+        TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KtLightClass)
 
-        val delegate = (lightClass as KotlinLightClass).getDelegate()
+        val delegate = (lightClass as KtLightClass).getDelegate()
         TestCase.assertTrue("Not a CLS element: $delegate", delegate is ClsElementImpl)
 
         val buffer = StringBuilder()
diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt
index d6b07aa5177..dbe2fbec74f 100644
--- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt
+++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler
 
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
@@ -58,7 +58,7 @@ public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() {
         val className = "test.A.B.C"
         val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project))
         assertNotNull(psiClass, "Psi class not found for $className")
-        assertTrue(psiClass !is KotlinLightClass, "Kotlin light classes are not not expected");
+        assertTrue(psiClass !is KtLightClass, "Kotlin light classes are not not expected");
 
         val binaryClass = JvmVirtualFileFinder.SERVICE.getInstance(project).findKotlinClass(JavaClassImpl(psiClass!!))
         assertNotNull(binaryClass, "No binary class for $className")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.java
similarity index 95%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.java
index 998d20dd1c2..897fa022b80 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.java
@@ -25,13 +25,13 @@ import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 import java.util.ResourceBundle;
 
-public class JetBundle {
+public class KotlinBundle {
     private static Reference<ResourceBundle> ourBundle;
 
     @NonNls
-    private static final String BUNDLE = "org.jetbrains.kotlin.idea.JetBundle";
+    private static final String BUNDLE = "org.jetbrains.kotlin.idea.KotlinBundle";
 
-    private JetBundle() {
+    private KotlinBundle() {
     }
 
     @NotNull
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
similarity index 100%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetBundle.properties
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinBundle.properties
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
similarity index 97%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
index 3a622dd92e8..075a070180d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetDescriptorIconProvider.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinDescriptorIconProvider.java
@@ -29,11 +29,11 @@ import org.jetbrains.kotlin.psi.KtElement;
 
 import javax.swing.*;
 
-public final class JetDescriptorIconProvider {
+public final class KotlinDescriptorIconProvider {
 
-    private static final Logger LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.JetDescriptorIconProvider");
+    private static final Logger LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider");
 
-    private JetDescriptorIconProvider() {
+    private KotlinDescriptorIconProvider() {
     }
 
     @NotNull
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.java
similarity index 89%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.java
index 55062291e70..a655e35a61c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/JetIconProvider.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/KotlinIconProvider.java
@@ -28,18 +28,18 @@ import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade;
-import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration;
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration;
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade;
+import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.*;
 
 import javax.swing.*;
 import java.util.List;
 
-public class JetIconProvider extends IconProvider implements DumbAware {
+public class KotlinIconProvider extends IconProvider implements DumbAware {
 
-    public static JetIconProvider INSTANCE = new JetIconProvider();
+    public static KotlinIconProvider INSTANCE = new KotlinIconProvider();
 
     @Nullable
     public static KtClassOrObject getMainClass(@NotNull KtFile file) {
@@ -101,12 +101,12 @@ public class JetIconProvider extends IconProvider implements DumbAware {
             return PlatformIcons.PACKAGE_ICON;
         }
 
-        if (psiElement instanceof KotlinLightClassForFacade) {
+        if (psiElement instanceof KtLightClassForFacade) {
             return KotlinIcons.FILE;
         }
 
-        if (psiElement instanceof KotlinLightClassForDecompiledDeclaration) {
-            KtClassOrObject origin = ((KotlinLightClassForDecompiledDeclaration) psiElement).getOrigin();
+        if (psiElement instanceof KtLightClassForDecompiledDeclaration) {
+            KtClassOrObject origin = ((KtLightClassForDecompiledDeclaration) psiElement).getOrigin();
             if (origin != null) {
                 psiElement = origin;
             }
@@ -116,7 +116,7 @@ public class JetIconProvider extends IconProvider implements DumbAware {
             }
         }
 
-        if (psiElement instanceof KotlinLightClassForExplicitDeclaration) {
+        if (psiElement instanceof KtLightClassForExplicitDeclaration) {
             psiElement = psiElement.getNavigationElement();
         }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
similarity index 84%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
index d5fddaab9b9..11b150a9516 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/JetShortNamesCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCache.kt
@@ -28,25 +28,25 @@ import com.intellij.util.containers.HashSet
 import org.jetbrains.kotlin.asJava.JavaElementFinder
 import org.jetbrains.kotlin.asJava.defaultImplsChild
 import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
-import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetFileFacadeShortNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinClassShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex
 import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.FqName
 import java.util.*
 
-public class JetShortNamesCache(private val project: Project) : PsiShortNamesCache() {
+public class KotlinShortNamesCache(private val project: Project) : PsiShortNamesCache() {
     /**
      * Return kotlin class names from project sources which should be visible from java.
      */
     override fun getAllClassNames(): Array<String> {
-        val classNames = JetClassShortNameIndex.getInstance().getAllKeys(project)
+        val classNames = KotlinClassShortNameIndex.getInstance().getAllKeys(project)
 
         // package classes can not be indexed, since they have no explicit declarations
         val packageClassShortNames = PackageIndexUtil.getAllPossiblePackageClasses(project).keySet()
         classNames.addAll(packageClassShortNames)
-        classNames.addAll(JetFileFacadeShortNameIndex.INSTANCE.getAllKeys(project))
+        classNames.addAll(KotlinFileFacadeShortNameIndex.INSTANCE.getAllKeys(project))
 
         return classNames.toTypedArray()
     }
@@ -60,10 +60,10 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac
         val packageClassNames = PackageIndexUtil.getAllPossiblePackageClasses(project).get(name)
         allFqNames.addAll(packageClassNames)
 
-        JetClassShortNameIndex.getInstance().get(name, project, scope)
+        KotlinClassShortNameIndex.getInstance().get(name, project, scope)
                 .mapTo(allFqNames) { it.fqName }
 
-        JetFileFacadeShortNameIndex.INSTANCE.get(name, project, scope)
+        KotlinFileFacadeShortNameIndex.INSTANCE.get(name, project, scope)
                 .mapTo(allFqNames) { it.javaFileFacadeFqName }
 
         val result = ArrayList<PsiClass>()
@@ -103,10 +103,10 @@ public class JetShortNamesCache(private val project: Project) : PsiShortNamesCac
             = ContainerUtil.process(getMethodsByName(name, scope), processor)
 
     override fun getAllMethodNames(): Array<String>
-            = JetFunctionShortNameIndex.getInstance().getAllKeys(project).toTypedArray()
+            = KotlinFunctionShortNameIndex.getInstance().getAllKeys(project).toTypedArray()
 
     override fun getAllMethodNames(set: HashSet<String>) {
-        set.addAll(JetFunctionShortNameIndex.getInstance().getAllKeys(project))
+        set.addAll(KotlinFunctionShortNameIndex.getInstance().getAllKeys(project))
     }
 
     override fun getFieldsByName(name: String, scope: GlobalSearchScope): Array<PsiField>
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
index c22a4b7e2f1..a1b7ccab776 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.kt
@@ -32,11 +32,11 @@ import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.asJava.*
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
-import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper
+import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper
 import org.jetbrains.kotlin.idea.project.ResolveElementCache
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.stubindex.*
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope.kotlinSourceAndClassFiles
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope.kotlinSourceAndClassFiles
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
@@ -116,7 +116,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
     }
 
     override fun findClassOrObjectDeclarations(fqName: FqName, searchScope: GlobalSearchScope): Collection<KtClassOrObject> {
-        return JetFullClassNameIndex.getInstance().get(fqName.asString(), project, kotlinSourceAndClassFiles(searchScope, project))
+        return KotlinFullClassNameIndex.getInstance().get(fqName.asString(), project, kotlinSourceAndClassFiles(searchScope, project))
     }
 
     override fun findFilesForPackage(fqName: FqName, searchScope: GlobalSearchScope): Collection<KtFile> {
@@ -127,7 +127,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
             packageFqName: FqName,
             searchScope: GlobalSearchScope
     ): Collection<KtClassOrObject> {
-        return JetTopLevelClassByPackageIndex.getInstance().get(
+        return KotlinTopLevelClassByPackageIndex.getInstance().get(
                 packageFqName.asString(), project, kotlinSourceAndClassFiles(searchScope, project))
     }
 
@@ -145,13 +145,13 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
             if (ProjectRootsUtil.isLibraryClassFile(project, virtualFile)) {
                 return getLightClassForDecompiledClassOrObject(classOrObject)
             }
-            return JetSourceNavigationHelper.getOriginalClass(classOrObject)
+            return SourceNavigationHelper.getOriginalClass(classOrObject)
         }
-        return KotlinLightClassForExplicitDeclaration.create(psiManager, classOrObject)
+        return KtLightClassForExplicitDeclaration.create(psiManager, classOrObject)
     }
 
     private fun withFakeLightClasses(
-            lightClassForFacade: KotlinLightClassForFacade?,
+            lightClassForFacade: KtLightClassForFacade?,
             facadeFiles: List<KtFile>
     ): List<PsiClass> {
         if (lightClassForFacade == null) return emptyList()
@@ -182,7 +182,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
             moduleInfo: IdeaModuleInfo
     ): List<PsiClass> {
         if (moduleInfo is ModuleSourceInfo) {
-            val lightClassForFacade = KotlinLightClassForFacade.createForFacade(
+            val lightClassForFacade = KtLightClassForFacade.createForFacade(
                     psiManager, facadeFqName, moduleInfo.contentScope(), facadeFiles)
             return withFakeLightClasses(lightClassForFacade, facadeFiles)
         }
@@ -192,7 +192,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
     }
 
     override fun findFilesForFacade(facadeFqName: FqName, scope: GlobalSearchScope): Collection<KtFile> {
-        return JetFileFacadeFqNameIndex.INSTANCE.get(facadeFqName.asString(), project, scope)
+        return KotlinFileFacadeFqNameIndex.INSTANCE.get(facadeFqName.asString(), project, scope)
     }
 
     override fun resolveClassToDescriptor(classOrObject: KtClassOrObject): ClassDescriptor? {
@@ -205,12 +205,12 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
     }
 
     override fun getFacadeNames(packageFqName: FqName, scope: GlobalSearchScope): Collection<String> {
-        val facadeFilesInPackage = JetFileFacadeClassByPackageIndex.getInstance().get(packageFqName.asString(), project, scope)
+        val facadeFilesInPackage = KotlinFileFacadeClassByPackageIndex.getInstance().get(packageFqName.asString(), project, scope)
         return facadeFilesInPackage.map { it.javaFileFacadeFqName.shortName().asString() }
     }
 
     override fun getFacadeClassesInPackage(packageFqName: FqName, scope: GlobalSearchScope): Collection<PsiClass> {
-        val facadeFilesInPackage = JetFileFacadeClassByPackageIndex.getInstance().get(packageFqName.asString(), project, scope)
+        val facadeFilesInPackage = KotlinFileFacadeClassByPackageIndex.getInstance().get(packageFqName.asString(), project, scope)
         val groupedByFqNameAndModuleInfo = facadeFilesInPackage.groupBy {
             Pair(it.javaFileFacadeFqName, it.getModuleInfo())
         }
@@ -304,7 +304,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
         return getClassRelativeName(parent).child(name)
     }
 
-    private fun createLightClassForDecompiledKotlinFile(file: KtFile): KotlinLightClassForDecompiledDeclaration? {
+    private fun createLightClassForDecompiledKotlinFile(file: KtFile): KtLightClassForDecompiledDeclaration? {
         val virtualFile = file.virtualFile ?: return null
 
         val classOrObject = file.declarations.filterIsInstance<KtClassOrObject>().singleOrNull()
@@ -314,7 +314,7 @@ public class IDELightClassGenerationSupport(private val project: Project) : Ligh
                 correspondingClassOrObject = classOrObject
         ) ?: return null
 
-        return KotlinLightClassForDecompiledDeclaration(javaClsClass, classOrObject)
+        return KtLightClassForDecompiledDeclaration(javaClsClass, classOrObject)
     }
 
     private fun createClsJavaClassFromVirtualFile(
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt
similarity index 79%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt
index f25f713d126..7ad78851ed6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinLightClassForDecompiledDeclaration.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KtLightClassForDecompiledDeclaration.kt
@@ -18,14 +18,14 @@ package org.jetbrains.kotlin.idea.caches.resolve
 
 import com.intellij.psi.PsiClass
 import com.intellij.psi.impl.compiled.ClsClassImpl
-import org.jetbrains.kotlin.asJava.KotlinWrappingLightClass
+import org.jetbrains.kotlin.asJava.KtWrappingLightClass
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.KtClassOrObject
 
-class KotlinLightClassForDecompiledDeclaration(
+class KtLightClassForDecompiledDeclaration(
         private val clsClass: ClsClassImpl,
         private val origin: KtClassOrObject?
-) : KotlinWrappingLightClass(clsClass.getManager()) {
+) : KtWrappingLightClass(clsClass.getManager()) {
     private val fqName = origin?.getFqName() ?: FqName(clsClass.getQualifiedName())
 
     override fun copy() = this
@@ -33,8 +33,8 @@ class KotlinLightClassForDecompiledDeclaration(
     override fun getOwnInnerClasses(): List<PsiClass> {
         val nestedClasses = origin?.getDeclarations()?.filterIsInstance<KtClassOrObject>() ?: emptyList()
         return clsClass.getOwnInnerClasses().map { innerClsClass ->
-            KotlinLightClassForDecompiledDeclaration(innerClsClass as ClsClassImpl,
-                                                     nestedClasses.firstOrNull { innerClsClass.getName() == it.getName() })
+            KtLightClassForDecompiledDeclaration(innerClsClass as ClsClassImpl,
+                                                 nestedClasses.firstOrNull { innerClsClass.getName() == it.getName() })
         }
     }
 
@@ -49,7 +49,7 @@ class KotlinLightClassForDecompiledDeclaration(
     override fun getParent() = clsClass.parent
 
     override fun equals(other: Any?): Boolean =
-            other is KotlinLightClassForDecompiledDeclaration &&
+            other is KtLightClassForDecompiledDeclaration &&
             getFqName() == other.getFqName()
 
     override fun hashCode(): Int =
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
index 914161d69aa..80e3100ae13 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
@@ -17,13 +17,13 @@
 package org.jetbrains.kotlin.idea.caches.resolve
 
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.asJava.KotlinLightElement
+import org.jetbrains.kotlin.asJava.KtLightElement
 import org.jetbrains.kotlin.psi.*
 import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.roots.LibraryOrderEntry
 import com.intellij.openapi.roots.JdkOrderEntry
 import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.roots.ModuleRootManager
@@ -35,7 +35,7 @@ fun PsiElement.getModuleInfo(): IdeaModuleInfo {
         return NotUnderContentRootModuleInfo
     }
 
-    if (this is KotlinLightElement<*, *>) return this.getModuleInfoForLightElement()
+    if (this is KtLightElement<*, *>) return this.getModuleInfoForLightElement()
 
     val containingJetFile = (this as? KtElement)?.getContainingFile() as? KtFile
     val context = containingJetFile?.analysisContext
@@ -114,13 +114,13 @@ private fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFil
     return NotUnderContentRootModuleInfo
 }
 
-private fun KotlinLightElement<*, *>.getModuleInfoForLightElement(): IdeaModuleInfo {
-    if (this is KotlinLightClassForDecompiledDeclaration) {
+private fun KtLightElement<*, *>.getModuleInfoForLightElement(): IdeaModuleInfo {
+    if (this is KtLightClassForDecompiledDeclaration) {
         return getModuleInfoByVirtualFile(getProject(), getContainingFile().getVirtualFile(), false)
     }
     val element = getOrigin() ?: when (this) {
         is FakeLightClassForFileOfPackage -> this.getContainingFile()!!
-        is KotlinLightClassForFacade -> this.files.first()
+        is KtLightClassForFacade -> this.files.first()
         else -> throw IllegalStateException("Unknown light class without origin is referenced by IDE lazy resolve: $javaClass")
     }
     return element.getModuleInfo()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/KotlinFileReferencesResolver.kt
similarity index 87%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/KotlinFileReferencesResolver.kt
index 138e906aa19..5ab0533d5e0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/JetFileReferencesResolver.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/codeInsight/KotlinFileReferencesResolver.kt
@@ -16,21 +16,12 @@
 
 package org.jetbrains.kotlin.idea.codeInsight
 
-import org.jetbrains.kotlin.psi.KtReferenceExpression
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
-import org.jetbrains.kotlin.psi.KtUserType
-import org.jetbrains.kotlin.psi.KtExpression
-import org.jetbrains.kotlin.psi.KtCallExpression
-import org.jetbrains.kotlin.psi.KtSimpleNameExpression
-import java.util.Collections
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
-import org.jetbrains.kotlin.psi.KtQualifiedExpression
-import java.util.LinkedHashMap
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.resolve.BindingContext
+import java.util.*
 
-object JetFileReferencesResolver {
+object KotlinFileReferencesResolver {
     fun resolve(
             element: KtElement,
             resolveQualifiers: Boolean = true,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/KotlinModuleTypeManager.java
similarity index 85%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/KotlinModuleTypeManager.java
index a2b92e5f3a7..9a53ab8b4ec 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/JetModuleTypeManager.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/configuration/KotlinModuleTypeManager.java
@@ -20,9 +20,9 @@ import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
 
-public abstract class JetModuleTypeManager {
-    public static JetModuleTypeManager getInstance() {
-        return ServiceManager.getService(JetModuleTypeManager.class);
+public abstract class KotlinModuleTypeManager {
+    public static KotlinModuleTypeManager getInstance() {
+        return ServiceManager.getService(KotlinModuleTypeManager.class);
     }
 
     public abstract boolean isAndroidGradleModule(@NotNull Module module);
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClassFileDecompiler.kt
similarity index 86%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClassFileDecompiler.kt
index 587d6970a90..a3c1b2b5b03 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClassFileDecompiler.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClassFileDecompiler.kt
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiManager
 import com.intellij.psi.compiled.ClassFileDecompilers
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.KotlinClsStubBuilder
 
-public class JetClassFileDecompiler : ClassFileDecompilers.Full() {
+public class KotlinClassFileDecompiler : ClassFileDecompilers.Full() {
     private val stubBuilder = KotlinClsStubBuilder()
 
     override fun accepts(file: VirtualFile) = isKotlinJvmCompiledFile(file)
@@ -29,5 +29,5 @@ public class JetClassFileDecompiler : ClassFileDecompilers.Full() {
     override fun getStubBuilder() = stubBuilder
 
     override fun createFileViewProvider(file: VirtualFile, manager: PsiManager, physical: Boolean)
-            = JetClassFileViewProvider(manager, file, physical, isKotlinInternalCompiledFile(file))
+            = KotlinClassFileViewProvider(manager, file, physical, isKotlinInternalCompiledFile(file))
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinJavascriptMetaFile.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinJavascriptMetaFile.kt
index 078d80fbc5d..27edb383799 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinJavascriptMetaFile.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinJavascriptMetaFile.kt
@@ -16,12 +16,11 @@
 
 package org.jetbrains.kotlin.idea.decompiler
 
-import com.intellij.psi.FileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledTextFromJsMetadata
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
+import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledTextFromJsMetadata
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
 
-public class KotlinJavascriptMetaFile(provider: KotlinClassFileViewProvider) : KotlinClsFileBase(provider) {
+public class KotlinJavascriptMetaFile(provider: KotlinClassFileViewProviderBase) : KtClsFileBase(provider) {
     protected override val decompiledText: LockedClearableLazyValue<DecompiledText> = LockedClearableLazyValue(Any()) {
         buildDecompiledTextFromJsMetadata(getVirtualFile())
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFile.kt
similarity index 88%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFile.kt
index b5a5025a8ba..0a7a3d9b59e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/JetClsFile.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFile.kt
@@ -16,12 +16,11 @@
 
 package org.jetbrains.kotlin.idea.decompiler
 
-import com.intellij.psi.FileViewProvider
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.DecompiledText
 import org.jetbrains.kotlin.idea.decompiler.textBuilder.buildDecompiledText
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
 
-public class JetClsFile(provider: KotlinClassFileViewProvider) : KotlinClsFileBase(provider) {
+public class KtClsFile(provider: KotlinClassFileViewProviderBase) : KtClsFileBase(provider) {
     protected override val decompiledText: LockedClearableLazyValue<DecompiledText> = LockedClearableLazyValue(Any()) {
         buildDecompiledText(getVirtualFile())
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFileBase.kt
similarity index 96%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFileBase.kt
index 87d84b24776..04191131da2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KotlinClsFileBase.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/KtClsFileBase.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
 
-public abstract class KotlinClsFileBase(val provider: KotlinClassFileViewProvider) : KtFile(provider, true) {
+public abstract class KtClsFileBase(val provider: KotlinClassFileViewProviderBase) : KtFile(provider, true) {
     protected abstract val decompiledText: LockedClearableLazyValue<DecompiledText>
 
     public fun getDeclarationForDescriptor(descriptor: DeclarationDescriptor): KtDeclaration? {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/kotlinFileViewProviders.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/kotlinFileViewProviders.kt
index 99f6b1f73b5..6f9db2fc97e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/kotlinFileViewProviders.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/kotlinFileViewProviders.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.KotlinLanguage
 import org.jetbrains.kotlin.utils.concurrent.block.LockedClearableLazyValue
 
-abstract class KotlinClassFileViewProvider(
+abstract class KotlinClassFileViewProviderBase(
         manager: PsiManager,
         file: VirtualFile,
         physical: Boolean) : SingleRootFileViewProvider(manager, file, physical, KotlinLanguage.INSTANCE) {
@@ -50,11 +50,11 @@ abstract class KotlinClassFileViewProvider(
     override fun getContents() = content.get()
 }
 
-public class JetClassFileViewProvider(
+public class KotlinClassFileViewProvider(
         manager: PsiManager,
         file: VirtualFile,
         physical: Boolean,
-        val isInternal: Boolean) : KotlinClassFileViewProvider(manager, file, physical) {
+        val isInternal: Boolean) : KotlinClassFileViewProviderBase(manager, file, physical) {
 
     override fun createFile(project: Project, file: VirtualFile, fileType: FileType): PsiFile? {
         val fileIndex = ServiceManager.getService(project, javaClass<FileIndexFacade>())
@@ -64,17 +64,17 @@ public class JetClassFileViewProvider(
 
         if (isInternal) return null
 
-        return JetClsFile(this)
+        return KtClsFile(this)
     }
 
-    override fun createCopy(copy: VirtualFile) = JetClassFileViewProvider(getManager(), copy, false, isInternal)
+    override fun createCopy(copy: VirtualFile) = KotlinClassFileViewProvider(getManager(), copy, false, isInternal)
 }
 
 public class KotlinJavascriptMetaFileViewProvider (
         manager: PsiManager,
         val file: VirtualFile,
         physical: Boolean,
-        val isInternal: Boolean) : KotlinClassFileViewProvider(manager, file, physical) {
+        val isInternal: Boolean) : KotlinClassFileViewProviderBase(manager, file, physical) {
 
     //TODO: check index that file is library file, as in ClassFileViewProvider
     override fun createFile(project: Project, file: VirtualFile, fileType: FileType) =
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
index 47ded54a3e5..3ed26c1a897 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java
@@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
 import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil;
-import org.jetbrains.kotlin.idea.decompiler.KotlinClsFileBase;
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
+import org.jetbrains.kotlin.idea.decompiler.KtClsFileBase;
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope;
 import org.jetbrains.kotlin.idea.stubindex.StaticFacadeIndexUtil;
 import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinderFactory;
 import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory;
@@ -62,11 +62,11 @@ public final class DecompiledNavigationUtils {
         if (virtualFile == null) return null;
 
         PsiFile psiFile = PsiManager.getInstance(project).findFile(virtualFile);
-        if (!(psiFile instanceof KotlinClsFileBase)) {
+        if (!(psiFile instanceof KtClsFileBase)) {
             return null;
         }
 
-        return ((KotlinClsFileBase) psiFile).getDeclarationForDescriptor(referencedDescriptor);
+        return ((KtClsFileBase) psiFile).getDeclarationForDescriptor(referencedDescriptor);
     }
 
     private static boolean isLocal(DeclarationDescriptor descriptor) {
@@ -91,7 +91,7 @@ public final class DecompiledNavigationUtils {
         ClassId containerClassId = getContainerClassId(project, referencedDescriptor);
         if (containerClassId == null) return null;
 
-        GlobalSearchScope scopeToSearchIn = JetSourceFilterScope.kotlinSourceAndClassFiles(GlobalSearchScope.allScope(project), project);
+        GlobalSearchScope scopeToSearchIn = KotlinSourceFilterScope.kotlinSourceAndClassFiles(GlobalSearchScope.allScope(project), project);
 
         VirtualFileFinderFactory virtualFileFinderFactory;
         if (isFromKotlinJavasriptMetadata(referencedDescriptor)) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt
index 8fdb9264450..ab817c3d535 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/KotlinDeclarationNavigationPolicyImpl.kt
@@ -23,7 +23,7 @@ import com.intellij.openapi.project.DumbService
 
 public class KotlinDeclarationNavigationPolicyImpl : KotlinDeclarationNavigationPolicy {
     override fun getOriginalElement(declaration: KtDeclaration) =
-            JetSourceNavigationHelper.getOriginalElement(declaration)
+            SourceNavigationHelper.getOriginalElement(declaration)
     override fun getNavigationElement(declaration: KtDeclaration) =
-            JetSourceNavigationHelper.getNavigationElement(declaration)
+            SourceNavigationHelper.getNavigationElement(declaration)
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
similarity index 95%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
index 7fa86c1c5b6..f8e3e0634ff 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java
@@ -47,10 +47,10 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.ModuleDescriptorKt;
 import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider;
 import org.jetbrains.kotlin.frontend.di.InjectionKt;
-import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyFqnNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope;
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyFqnNameIndex;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.name.ClassId;
@@ -74,8 +74,8 @@ import java.util.Set;
 
 import static org.jetbrains.kotlin.idea.decompiler.navigation.MemberMatching.*;
 
-public class JetSourceNavigationHelper {
-    private static final Logger LOG = Logger.getInstance(JetSourceNavigationHelper.class);
+public class SourceNavigationHelper {
+    private static final Logger LOG = Logger.getInstance(SourceNavigationHelper.class);
 
     public enum NavigationKind {
         CLASS_FILES_TO_SOURCES,
@@ -84,7 +84,7 @@ public class JetSourceNavigationHelper {
 
     private static boolean forceResolve = false;
 
-    private JetSourceNavigationHelper() {
+    private SourceNavigationHelper() {
     }
 
     @NotNull
@@ -103,8 +103,8 @@ public class JetSourceNavigationHelper {
 
         Project project = declaration.getProject();
         return includeLibrarySources
-               ? JetSourceFilterScope.kotlinLibrarySources(GlobalSearchScope.allScope(project), project)
-               : JetSourceFilterScope.kotlinLibraryClassFiles(GlobalSearchScope.allScope(project), project);
+               ? KotlinSourceFilterScope.kotlinLibrarySources(GlobalSearchScope.allScope(project), project)
+               : KotlinSourceFilterScope.kotlinLibraryClassFiles(GlobalSearchScope.allScope(project), project);
     }
 
     private static List<KtFile> getContainingFiles(@NotNull Iterable<KtNamedDeclaration> declarations) {
@@ -279,7 +279,7 @@ public class JetSourceNavigationHelper {
         if (librarySourcesScope == GlobalSearchScope.EMPTY_SCOPE) { // .getProject() == null for EMPTY_SCOPE, and this breaks code
             return null;
         }
-        Collection<KtClassOrObject> classes = JetFullClassNameIndex.getInstance()
+        Collection<KtClassOrObject> classes = KotlinFullClassNameIndex.getInstance()
                 .get(classFqName.asString(), classOrObject.getProject(), librarySourcesScope);
         if (classes.isEmpty()) {
             return null;
@@ -309,10 +309,10 @@ public class JetSourceNavigationHelper {
             @NotNull KtNamedDeclaration decompiledDeclaration
     ) {
         if (decompiledDeclaration instanceof KtNamedFunction) {
-            return JetTopLevelFunctionFqnNameIndex.getInstance();
+            return KotlinTopLevelFunctionFqnNameIndex.getInstance();
         }
         if (decompiledDeclaration instanceof KtProperty) {
-            return JetTopLevelPropertyFqnNameIndex.getInstance();
+            return KotlinTopLevelPropertyFqnNameIndex.getInstance();
         }
         throw new IllegalArgumentException("Neither function nor declaration: " + decompiledDeclaration.getClass().getName());
     }
@@ -360,7 +360,7 @@ public class JetSourceNavigationHelper {
 
     @TestOnly
     public static void setForceResolve(boolean forceResolve) {
-        JetSourceNavigationHelper.forceResolve = forceResolve;
+        SourceNavigationHelper.forceResolve = forceResolve;
     }
 
     @Nullable
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
similarity index 94%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
index f7549e4ad0a..968b10ab7ed 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/JetFindUsagesProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/findUsages/KotlinFindUsagesProvider.kt
@@ -16,13 +16,12 @@
 
 package org.jetbrains.kotlin.idea.findUsages
 
-import com.intellij.lang.cacheBuilder.WordsScanner
 import com.intellij.lang.findUsages.FindUsagesProvider
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiNamedElement
 import org.jetbrains.kotlin.psi.*
 
-public class JetFindUsagesProvider : FindUsagesProvider {
+public class KotlinFindUsagesProvider : FindUsagesProvider {
     public override fun canFindUsagesFor(psiElement: PsiElement): Boolean =
             psiElement is KtNamedDeclaration
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
index fb5209d881f..c9424b87c88 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DebugInfoAnnotator.java
@@ -53,20 +53,20 @@ public class DebugInfoAnnotator implements Annotator {
                     @Override
                     public void reportElementWithErrorType(@NotNull KtReferenceExpression expression) {
                         holder.createErrorAnnotation(expression, "[DEBUG] Resolved to error element")
-                                .setTextAttributes(JetHighlightingColors.RESOLVED_TO_ERROR);
+                                .setTextAttributes(KotlinHighlightingColors.RESOLVED_TO_ERROR);
                     }
 
                     @Override
                     public void reportMissingUnresolved(@NotNull KtReferenceExpression expression) {
                         holder.createErrorAnnotation(expression,
                                                      "[DEBUG] Reference is not resolved to anything, but is not marked unresolved")
-                                .setTextAttributes(JetHighlightingColors.DEBUG_INFO);
+                                .setTextAttributes(KotlinHighlightingColors.DEBUG_INFO);
                     }
 
                     @Override
                     public void reportUnresolvedWithTarget(@NotNull KtReferenceExpression expression, @NotNull String target) {
                         holder.createErrorAnnotation(expression, "[DEBUG] Reference marked as unresolved is actually resolved to " + target)
-                                .setTextAttributes(JetHighlightingColors.DEBUG_INFO);
+                                .setTextAttributes(KotlinHighlightingColors.DEBUG_INFO);
                     }
                 });
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
index c05b3a529d0..9546670d744 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java
@@ -47,6 +47,6 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
         Diagnostics diagnostics = DuplicateJvmSignatureUtilKt.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope);
 
         if (diagnostics == null) return;
-        new JetPsiChecker().annotateElement(element, holder, diagnostics);
+        new KotlinPsiChecker().annotateElement(element, holder, diagnostics);
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java
index b9c93f34abf..9dee08a0516 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java
@@ -40,7 +40,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
     public void visitNamedFunction(@NotNull KtNamedFunction function) {
         PsiElement nameIdentifier = function.getNameIdentifier();
         if (nameIdentifier != null) {
-            NameHighlighter.highlightName(holder, nameIdentifier, JetHighlightingColors.FUNCTION_DECLARATION);
+            NameHighlighter.highlightName(holder, nameIdentifier, KotlinHighlightingColors.FUNCTION_DECLARATION);
         }
 
         super.visitNamedFunction(function);
@@ -55,7 +55,7 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
             if (typeElement instanceof KtUserType) {
                 KtSimpleNameExpression nameExpression = ((KtUserType)typeElement).getReferenceExpression();
                 if (nameExpression != null) {
-                    NameHighlighter.highlightName(holder, nameExpression, JetHighlightingColors.CONSTRUCTOR_CALL);
+                    NameHighlighter.highlightName(holder, nameExpression, KotlinHighlightingColors.CONSTRUCTOR_CALL);
                 }
             }
         }
@@ -70,25 +70,25 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit
             CallableDescriptor calleeDescriptor = resolvedCall.getResultingDescriptor();
 
             if (DynamicCallsKt.isDynamic(calleeDescriptor)) {
-                NameHighlighter.highlightName(holder, callee, JetHighlightingColors.DYNAMIC_FUNCTION_CALL);
+                NameHighlighter.highlightName(holder, callee, KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL);
             }
             else if (resolvedCall instanceof VariableAsFunctionResolvedCall) {
                 NameHighlighter.highlightName(holder, callee, containedInFunctionClassOrSubclass(calleeDescriptor)
-                                                            ? JetHighlightingColors.VARIABLE_AS_FUNCTION_CALL
-                                                            : JetHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL);
+                                                            ? KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL
+                                                            : KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL);
             }
             else {
                 if (calleeDescriptor instanceof ConstructorDescriptor) {
-                    NameHighlighter.highlightName(holder, callee, JetHighlightingColors.CONSTRUCTOR_CALL);
+                    NameHighlighter.highlightName(holder, callee, KotlinHighlightingColors.CONSTRUCTOR_CALL);
                 }
                 else if (calleeDescriptor instanceof FunctionDescriptor) {
                     FunctionDescriptor fun = (FunctionDescriptor) calleeDescriptor;
-                    NameHighlighter.highlightName(holder, callee, JetHighlightingColors.FUNCTION_CALL);
+                    NameHighlighter.highlightName(holder, callee, KotlinHighlightingColors.FUNCTION_CALL);
                     if (DescriptorUtils.isTopLevelDeclaration(fun)) {
-                        NameHighlighter.highlightName(holder, callee, JetHighlightingColors.PACKAGE_FUNCTION_CALL);
+                        NameHighlighter.highlightName(holder, callee, KotlinHighlightingColors.PACKAGE_FUNCTION_CALL);
                     }
                     if (fun.getExtensionReceiverParameter() != null) {
-                        NameHighlighter.highlightName(holder, callee, JetHighlightingColors.EXTENSION_FUNCTION_CALL);
+                        NameHighlighter.highlightName(holder, callee, KotlinHighlightingColors.EXTENSION_FUNCTION_CALL);
                     }
                 }
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java
deleted file mode 100644
index f122723110d..00000000000
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlighter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.highlighter;
-
-import com.intellij.lexer.Lexer;
-import com.intellij.openapi.editor.colors.TextAttributesKey;
-import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
-import com.intellij.psi.TokenType;
-import com.intellij.psi.tree.IElementType;
-import com.intellij.psi.tree.TokenSet;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
-import org.jetbrains.kotlin.lexer.KtTokens;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class JetHighlighter extends SyntaxHighlighterBase {
-    private static final Map<IElementType, TextAttributesKey> keys1;
-    private static final Map<IElementType, TextAttributesKey> keys2;
-
-    @Override
-    @NotNull
-    public Lexer getHighlightingLexer() {
-        return new JetHighlightingLexer();
-    }
-
-    @Override
-    @NotNull
-    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
-        return pack(keys1.get(tokenType), keys2.get(tokenType));
-    }
-
-    static {
-        keys1 = new HashMap<IElementType, TextAttributesKey>();
-        keys2 = new HashMap<IElementType, TextAttributesKey>();
-
-        fillMap(keys1, KtTokens.KEYWORDS, JetHighlightingColors.KEYWORD);
-
-        keys1.put(KtTokens.AS_SAFE, JetHighlightingColors.KEYWORD);
-        keys1.put(KtTokens.INTEGER_LITERAL, JetHighlightingColors.NUMBER);
-        keys1.put(KtTokens.FLOAT_LITERAL, JetHighlightingColors.NUMBER);
-
-        fillMap(keys1,
-                TokenSet.andNot(KtTokens.OPERATIONS,
-                                TokenSet.orSet(
-                                        TokenSet.create(KtTokens.IDENTIFIER, KtTokens.AT),
-                                        KtTokens.KEYWORDS)),
-                JetHighlightingColors.OPERATOR_SIGN);
-
-        keys1.put(KtTokens.LPAR, JetHighlightingColors.PARENTHESIS);
-        keys1.put(KtTokens.RPAR, JetHighlightingColors.PARENTHESIS);
-        keys1.put(KtTokens.LBRACE, JetHighlightingColors.BRACES);
-        keys1.put(KtTokens.RBRACE, JetHighlightingColors.BRACES);
-        keys1.put(KtTokens.LBRACKET, JetHighlightingColors.BRACKETS);
-        keys1.put(KtTokens.RBRACKET, JetHighlightingColors.BRACKETS);
-        keys1.put(KtTokens.COMMA, JetHighlightingColors.COMMA);
-        keys1.put(KtTokens.SEMICOLON, JetHighlightingColors.SEMICOLON);
-        keys1.put(KtTokens.DOT, JetHighlightingColors.DOT);
-        keys1.put(KtTokens.ARROW, JetHighlightingColors.ARROW);
-
-        keys1.put(KtTokens.OPEN_QUOTE, JetHighlightingColors.STRING);
-        keys1.put(KtTokens.CLOSING_QUOTE, JetHighlightingColors.STRING);
-        keys1.put(KtTokens.REGULAR_STRING_PART, JetHighlightingColors.STRING);
-        keys1.put(KtTokens.LONG_TEMPLATE_ENTRY_END, JetHighlightingColors.STRING_ESCAPE);
-        keys1.put(KtTokens.LONG_TEMPLATE_ENTRY_START, JetHighlightingColors.STRING_ESCAPE);
-        keys1.put(KtTokens.SHORT_TEMPLATE_ENTRY_START, JetHighlightingColors.STRING_ESCAPE);
-
-        keys1.put(KtTokens.ESCAPE_SEQUENCE, JetHighlightingColors.STRING_ESCAPE);
-
-        keys1.put(KtTokens.CHARACTER_LITERAL, JetHighlightingColors.STRING);
-
-        keys1.put(KtTokens.EOL_COMMENT, JetHighlightingColors.LINE_COMMENT);
-        keys1.put(KtTokens.SHEBANG_COMMENT, JetHighlightingColors.LINE_COMMENT);
-        keys1.put(KtTokens.BLOCK_COMMENT, JetHighlightingColors.BLOCK_COMMENT);
-        keys1.put(KtTokens.DOC_COMMENT, JetHighlightingColors.DOC_COMMENT);
-
-        fillMap(keys1, KDocTokens.KDOC_HIGHLIGHT_TOKENS, JetHighlightingColors.DOC_COMMENT);
-        keys1.put(KDocTokens.TAG_NAME, JetHighlightingColors.KDOC_TAG);
-        keys2.put(KDocTokens.TAG_NAME, JetHighlightingColors.DOC_COMMENT);
-
-        keys1.put(TokenType.BAD_CHARACTER, JetHighlightingColors.BAD_CHARACTER);
-    }
-}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
new file mode 100644
index 00000000000..442d60e6b2d
--- /dev/null
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlighter.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.highlighter;
+
+import com.intellij.lexer.Lexer;
+import com.intellij.openapi.editor.colors.TextAttributesKey;
+import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
+import com.intellij.psi.TokenType;
+import com.intellij.psi.tree.IElementType;
+import com.intellij.psi.tree.TokenSet;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
+import org.jetbrains.kotlin.lexer.KtTokens;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class KotlinHighlighter extends SyntaxHighlighterBase {
+    private static final Map<IElementType, TextAttributesKey> keys1;
+    private static final Map<IElementType, TextAttributesKey> keys2;
+
+    @Override
+    @NotNull
+    public Lexer getHighlightingLexer() {
+        return new KotlinHighlightingLexer();
+    }
+
+    @Override
+    @NotNull
+    public TextAttributesKey[] getTokenHighlights(IElementType tokenType) {
+        return pack(keys1.get(tokenType), keys2.get(tokenType));
+    }
+
+    static {
+        keys1 = new HashMap<IElementType, TextAttributesKey>();
+        keys2 = new HashMap<IElementType, TextAttributesKey>();
+
+        fillMap(keys1, KtTokens.KEYWORDS, KotlinHighlightingColors.KEYWORD);
+
+        keys1.put(KtTokens.AS_SAFE, KotlinHighlightingColors.KEYWORD);
+        keys1.put(KtTokens.INTEGER_LITERAL, KotlinHighlightingColors.NUMBER);
+        keys1.put(KtTokens.FLOAT_LITERAL, KotlinHighlightingColors.NUMBER);
+
+        fillMap(keys1,
+                TokenSet.andNot(KtTokens.OPERATIONS,
+                                TokenSet.orSet(
+                                        TokenSet.create(KtTokens.IDENTIFIER, KtTokens.AT),
+                                        KtTokens.KEYWORDS)),
+                KotlinHighlightingColors.OPERATOR_SIGN);
+
+        keys1.put(KtTokens.LPAR, KotlinHighlightingColors.PARENTHESIS);
+        keys1.put(KtTokens.RPAR, KotlinHighlightingColors.PARENTHESIS);
+        keys1.put(KtTokens.LBRACE, KotlinHighlightingColors.BRACES);
+        keys1.put(KtTokens.RBRACE, KotlinHighlightingColors.BRACES);
+        keys1.put(KtTokens.LBRACKET, KotlinHighlightingColors.BRACKETS);
+        keys1.put(KtTokens.RBRACKET, KotlinHighlightingColors.BRACKETS);
+        keys1.put(KtTokens.COMMA, KotlinHighlightingColors.COMMA);
+        keys1.put(KtTokens.SEMICOLON, KotlinHighlightingColors.SEMICOLON);
+        keys1.put(KtTokens.DOT, KotlinHighlightingColors.DOT);
+        keys1.put(KtTokens.ARROW, KotlinHighlightingColors.ARROW);
+
+        keys1.put(KtTokens.OPEN_QUOTE, KotlinHighlightingColors.STRING);
+        keys1.put(KtTokens.CLOSING_QUOTE, KotlinHighlightingColors.STRING);
+        keys1.put(KtTokens.REGULAR_STRING_PART, KotlinHighlightingColors.STRING);
+        keys1.put(KtTokens.LONG_TEMPLATE_ENTRY_END, KotlinHighlightingColors.STRING_ESCAPE);
+        keys1.put(KtTokens.LONG_TEMPLATE_ENTRY_START, KotlinHighlightingColors.STRING_ESCAPE);
+        keys1.put(KtTokens.SHORT_TEMPLATE_ENTRY_START, KotlinHighlightingColors.STRING_ESCAPE);
+
+        keys1.put(KtTokens.ESCAPE_SEQUENCE, KotlinHighlightingColors.STRING_ESCAPE);
+
+        keys1.put(KtTokens.CHARACTER_LITERAL, KotlinHighlightingColors.STRING);
+
+        keys1.put(KtTokens.EOL_COMMENT, KotlinHighlightingColors.LINE_COMMENT);
+        keys1.put(KtTokens.SHEBANG_COMMENT, KotlinHighlightingColors.LINE_COMMENT);
+        keys1.put(KtTokens.BLOCK_COMMENT, KotlinHighlightingColors.BLOCK_COMMENT);
+        keys1.put(KtTokens.DOC_COMMENT, KotlinHighlightingColors.DOC_COMMENT);
+
+        fillMap(keys1, KDocTokens.KDOC_HIGHLIGHT_TOKENS, KotlinHighlightingColors.DOC_COMMENT);
+        keys1.put(KDocTokens.TAG_NAME, KotlinHighlightingColors.KDOC_TAG);
+        keys2.put(KDocTokens.TAG_NAME, KotlinHighlightingColors.DOC_COMMENT);
+
+        keys1.put(TokenType.BAD_CHARACTER, KotlinHighlightingColors.BAD_CHARACTER);
+    }
+}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
similarity index 99%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
index 91a40a71ec8..92502fe2fb0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingColors.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingColors.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey;
 
 import static com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey;
 
-public class JetHighlightingColors {
+public class KotlinHighlightingColors {
     // default keys (mostly syntax elements)
     public static final TextAttributesKey KEYWORD = createTextAttributesKey("KOTLIN_KEYWORD", JavaHighlightingColors.KEYWORD);
     public static final TextAttributesKey BUILTIN_ANNOTATION = createTextAttributesKey("KOTLIN_BUILTIN_ANNOTATION", JavaHighlightingColors.KEYWORD);
@@ -87,6 +87,6 @@ public class JetHighlightingColors {
     public static final TextAttributesKey DEBUG_INFO = createTextAttributesKey("KOTLIN_DEBUG_INFO");
     public static final TextAttributesKey RESOLVED_TO_ERROR = createTextAttributesKey("KOTLIN_RESOLVED_TO_ERROR");
 
-    private JetHighlightingColors() {
+    private KotlinHighlightingColors() {
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexer.java
similarity index 91%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexer.java
index cc5b4c0c6fa..46b8248102e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetHighlightingLexer.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinHighlightingLexer.java
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.kdoc.lexer.KDocLexer;
 import org.jetbrains.kotlin.lexer.KotlinLexer;
 import org.jetbrains.kotlin.lexer.KtTokens;
 
-public class JetHighlightingLexer extends LayeredLexer {
-    public JetHighlightingLexer() {
+public class KotlinHighlightingLexer extends LayeredLexer {
+    public KotlinHighlightingLexer() {
         super(new KotlinLexer());
 
         registerSelfStoppingLayer(new KDocLexer(), new IElementType[]{KtTokens.DOC_COMMENT}, IElementType.EMPTY_ARRAY);
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
similarity index 98%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
index 99b940e6085..f930d509e3d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetPsiChecker.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiChecker.kt
@@ -54,7 +54,7 @@ import org.jetbrains.kotlin.utils.singletonOrEmptyList
 import java.lang.reflect.*
 import java.util.*
 
-public open class JetPsiChecker : Annotator, HighlightRangeExtension {
+public open class KotlinPsiChecker : Annotator, HighlightRangeExtension {
 
     override fun annotate(element: PsiElement, holder: AnnotationHolder) {
         if (!(ProjectRootsUtil.isInProjectOrLibraryContent(element) || element.getContainingFile() is KtCodeFragment)) return
@@ -199,7 +199,7 @@ private class ElementAnnotator(private val element: PsiElement,
                         }
                     }
 
-                    Errors.ILLEGAL_ESCAPE -> AnnotationPresentationInfo(ranges, textAttributes = JetHighlightingColors.INVALID_STRING_ESCAPE)
+                    Errors.ILLEGAL_ESCAPE -> AnnotationPresentationInfo(ranges, textAttributes = KotlinHighlightingColors.INVALID_STRING_ESCAPE)
 
                     Errors.REDECLARATION -> AnnotationPresentationInfo(
                             ranges = listOf(diagnostic.getTextRanges().first()), nonDefaultMessage = "")
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSyntaxHighlighterFactory.java
similarity index 87%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSyntaxHighlighterFactory.java
index f28899827b9..da1f9728343 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/JetSyntaxHighlighterFactory.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSyntaxHighlighterFactory.java
@@ -20,10 +20,10 @@ import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory
 import com.intellij.openapi.fileTypes.SyntaxHighlighter;
 import org.jetbrains.annotations.NotNull;
 
-public class JetSyntaxHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
+public class KotlinSyntaxHighlighterFactory extends SingleLazyInstanceSyntaxHighlighterFactory {
     @Override
     @NotNull
     protected SyntaxHighlighter createHighlighter() {
-      return new JetHighlighter();
+      return new KotlinHighlighter();
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java
index edf6760e185..7193e771738 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/LabelsHighlightingVisitor.java
@@ -33,7 +33,7 @@ class LabelsHighlightingVisitor extends KtVisitorVoid {
     public void visitExpressionWithLabel(@NotNull KtExpressionWithLabel expression) {
         KtSimpleNameExpression targetLabel = expression.getTargetLabel();
         if (targetLabel != null) {
-            NameHighlighter.highlightName(holder, targetLabel, JetHighlightingColors.LABEL);
+            NameHighlighter.highlightName(holder, targetLabel, KotlinHighlightingColors.LABEL);
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java
index 7d127699501..5c49f38d94a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor;
-import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.KtParameter;
 import org.jetbrains.kotlin.psi.KtProperty;
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression;
@@ -44,7 +43,7 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
         }
         DeclarationDescriptor target = bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
         if (target instanceof SyntheticFieldDescriptor) {
-            NameHighlighter.highlightName(holder, expression, JetHighlightingColors.BACKING_FIELD_VARIABLE);
+            NameHighlighter.highlightName(holder, expression, KotlinHighlightingColors.BACKING_FIELD_VARIABLE);
             return;
         }
         if (!(target instanceof PropertyDescriptor)) {
@@ -86,21 +85,21 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
             boolean withBackingField
     ) {
         if (DynamicCallsKt.isDynamic(descriptor)) {
-            NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.DYNAMIC_PROPERTY_CALL);
+            NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL);
             return;
         }
 
         boolean isStatic = DescriptorUtils.isStaticDeclaration(descriptor);
         NameHighlighter.highlightName(
                 holder, elementToHighlight,
-                isStatic ? JetHighlightingColors.PACKAGE_PROPERTY : JetHighlightingColors.INSTANCE_PROPERTY
+                isStatic ? KotlinHighlightingColors.PACKAGE_PROPERTY : KotlinHighlightingColors.INSTANCE_PROPERTY
         );
         if (descriptor.getExtensionReceiverParameter() != null) {
-            NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.EXTENSION_PROPERTY);
+            NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.EXTENSION_PROPERTY);
         }
         if (withBackingField) {
             holder.createInfoAnnotation(elementToHighlight, "This property has a backing field")
-                    .setTextAttributes(JetHighlightingColors.PROPERTY_WITH_BACKING_FIELD);
+                    .setTextAttributes(KotlinHighlightingColors.PROPERTY_WITH_BACKING_FIELD);
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java
index d5f324033bc..d16f63df47a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/SoftKeywordsHighlightingVisitor.java
@@ -40,14 +40,14 @@ class SoftKeywordsHighlightingVisitor extends KtVisitorVoid {
         if (element instanceof LeafPsiElement) {
             IElementType elementType = ((LeafPsiElement)element).getElementType();
             if (KtTokens.SOFT_KEYWORDS.contains(elementType)) {
-                TextAttributesKey attributes = JetHighlightingColors.KEYWORD;
+                TextAttributesKey attributes = KotlinHighlightingColors.KEYWORD;
                 if (KtTokens.MODIFIER_KEYWORDS.contains(elementType)) {
-                    attributes = JetHighlightingColors.BUILTIN_ANNOTATION;
+                    attributes = KotlinHighlightingColors.BUILTIN_ANNOTATION;
                 }
                 holder.createInfoAnnotation(element, null).setTextAttributes(attributes);
             }
             if (KtTokens.SAFE_ACCESS.equals(elementType)) {
-                holder.createInfoAnnotation(element, null).setTextAttributes(JetHighlightingColors.SAFE_ACCESS);
+                holder.createInfoAnnotation(element, null).setTextAttributes(KotlinHighlightingColors.SAFE_ACCESS);
             }
         }
     }
@@ -56,14 +56,14 @@ class SoftKeywordsHighlightingVisitor extends KtVisitorVoid {
     public void visitFunctionLiteralExpression(@NotNull KtFunctionLiteralExpression expression) {
         if (ApplicationManager.getApplication().isUnitTestMode()) return;
         KtFunctionLiteral functionLiteral = expression.getFunctionLiteral();
-        holder.createInfoAnnotation(functionLiteral.getLBrace(), null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
+        holder.createInfoAnnotation(functionLiteral.getLBrace(), null).setTextAttributes(KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
         PsiElement closingBrace = functionLiteral.getRBrace();
         if (closingBrace != null) {
-            holder.createInfoAnnotation(closingBrace, null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
+            holder.createInfoAnnotation(closingBrace, null).setTextAttributes(KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
         }
         PsiElement arrow = functionLiteral.getArrow();
         if (arrow != null) {
-            holder.createInfoAnnotation(arrow, null).setTextAttributes(JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
+            holder.createInfoAnnotation(arrow, null).setTextAttributes(KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW);
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
index dead67f2f65..d7378a8c1fe 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java
@@ -44,7 +44,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
 
             if (referenceTarget instanceof ClassDescriptor) {
                 TextAttributesKey textAttributesKey = textAttributesKeyForClass((ClassDescriptor) referenceTarget);
-                if (textAttributesKey == JetHighlightingColors.ANNOTATION) {
+                if (textAttributesKey == KotlinHighlightingColors.ANNOTATION) {
                     highlightAnnotation(expression);
                 }
                 else {
@@ -52,21 +52,21 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
                 }
             }
             else if (referenceTarget instanceof TypeParameterDescriptor) {
-                highlightName(expression, JetHighlightingColors.TYPE_PARAMETER);
+                highlightName(expression, KotlinHighlightingColors.TYPE_PARAMETER);
             }
         }
     }
 
     private void highlightAnnotation(@NotNull KtSimpleNameExpression expression) {
         TextRange toHighlight = JetPsiUtilKt.getCalleeHighlightingRange(expression);
-        NameHighlighter.highlightName(holder, toHighlight, JetHighlightingColors.ANNOTATION);
+        NameHighlighter.highlightName(holder, toHighlight, KotlinHighlightingColors.ANNOTATION);
     }
 
     @Override
     public void visitTypeParameter(@NotNull KtTypeParameter parameter) {
         PsiElement identifier = parameter.getNameIdentifier();
         if (identifier != null) {
-            highlightName(identifier, JetHighlightingColors.TYPE_PARAMETER);
+            highlightName(identifier, KotlinHighlightingColors.TYPE_PARAMETER);
         }
         super.visitTypeParameter(parameter);
     }
@@ -94,17 +94,17 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
     private static TextAttributesKey textAttributesKeyForClass(@NotNull ClassDescriptor descriptor) {
         switch (descriptor.getKind()) {
             case INTERFACE:
-                return JetHighlightingColors.TRAIT;
+                return KotlinHighlightingColors.TRAIT;
             case ANNOTATION_CLASS:
-                return JetHighlightingColors.ANNOTATION;
+                return KotlinHighlightingColors.ANNOTATION;
             case OBJECT:
-                return JetHighlightingColors.OBJECT;
+                return KotlinHighlightingColors.OBJECT;
             case ENUM_ENTRY:
-                return JetHighlightingColors.ENUM_ENTRY;
+                return KotlinHighlightingColors.ENUM_ENTRY;
             default:
                 return descriptor.getModality() == Modality.ABSTRACT
-                       ? JetHighlightingColors.ABSTRACT_CLASS
-                       : JetHighlightingColors.CLASS;
+                       ? KotlinHighlightingColors.ABSTRACT_CLASS
+                       : KotlinHighlightingColors.CLASS;
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java
index e0c43002cae..5e12caa4fb5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java
@@ -47,7 +47,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
             ValueParameterDescriptor parameterDescriptor = (ValueParameterDescriptor) target;
             if (Boolean.TRUE.equals(bindingContext.get(AUTO_CREATED_IT, parameterDescriptor))) {
                 holder.createInfoAnnotation(expression, "Automatically declared based on the expected type").setTextAttributes(
-                    JetHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER);
+                        KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER);
             }
         }
 
@@ -72,7 +72,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
         KotlinType smartCast = bindingContext.get(SMARTCAST, expression);
         if (smartCast != null) {
             holder.createInfoAnnotation(expression, "Smart cast to " + DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(smartCast)).setTextAttributes(
-                JetHighlightingColors.SMART_CAST_VALUE);
+                    KotlinHighlightingColors.SMART_CAST_VALUE);
         }
         super.visitExpression(expression);
     }
@@ -90,27 +90,27 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
             VariableDescriptor variableDescriptor = (VariableDescriptor) descriptor;
 
             if (DynamicCallsKt.isDynamic(variableDescriptor)) {
-                NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.DYNAMIC_PROPERTY_CALL);
+                NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL);
                 return;
             }
 
             if (variableDescriptor.isVar()) {
-                NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.MUTABLE_VARIABLE);
+                NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.MUTABLE_VARIABLE);
             }
 
             if (bindingContext.get(CAPTURED_IN_CLOSURE, variableDescriptor) == CaptureKind.NOT_INLINE) {
                 String msg = ((VariableDescriptor) descriptor).isVar()
                              ? "Wrapped into a reference object to be modified when captured in a closure"
                              : "Value captured in a closure";
-                holder.createInfoAnnotation(elementToHighlight, msg).setTextAttributes(JetHighlightingColors.WRAPPED_INTO_REF);
+                holder.createInfoAnnotation(elementToHighlight, msg).setTextAttributes(KotlinHighlightingColors.WRAPPED_INTO_REF);
             }
 
             if (descriptor instanceof LocalVariableDescriptor) {
-                NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.LOCAL_VARIABLE);
+                NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.LOCAL_VARIABLE);
             }
 
             if (descriptor instanceof ValueParameterDescriptor) {
-                NameHighlighter.highlightName(holder, elementToHighlight, JetHighlightingColors.PARAMETER);
+                NameHighlighter.highlightName(holder, elementToHighlight, KotlinHighlightingColors.PARAMETER);
             }
         }
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
index 54378018303..28605ea44e1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/inspections/IntentionBasedInspection.kt
@@ -31,7 +31,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiFile
 import com.intellij.util.SmartList
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.psi.KtElement
 
 public abstract class IntentionBasedInspection<TElement : KtElement>(
@@ -40,11 +40,11 @@ public abstract class IntentionBasedInspection<TElement : KtElement>(
         protected val elementType: Class<TElement>
 ) : AbstractKotlinInspection() {
 
-    constructor(intention: JetSelfTargetingRangeIntention<TElement>, additionalChecker: (TElement) -> Boolean = { true })
+    constructor(intention: SelfTargetingRangeIntention<TElement>, additionalChecker: (TElement) -> Boolean = { true })
     : this(listOf(IntentionData(intention, additionalChecker)), null, intention.elementType)
 
     public data class IntentionData<TElement : KtElement>(
-            val intention: JetSelfTargetingRangeIntention<TElement>,
+            val intention: SelfTargetingRangeIntention<TElement>,
             val additionalChecker: (TElement) -> Boolean = { true }
     )
 
@@ -89,7 +89,7 @@ public abstract class IntentionBasedInspection<TElement : KtElement>(
 
     /* we implement IntentionAction to provide isAvailable which will be used to hide outdated items and make sure we never call 'invoke' for such item */
     private class IntentionBasedQuickFix<TElement : KtElement>(
-            private val intention: JetSelfTargetingRangeIntention<TElement>,
+            private val intention: SelfTargetingRangeIntention<TElement>,
             private val text: String,
             private val additionalChecker: (TElement) -> Boolean,
             targetElement: TElement
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
index 6b293c23929..5946e31bb18 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/OperatorToFunctionIntention.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
-public class OperatorToFunctionIntention : JetSelfTargetingIntention<KtExpression>(javaClass(), "Replace overloaded operator with function call") {
+public class OperatorToFunctionIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Replace overloaded operator with function call") {
     companion object {
         private fun isApplicablePrefix(element: KtPrefixExpression, caretOffset: Int): Boolean {
             val opRef = element.getOperationReference()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
similarity index 91%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
index 2b7ca836611..0214903dfd5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/JetSelfTargetingIntention.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
@@ -32,9 +32,9 @@ import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.psiUtil.containsInside
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
-import java.util.HashMap
+import java.util.*
 
-public abstract class JetSelfTargetingIntention<TElement : KtElement>(
+public abstract class SelfTargetingIntention<TElement : KtElement>(
         public val elementType: Class<TElement>,
         private var text: String,
         private val familyName: String = text
@@ -107,9 +107,9 @@ public abstract class JetSelfTargetingIntention<TElement : KtElement>(
     override fun toString(): String = getText()
 
     companion object {
-        private val intentionBasedInspections = HashMap<Class<out JetSelfTargetingIntention<*>>, IntentionBasedInspection<*>?>()
+        private val intentionBasedInspections = HashMap<Class<out SelfTargetingIntention<*>>, IntentionBasedInspection<*>?>()
 
-        fun <TElement : KtElement> findInspection(intentionClass: Class<out JetSelfTargetingIntention<TElement>>): IntentionBasedInspection<TElement>? {
+        fun <TElement : KtElement> findInspection(intentionClass: Class<out SelfTargetingIntention<TElement>>): IntentionBasedInspection<TElement>? {
             if (intentionBasedInspections.containsKey(intentionClass)) {
                 @Suppress("UNCHECKED_CAST")
                 return intentionBasedInspections[intentionClass] as IntentionBasedInspection<TElement>?
@@ -129,11 +129,11 @@ public abstract class JetSelfTargetingIntention<TElement : KtElement>(
     }
 }
 
-public abstract class JetSelfTargetingRangeIntention<TElement : KtElement>(
+public abstract class SelfTargetingRangeIntention<TElement : KtElement>(
         elementType: Class<TElement>,
         text: String,
         familyName: String = text
-) : JetSelfTargetingIntention<TElement>(elementType, text, familyName) {
+) : SelfTargetingIntention<TElement>(elementType, text, familyName) {
 
     public abstract fun applicabilityRange(element: TElement): TextRange?
 
@@ -143,11 +143,11 @@ public abstract class JetSelfTargetingRangeIntention<TElement : KtElement>(
     }
 }
 
-public abstract class JetSelfTargetingOffsetIndependentIntention<TElement : KtElement>(
+public abstract class SelfTargetingOffsetIndependentIntention<TElement : KtElement>(
         elementType: Class<TElement>,
         text: String,
         familyName: String = text
-) : JetSelfTargetingRangeIntention<TElement>(elementType, text, familyName) {
+) : SelfTargetingRangeIntention<TElement>(elementType, text, familyName) {
 
     public abstract fun isApplicableTo(element: TElement): Boolean
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt
index dffe27910ad..28c8f1a2478 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingVisitor.kt
@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.idea.kdoc
 import com.intellij.lang.annotation.AnnotationHolder
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiElementVisitor
-import org.jetbrains.kotlin.idea.highlighter.JetHighlightingColors
+import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingColors
 import org.jetbrains.kotlin.kdoc.psi.impl.KDocLink
 
 class KDocHighlightingVisitor(private val holder: AnnotationHolder): PsiElementVisitor() {
     override fun visitElement(element: PsiElement) {
         if (element is KDocLink) {
-            holder.createInfoAnnotation(element, null).setTextAttributes(JetHighlightingColors.KDOC_LINK)
+            holder.createInfoAnnotation(element, null).setTextAttributes(KotlinHighlightingColors.KDOC_LINK)
         }
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
index 9e5cde4613d..ed1bce07c00 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
@@ -32,8 +32,8 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.frontend.di.createContainerForBodyResolve
 import org.jetbrains.kotlin.idea.caches.resolve.CodeFragmentAnalyzer
-import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingFunctionShortNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingPropertyShortNameIndex
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.forEachDescendantOfType
@@ -105,8 +105,8 @@ public class ResolveElementCache(
 
     private fun probablyNothingCallableNames(): ProbablyNothingCallableNames {
         return object : ProbablyNothingCallableNames {
-            override fun functionNames() = JetProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project)
-            override fun propertyNames() = JetProbablyNothingPropertyShortNameIndex.getInstance().getAllKeys(project)
+            override fun functionNames() = KotlinProbablyNothingFunctionShortNameIndex.getInstance().getAllKeys(project)
+            override fun propertyNames() = KotlinProbablyNothingPropertyShortNameIndex.getInstance().getAllKeys(project)
         }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionsFactory.kt
similarity index 97%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionsFactory.kt
index b9735184d43..50d16e7e558 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/JetIntentionActionsFactory.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionsFactory.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.psi.KtCodeFragment
 import org.jetbrains.kotlin.utils.singletonOrEmptyList
 
-public abstract class JetIntentionActionsFactory {
+public abstract class KotlinIntentionActionsFactory {
     protected open fun isApplicableForCodeFragment(): Boolean = false
 
     protected abstract fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction>
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
index e1b59ae539b..f8f6e4da60f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/KotlinSuppressIntentionAction.kt
@@ -21,11 +21,11 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.psi.*
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import com.intellij.codeInspection.SuppressIntentionAction
-import org.jetbrains.kotlin.idea.util.JetPsiPrecedences
+import org.jetbrains.kotlin.idea.util.PsiPrecedences
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 
 public class KotlinSuppressIntentionAction(
@@ -34,8 +34,8 @@ public class KotlinSuppressIntentionAction(
         private val kind: AnnotationHostKind
 ) : SuppressIntentionAction() {
 
-    override fun getFamilyName() = JetBundle.message("suppress.warnings.family")
-    override fun getText() = JetBundle.message("suppress.warning.for", diagnosticFactory.getName(), kind.kind, kind.name)
+    override fun getFamilyName() = KotlinBundle.message("suppress.warnings.family")
+    override fun getText() = KotlinBundle.message("suppress.warning.for", diagnosticFactory.getName(), kind.kind, kind.name)
 
     override fun isAvailable(project: Project, editor: Editor?, element: PsiElement) = element.isValid()
 
@@ -93,7 +93,7 @@ public class KotlinSuppressIntentionAction(
         val suppressAt = caretBox.expression
         assert(suppressAt !is KtDeclaration) { "Declarations should have been checked for above" }
 
-        val parentheses = JetPsiPrecedences.getPrecedence(suppressAt) > JetPsiPrecedences.PRECEDENCE_OF_PREFIX_EXPRESSION
+        val parentheses = PsiPrecedences.getPrecedence(suppressAt) > PsiPrecedences.PRECEDENCE_OF_PREFIX_EXPRESSION
         val placeholderText = "PLACEHOLDER_ID"
         val inner = if (parentheses) "($placeholderText)" else placeholderText
         val annotatedExpression = KtPsiFactory(suppressAt).createExpression(suppressAnnotationText(id) + "\n" + inner)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
index ab3f6de7d9e..7a1336332d3 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/quickfix/QuickFixes.kt
@@ -25,14 +25,14 @@ import com.intellij.openapi.extensions.Extensions
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 
 public class QuickFixes {
-    private val factories: Multimap<DiagnosticFactory<*>, JetIntentionActionsFactory> = HashMultimap.create<DiagnosticFactory<*>, JetIntentionActionsFactory>()
+    private val factories: Multimap<DiagnosticFactory<*>, KotlinIntentionActionsFactory> = HashMultimap.create<DiagnosticFactory<*>, KotlinIntentionActionsFactory>()
     private val actions: Multimap<DiagnosticFactory<*>, IntentionAction> = HashMultimap.create<DiagnosticFactory<*>, IntentionAction>()
 
     init {
         Extensions.getExtensions(QuickFixContributor.EP_NAME).forEach { it.registerQuickFixes(this) }
     }
 
-    public fun register(diagnosticFactory: DiagnosticFactory<*>, vararg factory: JetIntentionActionsFactory) {
+    public fun register(diagnosticFactory: DiagnosticFactory<*>, vararg factory: KotlinIntentionActionsFactory) {
         factories.putAll(diagnosticFactory, factory.toList())
     }
 
@@ -40,7 +40,7 @@ public class QuickFixes {
         actions.putAll(diagnosticFactory, action.toList())
     }
 
-    public fun getActionFactories(diagnosticFactory: DiagnosticFactory<*>): Collection<JetIntentionActionsFactory> {
+    public fun getActionFactories(diagnosticFactory: DiagnosticFactory<*>): Collection<KotlinIntentionActionsFactory> {
         return factories.get(diagnosticFactory)
     }
 
@@ -48,7 +48,7 @@ public class QuickFixes {
         return actions.get(diagnosticFactory)
     }
 
-    public fun getDiagnostics(factory: JetIntentionActionsFactory): Collection<DiagnosticFactory<*>> {
+    public fun getDiagnostics(factory: KotlinIntentionActionsFactory): Collection<DiagnosticFactory<*>> {
         return factories.keySet().filter { factory in factories.get(it) }
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReadWriteAccessDetector.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReadWriteAccessDetector.kt
index 81d2d81c116..3c53993dd68 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReadWriteAccessDetector.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReadWriteAccessDetector.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.highlighting.JavaReadWriteAccessDetector
 import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiReference
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.idea.references.ReferenceAccess
 import org.jetbrains.kotlin.idea.references.readWriteAccess
 import org.jetbrains.kotlin.load.java.JvmAbi
@@ -38,7 +38,7 @@ public class KotlinReadWriteAccessDetector : ReadWriteAccessDetector() {
         }
 
         val refTarget = reference.resolve()
-        if (refTarget is KotlinLightMethod) {
+        if (refTarget is KtLightMethod) {
             val origin = refTarget.getOrigin()
             val declaration: KtNamedDeclaration = when (origin) {
                 is KtPropertyAccessor -> origin.getNonStrictParentOfType<KtProperty>()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
index 85d6dcd6729..667152d3f5c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.search.KOTLIN_NAMED_ARGUMENT_SEARCH_CONTEXT
 import org.jetbrains.kotlin.idea.search.allScope
 import org.jetbrains.kotlin.idea.search.usagesSearch.*
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -110,7 +110,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
         var namedArgsScope = function.useScope.intersectWith(queryParameters.scopeDeterminedByUser)
 
         if (namedArgsScope is GlobalSearchScope) {
-            namedArgsScope = JetSourceFilterScope.kotlinSourcesAndLibraries(namedArgsScope, project)
+            namedArgsScope = KotlinSourceFilterScope.kotlinSourcesAndLibraries(namedArgsScope, project)
 
             val filesWithFunctionName = CacheManager.SERVICE.getInstance(project).getVirtualFilesWithWord(
                     function.name!!, UsageSearchContext.IN_CODE, namedArgsScope, true)
@@ -190,9 +190,9 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
                                 val originClass = element.getStrictParentOfType<KtClass>()
                                 val originLightClass = LightClassUtil.getPsiClass(originClass)
                                 if (originLightClass != null) {
-                                    val lightDeclarations: List<KotlinLightElement<*, *>?> =
-                                            originLightClass.methods.map { it as? KotlinLightMethod } +
-                                            originLightClass.fields.map { it as? KotlinLightField }
+                                    val lightDeclarations: List<KtLightElement<*, *>?> =
+                                            originLightClass.methods.map { it as? KtLightMethod } +
+                                            originLightClass.fields.map { it as? KtLightField }
 
                                     for (declaration in element.declarations) {
                                         val lightDeclaration = lightDeclarations.find { it?.getOrigin() == declaration }
@@ -216,7 +216,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
                 val originClass = originObject.getStrictParentOfType<KtClass>()
                 val originLightClass = LightClassUtil.getPsiClass(originClass)
                 val allMethods = originLightClass?.allMethods
-                return allMethods?.find { it is KotlinLightMethod && it.getOrigin() == function }
+                return allMethods?.find { it is KtLightMethod && it.getOrigin() == function }
             }
             return null
         }
@@ -272,7 +272,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
                     }
                 }
 
-                is KotlinLightMethod -> {
+                is KtLightMethod -> {
                     val declaration = element.getOrigin()
                     if (declaration is KtProperty || (declaration is KtParameter && declaration.hasValOrVar())) {
                         searchNamedElement(queryParameters, declaration as PsiNamedElement)
@@ -289,7 +289,7 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
                     }
                 }
 
-                is KotlinLightParameter -> {
+                is KtLightParameter -> {
                     val origin = element.getOrigin() ?: return
                     runReadAction {
                         val componentFunctionDescriptor = origin.dataClassComponentFunction()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
index 1abfc8ae81c..7c5391a42c2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
@@ -126,9 +126,9 @@ private fun PsiElement.processDelegationCallKotlinConstructorUsages(scope: Searc
 }
 
 private fun PsiElement.processDelegationCallJavaConstructorUsages(scope: SearchScope, process: (KtCallElement) -> Boolean): Boolean {
-    if (this is KotlinLightElement<*, *>) return true
+    if (this is KtLightElement<*, *>) return true
     // TODO: Temporary hack to avoid NPE while KotlinNoOriginLightMethod is around
-    if (this is KotlinLightMethod && this.getOrigin() == null) return true
+    if (this is KtLightMethod && this.getOrigin() == null) return true
     if (!(this is PsiMethod && isConstructor())) return true
     val klass = getContainingClass() ?: return true
     val descriptor = getJavaMethodDescriptor() as? ConstructorDescriptor ?: return true
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
index 69837869e6d..30c72030f16 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinInheritedMembersNodeProvider.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 
 public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<TreeElement>() {
     override fun provideNodes(node: TreeElement): Collection<TreeElement> {
-        if (node !is JetStructureViewElement) return listOf()
+        if (node !is KotlinStructureViewElement) return listOf()
 
         val element = node.getElement()
         if (element !is KtClassOrObject) return listOf()
@@ -53,7 +53,7 @@ public class KotlinInheritedMembersNodeProvider: InheritedMembersNodeProvider<Tr
                 CallableMemberDescriptor.Kind.DELEGATION -> {
                     val superTypeMember = DescriptorToSourceUtilsIde.getAnyDeclaration(project, memberDescriptor)
                     if (superTypeMember is NavigatablePsiElement) {
-                        children.add(JetStructureViewElement(superTypeMember, memberDescriptor, true))
+                        children.add(KotlinStructureViewElement(superTypeMember, memberDescriptor, true))
                     }
                 }
             }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
index aa4935a3d02..53c734fb5f2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureElementPresentation.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider;
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider;
 import org.jetbrains.kotlin.psi.KtClassInitializer;
 import org.jetbrains.kotlin.psi.KtModifierListOwner;
 import org.jetbrains.kotlin.psi.KtPsiUtil;
@@ -111,7 +111,7 @@ class KotlinStructureElementPresentation implements ColoredItemPresentation, Loc
     @Nullable
     private static Icon getElementIcon(@NotNull NavigatablePsiElement navigatablePsiElement, @Nullable DeclarationDescriptor descriptor) {
         if (descriptor != null) {
-            return JetDescriptorIconProvider.getIcon(descriptor, navigatablePsiElement, Iconable.ICON_FLAG_VISIBILITY);
+            return KotlinDescriptorIconProvider.getIcon(descriptor, navigatablePsiElement, Iconable.ICON_FLAG_VISIBILITY);
         }
 
         return PsiIconUtil.getProvidersIcon(navigatablePsiElement, Iconable.ICON_FLAG_VISIBILITY);
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
similarity index 91%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
index f4f16e0b9de..e2c5db9d461 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewElement.java
@@ -39,13 +39,13 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-public class JetStructureViewElement implements StructureViewTreeElement, Queryable {
+public class KotlinStructureViewElement implements StructureViewTreeElement, Queryable {
     private final NavigatablePsiElement element;
     private final boolean isInherited;
 
     private KotlinStructureElementPresentation presentation;
 
-    public JetStructureViewElement(@NotNull NavigatablePsiElement element, @NotNull DeclarationDescriptor descriptor, boolean isInherited) {
+    public KotlinStructureViewElement(@NotNull NavigatablePsiElement element, @NotNull DeclarationDescriptor descriptor, boolean isInherited) {
         this.element = element;
         this.isInherited = isInherited;
 
@@ -55,12 +55,12 @@ public class JetStructureViewElement implements StructureViewTreeElement, Querya
         }
     }
 
-    public JetStructureViewElement(@NotNull NavigatablePsiElement element, boolean isInherited) {
+    public KotlinStructureViewElement(@NotNull NavigatablePsiElement element, boolean isInherited) {
         this.element = element;
         this.isInherited = isInherited;
     }
 
-    public JetStructureViewElement(@NotNull KtFile fileElement) {
+    public KotlinStructureViewElement(@NotNull KtFile fileElement) {
         element = fileElement;
         isInherited = false;
     }
@@ -107,7 +107,7 @@ public class JetStructureViewElement implements StructureViewTreeElement, Querya
         return ArrayUtil.toObjectArray(ContainerUtil.map(childrenDeclarations, new Function<KtDeclaration, TreeElement>() {
             @Override
             public TreeElement fun(KtDeclaration declaration) {
-                return new JetStructureViewElement(declaration, false);
+                return new KotlinStructureViewElement(declaration, false);
             }
         }), TreeElement.class);
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java
similarity index 91%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java
index 45a5b93a949..ef7a3302405 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewFactory.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewFactory.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.psi.KtFile;
 
-public class JetStructureViewFactory implements PsiStructureViewFactory {
+public class KotlinStructureViewFactory implements PsiStructureViewFactory {
     @Override
     public StructureViewBuilder getStructureViewBuilder(PsiFile psiFile) {
         if (psiFile instanceof KtFile) {
@@ -36,7 +36,7 @@ public class JetStructureViewFactory implements PsiStructureViewFactory {
                 @NotNull
                 @Override
                 public StructureViewModel createStructureViewModel(@Nullable Editor editor) {
-                    return new JetStructureViewModel(file);
+                    return new KotlinStructureViewModel(file);
                 }
             };
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.java
similarity index 88%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.java
index 8056e287683..d3d951f7125 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewModel.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KotlinStructureViewModel.java
@@ -26,14 +26,14 @@ import org.jetbrains.kotlin.psi.KtFile;
 import java.util.Arrays;
 import java.util.Collection;
 
-public class JetStructureViewModel extends StructureViewModelBase {
+public class KotlinStructureViewModel extends StructureViewModelBase {
     private static final Collection<NodeProvider> NODE_PROVIDERS = Arrays.<NodeProvider>asList(
             new KotlinInheritedMembersNodeProvider());
 
     private static final Sorter[] sorters = new Sorter[] {Sorter.ALPHA_SORTER};
 
-    public JetStructureViewModel(@NotNull KtFile jetFile) {
-        super(jetFile, new JetStructureViewElement(jetFile));
+    public KotlinStructureViewModel(@NotNull KtFile jetFile) {
+        super(jetFile, new KotlinStructureViewElement(jetFile));
         withSuitableClasses(KtDeclaration.class);
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
similarity index 83%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
index d37b7d308b0..302bec0d054 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetClsStructureViewBuilderProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/KtClsStructureViewBuilderProvider.kt
@@ -16,18 +16,18 @@
 
 package org.jetbrains.kotlin.idea.structureView
 
+import com.intellij.ide.structureView.StructureViewBuilder
 import com.intellij.ide.structureView.StructureViewBuilderProvider
 import com.intellij.openapi.fileTypes.FileType
-import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.project.Project
-import com.intellij.ide.structureView.StructureViewBuilder
+import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile
 
 //TODO: workaround for bug in JavaClsStructureViewBuilderProvider, remove when IDEA api is updated
-public class JetClsStructureViewBuilderProvider : StructureViewBuilderProvider {
+public class KtClsStructureViewBuilderProvider : StructureViewBuilderProvider {
     override fun getStructureViewBuilder(fileType: FileType, file: VirtualFile, project: Project): StructureViewBuilder? {
-        val psiFile = PsiManager.getInstance(project).findFile(file) as? JetClsFile ?: return null
-        return JetStructureViewFactory().getStructureViewBuilder(psiFile)
+        val psiFile = PsiManager.getInstance(project).findFile(file) as? KtClsFile ?: return null
+        return KotlinStructureViewFactory().getStructureViewBuilder(psiFile)
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
index 3fc9bf32111..329cdbe1802 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IdeStubIndexService.java
@@ -44,18 +44,18 @@ public class IdeStubIndexService extends StubIndexService {
     public void indexFile(KotlinFileStub stub, IndexSink sink) {
         FqName packageFqName = stub.getPackageFqName();
 
-        sink.occurrence(JetExactPackagesIndex.getInstance().getKey(), packageFqName.asString());
+        sink.occurrence(KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString());
 
         FqName facadeFqName = ((KotlinFileStubForIde) stub).getFacadeFqName();
         if (facadeFqName != null) {
-            sink.occurrence(JetFileFacadeFqNameIndex.INSTANCE.getKey(), facadeFqName.asString());
-            sink.occurrence(JetFileFacadeShortNameIndex.INSTANCE.getKey(), facadeFqName.shortName().asString());
-            sink.occurrence(JetFileFacadeClassByPackageIndex.INSTANCE.getKey(), packageFqName.asString());
+            sink.occurrence(KotlinFileFacadeFqNameIndex.INSTANCE.getKey(), facadeFqName.asString());
+            sink.occurrence(KotlinFileFacadeShortNameIndex.INSTANCE.getKey(), facadeFqName.shortName().asString());
+            sink.occurrence(KotlinFileFacadeClassByPackageIndex.INSTANCE.getKey(), packageFqName.asString());
         }
 
         FqName partFqName = ((KotlinFileStubForIde) stub).getPartFqName();
         if (partFqName != null) {
-            sink.occurrence(JetFilePartClassIndex.INSTANCE.getKey(), partFqName.asString());
+            sink.occurrence(KotlinFilePartClassIndex.INSTANCE.getKey(), partFqName.asString());
         }
 
         List<StringRef> partNames = ((KotlinFileStubForIde) stub).getFacadePartSimpleNames();
@@ -66,7 +66,7 @@ public class IdeStubIndexService extends StubIndexService {
                     continue;
                 }
                 FqName multifileClassPartFqName = packageFqName.child(Name.identifier(partSimpleName));
-                sink.occurrence(JetMultifileClassPartIndex.INSTANCE.getKey(), multifileClassPartFqName.asString());
+                sink.occurrence(KotlinMultifileClassPartIndex.INSTANCE.getKey(), multifileClassPartFqName.asString());
             }
         }
     }
@@ -75,20 +75,20 @@ public class IdeStubIndexService extends StubIndexService {
     public void indexClass(KotlinClassStub stub, IndexSink sink) {
         String name = stub.getName();
         if (name != null) {
-            sink.occurrence(JetClassShortNameIndex.getInstance().getKey(), name);
+            sink.occurrence(KotlinClassShortNameIndex.getInstance().getKey(), name);
         }
 
         FqName fqName = stub.getFqName();
         if (fqName != null) {
-            sink.occurrence(JetFullClassNameIndex.getInstance().getKey(), fqName.asString());
+            sink.occurrence(KotlinFullClassNameIndex.getInstance().getKey(), fqName.asString());
 
             if (stub.isTopLevel()) {
-                sink.occurrence(JetTopLevelClassByPackageIndex.getInstance().getKey(), fqName.parent().asString());
+                sink.occurrence(KotlinTopLevelClassByPackageIndex.getInstance().getKey(), fqName.parent().asString());
             }
         }
 
         if (stub.isInterface()) {
-            sink.occurrence(JetClassShortNameIndex.getInstance().getKey(), JvmAbi.DEFAULT_IMPLS_CLASS_NAME);
+            sink.occurrence(KotlinClassShortNameIndex.getInstance().getKey(), JvmAbi.DEFAULT_IMPLS_CLASS_NAME);
         }
 
         indexSuperNames(stub, sink);
@@ -98,15 +98,15 @@ public class IdeStubIndexService extends StubIndexService {
     public void indexObject(KotlinObjectStub stub, IndexSink sink) {
         String name = stub.getName();
         if (name != null) {
-            sink.occurrence(JetClassShortNameIndex.getInstance().getKey(), name);
+            sink.occurrence(KotlinClassShortNameIndex.getInstance().getKey(), name);
         }
 
         FqName fqName = stub.getFqName();
         if (fqName != null) {
-            sink.occurrence(JetFullClassNameIndex.getInstance().getKey(), fqName.asString());
+            sink.occurrence(KotlinFullClassNameIndex.getInstance().getKey(), fqName.asString());
 
             if (stub.isTopLevel()) {
-                sink.occurrence(JetTopLevelClassByPackageIndex.getInstance().getKey(), fqName.parent().asString());
+                sink.occurrence(KotlinTopLevelClassByPackageIndex.getInstance().getKey(), fqName.parent().asString());
             }
         }
 
@@ -115,7 +115,7 @@ public class IdeStubIndexService extends StubIndexService {
 
     private static void indexSuperNames(KotlinClassOrObjectStub<? extends KtClassOrObject> stub, IndexSink sink) {
         for (String superName : stub.getSuperNames()) {
-            sink.occurrence(JetSuperClassIndex.getInstance().getKey(), superName);
+            sink.occurrence(KotlinSuperClassIndex.getInstance().getKey(), superName);
         }
     }
 
@@ -123,10 +123,10 @@ public class IdeStubIndexService extends StubIndexService {
     public void indexFunction(KotlinFunctionStub stub, IndexSink sink) {
         String name = stub.getName();
         if (name != null) {
-            sink.occurrence(JetFunctionShortNameIndex.getInstance().getKey(), name);
+            sink.occurrence(KotlinFunctionShortNameIndex.getInstance().getKey(), name);
 
             if (TypeIndexUtilKt.isProbablyNothing(stub.getPsi().getTypeReference())) {
-                sink.occurrence(JetProbablyNothingFunctionShortNameIndex.getInstance().getKey(), name);
+                sink.occurrence(KotlinProbablyNothingFunctionShortNameIndex.getInstance().getKey(), name);
             }
         }
 
@@ -134,8 +134,8 @@ public class IdeStubIndexService extends StubIndexService {
             // can have special fq name in case of syntactically incorrect function with no name
             FqName fqName = stub.getFqName();
             if (fqName != null) {
-                sink.occurrence(JetTopLevelFunctionFqnNameIndex.getInstance().getKey(), fqName.asString());
-                sink.occurrence(JetTopLevelFunctionByPackageIndex.getInstance().getKey(), fqName.parent().asString());
+                sink.occurrence(KotlinTopLevelFunctionFqnNameIndex.getInstance().getKey(), fqName.asString());
+                sink.occurrence(KotlinTopLevelFunctionByPackageIndex.getInstance().getKey(), fqName.parent().asString());
                 IndexUtilsKt.indexTopLevelExtension(stub, sink);
             }
         }
@@ -145,10 +145,10 @@ public class IdeStubIndexService extends StubIndexService {
     public void indexProperty(KotlinPropertyStub stub, IndexSink sink) {
         String name = stub.getName();
         if (name != null) {
-            sink.occurrence(JetPropertyShortNameIndex.getInstance().getKey(), name);
+            sink.occurrence(KotlinPropertyShortNameIndex.getInstance().getKey(), name);
 
             if (TypeIndexUtilKt.isProbablyNothing(stub.getPsi().getTypeReference())) {
-                sink.occurrence(JetProbablyNothingPropertyShortNameIndex.getInstance().getKey(), name);
+                sink.occurrence(KotlinProbablyNothingPropertyShortNameIndex.getInstance().getKey(), name);
             }
         }
 
@@ -156,8 +156,8 @@ public class IdeStubIndexService extends StubIndexService {
             FqName fqName = stub.getFqName();
             // can have special fq name in case of syntactically incorrect property with no name
             if (fqName != null) {
-                sink.occurrence(JetTopLevelPropertyFqnNameIndex.getInstance().getKey(), fqName.asString());
-                sink.occurrence(JetTopLevelPropertyByPackageIndex.getInstance().getKey(), fqName.parent().asString());
+                sink.occurrence(KotlinTopLevelPropertyFqnNameIndex.getInstance().getKey(), fqName.asString());
+                sink.occurrence(KotlinTopLevelPropertyByPackageIndex.getInstance().getKey(), fqName.parent().asString());
                 IndexUtilsKt.indexTopLevelExtension(stub, sink);
             }
         }
@@ -165,13 +165,13 @@ public class IdeStubIndexService extends StubIndexService {
 
     @Override
     public void indexAnnotation(KotlinAnnotationEntryStub stub, IndexSink sink) {
-        sink.occurrence(JetAnnotationsIndex.getInstance().getKey(), stub.getShortName());
+        sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), stub.getShortName());
 
         KotlinFileStub fileStub = getContainingFileStub(stub);
         if (fileStub != null) {
             List<KotlinImportDirectiveStub> aliasImportStubs = fileStub.findImportsByAlias(stub.getShortName());
             for (KotlinImportDirectiveStub importStub : aliasImportStubs) {
-                sink.occurrence(JetAnnotationsIndex.getInstance().getKey(), importStub.getImportedFqName().shortName().asString());
+                sink.occurrence(KotlinAnnotationsIndex.getInstance().getKey(), importStub.getImportedFqName().shortName().asString());
             }
         }
     }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
index 8e8e35ef214..a37e5d6ec70 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/IndexUtils.kt
@@ -31,8 +31,8 @@ fun indexTopLevelExtension<TDeclaration : KtCallableDeclaration>(stub: KotlinCal
 private fun KtTypeElement.index<TDeclaration : KtCallableDeclaration>(declaration: TDeclaration, sink: IndexSink) {
     fun occurrence(typeName: String) {
         val name = declaration.getName() ?: return
-        sink.occurrence(JetTopLevelExtensionsByReceiverTypeIndex.INSTANCE.getKey(),
-                        JetTopLevelExtensionsByReceiverTypeIndex.buildKey(typeName, name))
+        sink.occurrence(KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE.getKey(),
+                        KotlinTopLevelExtensionsByReceiverTypeIndex.buildKey(typeName, name))
     }
 
     when (this) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java
similarity index 76%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java
index ae59b951624..a4657269569 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetAnnotationsIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinAnnotationsIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry;
 
 import java.util.Collection;
 
-public class JetAnnotationsIndex extends StringStubIndexExtension<KtAnnotationEntry> {
-    private static final StubIndexKey<String, KtAnnotationEntry> KEY = KotlinIndexUtil.createIndexKey(JetAnnotationsIndex.class);
+public class KotlinAnnotationsIndex extends StringStubIndexExtension<KtAnnotationEntry> {
+    private static final StubIndexKey<String, KtAnnotationEntry> KEY = KotlinIndexUtil.createIndexKey(KotlinAnnotationsIndex.class);
 
-    private static final JetAnnotationsIndex ourInstance = new JetAnnotationsIndex();
+    private static final KotlinAnnotationsIndex ourInstance = new KotlinAnnotationsIndex();
 
-    public static JetAnnotationsIndex getInstance() {
+    public static KotlinAnnotationsIndex getInstance() {
         return ourInstance;
     }
 
-    private JetAnnotationsIndex() {}
+    private KotlinAnnotationsIndex() {}
 
     @NotNull
     @Override
@@ -45,7 +45,7 @@ public class JetAnnotationsIndex extends StringStubIndexExtension<KtAnnotationEn
     @NotNull
     @Override
     public Collection<KtAnnotationEntry> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 
     @Override
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java
similarity index 74%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java
index 4993a268f45..0d8b1496830 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetClassShortNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinClassShortNameIndex.java
@@ -25,17 +25,17 @@ import org.jetbrains.kotlin.psi.KtClassOrObject;
 
 import java.util.Collection;
 
-public class JetClassShortNameIndex extends StringStubIndexExtension<KtClassOrObject> {
-    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(JetClassShortNameIndex.class);
+public class KotlinClassShortNameIndex extends StringStubIndexExtension<KtClassOrObject> {
+    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(KotlinClassShortNameIndex.class);
 
-    private static final JetClassShortNameIndex ourInstance = new JetClassShortNameIndex();
+    private static final KotlinClassShortNameIndex ourInstance = new KotlinClassShortNameIndex();
 
     @NotNull
-    public static JetClassShortNameIndex getInstance() {
+    public static KotlinClassShortNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetClassShortNameIndex() {}
+    private KotlinClassShortNameIndex() {}
 
     @NotNull
     @Override
@@ -46,6 +46,6 @@ public class JetClassShortNameIndex extends StringStubIndexExtension<KtClassOrOb
     @NotNull
     @Override
     public Collection<KtClassOrObject> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java
similarity index 74%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java
index f9fbf19251f..81b2154d21c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetExactPackagesIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinExactPackagesIndex.java
@@ -25,17 +25,17 @@ import org.jetbrains.kotlin.psi.KtFile;
 
 import java.util.Collection;
 
-public class JetExactPackagesIndex extends StringStubIndexExtension<KtFile> {
-    private static final StubIndexKey<String, KtFile> KEY = KotlinIndexUtil.createIndexKey(JetExactPackagesIndex.class);
+public class KotlinExactPackagesIndex extends StringStubIndexExtension<KtFile> {
+    private static final StubIndexKey<String, KtFile> KEY = KotlinIndexUtil.createIndexKey(KotlinExactPackagesIndex.class);
 
-    private static final JetExactPackagesIndex ourInstance = new JetExactPackagesIndex();
+    private static final KotlinExactPackagesIndex ourInstance = new KotlinExactPackagesIndex();
 
     @NotNull
-    public static JetExactPackagesIndex getInstance() {
+    public static KotlinExactPackagesIndex getInstance() {
         return ourInstance;
     }
 
-    private JetExactPackagesIndex() {}
+    private KotlinExactPackagesIndex() {}
 
     @NotNull
     @Override
@@ -46,6 +46,6 @@ public class JetExactPackagesIndex extends StringStubIndexExtension<KtFile> {
     @NotNull
     @Override
     public Collection<KtFile> get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(fqName, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
similarity index 67%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
index 2d5447ef02f..33e8a6aae96 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeClassByPackageIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt
@@ -22,16 +22,16 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-public class JetFileFacadeClassByPackageIndex private constructor() : StringStubIndexExtension<KtFile>() {
+public class KotlinFileFacadeClassByPackageIndex private constructor() : StringStubIndexExtension<KtFile>() {
     override fun getKey(): StubIndexKey<String, KtFile> = KEY
 
     override fun get(key: String, project: Project, scope: GlobalSearchScope) =
-            super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            super.get(key, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeClassByPackageIndex::class.java)
-        public val INSTANCE: JetFileFacadeClassByPackageIndex = JetFileFacadeClassByPackageIndex()
+        private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeClassByPackageIndex::class.java)
+        public val INSTANCE: KotlinFileFacadeClassByPackageIndex = KotlinFileFacadeClassByPackageIndex()
         @JvmStatic
-        public fun getInstance(): JetFileFacadeClassByPackageIndex = INSTANCE
+        public fun getInstance(): KotlinFileFacadeClassByPackageIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
similarity index 72%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
index 515d39901af..e17f846b3f8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeShortNameIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt
@@ -22,16 +22,16 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-public class JetFileFacadeShortNameIndex private constructor() : StringStubIndexExtension<KtFile>() {
+public class KotlinFileFacadeFqNameIndex private constructor() : StringStubIndexExtension<KtFile>() {
     override fun getKey(): StubIndexKey<String, KtFile> = KEY
 
     override fun get(key: String, project: Project, scope: GlobalSearchScope) =
-            super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            super.get(key, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeShortNameIndex::class.java)
-        public val INSTANCE: JetFileFacadeShortNameIndex = JetFileFacadeShortNameIndex()
+        private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeFqNameIndex::class.java)
+        public val INSTANCE: KotlinFileFacadeFqNameIndex = KotlinFileFacadeFqNameIndex()
         @JvmStatic
-        public fun getInstance(): JetFileFacadeShortNameIndex = INSTANCE
+        public fun getInstance(): KotlinFileFacadeFqNameIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
similarity index 69%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
index 30f7ca38cca..76791033266 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFilePartClassIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt
@@ -22,17 +22,16 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-
-public class JetFilePartClassIndex private constructor() : StringStubIndexExtension<KtFile>() {
+public class KotlinFileFacadeShortNameIndex private constructor() : StringStubIndexExtension<KtFile>() {
     override fun getKey(): StubIndexKey<String, KtFile> = KEY
 
     override fun get(key: String, project: Project, scope: GlobalSearchScope) =
-            super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            super.get(key, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey(JetFilePartClassIndex::class.java)
-        public val INSTANCE: JetFilePartClassIndex = JetFilePartClassIndex()
+        private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeShortNameIndex::class.java)
+        public val INSTANCE: KotlinFileFacadeShortNameIndex = KotlinFileFacadeShortNameIndex()
         @JvmStatic
-        public fun getInstance(): JetFilePartClassIndex = INSTANCE
+        public fun getInstance(): KotlinFileFacadeShortNameIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
similarity index 73%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
index fe14e86711d..59dcf46dcbb 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFileFacadeFqNameIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt
@@ -22,16 +22,17 @@ import com.intellij.psi.stubs.StringStubIndexExtension
 import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
-public class JetFileFacadeFqNameIndex private constructor() : StringStubIndexExtension<KtFile>() {
+
+public class KotlinFilePartClassIndex private constructor() : StringStubIndexExtension<KtFile>() {
     override fun getKey(): StubIndexKey<String, KtFile> = KEY
 
     override fun get(key: String, project: Project, scope: GlobalSearchScope) =
-            super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            super.get(key, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey(JetFileFacadeFqNameIndex::class.java)
-        public val INSTANCE: JetFileFacadeFqNameIndex = JetFileFacadeFqNameIndex()
+        private val KEY = KotlinIndexUtil.createIndexKey(KotlinFilePartClassIndex::class.java)
+        public val INSTANCE: KotlinFilePartClassIndex = KotlinFilePartClassIndex()
         @JvmStatic
-        public fun getInstance(): JetFileFacadeFqNameIndex = INSTANCE
+        public fun getInstance(): KotlinFilePartClassIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java
similarity index 74%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java
index aed1144b42d..a50b3182047 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFullClassNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFullClassNameIndex.java
@@ -25,17 +25,17 @@ import org.jetbrains.kotlin.psi.KtClassOrObject;
 
 import java.util.Collection;
 
-public class JetFullClassNameIndex extends StringStubIndexExtension<KtClassOrObject> {
-    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(JetFullClassNameIndex.class);
+public class KotlinFullClassNameIndex extends StringStubIndexExtension<KtClassOrObject> {
+    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(KotlinFullClassNameIndex.class);
 
-    private static final JetFullClassNameIndex ourInstance = new JetFullClassNameIndex();
+    private static final KotlinFullClassNameIndex ourInstance = new KotlinFullClassNameIndex();
 
     @NotNull
-    public static JetFullClassNameIndex getInstance() {
+    public static KotlinFullClassNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetFullClassNameIndex() {}
+    private KotlinFullClassNameIndex() {}
 
     @NotNull
     @Override
@@ -46,6 +46,6 @@ public class JetFullClassNameIndex extends StringStubIndexExtension<KtClassOrObj
     @NotNull
     @Override
     public Collection<KtClassOrObject> get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(fqName, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java
similarity index 73%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java
index 18b862778c3..a7e2bccfd2f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetFunctionShortNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFunctionShortNameIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtNamedFunction;
 
 import java.util.Collection;
 
-public class JetFunctionShortNameIndex extends StringStubIndexExtension<KtNamedFunction> {
-    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(JetFunctionShortNameIndex.class);
+public class KotlinFunctionShortNameIndex extends StringStubIndexExtension<KtNamedFunction> {
+    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(KotlinFunctionShortNameIndex.class);
 
-    private static final JetFunctionShortNameIndex ourInstance = new JetFunctionShortNameIndex();
+    private static final KotlinFunctionShortNameIndex ourInstance = new KotlinFunctionShortNameIndex();
 
-    public static JetFunctionShortNameIndex getInstance() {
+    public static KotlinFunctionShortNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetFunctionShortNameIndex() {}
+    private KotlinFunctionShortNameIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetFunctionShortNameIndex extends StringStubIndexExtension<KtNamedF
     @NotNull
     @Override
     public Collection<KtNamedFunction> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetMultifileClassPartIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt
similarity index 68%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetMultifileClassPartIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt
index d6bee1e5f86..3e6ae985354 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetMultifileClassPartIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt
@@ -23,15 +23,15 @@ import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtFile
 
 
-public class JetMultifileClassPartIndex private constructor() : StringStubIndexExtension<KtFile>() {
+public class KotlinMultifileClassPartIndex private constructor() : StringStubIndexExtension<KtFile>() {
     override fun getKey(): StubIndexKey<String, KtFile> = KEY
 
     override fun get(key: String, project: Project, scope: GlobalSearchScope) =
-            super.get(key, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            super.get(key, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey(JetMultifileClassPartIndex::class.java)
-        public val INSTANCE: JetMultifileClassPartIndex = JetMultifileClassPartIndex()
-        public @JvmStatic fun getInstance(): JetMultifileClassPartIndex = INSTANCE
+        private val KEY = KotlinIndexUtil.createIndexKey(KotlinMultifileClassPartIndex::class.java)
+        public val INSTANCE: KotlinMultifileClassPartIndex = KotlinMultifileClassPartIndex()
+        public @JvmStatic fun getInstance(): KotlinMultifileClassPartIndex = INSTANCE
     }
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java
similarity index 69%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java
index 5e8ee1618e3..b225cb8a1d0 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingFunctionShortNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingFunctionShortNameIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtNamedFunction;
 
 import java.util.Collection;
 
-public class JetProbablyNothingFunctionShortNameIndex extends StringStubIndexExtension<KtNamedFunction> {
-    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(JetProbablyNothingFunctionShortNameIndex.class);
+public class KotlinProbablyNothingFunctionShortNameIndex extends StringStubIndexExtension<KtNamedFunction> {
+    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(KotlinProbablyNothingFunctionShortNameIndex.class);
 
-    private static final JetProbablyNothingFunctionShortNameIndex ourInstance = new JetProbablyNothingFunctionShortNameIndex();
+    private static final KotlinProbablyNothingFunctionShortNameIndex ourInstance = new KotlinProbablyNothingFunctionShortNameIndex();
 
-    public static JetProbablyNothingFunctionShortNameIndex getInstance() {
+    public static KotlinProbablyNothingFunctionShortNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetProbablyNothingFunctionShortNameIndex() {}
+    private KotlinProbablyNothingFunctionShortNameIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetProbablyNothingFunctionShortNameIndex extends StringStubIndexExt
     @NotNull
     @Override
     public Collection<KtNamedFunction> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java
similarity index 70%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java
index 723436c5f0c..6d4de1d89b8 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetProbablyNothingPropertyShortNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinProbablyNothingPropertyShortNameIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtProperty;
 
 import java.util.Collection;
 
-public class JetProbablyNothingPropertyShortNameIndex extends StringStubIndexExtension<KtProperty> {
-    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(JetProbablyNothingPropertyShortNameIndex.class);
+public class KotlinProbablyNothingPropertyShortNameIndex extends StringStubIndexExtension<KtProperty> {
+    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(KotlinProbablyNothingPropertyShortNameIndex.class);
 
-    private static final JetProbablyNothingPropertyShortNameIndex ourInstance = new JetProbablyNothingPropertyShortNameIndex();
+    private static final KotlinProbablyNothingPropertyShortNameIndex ourInstance = new KotlinProbablyNothingPropertyShortNameIndex();
 
-    public static JetProbablyNothingPropertyShortNameIndex getInstance() {
+    public static KotlinProbablyNothingPropertyShortNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetProbablyNothingPropertyShortNameIndex() {}
+    private KotlinProbablyNothingPropertyShortNameIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetProbablyNothingPropertyShortNameIndex extends StringStubIndexExt
     @NotNull
     @Override
     public Collection<KtProperty> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java
similarity index 73%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java
index 76c729f6e5c..d866ba70504 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetPropertyShortNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinPropertyShortNameIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtProperty;
 
 import java.util.Collection;
 
-public class JetPropertyShortNameIndex extends StringStubIndexExtension<KtProperty> {
-    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(JetPropertyShortNameIndex.class);
+public class KotlinPropertyShortNameIndex extends StringStubIndexExtension<KtProperty> {
+    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(KotlinPropertyShortNameIndex.class);
 
-    private static final JetPropertyShortNameIndex ourInstance = new JetPropertyShortNameIndex();
+    private static final KotlinPropertyShortNameIndex ourInstance = new KotlinPropertyShortNameIndex();
 
-    public static JetPropertyShortNameIndex getInstance() {
+    public static KotlinPropertyShortNameIndex getInstance() {
         return ourInstance;
     }
 
-    private JetPropertyShortNameIndex() {}
+    private KotlinPropertyShortNameIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetPropertyShortNameIndex extends StringStubIndexExtension<KtProper
     @NotNull
     @Override
     public Collection<KtProperty> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSourceFilterScope.java
similarity index 84%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSourceFilterScope.java
index fb13f12e3fa..2d691f2d6ce 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSourceFilterScope.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSourceFilterScope.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.caches.resolve.JsProjectDetector;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
 
-public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
+public class KotlinSourceFilterScope extends DelegatingGlobalSearchScope {
     @NotNull
     public static GlobalSearchScope kotlinSourcesAndLibraries(@NotNull GlobalSearchScope delegate, @NotNull Project project) {
         return create(delegate, true, true, true, project);
@@ -62,21 +62,21 @@ public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
     ) {
         if (delegate == GlobalSearchScope.EMPTY_SCOPE) return delegate;
 
-        if (delegate instanceof JetSourceFilterScope) {
-            JetSourceFilterScope wrappedDelegate = (JetSourceFilterScope) delegate;
+        if (delegate instanceof KotlinSourceFilterScope) {
+            KotlinSourceFilterScope wrappedDelegate = (KotlinSourceFilterScope) delegate;
 
             boolean doIncludeProjectSourceFiles = wrappedDelegate.includeProjectSourceFiles && includeProjectSourceFiles;
             boolean doIncludeLibrarySourceFiles = wrappedDelegate.includeLibrarySourceFiles && includeLibrarySourceFiles;
             boolean doIncludeClassFiles = wrappedDelegate.includeClassFiles && includeClassFiles;
 
-            return new JetSourceFilterScope(wrappedDelegate.myBaseScope,
-                                            doIncludeProjectSourceFiles,
-                                            doIncludeLibrarySourceFiles,
-                                            doIncludeClassFiles,
-                                            project);
+            return new KotlinSourceFilterScope(wrappedDelegate.myBaseScope,
+                                               doIncludeProjectSourceFiles,
+                                               doIncludeLibrarySourceFiles,
+                                               doIncludeClassFiles,
+                                               project);
         }
 
-        return new JetSourceFilterScope(delegate, includeProjectSourceFiles, includeLibrarySourceFiles, includeClassFiles, project);
+        return new KotlinSourceFilterScope(delegate, includeProjectSourceFiles, includeLibrarySourceFiles, includeClassFiles, project);
     }
 
     private final ProjectFileIndex index;
@@ -86,7 +86,7 @@ public class JetSourceFilterScope extends DelegatingGlobalSearchScope {
     private final boolean includeClassFiles;
     private final boolean isJsProject;
 
-    private JetSourceFilterScope(
+    private KotlinSourceFilterScope(
             @NotNull GlobalSearchScope delegate,
             boolean includeProjectSourceFiles,
             boolean includeLibrarySourceFiles,
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java
similarity index 75%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java
index e4e2e9e3ae0..07ea8be1bb5 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetSuperClassIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinSuperClassIndex.java
@@ -25,17 +25,17 @@ import org.jetbrains.kotlin.psi.KtClassOrObject;
 
 import java.util.Collection;
 
-public class JetSuperClassIndex extends StringStubIndexExtension<KtClassOrObject> {
-    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(JetSuperClassIndex.class);
+public class KotlinSuperClassIndex extends StringStubIndexExtension<KtClassOrObject> {
+    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(KotlinSuperClassIndex.class);
 
-    private static final JetSuperClassIndex ourInstance = new JetSuperClassIndex();
+    private static final KotlinSuperClassIndex ourInstance = new KotlinSuperClassIndex();
 
     @NotNull
-    public static JetSuperClassIndex getInstance() {
+    public static KotlinSuperClassIndex getInstance() {
         return ourInstance;
     }
 
-    private JetSuperClassIndex() {}
+    private KotlinSuperClassIndex() {}
 
     @NotNull
     @Override
@@ -46,6 +46,6 @@ public class JetSuperClassIndex extends StringStubIndexExtension<KtClassOrObject
     @NotNull
     @Override
     public Collection<KtClassOrObject> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java
similarity index 72%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java
index ad7261a8512..375d56a327a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelClassByPackageIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelClassByPackageIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtClassOrObject;
 
 import java.util.Collection;
 
-public class JetTopLevelClassByPackageIndex extends StringStubIndexExtension<KtClassOrObject> {
-    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(JetTopLevelClassByPackageIndex.class);
+public class KotlinTopLevelClassByPackageIndex extends StringStubIndexExtension<KtClassOrObject> {
+    private static final StubIndexKey<String, KtClassOrObject> KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelClassByPackageIndex.class);
 
-    private static final JetTopLevelClassByPackageIndex ourInstance = new JetTopLevelClassByPackageIndex();
+    private static final KotlinTopLevelClassByPackageIndex ourInstance = new KotlinTopLevelClassByPackageIndex();
 
-    public static JetTopLevelClassByPackageIndex getInstance() {
+    public static KotlinTopLevelClassByPackageIndex getInstance() {
         return ourInstance;
     }
 
-    private JetTopLevelClassByPackageIndex() {}
+    private KotlinTopLevelClassByPackageIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetTopLevelClassByPackageIndex extends StringStubIndexExtension<KtC
     @NotNull
     @Override
     public Collection<KtClassOrObject> get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(fqName, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
similarity index 75%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
index 2c9adbe19e1..33ea5220807 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelExtensionsByReceiverTypeIndex.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelExtensionsByReceiverTypeIndex.kt
@@ -19,21 +19,20 @@ package org.jetbrains.kotlin.idea.stubindex
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.stubs.StringStubIndexExtension
-import com.intellij.psi.stubs.StubIndexKey
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
 
-public class JetTopLevelExtensionsByReceiverTypeIndex private constructor() : StringStubIndexExtension<KtCallableDeclaration>() {
+public class KotlinTopLevelExtensionsByReceiverTypeIndex private constructor() : StringStubIndexExtension<KtCallableDeclaration>() {
 
     override fun getKey() = KEY
 
     override fun get(s: String, project: Project, scope: GlobalSearchScope)
-            = super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
+            = super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project))
 
     companion object {
-        private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(javaClass<JetTopLevelExtensionsByReceiverTypeIndex>())
+        private val KEY = KotlinIndexUtil.createIndexKey<String, KtCallableDeclaration>(javaClass<KotlinTopLevelExtensionsByReceiverTypeIndex>())
         private val SEPARATOR = '\n'
 
-        public val INSTANCE: JetTopLevelExtensionsByReceiverTypeIndex = JetTopLevelExtensionsByReceiverTypeIndex()
+        public val INSTANCE: KotlinTopLevelExtensionsByReceiverTypeIndex = KotlinTopLevelExtensionsByReceiverTypeIndex()
 
         public fun buildKey(receiverTypeName: String, callableName: String): String = receiverTypeName + SEPARATOR + callableName
 
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java
similarity index 71%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java
index 214eb04ba47..046d0d9797c 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionByPackageIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionByPackageIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtNamedFunction;
 
 import java.util.Collection;
 
-public class JetTopLevelFunctionByPackageIndex extends StringStubIndexExtension<KtNamedFunction> {
-    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(JetTopLevelFunctionByPackageIndex.class);
+public class KotlinTopLevelFunctionByPackageIndex extends StringStubIndexExtension<KtNamedFunction> {
+    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelFunctionByPackageIndex.class);
 
-    private static final JetTopLevelFunctionByPackageIndex ourInstance = new JetTopLevelFunctionByPackageIndex();
+    private static final KotlinTopLevelFunctionByPackageIndex ourInstance = new KotlinTopLevelFunctionByPackageIndex();
 
-    public static JetTopLevelFunctionByPackageIndex getInstance() {
+    public static KotlinTopLevelFunctionByPackageIndex getInstance() {
         return ourInstance;
     }
 
-    private JetTopLevelFunctionByPackageIndex() {}
+    private KotlinTopLevelFunctionByPackageIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetTopLevelFunctionByPackageIndex extends StringStubIndexExtension<
     @NotNull
     @Override
     public Collection<KtNamedFunction> get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(fqName, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java
similarity index 73%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java
index 19df08f0c63..dbd0456103f 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelFunctionFqnNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelFunctionFqnNameIndex.java
@@ -28,17 +28,17 @@ import java.util.Collection;
 /**
  * Stores package top level function (both extension and non-extension) full qualified names.
  */
-public class JetTopLevelFunctionFqnNameIndex extends StringStubIndexExtension<KtNamedFunction> {
-    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(JetTopLevelFunctionFqnNameIndex.class);
+public class KotlinTopLevelFunctionFqnNameIndex extends StringStubIndexExtension<KtNamedFunction> {
+    private static final StubIndexKey<String, KtNamedFunction> KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelFunctionFqnNameIndex.class);
 
-    private static final JetTopLevelFunctionFqnNameIndex INSTANCE = new JetTopLevelFunctionFqnNameIndex();
+    private static final KotlinTopLevelFunctionFqnNameIndex INSTANCE = new KotlinTopLevelFunctionFqnNameIndex();
 
     @NotNull
-    public static JetTopLevelFunctionFqnNameIndex getInstance() {
+    public static KotlinTopLevelFunctionFqnNameIndex getInstance() {
         return INSTANCE;
     }
 
-    private JetTopLevelFunctionFqnNameIndex() {}
+    private KotlinTopLevelFunctionFqnNameIndex() {}
 
     @NotNull
     @Override
@@ -49,6 +49,6 @@ public class JetTopLevelFunctionFqnNameIndex extends StringStubIndexExtension<Kt
     @NotNull
     @Override
     public Collection<KtNamedFunction> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java
similarity index 71%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java
index a20b7383149..acbfb45d652 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyByPackageIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyByPackageIndex.java
@@ -25,16 +25,16 @@ import org.jetbrains.kotlin.psi.KtProperty;
 
 import java.util.Collection;
 
-public class JetTopLevelPropertyByPackageIndex extends StringStubIndexExtension<KtProperty> {
-    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(JetTopLevelPropertyByPackageIndex.class);
+public class KotlinTopLevelPropertyByPackageIndex extends StringStubIndexExtension<KtProperty> {
+    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelPropertyByPackageIndex.class);
 
-    private static final JetTopLevelPropertyByPackageIndex ourInstance = new JetTopLevelPropertyByPackageIndex();
+    private static final KotlinTopLevelPropertyByPackageIndex ourInstance = new KotlinTopLevelPropertyByPackageIndex();
 
-    public static JetTopLevelPropertyByPackageIndex getInstance() {
+    public static KotlinTopLevelPropertyByPackageIndex getInstance() {
         return ourInstance;
     }
 
-    private JetTopLevelPropertyByPackageIndex() {}
+    private KotlinTopLevelPropertyByPackageIndex() {}
 
     @NotNull
     @Override
@@ -45,6 +45,6 @@ public class JetTopLevelPropertyByPackageIndex extends StringStubIndexExtension<
     @NotNull
     @Override
     public Collection<KtProperty> get(@NotNull String fqName, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(fqName, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(fqName, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java
similarity index 72%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.java
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java
index dbf4d05c616..8a3edb1f293 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/JetTopLevelPropertyFqnNameIndex.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinTopLevelPropertyFqnNameIndex.java
@@ -25,17 +25,17 @@ import org.jetbrains.kotlin.psi.KtProperty;
 
 import java.util.Collection;
 
-public class JetTopLevelPropertyFqnNameIndex extends StringStubIndexExtension<KtProperty> {
-    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(JetTopLevelPropertyFqnNameIndex.class);
+public class KotlinTopLevelPropertyFqnNameIndex extends StringStubIndexExtension<KtProperty> {
+    private static final StubIndexKey<String, KtProperty> KEY = KotlinIndexUtil.createIndexKey(KotlinTopLevelPropertyFqnNameIndex.class);
 
-    private static final JetTopLevelPropertyFqnNameIndex INSTANCE = new JetTopLevelPropertyFqnNameIndex();
+    private static final KotlinTopLevelPropertyFqnNameIndex INSTANCE = new KotlinTopLevelPropertyFqnNameIndex();
 
     @NotNull
-    public static JetTopLevelPropertyFqnNameIndex getInstance() {
+    public static KotlinTopLevelPropertyFqnNameIndex getInstance() {
         return INSTANCE;
     }
 
-    private JetTopLevelPropertyFqnNameIndex() {}
+    private KotlinTopLevelPropertyFqnNameIndex() {}
 
     @NotNull
     @Override
@@ -46,6 +46,6 @@ public class JetTopLevelPropertyFqnNameIndex extends StringStubIndexExtension<Kt
     @NotNull
     @Override
     public Collection<KtProperty> get(@NotNull String s, @NotNull Project project, @NotNull GlobalSearchScope scope) {
-        return super.get(s, project, JetSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
+        return super.get(s, project, KotlinSourceFilterScope.kotlinSourcesAndLibraries(scope, project));
     }
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
index 70df1307492..c3db98bc602 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/PackageIndexUtil.kt
@@ -45,7 +45,7 @@ public object PackageIndexUtil {
             searchScope: GlobalSearchScope,
             project: Project
     ): Collection<KtFile> {
-        return JetExactPackagesIndex.getInstance().get(packageFqName.asString(), project, searchScope)
+        return KotlinExactPackagesIndex.getInstance().get(packageFqName.asString(), project, searchScope)
     }
 
     @JvmStatic
@@ -66,7 +66,7 @@ public object PackageIndexUtil {
     ): Boolean {
         var result = false
         StubIndex.getInstance().processElements<String, KtFile>(
-                JetExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<KtFile>()
+                KotlinExactPackagesIndex.getInstance().getKey(), packageFqName.asString(), project, searchScope, javaClass<KtFile>()
         ) {
             result = true
             false
@@ -82,7 +82,7 @@ public object PackageIndexUtil {
     }
 
     private fun computeAllPossiblePackageClasses(project: Project): MultiMap<String, FqName> {
-        val packageFqNames = JetExactPackagesIndex.getInstance().getAllKeys(project)
+        val packageFqNames = KotlinExactPackagesIndex.getInstance().getAllKeys(project)
         val result = MultiMap<String, FqName>()
         for (packageFqName in packageFqNames) {
             val packageClassFqName = PackageClassUtils.getPackageClassFqName(FqName(packageFqName))
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
index b503b0ae185..3aaf3dd0144 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/StaticFacadeIndexUtil.kt
@@ -33,12 +33,12 @@ public object StaticFacadeIndexUtil {
             project: Project
     ) : Collection<KtFile> =
             PackagePartClassUtils.getFilesWithCallables(
-                    JetFileFacadeFqNameIndex.INSTANCE.get(partFqName.asString(), project, searchScope))
+                    KotlinFileFacadeFqNameIndex.INSTANCE.get(partFqName.asString(), project, searchScope))
 
     @JvmStatic public fun getMultifileClassForPart(
             partFqName: FqName,
             searchScope: GlobalSearchScope,
             project: Project
     ): Collection<KtFile> =
-            JetMultifileClassPartIndex.INSTANCE.get(partFqName.asString(), project, searchScope)
+            KotlinMultifileClassPartIndex.INSTANCE.get(partFqName.asString(), project, searchScope)
 }
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
index 4669e5f2b5c..c12ab0c70b1 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/SubpackagesIndexService.kt
@@ -32,7 +32,7 @@ public class SubpackagesIndexService(private val project: Project) {
     private val cachedValue = CachedValuesManager.getManager(project).createCachedValue(
             {
                 CachedValueProvider.Result(
-                        SubpackagesIndex(JetExactPackagesIndex.getInstance().getAllKeys(project)),
+                        SubpackagesIndex(KotlinExactPackagesIndex.getInstance().getAllKeys(project)),
                         PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
             },
             false
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt
index 73a403620b2..101fe637e5e 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/PluginDeclarationProviderFactoryService.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.stubindex.resolve
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory
 import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService
@@ -32,5 +32,5 @@ public class PluginDeclarationProviderFactoryService : DeclarationProviderFactor
             syntheticFiles: Collection<KtFile>,
             filesScope: GlobalSearchScope
     ): DeclarationProviderFactory =
-        PluginDeclarationProviderFactory(project, JetSourceFilterScope.kotlinSources(filesScope, project), storageManager, syntheticFiles)
+        PluginDeclarationProviderFactory(project, KotlinSourceFilterScope.kotlinSources(filesScope, project), storageManager, syntheticFiles)
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
index 8752611e53f..01ee645dba4 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt
@@ -22,19 +22,19 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
 import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil
 import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo
 import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil
 import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils
 import java.util.ArrayList
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionByPackageIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionByPackageIndex
 import com.intellij.psi.stubs.StringStubIndexExtension
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyByPackageIndex
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyFqnNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyByPackageIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyFqnNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelClassByPackageIndex
 
 public class StubBasedPackageMemberDeclarationProvider(
         private val fqName: FqName,
@@ -50,31 +50,31 @@ public class StubBasedPackageMemberDeclarationProvider(
         }
 
         if (kindFilter.acceptsKinds(DescriptorKindFilter.CLASSIFIERS_MASK)) {
-            addFromIndex(JetTopLevelClassByPackageIndex.getInstance())
+            addFromIndex(KotlinTopLevelClassByPackageIndex.getInstance())
         }
 
         if (kindFilter.acceptsKinds(DescriptorKindFilter.FUNCTIONS_MASK)) {
-            addFromIndex(JetTopLevelFunctionByPackageIndex.getInstance())
+            addFromIndex(KotlinTopLevelFunctionByPackageIndex.getInstance())
         }
 
         if (kindFilter.acceptsKinds(DescriptorKindFilter.VARIABLES_MASK)) {
-            addFromIndex(JetTopLevelPropertyByPackageIndex.getInstance())
+            addFromIndex(KotlinTopLevelPropertyByPackageIndex.getInstance())
         }
 
         return result
     }
 
     override fun getClassOrObjectDeclarations(name: Name): Collection<JetClassLikeInfo> {
-        return JetFullClassNameIndex.getInstance().get(childName(name), project, searchScope)
+        return KotlinFullClassNameIndex.getInstance().get(childName(name), project, searchScope)
                 .map { JetClassInfoUtil.createClassLikeInfo(it) }
     }
 
     override fun getFunctionDeclarations(name: Name): Collection<KtNamedFunction> {
-        return JetTopLevelFunctionFqnNameIndex.getInstance().get(childName(name), project, searchScope)
+        return KotlinTopLevelFunctionFqnNameIndex.getInstance().get(childName(name), project, searchScope)
     }
 
     override fun getPropertyDeclarations(name: Name): Collection<KtProperty> {
-        return JetTopLevelPropertyFqnNameIndex.getInstance().get(childName(name), project, searchScope)
+        return KotlinTopLevelPropertyFqnNameIndex.getInstance().get(childName(name), project, searchScope)
     }
 
     override fun getAllDeclaredSubPackages(nameFilter: (Name) -> Boolean): Collection<FqName> {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
similarity index 92%
rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt
rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
index dc13468fbb6..8127e73be7d 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/JetPsiPrecedences.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/PsiPrecedences.kt
@@ -19,13 +19,14 @@ package org.jetbrains.kotlin.idea.util
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.psi.tree.IElementType
 import org.jetbrains.kotlin.parsing.JetExpressionParsing
-import java.util.HashMap
-import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.*
+import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.POSTFIX
+import org.jetbrains.kotlin.parsing.JetExpressionParsing.Precedence.PREFIX
 import org.jetbrains.kotlin.psi.*
+import java.util.*
 
-public object JetPsiPrecedences {
+public object PsiPrecedences {
 
-    private val LOG = Logger.getInstance(javaClass<JetPsiPrecedences>())
+    private val LOG = Logger.getInstance(javaClass<PsiPrecedences>())
 
     private val precedence: Map<IElementType, Int>
     init {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
index 2c806a8f366..cb3b11f2d75 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/AllClassesCompletion.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.AllClassesGetter
 import com.intellij.codeInsight.completion.CompletionParameters
 import com.intellij.codeInsight.completion.PrefixMatcher
 import com.intellij.psi.PsiClass
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
@@ -70,7 +70,7 @@ class AllClassesCompletion(private val parameters: CompletionParameters,
 
     private fun addAdaptedJavaCompletion(collector: (PsiClass) -> Unit) {
         AllClassesGetter.processJavaClasses(parameters, prefixMatcher, true, { psiClass ->
-            if (psiClass!! !is KotlinLightClass) { // Kotlin class should have already been added as kotlin element before
+            if (psiClass!! !is KtLightClass) { // Kotlin class should have already been added as kotlin element before
                 if (psiClass.isSyntheticKotlinClass()) return@processJavaClasses // filter out synthetic classes produced by Kotlin compiler
 
                 val kind = when {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt
index 6aa4c9a2a28..d89fa25dffb 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/BasicLookupElementFactory.kt
@@ -20,9 +20,9 @@ import com.intellij.codeInsight.lookup.*
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.completion.handlers.BaseDeclarationInsertHandler
 import org.jetbrains.kotlin.idea.completion.handlers.KotlinClassifierInsertHandler
@@ -113,7 +113,7 @@ class BasicLookupElementFactory(
     ): LookupElement {
         if (descriptor is ClassifierDescriptor &&
             declaration is PsiClass &&
-            declaration !is KotlinLightClass) {
+            declaration !is KtLightClass) {
             // for java classes we create special lookup elements
             // because they must be equal to ones created in TypesCompletion
             // otherwise we may have duplicates
@@ -141,7 +141,7 @@ class BasicLookupElementFactory(
         val name = nameAndIconDescriptor.getName().asString()
 
         val lookupObject = object : DeclarationLookupObjectImpl(descriptor, declaration) {
-            override fun getIcon(flags: Int) = JetDescriptorIconProvider.getIcon(nameAndIconDescriptor, iconDeclaration, flags)
+            override fun getIcon(flags: Int) = KotlinDescriptorIconProvider.getIcon(nameAndIconDescriptor, iconDeclaration, flags)
         }
         var element = LookupElementBuilder.create(lookupObject, name)
 
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt
index 2fb44f0db71..b6aa5b8444d 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/OverridesCompletion.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.completion.handlers.indexOfSkippingSpace
 import org.jetbrains.kotlin.idea.core.completion.DeclarationLookupObject
@@ -85,7 +85,7 @@ class OverridesCompletion(
             val icon = RowIcon(baseIcon, additionalIcon)
 
             val baseClassDeclaration = DescriptorToSourceUtilsIde.getAnyDeclaration(position.project, baseClass)
-            val baseClassIcon = JetDescriptorIconProvider.getIcon(baseClass, baseClassDeclaration, 0)
+            val baseClassIcon = KotlinDescriptorIconProvider.getIcon(baseClass, baseClassDeclaration, 0)
 
             lookupElement = object : LookupElementDecorator<LookupElement>(lookupElement) {
                 override fun getLookupString() = "override"
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
index c9eb17294ae..1d148a5a267 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/ParameterNameAndTypeCompletion.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.idea.core.KotlinIndicesHelper
 import org.jetbrains.kotlin.idea.core.KotlinNameSuggester
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.getResolutionScope
@@ -206,7 +206,7 @@ class ParameterNameAndTypeCompletion(
         }
 
         override fun handleInsert(context: InsertionContext) {
-            val settings = CodeStyleSettingsManager.getInstance(context.getProject()).getCurrentSettings().getCustomSettings(JetCodeStyleSettings::class.java)
+            val settings = CodeStyleSettingsManager.getInstance(context.getProject()).getCurrentSettings().getCustomSettings(KotlinCodeStyleSettings::class.java)
             val spaceBefore = if (settings.SPACE_BEFORE_TYPE_COLON) " " else ""
             val spaceAfter = if (settings.SPACE_AFTER_TYPE_COLON) " " else ""
             val text = parameterName + spaceBefore + ":" + spaceAfter
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt
index 0cb59675443..40da122fe10 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/handlers/KotlinFunctionInsertHandler.kt
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiElement
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtTypeArgumentList
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
@@ -179,7 +179,7 @@ sealed class KotlinFunctionInsertHandler : KotlinCallableInsertHandler() {
         }
 
         private fun isInsertSpacesInOneLineFunctionEnabled(project: Project)
-                = CodeStyleSettingsManager.getSettings(project).getCustomSettings(javaClass<JetCodeStyleSettings>())!!.INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD
+                = CodeStyleSettingsManager.getSettings(project).getCustomSettings(javaClass<KotlinCodeStyleSettings>())!!.INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD
     }
 
     object Infix : KotlinFunctionInsertHandler() {
diff --git a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
index dceba16cac4..0c5ee0501f3 100644
--- a/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
+++ b/idea/idea-completion/src/org/jetbrains/kotlin/idea/completion/smart/MultipleArgumentsItemProvider.kt
@@ -22,7 +22,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder
 import com.intellij.ui.LayeredIcon
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
 import org.jetbrains.kotlin.idea.completion.ArgumentPositionData
 import org.jetbrains.kotlin.idea.completion.ExpectedInfo
 import org.jetbrains.kotlin.idea.completion.SmartCastCalculator
@@ -82,8 +82,8 @@ class MultipleArgumentsItemProvider(
 
     private fun createParametersLookupElement(variables: List<VariableDescriptor>, tail: Tail): LookupElement {
         val compoundIcon = LayeredIcon(2)
-        val firstIcon = JetDescriptorIconProvider.getIcon(variables.first(), null, 0)
-        val lastIcon = JetDescriptorIconProvider.getIcon(variables.last(), null, 0)
+        val firstIcon = KotlinDescriptorIconProvider.getIcon(variables.first(), null, 0)
+        val lastIcon = KotlinDescriptorIconProvider.getIcon(variables.last(), null, 0)
         compoundIcon.setIcon(lastIcon, 0, 2 * firstIcon.getIconWidth() / 5, 0)
         compoundIcon.setIcon(firstIcon, 1, 0, 0)
 
diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt
index 8f7196251d1..71bb3f0256f 100644
--- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt
+++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/AbstractCompletionHandlerTests.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.CompletionType
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import org.jetbrains.kotlin.idea.completion.test.ExpectedCompletionUtils
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.utils.addToStdlib.indexOfOrNull
@@ -56,7 +56,7 @@ public abstract class AbstractCompletionHandlerTest(private val defaultCompletio
 
             val completionType = ExpectedCompletionUtils.getCompletionType(fileText) ?: defaultCompletionType
 
-            val codeStyleSettings = JetCodeStyleSettings.getInstance(getProject())
+            val codeStyleSettings = KotlinCodeStyleSettings.getInstance(getProject())
             for (line in InTextDirectivesUtils.findLinesWithPrefixesRemoved(fileText, CODE_STYLE_SETTING_PREFIX)) {
                 val index = line.indexOfOrNull('=') ?: error("Invalid code style setting '$line': '=' expected")
                 val settingName = line.substring(0, index).trim()
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
index c6729b43b04..3d44aecb318 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/KotlinIndicesHelper.kt
@@ -61,8 +61,8 @@ public class KotlinIndicesHelper(
 
     public fun getTopLevelCallablesByName(name: String): Collection<CallableDescriptor> {
         val declarations = HashSet<KtNamedDeclaration>()
-        declarations.addTopLevelNonExtensionCallablesByName(JetFunctionShortNameIndex.getInstance(), name)
-        declarations.addTopLevelNonExtensionCallablesByName(JetPropertyShortNameIndex.getInstance(), name)
+        declarations.addTopLevelNonExtensionCallablesByName(KotlinFunctionShortNameIndex.getInstance(), name)
+        declarations.addTopLevelNonExtensionCallablesByName(KotlinPropertyShortNameIndex.getInstance(), name)
         return declarations.flatMap {
             if (it.getContainingJetFile().isCompiled()) { //TODO: it's temporary while resolveToDescriptor does not work for compiled declarations
                 resolutionFacade.resolveImportReference(moduleDescriptor, it.getFqName()!!).filterIsInstance<CallableDescriptor>()
@@ -81,8 +81,8 @@ public class KotlinIndicesHelper(
     }
 
     public fun getTopLevelCallables(nameFilter: (String) -> Boolean): Collection<CallableDescriptor> {
-        return (JetTopLevelFunctionFqnNameIndex.getInstance().getAllKeys(project).asSequence() +
-                    JetTopLevelPropertyFqnNameIndex.getInstance().getAllKeys(project).asSequence())
+        return (KotlinTopLevelFunctionFqnNameIndex.getInstance().getAllKeys(project).asSequence() +
+                KotlinTopLevelPropertyFqnNameIndex.getInstance().getAllKeys(project).asSequence())
                 .map { FqName(it) }
                 .filter { nameFilter(it.shortName().asString()) }
                 .toSet()
@@ -110,13 +110,13 @@ public class KotlinIndicesHelper(
         val receiverTypeNames = HashSet<String>()
         receiverTypes.forEach { receiverTypeNames.addTypeNames(it) }
 
-        val index = JetTopLevelExtensionsByReceiverTypeIndex.INSTANCE
+        val index = KotlinTopLevelExtensionsByReceiverTypeIndex.INSTANCE
 
         val declarations = index.getAllKeys(project)
                 .asSequence()
                 .filter {
-                    JetTopLevelExtensionsByReceiverTypeIndex.receiverTypeNameFromKey(it) in receiverTypeNames
-                    && nameFilter(JetTopLevelExtensionsByReceiverTypeIndex.callableNameFromKey(it))
+                    KotlinTopLevelExtensionsByReceiverTypeIndex.receiverTypeNameFromKey(it) in receiverTypeNames
+                    && nameFilter(KotlinTopLevelExtensionsByReceiverTypeIndex.callableNameFromKey(it))
                 }
                 .flatMap { index.get(it, project, scope).asSequence() }
 
@@ -170,7 +170,7 @@ public class KotlinIndicesHelper(
             .toSet()
 
     public fun getKotlinClasses(nameFilter: (String) -> Boolean, kindFilter: (ClassKind) -> Boolean): Collection<ClassDescriptor> {
-        return JetFullClassNameIndex.getInstance().getAllKeys(project).asSequence()
+        return KotlinFullClassNameIndex.getInstance().getAllKeys(project).asSequence()
                 .map { FqName(it) }
                 .filter { nameFilter(it.shortName().asString()) }
                 .toList()
@@ -178,7 +178,7 @@ public class KotlinIndicesHelper(
     }
 
     private fun getClassDescriptorsByFQName(classFQName: FqName, kindFilter: (ClassKind) -> Boolean): Collection<ClassDescriptor> {
-        val declarations = JetFullClassNameIndex.getInstance()[classFQName.asString(), project, scope]
+        val declarations = KotlinFullClassNameIndex.getInstance()[classFQName.asString(), project, scope]
 
         if (declarations.isEmpty()) {
             // This fqn is absent in caches, dead or not in scope
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/JetCodeStyleSettings.java b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
similarity index 86%
rename from idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/JetCodeStyleSettings.java
rename to idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
index 1d3ec720355..0b34b642f73 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/JetCodeStyleSettings.java
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/formatter/KotlinCodeStyleSettings.java
@@ -22,7 +22,7 @@ import com.intellij.psi.codeStyle.*;
 import com.intellij.util.ReflectionUtil;
 import org.jetbrains.annotations.NotNull;
 
-public class JetCodeStyleSettings extends CustomCodeStyleSettings {
+public class KotlinCodeStyleSettings extends CustomCodeStyleSettings {
 
     public final PackageEntryTable PACKAGES_TO_USE_STAR_IMPORTS = new PackageEntryTable();
     public boolean SPACE_AROUND_RANGE = false;
@@ -40,7 +40,7 @@ public class JetCodeStyleSettings extends CustomCodeStyleSettings {
     public int NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS = ApplicationManager.getApplication().isUnitTestMode() ? Integer.MAX_VALUE : 3;
     public boolean IMPORT_NESTED_CLASSES = false;
 
-    public JetCodeStyleSettings(CodeStyleSettings container) {
+    public KotlinCodeStyleSettings(CodeStyleSettings container) {
         super("JetCodeStyleSettings", container);
 
         // defaults in IDE but not in tests
@@ -50,18 +50,18 @@ public class JetCodeStyleSettings extends CustomCodeStyleSettings {
         }
     }
 
-    public static JetCodeStyleSettings getInstance(Project project) {
-        return CodeStyleSettingsManager.getSettings(project).getCustomSettings(JetCodeStyleSettings.class);
+    public static KotlinCodeStyleSettings getInstance(Project project) {
+        return CodeStyleSettingsManager.getSettings(project).getCustomSettings(KotlinCodeStyleSettings.class);
     }
 
     @Override
     public Object clone() {
-        JetCodeStyleSettings clone = new JetCodeStyleSettings(getContainer());
+        KotlinCodeStyleSettings clone = new KotlinCodeStyleSettings(getContainer());
         clone.copyFrom(this);
         return clone;
     }
 
-    private void copyFrom(@NotNull JetCodeStyleSettings from) {
+    private void copyFrom(@NotNull KotlinCodeStyleSettings from) {
         ReflectionUtil.copyFields(getClass().getFields(), from, this);
 
         PACKAGES_TO_USE_STAR_IMPORTS.copyFrom(from.PACKAGES_TO_USE_STAR_IMPORTS);
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
index 6482e6a00ca..0df18f436e7 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/ImplementMembersHandler.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.resolve.OverrideResolver
 
 public class ImplementMembersHandler : OverrideImplementMembersHandler(), IntentionAction {
@@ -34,8 +34,8 @@ public class ImplementMembersHandler : OverrideImplementMembersHandler(), Intent
 
     override fun getNoMembersFoundHint() = "No members to implement have been found"
 
-    override fun getText() = JetBundle.message("implement.members")
-    override fun getFamilyName() = JetBundle.message("implement.members")
+    override fun getText() = KotlinBundle.message("implement.members")
+    override fun getFamilyName() = KotlinBundle.message("implement.members")
 
     override fun isAvailable(project: Project, editor: Editor, file: PsiFile) = isValidFor(editor, file)
 }
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiClassToDescriptor.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiClassToDescriptor.kt
index edd18d5baa7..940fc4ad924 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiClassToDescriptor.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/psiClassToDescriptor.kt
@@ -17,9 +17,9 @@
 package org.jetbrains.kotlin.idea.core
 
 import com.intellij.psi.PsiClass
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
-import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration
+import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
 import org.jetbrains.kotlin.idea.resolve.frontendService
 import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
@@ -30,7 +30,7 @@ public fun ResolutionFacade.psiClassToDescriptor(
         psiClass: PsiClass,
         declarationTranslator: (KtClassOrObject) -> KtClassOrObject? = { it }
 ): ClassifierDescriptor? {
-    return if (psiClass is KotlinLightClass && psiClass !is KotlinLightClassForDecompiledDeclaration) {
+    return if (psiClass is KtLightClass && psiClass !is KtLightClassForDecompiledDeclaration) {
         val origin = psiClass.getOrigin () ?: return null
         val declaration = declarationTranslator(origin) ?: return null
         resolveToDescriptor(declaration)
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
index 60e2f6eceac..44c265fa0ea 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/util/DescriptorMemberChooserObject.kt
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiMember
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtFile
@@ -87,7 +87,7 @@ public open class DescriptorMemberChooserObject(
                 if (declaration is KtDeclaration) {
                     // kotlin declaration
                     // visibility and abstraction better detect by a descriptor
-                    return JetDescriptorIconProvider.getIcon(descriptor, declaration, flags)
+                    return KotlinDescriptorIconProvider.getIcon(descriptor, declaration, flags)
                 }
                 else {
                     // it is better to show java icons for java code
@@ -95,7 +95,7 @@ public open class DescriptorMemberChooserObject(
                 }
             }
             else {
-                return JetDescriptorIconProvider.getIcon(descriptor, declaration, 0)
+                return KotlinDescriptorIconProvider.getIcon(descriptor, declaration, 0)
             }
         }
     }
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 f7cded80a3c..373be27758b 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
@@ -32,8 +32,8 @@ import org.jetbrains.kotlin.diagnostics.Severity
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
-import org.jetbrains.kotlin.idea.decompiler.JetClassFileViewProvider
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.idea.decompiler.KotlinClassFileViewProvider
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile
 import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager
 import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver
 import org.jetbrains.kotlin.psi.KtFile
@@ -89,10 +89,10 @@ public fun closeAndDeleteProject(): Unit =
 public fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: RunnableWithException) {
     val builtInsSources = BuiltInsReferenceResolver.getInstance(project).builtInsSources!!
 
-    val stdLibViewProviders = HashSet<JetClassFileViewProvider>()
+    val stdLibViewProviders = HashSet<KotlinClassFileViewProvider>()
     val vFileToViewProviderMap = ((PsiManager.getInstance(project) as PsiManagerEx).fileManager as FileManagerImpl).vFileToViewProviderMap
     for ((file, viewProvider) in vFileToViewProviderMap) {
-        if (file.isStdLibFile && viewProvider is JetClassFileViewProvider) {
+        if (file.isStdLibFile && viewProvider is KotlinClassFileViewProvider) {
             stdLibViewProviders.add(viewProvider)
         }
     }
@@ -108,7 +108,7 @@ public fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: RunnableWit
 
     builtInsSources.forEach { unInvalidateFile(it) }
     stdLibViewProviders.forEach {
-        it.allFiles.forEach { unInvalidateFile(it as JetClsFile) }
+        it.allFiles.forEach { unInvalidateFile(it as KtClsFile) }
         vFileToViewProviderMap.set(it.virtualFile, it)
     }
 }
diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 5fa298bd867..701800f396f 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templateSet group="Kotlin">
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
               name="main" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -31,7 +31,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.soutp"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.soutp"
               name="soutp" toReformat="true" toShortenFQNames="true" value="println($FORMAT$)">
         <variable alwaysStopAt="false" defaultValue="" expression="groovyScript(&quot;'\&quot;' + _1.collect { it + ' = [${' + it + '}]'}.join(', ') + '\&quot;'&quot;, functionParameters())"
                   name="FORMAT" />
@@ -39,7 +39,7 @@
             <option name="KOTLIN_STATEMENT" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.iter"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.iter"
               name="iter" toReformat="true" toShortenFQNames="true"
               value="for ($VAR$ in $ITERABLE$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;iterable&quot;" expression="kotlinIterableVariable()" name="ITERABLE" />
@@ -48,7 +48,7 @@
             <option name="KOTLIN_STATEMENT" value="true" />
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.ifn"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.ifn"
               name="ifn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ == null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -56,7 +56,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.inn"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.inn"
               name="inn" toReformat="true" toShortenFQNames="true"
               value="if ($VAR$ != null) {&#10;$END$&#10;}">
       <variable alwaysStopAt="true" defaultValue="&quot;i&quot;" expression="kotlinSuggestVariableName()" name="VAR" />
@@ -64,7 +64,7 @@
         <option name="KOTLIN_EXPRESSION" value="true" />
       </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.void"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.void"
               name="void" toReformat="true" toShortenFQNames="true" value="fun $NAME$($PARAMS$) {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="" expression="" name="PARAMS" />
@@ -74,7 +74,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun0"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun0"
               name="fun0" toReformat="true" toShortenFQNames="true" value="fun $NAME$() : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <variable alwaysStopAt="true" defaultValue="&quot;Unit&quot;" expression="" name="RETURN" />
@@ -84,7 +84,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun1"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun1"
               name="fun1" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -97,7 +97,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.fun2"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.fun2"
               name="fun2" toReformat="true" toShortenFQNames="true"
               value="fun $NAME$($PARAM1$ : $PARAM1TYPE$, $PARAM2$ : $PARAM2TYPE$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
@@ -113,7 +113,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.interface"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.interface"
               name="interface" toReformat="true" toShortenFQNames="true" value="interface $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -122,7 +122,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.singleton"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.singleton"
               name="singleton" toReformat="true" toShortenFQNames="true" value="object $NAME$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="" expression="" name="NAME" />
         <context>
@@ -132,7 +132,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.closure"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.closure"
               name="closure" toReformat="true" toShortenFQNames="true" value="{$PARAM$ -> $PARAM_COPY$}">
         <variable alwaysStopAt="true" defaultValue="&quot;x&quot;" expression="" name="PARAM" />
         <variable alwaysStopAt="true" defaultValue="" expression="PARAM" name="PARAM_COPY" />
@@ -141,7 +141,7 @@
             <option name="KOTLIN_EXPRESSION" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.anonymous"
               name="anonymous" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
@@ -150,7 +150,7 @@
         </context>
     </template>
 
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exfun"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exfun"
               name="exfun" toReformat="true" toShortenFQNames="true"
               value="fun $RECEIVER$.$NAME$($PARAMS$) : $RETURN$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -162,7 +162,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exval"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exval"
               name="exval" toReformat="true" toShortenFQNames="true"
               value="val $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -173,7 +173,7 @@
             <option name="KOTLIN_TOPLEVEL" value="true"/>
         </context>
     </template>
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.exvar"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.exvar"
               name="exvar" toReformat="true" toShortenFQNames="true"
               value="var $RECEIVER$.$NAME$ : $TYPE$&#10;get() {&#10;$END$&#10;}&#10;set(value) {&#10; &#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Any&quot;" expression="" name="RECEIVER" />
@@ -189,7 +189,7 @@
     <!-- Synonyms -->
 
     <!-- Synonym for main -->
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.main"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.main"
               name="psvm" toReformat="true" toShortenFQNames="true"
               value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
         <context>
@@ -198,7 +198,7 @@
     </template>
 
     <!-- Synonym for anonymous -->
-    <template resource-bundle="org.jetbrains.kotlin.idea.JetBundle" key="livetemplate.description.anonymous"
+    <template resource-bundle="org.jetbrains.kotlin.idea.KotlinBundle" key="livetemplate.description.anonymous"
               name="object" id="kt-object" toReformat="true" toShortenFQNames="true" value="object : $SUPERTYPE$ {&#10;$END$&#10;}">
         <variable alwaysStopAt="true" defaultValue="&quot;Object&quot;" expression="anonymousSuper()" name="SUPERTYPE" />
         <context>
diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index d627ff3b1fd..636ad58a9fb 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -20,7 +20,7 @@
 
   <project-components>
     <component>
-      <implementation-class>org.jetbrains.kotlin.idea.compiler.JetCompilerManager</implementation-class>
+      <implementation-class>org.jetbrains.kotlin.idea.compiler.KotlinCompilerManager</implementation-class>
     </component>
     <component>
       <implementation-class>org.jetbrains.kotlin.idea.versions.OutdatedKotlinRuntimeNotification</implementation-class>
@@ -188,8 +188,8 @@
     <applicationService serviceInterface="org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache"
                         serviceImplementation="org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache"/>
 
-    <applicationService serviceInterface="org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager"
-                        serviceImplementation="org.jetbrains.kotlin.idea.JetModuleTypeManagerImpl"/>
+    <applicationService serviceInterface="org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager"
+                        serviceImplementation="org.jetbrains.kotlin.idea.KotlinModuleTypeManagerImpl"/>
 
     <applicationService serviceInterface="org.jetbrains.kotlin.idea.quickfix.QuickFixes"
                         serviceImplementation="org.jetbrains.kotlin.idea.quickfix.QuickFixes"/>
@@ -246,8 +246,8 @@
 
     <projectService serviceImplementation="org.jetbrains.kotlin.idea.versions.SuppressNotificationState"/>
 
-    <projectService serviceInterface="org.jetbrains.kotlin.asJava.KotlinLightClassForFacade$FacadeStubCache"
-                    serviceImplementation="org.jetbrains.kotlin.asJava.KotlinLightClassForFacade$FacadeStubCache"/>
+    <projectService serviceInterface="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache"
+                    serviceImplementation="org.jetbrains.kotlin.asJava.KtLightClassForFacade$FacadeStubCache"/>
 
     <projectService serviceInterface="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache"
                     serviceImplementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinEvaluateExpressionCache"/>
@@ -283,12 +283,12 @@
     <internalFileTemplate name="Kotlin Enum"/>
     <internalFileTemplate name="Kotlin Interface"/>
 
-    <gotoSymbolContributor implementation="org.jetbrains.kotlin.idea.caches.JetGotoSymbolContributor"/>
-    <gotoClassContributor implementation="org.jetbrains.kotlin.idea.caches.JetGotoClassContributor"/>
+    <gotoSymbolContributor implementation="org.jetbrains.kotlin.idea.caches.KotlinGotoSymbolContributor"/>
+    <gotoClassContributor implementation="org.jetbrains.kotlin.idea.caches.KotlinGotoClassContributor"/>
     <lang.importOptimizer language="kotlin" implementationClass="org.jetbrains.kotlin.idea.imports.KotlinImportOptimizer"/>
     <lang.namesValidator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinNamesValidator"/>
 
-    <fileTypeFactory implementation="org.jetbrains.kotlin.idea.JetFileFactory"/>
+    <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinFileTypeFactory"/>
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinJavaScriptMetaFileTypeFactory"/>
     <fileTypeFactory implementation="org.jetbrains.kotlin.idea.KotlinModuleFileFactory"/>
 
@@ -296,21 +296,21 @@
     <compiler.task execute="BEFORE" implementation="org.jetbrains.kotlin.idea.internal.makeBackup.MakeBackupCompileTask"/>
     <buildProcess.parametersProvider implementation="org.jetbrains.kotlin.idea.compiler.configuration.KotlinBuildProcessParametersProvider"/>
 
-    <lang.syntaxHighlighterFactory key="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetSyntaxHighlighterFactory"/>
-    <lang.braceMatcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.JetPairMatcher"/>
+    <lang.syntaxHighlighterFactory key="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinSyntaxHighlighterFactory"/>
+    <lang.braceMatcher language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinPairMatcher"/>
     <lang.parserDefinition language="kotlin" implementationClass="org.jetbrains.kotlin.parsing.JetParserDefinition"/>
-    <lang.commenter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.JetCommenter"/>
-    <lang.psiStructureViewFactory language="kotlin" implementationClass="org.jetbrains.kotlin.idea.structureView.JetStructureViewFactory"/>
-    <structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.kotlin.idea.structureView.JetClsStructureViewBuilderProvider"/>
+    <lang.commenter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinCommenter"/>
+    <lang.psiStructureViewFactory language="kotlin" implementationClass="org.jetbrains.kotlin.idea.structureView.KotlinStructureViewFactory"/>
+    <structureViewBuilder order="first" key="CLASS" factoryClass="org.jetbrains.kotlin.idea.structureView.KtClsStructureViewBuilderProvider"/>
 
     <lang.foldingBuilder language="kotlin" implementationClass="org.jetbrains.kotlin.idea.KotlinFoldingBuilder"/>
-    <lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.JetFormattingModelBuilder"/>
+    <lang.formatter language="kotlin" implementationClass="org.jetbrains.kotlin.idea.formatter.KotlinFormattingModelBuilder"/>
     <preFormatProcessor implementation="org.jetbrains.kotlin.idea.formatter.KotlinPreFormatProcessor"/>
-    <lang.findUsagesProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.findUsages.JetFindUsagesProvider"/>
+    <lang.findUsagesProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesProvider"/>
     <lang.elementManipulator forClass="org.jetbrains.kotlin.psi.KtStringTemplateExpression"
                              implementationClass="org.jetbrains.kotlin.psi.psiUtil.KtStringTemplateExpressionManipulator"/>
     <fileStructureGroupRuleProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinDeclarationGroupRuleProvider"/>
-    <importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.JetImportFilteringRule"/>
+    <importFilteringRule implementation="org.jetbrains.kotlin.idea.findUsages.KotlinImportFilteringRule"/>
     <lang.refactoringSupport language="kotlin" implementationClass="org.jetbrains.kotlin.idea.refactoring.KotlinRefactoringSupportProvider"/>
     <lang.surroundDescriptor language="kotlin"
                              implementationClass="org.jetbrains.kotlin.idea.codeInsight.surroundWith.expression.KotlinExpressionSurroundDescriptor"/>
@@ -341,15 +341,15 @@
     <refactoring.introduceParameterMethodUsagesProcessor
         implementation="org.jetbrains.kotlin.idea.refactoring.introduce.introduceParameter.KotlinIntroduceParameterMethodUsageProcessor"/>
     <inlineActionHandler implementation="org.jetbrains.kotlin.idea.refactoring.inline.KotlinInlineValHandler"/>
-    <treeStructureProvider implementation="org.jetbrains.kotlin.idea.projectView.JetProjectViewProvider" order="last" />
+    <treeStructureProvider implementation="org.jetbrains.kotlin.idea.projectView.KotlinProjectViewProvider" order="last" />
     <treeStructureProvider implementation="org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryContentsTreeStructureProvider" order="last"/>
 
     <colorSettingsPage implementation="org.jetbrains.kotlin.idea.highlighter.KotlinColorSettingsPage"/>
     <additionalTextAttributes scheme="Default" file="colorScheme/Default_Kotlin.xml"/>
     <additionalTextAttributes scheme="Darcula" file="colorScheme/Darcula_Kotlin.xml"/>
 
-    <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.JetCodeStyleSettingsProvider"/>
-    <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.JetLanguageCodeStyleSettingsProvider"/>
+    <codeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinCodeStyleSettingsProvider"/>
+    <langCodeStyleSettingsProvider implementation="org.jetbrains.kotlin.idea.formatter.KotlinLanguageCodeStyleSettingsProvider"/>
 
     <projectConfigurable instance="org.jetbrains.kotlin.idea.compiler.configuration.KotlinCompilerConfigurableTab"
                          id="project.kotlinCompiler"
@@ -362,7 +362,7 @@
     <codeInsight.parameterInfo language="kotlin" implementationClass="org.jetbrains.kotlin.idea.parameterInfo.KotlinArrayAccessParameterInfoHandler"/>
 
     <codeInsight.gotoSuper language="kotlin" implementationClass="org.jetbrains.kotlin.idea.codeInsight.GotoSuperActionHandler"/>
-    <typeDeclarationProvider implementation="org.jetbrains.kotlin.idea.codeInsight.JetTypeDeclarationProvider"/>
+    <typeDeclarationProvider implementation="org.jetbrains.kotlin.idea.codeInsight.KotlinTypeDeclarationProvider"/>
 
     <completion.contributor language="kotlin"
                             id="KotlinCompletionContributor"
@@ -412,22 +412,22 @@
 
     <spellchecker.support implementationClass="org.jetbrains.kotlin.idea.KotlinSpellcheckingStrategy" language="kotlin"/>
 
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Generic"/>
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$TopLevel"/>
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Statement"/>
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Class"/>
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Expression"/>
-    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType$Comment"/>
-    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.JetLiveTemplatesProvider"/>
-    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetAnyVariableMacro"/>
-    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetFunctionParametersMacro"/>
-    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetAnonymousSuperMacro"/>
-    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetIterableVariableMacro"/>
-    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.JetSuggestVariableNameMacro"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Generic"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$TopLevel"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Statement"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Class"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Expression"/>
+    <liveTemplateContext implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType$Comment"/>
+    <defaultLiveTemplatesProvider implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinLiveTemplatesProvider"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.AnyVariableMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.FunctionParametersMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.AnonymousSuperMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.IterableVariableMacro"/>
+    <liveTemplateMacro implementation="org.jetbrains.kotlin.idea.liveTemplates.macro.SuggestVariableNameMacro"/>
     <liveTemplateOptionalProcessor implementation="org.jetbrains.kotlin.idea.liveTemplates.KotlinShortenFQNamesProcessor"/>
 
-    <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.JetPsiCheckerAndHighlightingUpdater"/>
-    <highlightRangeExtension implementation="org.jetbrains.kotlin.idea.highlighter.JetPsiChecker"/>
+    <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinPsiCheckerAndHighlightingUpdater"/>
+    <highlightRangeExtension implementation="org.jetbrains.kotlin.idea.highlighter.KotlinPsiChecker"/>
 
     <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.DebugInfoAnnotator"/>
     <annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.DuplicateJvmSignatureAnnotator"/>
@@ -463,23 +463,23 @@
     <runLineMarkerContributor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinRunLineMarkerContributor"/>
     <runLineMarkerContributor language="kotlin" implementationClass="org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor"/>
 
-    <iconProvider implementation="org.jetbrains.kotlin.idea.JetIconProvider"/>
-    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetFunctionPresenter"
+    <iconProvider implementation="org.jetbrains.kotlin.idea.KotlinIconProvider"/>
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtFunctionPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtFunction"/>
-    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetClassPresenter"
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtClassPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtClass"/>
-    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetObjectPresenter"
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtObjectPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtObjectDeclaration"/>
-    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetPropertyPresenter"
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtPropertyPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtProperty"/>
-    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.JetParameterPresenter"
+    <itemPresentationProvider implementationClass="org.jetbrains.kotlin.idea.presentation.KtParameterPresenter"
                               forClass="org.jetbrains.kotlin.psi.KtParameter"/>
-    <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.kotlin.idea.JetGotoTargetRenderProvider"
+    <gotoTargetRendererProvider id="JetGotoTargetRenderProvider" implementation="org.jetbrains.kotlin.idea.KotlinGotoTargetRenderProvider"
                                 order="first"/>
-    <elementDescriptionProvider implementation="org.jetbrains.kotlin.idea.findUsages.JetElementDescriptionProvider" order="first"/>
+    <elementDescriptionProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinElementDescriptionProvider" order="first"/>
     <highlightUsagesHandlerFactory implementation="org.jetbrains.kotlin.idea.highlighter.KotlinHighlightExitPointsHandlerFactory"/>
     <findUsagesHandlerFactory implementation="org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory"/>
-    <usageTypeProvider implementation="org.jetbrains.kotlin.idea.findUsages.JetUsageTypeProvider"/>
+    <usageTypeProvider implementation="org.jetbrains.kotlin.idea.findUsages.KotlinUsageTypeProvider"/>
     <useScopeEnlarger implementation="org.jetbrains.kotlin.idea.findUsages.BuiltInsUseScopeEnlarger"/>
 
     <refactoring.safeDeleteProcessor
@@ -491,7 +491,7 @@
         language="kotlin"
         implementationClass="org.jetbrains.kotlin.idea.refactoring.safeDelete.KotlinJavaSafeDeleteDelegate"/>
     <debugger.jvmSmartStepIntoHandler implementation="org.jetbrains.kotlin.idea.debugger.stepping.KotlinSmartStepIntoHandler"/>
-    <debugger.positionManagerFactory implementation="org.jetbrains.kotlin.idea.debugger.JetPositionManagerFactory"/>
+    <debugger.positionManagerFactory implementation="org.jetbrains.kotlin.idea.debugger.KotlinPositionManagerFactory"/>
     <debugger.codeFragmentFactory implementation="org.jetbrains.kotlin.idea.debugger.evaluate.KotlinCodeFragmentFactory"/>
     <debuggerEditorTextProvider language="kotlin" implementationClass="org.jetbrains.kotlin.idea.debugger.KotlinEditorTextProvider"/>
     <debuggerClassFilterProvider implementation="org.jetbrains.kotlin.idea.debugger.filter.KotlinDebuggerInternalClassesFilterProvider"/>
@@ -531,31 +531,31 @@
         implementationClass="org.jetbrains.kotlin.idea.hierarchy.overrides.KotlinOverrideHierarchyProvider" />
 
     <java.elementFinder implementation="org.jetbrains.kotlin.asJava.JavaElementFinder"/>
-    <java.shortNamesCache implementation="org.jetbrains.kotlin.idea.caches.JetShortNamesCache"/>
+    <java.shortNamesCache implementation="org.jetbrains.kotlin.idea.caches.KotlinShortNamesCache"/>
 
     <stubElementTypeHolder class="org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetExactPackagesIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionByPackageIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyByPackageIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetPropertyShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetSuperClassIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelPropertyFqnNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetTopLevelExtensionsByReceiverTypeIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingPropertyShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFileFacadeFqNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFilePartClassIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFileFacadeClassByPackageIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetFileFacadeShortNameIndex"/>
-    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.JetMultifileClassPartIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinExactPackagesIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelClassByPackageIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionByPackageIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyByPackageIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinClassShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinPropertyShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelPropertyFqnNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelExtensionsByReceiverTypeIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinAnnotationsIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingFunctionShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinProbablyNothingPropertyShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeFqNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFilePartClassIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeClassByPackageIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinFileFacadeShortNameIndex"/>
+    <stubIndex implementation="org.jetbrains.kotlin.idea.stubindex.KotlinMultifileClassPartIndex"/>
 
-    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.JetClassFileDecompiler"/>
+    <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.KotlinClassFileDecompiler"/>
     <psi.classFileDecompiler implementation="org.jetbrains.kotlin.idea.decompiler.KotlinJavaScriptMetaFileDecompiler"/>
 
     <fileBasedIndex implementation="org.jetbrains.kotlin.idea.versions.KotlinAbiVersionIndex"/>
@@ -586,18 +586,18 @@
 
     <readWriteAccessDetector implementation="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinReadWriteAccessDetector" id="kotlin"/>
 
-    <exceptionFilter implementation="org.jetbrains.kotlin.idea.filters.JetExceptionFilterFactory" order="first"/>
+    <exceptionFilter implementation="org.jetbrains.kotlin.idea.filters.KotlinExceptionFilterFactory" order="first"/>
 
-    <applicationService serviceInterface="org.jetbrains.kotlin.idea.editor.JetEditorOptions"
-                        serviceImplementation="org.jetbrains.kotlin.idea.editor.JetEditorOptions"/>
-    <editorAppearanceConfigurable instance="org.jetbrains.kotlin.idea.editor.JetSettingEditorConfigurable"/>
+    <applicationService serviceInterface="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"
+                        serviceImplementation="org.jetbrains.kotlin.idea.editor.KotlinEditorOptions"/>
+    <editorAppearanceConfigurable instance="org.jetbrains.kotlin.idea.editor.KotlinEditorOptionsConfigurable"/>
 
     <statementUpDownMover id="jetExpression"
-                          implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover"
+                          implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover"
                           order="before declaration" />
 
     <statementUpDownMover id="jetDeclaration"
-                          implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetDeclarationMover"
+                          implementation="org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover"
                           order="before jetExpression" />
 
     <joinLinesHandler implementation="org.jetbrains.kotlin.idea.joinLines.JoinDeclarationAndAssignmentHandler"/>
@@ -605,7 +605,7 @@
 
     <targetElementEvaluator
         language="kotlin"
-        implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.JetTargetElementEvaluator" />
+        implementationClass="org.jetbrains.kotlin.idea.search.ideaExtensions.KotlinTargetElementEvaluator" />
 
     <refactoring.pullUpHelperFactory
         language="kotlin"
diff --git a/idea/src/META-INF/testng-j.xml b/idea/src/META-INF/testng-j.xml
index c5a458056e6..7289d66978b 100644
--- a/idea/src/META-INF/testng-j.xml
+++ b/idea/src/META-INF/testng-j.xml
@@ -1,5 +1,5 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
-    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.JetTestNgConfigurationProducer"/>
+    <runConfigurationProducer implementation="org.jetbrains.kotlin.idea.run.KotlinTestNgConfigurationProducer"/>
   </extensions>
 </idea-plugin>
diff --git a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt b/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
index 8477c78beb7..5da57850bb3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/ExtraSteppingFilter.kt
@@ -21,7 +21,7 @@ import com.intellij.debugger.engine.SuspendContext
 import com.intellij.debugger.settings.DebuggerSettings
 import com.sun.jdi.Location
 import com.sun.jdi.request.StepRequest
-import org.jetbrains.kotlin.idea.debugger.JetPositionManager
+import org.jetbrains.kotlin.idea.debugger.KotlinPositionManager
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 
 public class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFilter {
@@ -32,7 +32,7 @@ public class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFil
         }
 
         val debugProcess = context.getDebugProcess()
-        val positionManager = JetPositionManager(debugProcess!!)
+        val positionManager = KotlinPositionManager(debugProcess!!)
         val location = context.getFrameProxy()!!.location()
         return runReadAction {
             shouldFilter(positionManager, location)
@@ -40,7 +40,7 @@ public class ExtraSteppingFilter : com.intellij.debugger.engine.ExtraSteppingFil
     }
 
 
-    private fun shouldFilter(positionManager: JetPositionManager, location: Location): Boolean {
+    private fun shouldFilter(positionManager: KotlinPositionManager, location: Location): Boolean {
         val defaultStrata = location.declaringType().defaultStratum()
         if ("Kotlin" != defaultStrata) {
             return false;
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetCommenter.java b/idea/src/org/jetbrains/kotlin/idea/KotlinCommenter.java
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/JetCommenter.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinCommenter.java
index 3bc00692c01..b16c0cf763f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetCommenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinCommenter.java
@@ -22,7 +22,7 @@ import com.intellij.psi.tree.IElementType;
 import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
 import org.jetbrains.kotlin.lexer.KtTokens;
 
-public class JetCommenter implements CodeDocumentationAwareCommenter {
+public class KotlinCommenter implements CodeDocumentationAwareCommenter {
     @Override
     public String getLineCommentPrefix() {
         return "//";
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetFileFactory.java b/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java
similarity index 93%
rename from idea/src/org/jetbrains/kotlin/idea/JetFileFactory.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java
index 0e0a7a9e319..9eecc66b352 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetFileFactory.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinFileTypeFactory.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.fileTypes.FileTypeFactory;
 import org.jetbrains.annotations.NotNull;
 
 
-public class JetFileFactory extends FileTypeFactory {
+public class KotlinFileTypeFactory extends FileTypeFactory {
     @Override
     public void createFileTypes(@NotNull FileTypeConsumer consumer) {
         consumer.consume(KotlinFileType.INSTANCE, "kt;kts");
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.java b/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java
similarity index 78%
rename from idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java
index e4b55926d08..af09cc25425 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetGotoTargetRenderProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinGotoTargetRenderProvider.java
@@ -21,16 +21,16 @@ import com.intellij.codeInsight.navigation.GotoTargetRendererProvider;
 import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightClass;
-import org.jetbrains.kotlin.idea.presentation.JetLightClassListCellRenderer;
+import org.jetbrains.kotlin.asJava.KtLightClass;
+import org.jetbrains.kotlin.idea.presentation.KtLightClassListCellRenderer;
 
-public class JetGotoTargetRenderProvider implements GotoTargetRendererProvider {
+public class KotlinGotoTargetRenderProvider implements GotoTargetRendererProvider {
     @Nullable
     @Override
     public PsiElementListCellRenderer getRenderer(PsiElement element, GotoTargetHandler.GotoData gotoData) {
-        if (element instanceof KotlinLightClass) {
+        if (element instanceof KtLightClass) {
             // Need to override default Java render
-            return new JetLightClassListCellRenderer();
+            return new KtLightClassListCellRenderer();
         }
 
         return null;
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.java b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
similarity index 89%
rename from idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
index bf0dbe5e6fe..3e440a58e13 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetModuleTypeManagerImpl.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinModuleTypeManagerImpl.java
@@ -20,9 +20,9 @@ import com.intellij.facet.Facet;
 import com.intellij.facet.FacetManager;
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager;
+import org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager;
 
-public class JetModuleTypeManagerImpl extends JetModuleTypeManager {
+public class KotlinModuleTypeManagerImpl extends KotlinModuleTypeManager {
     @Override
     public boolean isAndroidGradleModule(@NotNull Module module) {
         // We don't want to depend on the Android-Gradle plugin
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.java b/idea/src/org/jetbrains/kotlin/idea/KotlinPairMatcher.java
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinPairMatcher.java
index 7d670ca0b70..4bed6cbb4a5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetPairMatcher.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPairMatcher.java
@@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.KtTokens;
 
-public class JetPairMatcher implements PairedBraceMatcher {
+public class KotlinPairMatcher implements PairedBraceMatcher {
     private final BracePair[] pairs = new BracePair[]{
             new BracePair(KtTokens.LPAR, KtTokens.RPAR, false),
             new BracePair(KtTokens.LONG_TEMPLATE_ENTRY_START, KtTokens.LONG_TEMPLATE_ENTRY_END, false),
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
index 0d3b7cd2327..ec24f682ba7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUpdater.kt
@@ -96,7 +96,7 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos
 
             if (mainRepoUpdateSuccess || latestVersionInRepository != null) {
                 recordSuccessfulUpdateCheck()
-                if (latestVersionInRepository != null && VersionComparatorUtil.compare(latestVersionInRepository, JetPluginUtil.getPluginVersion()) > 0) {
+                if (latestVersionInRepository != null && VersionComparatorUtil.compare(latestVersionInRepository, KotlinPluginUtil.getPluginVersion()) > 0) {
                     ApplicationManager.getApplication().invokeLater {
                         notifyPluginUpdateAvailable(latestVersionInRepository!!, descriptorToInstall, hostToInstallFrom)
                     }
@@ -118,7 +118,7 @@ class KotlinPluginUpdater(val propertiesComponent: PropertiesComponent) : Dispos
 
     fun getPluginVersionFromMainRepository(): RepositoryCheckResult {
         val buildNumber = ApplicationInfo.getInstance().build.asString()
-        val pluginVersion = JetPluginUtil.getPluginVersion()
+        val pluginVersion = KotlinPluginUtil.getPluginVersion()
         val os = URLEncoder.encode(SystemInfo.OS_NAME + " " + SystemInfo.OS_VERSION, CharsetToolkit.UTF8)
         val uid = UpdateChecker.getInstallationUID(propertiesComponent)
         val url = "https://plugins.jetbrains.com/plugins/list?pluginId=6954&build=$buildNumber&pluginVersion=$pluginVersion&os=$os&uuid=a$uid"
diff --git a/idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.java b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.java
rename to idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
index f2e8ddd1322..2d029a5fb59 100644
--- a/idea/src/org/jetbrains/kotlin/idea/JetPluginUtil.java
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinPluginUtil.java
@@ -22,11 +22,11 @@ import com.intellij.ide.plugins.PluginManagerCore;
 import com.intellij.openapi.extensions.PluginId;
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.configuration.JetModuleTypeManager;
+import org.jetbrains.kotlin.idea.configuration.KotlinModuleTypeManager;
 
 import java.util.Arrays;
 
-public class JetPluginUtil {
+public class KotlinPluginUtil {
 
     @NotNull
     public static String getPluginVersion() {
@@ -36,11 +36,11 @@ public class JetPluginUtil {
     }
 
     public static boolean isAndroidGradleModule(@NotNull Module module) {
-        return JetModuleTypeManager.getInstance().isAndroidGradleModule(module);
+        return KotlinModuleTypeManager.getInstance().isAndroidGradleModule(module);
     }
 
     public static boolean isGradleModule(@NotNull Module module) {
-        return JetModuleTypeManager.getInstance().isGradleModule(module);
+        return KotlinModuleTypeManager.getInstance().isGradleModule(module);
     }
 
     public static boolean isMavenModule(@NotNull Module module) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
index 978e428b6d2..30f4da619ee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiManager
-import org.jetbrains.kotlin.asJava.KotlinLightElement
+import org.jetbrains.kotlin.asJava.KtLightElement
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithSource
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -91,7 +91,7 @@ public class KotlinQuickDocumentationProvider : AbstractDocumentationProvider()
             if (element is KtDeclaration) {
                 return renderKotlinDeclaration(element, quickNavigation)
             }
-            else if (element is KotlinLightElement<*, *>) {
+            else if (element is KtLightElement<*, *>) {
                 val origin = element.getOrigin() ?: return null
                 return renderKotlinDeclaration(origin, quickNavigation)
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
index 00c98f35fcc..696d6801b73 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/KotlinAddImportAction.kt
@@ -37,8 +37,8 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
-import org.jetbrains.kotlin.idea.JetBundle
-import org.jetbrains.kotlin.idea.JetDescriptorIconProvider
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.KotlinDescriptorIconProvider
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.ImportableFqNameClassifier
 import org.jetbrains.kotlin.idea.imports.importableFqName
@@ -131,7 +131,7 @@ internal class KotlinAddImportAction(
     }
 
     private fun getVariantSelectionPopup(): BaseListPopupStep<AutoImportVariant> {
-        return object : BaseListPopupStep<AutoImportVariant>(JetBundle.message("imports.chooser.title"), variants) {
+        return object : BaseListPopupStep<AutoImportVariant>(KotlinBundle.message("imports.chooser.title"), variants) {
             override fun isAutoSelectionEnabled() = false
 
             override fun onChosen(selectedValue: AutoImportVariant?, finalChoice: Boolean): PopupStep<String>? {
@@ -250,7 +250,7 @@ internal interface AutoImportVariant {
     val hint: String
     val excludeFqNameCheck: FqName
 
-    fun icon(project: Project) = JetDescriptorIconProvider.getIcon(descriptorsToImport.first(), declarationToImport(project), 0)
+    fun icon(project: Project) = KotlinDescriptorIconProvider.getIcon(descriptorsToImport.first(), declarationToImport(project), 0)
 
     fun declarationToImport(project: Project): PsiElement? =
             DescriptorToSourceUtilsIde.getAnyDeclaration(project, descriptorsToImport.first())
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
index db71f8d773d..fb79b7895e5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.java
@@ -30,7 +30,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.KotlinFileType;
 import org.jetbrains.kotlin.idea.KotlinIcons;
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils;
@@ -39,7 +39,7 @@ import java.util.Map;
 
 public class NewKotlinFileAction extends CreateFileFromTemplateAction implements DumbAware {
     public NewKotlinFileAction() {
-        super(JetBundle.message("new.kotlin.file.action"), "Creates new Kotlin file or class", KotlinFileType.INSTANCE.getIcon());
+        super(KotlinBundle.message("new.kotlin.file.action"), "Creates new Kotlin file or class", KotlinFileType.INSTANCE.getIcon());
     }
 
     @Override
@@ -65,7 +65,7 @@ public class NewKotlinFileAction extends CreateFileFromTemplateAction implements
 
     @Override
     protected String getActionName(PsiDirectory directory, String newName, String templateName) {
-        return JetBundle.message("new.kotlin.file.action");
+        return KotlinBundle.message("new.kotlin.file.action");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.java b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoClassContributor.java
similarity index 84%
rename from idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.java
rename to idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoClassContributor.java
index d2acb839a32..97953bdd012 100644
--- a/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoClassContributor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoClassContributor.java
@@ -22,8 +22,8 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
+import org.jetbrains.kotlin.idea.stubindex.KotlinClassShortNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
 import org.jetbrains.kotlin.psi.KtEnumEntry;
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class JetGotoClassContributor implements GotoClassContributor {
+public class KotlinGotoClassContributor implements GotoClassContributor {
     @Override
     public String getQualifiedName(NavigationItem item) {
         if (item instanceof KtNamedDeclaration) {
@@ -55,7 +55,7 @@ public class JetGotoClassContributor implements GotoClassContributor {
     @NotNull
     @Override
     public String[] getNames(Project project, boolean includeNonProjectItems) {
-        return ArrayUtil.toObjectArray(JetClassShortNameIndex.getInstance().getAllKeys(project), String.class);
+        return ArrayUtil.toObjectArray(KotlinClassShortNameIndex.getInstance().getAllKeys(project), String.class);
     }
 
     @NotNull
@@ -63,7 +63,7 @@ public class JetGotoClassContributor implements GotoClassContributor {
     public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) {
         GlobalSearchScope scope = includeNonProjectItems ? GlobalSearchScope.allScope(project) : GlobalSearchScope.projectScope(project);
         Collection<KtClassOrObject> classesOrObjects =
-                JetClassShortNameIndex.getInstance().get(name, project, JetSourceFilterScope.kotlinSourceAndClassFiles(scope, project));
+                KotlinClassShortNameIndex.getInstance().get(name, project, KotlinSourceFilterScope.kotlinSourceAndClassFiles(scope, project));
 
         if (classesOrObjects.isEmpty()) {
             return NavigationItem.EMPTY_NAVIGATION_ITEM_ARRAY;
diff --git a/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.java b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoSymbolContributor.java
similarity index 68%
rename from idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.java
rename to idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoSymbolContributor.java
index 8abde9972a0..a04af585fdd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/caches/JetGotoSymbolContributor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/caches/KotlinGotoSymbolContributor.java
@@ -25,20 +25,20 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.stubs.StubIndex;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.stubindex.JetFunctionShortNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetPropertyShortNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
+import org.jetbrains.kotlin.idea.stubindex.KotlinFunctionShortNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinPropertyShortNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class JetGotoSymbolContributor implements ChooseByNameContributor {
+public class KotlinGotoSymbolContributor implements ChooseByNameContributor {
     @NotNull
     @Override
     public String[] getNames(Project project, boolean includeNonProjectItems) {
-        Collection<String> items = StubIndex.getInstance().getAllKeys(JetFunctionShortNameIndex.getInstance().getKey(), project);
-        items.addAll(StubIndex.getInstance().getAllKeys(JetPropertyShortNameIndex.getInstance().getKey(), project));
+        Collection<String> items = StubIndex.getInstance().getAllKeys(KotlinFunctionShortNameIndex.getInstance().getKey(), project);
+        items.addAll(StubIndex.getInstance().getAllKeys(KotlinPropertyShortNameIndex.getInstance().getKey(), project));
 
         return ArrayUtil.toStringArray(items);
     }
@@ -47,10 +47,10 @@ public class JetGotoSymbolContributor implements ChooseByNameContributor {
     @Override
     public NavigationItem[] getItemsByName(String name, String pattern, Project project, boolean includeNonProjectItems) {
         GlobalSearchScope baseScope = includeNonProjectItems ? GlobalSearchScope.allScope(project) : GlobalSearchScope.projectScope(project);
-        GlobalSearchScope noLibrarySourceScope = JetSourceFilterScope.kotlinSourceAndClassFiles(baseScope, project);
+        GlobalSearchScope noLibrarySourceScope = KotlinSourceFilterScope.kotlinSourceAndClassFiles(baseScope, project);
 
-        Collection<? extends NavigationItem> functions = JetFunctionShortNameIndex.getInstance().get(name, project, noLibrarySourceScope);
-        Collection<? extends NavigationItem> properties = JetPropertyShortNameIndex.getInstance().get(name, project, noLibrarySourceScope);
+        Collection<? extends NavigationItem> functions = KotlinFunctionShortNameIndex.getInstance().get(name, project, noLibrarySourceScope);
+        Collection<? extends NavigationItem> properties = KotlinPropertyShortNameIndex.getInstance().get(name, project, noLibrarySourceScope);
 
         List<NavigationItem> items = new ArrayList<NavigationItem>(Collections2.filter(functions, Predicates.notNull()));
         items.addAll(properties);
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java
index b2e9a3cafed..0462f80a4d7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/GotoSuperActionHandler.java
@@ -34,7 +34,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.*;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
@@ -78,7 +78,7 @@ public class GotoSuperActionHandler implements CodeInsightActionHandler {
             JBPopup popup = descriptor instanceof ClassDescriptor
                             ? NavigationUtil.getPsiElementPopup(superDeclarationsArray, message)
                             : NavigationUtil.getPsiElementPopup(superDeclarationsArray,
-                                                                new JetFunctionPsiElementCellRenderer(), message);
+                                                                new KtFunctionPsiElementCellRenderer(), message);
             popup.showInBestPositionFor(editor);
         }
     }
@@ -86,15 +86,15 @@ public class GotoSuperActionHandler implements CodeInsightActionHandler {
     @Nullable
     private static String getTitle(DeclarationDescriptor descriptor) {
         if (descriptor instanceof ClassDescriptor) {
-            return JetBundle.message("goto.super.class.chooser.title");
+            return KotlinBundle.message("goto.super.class.chooser.title");
         }
 
         if (descriptor instanceof PropertyDescriptor) {
-            return JetBundle.message("goto.super.property.chooser.title");
+            return KotlinBundle.message("goto.super.property.chooser.title");
         }
 
         if (descriptor instanceof SimpleFunctionDescriptor) {
-            return JetBundle.message("goto.super.function.chooser.title");
+            return KotlinBundle.message("goto.super.function.chooser.title");
         }
 
         return null;
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.java
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.java
index 7af99fe7574..86ecb6e49d8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetTypeDeclarationProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KotlinTypeDeclarationProvider.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.BindingContext;
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.types.KotlinType;
 
-public class JetTypeDeclarationProvider implements TypeDeclarationProvider {
+public class KotlinTypeDeclarationProvider implements TypeDeclarationProvider {
     @Override
     public PsiElement[] getSymbolTypeDeclarations(PsiElement symbol) {
         if (symbol instanceof KtElement && symbol.getContainingFile() instanceof KtFile) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java
similarity index 94%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java
rename to idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java
index 3583f6faa0a..f1db2974da0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/JetFunctionPsiElementCellRenderer.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/KtFunctionPsiElementCellRenderer.java
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
 import org.jetbrains.kotlin.renderer.DescriptorRenderer;
 
-public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRenderer {
+public class KtFunctionPsiElementCellRenderer extends DefaultPsiElementCellRenderer {
     @Override
     public String getElementText(PsiElement element) {
         if (element instanceof KtNamedFunction) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java
index e12ed4b2fbe..923ee4a4eb5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/KotlinSurrounderUtils.java
@@ -20,13 +20,13 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
 import org.jetbrains.kotlin.psi.KtBlockExpression;
 
 public class KotlinSurrounderUtils {
-    public static String SURROUND_WITH = JetBundle.message("surround.with");
-    public static String SURROUND_WITH_ERROR = JetBundle.message("surround.with.cannot.perform.action");
+    public static String SURROUND_WITH = KotlinBundle.message("surround.with");
+    public static String SURROUND_WITH_ERROR = KotlinBundle.message("surround.with.cannot.perform.action");
 
     private KotlinSurrounderUtils() {
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
index c3b8d10675a..3d4ea80c344 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt
@@ -29,7 +29,7 @@ import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.openapi.progress.util.ProgressWindowWithNotification
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.debugger.evaluate.KotlinRuntimeTypeEvaluator
 import org.jetbrains.kotlin.idea.util.ShortenReferences
@@ -65,7 +65,7 @@ public class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() {
     }
 
     override fun getTemplateDescription(): String {
-        return JetBundle.message("surround.with.runtime.type.cast.template")
+        return KotlinBundle.message("surround.with.runtime.type.cast.template")
     }
 
     private inner class SurroundWithCastWorker(
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
index 6c9341726bb..67b77c770d8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
@@ -22,13 +22,13 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.*;
 
 public class KotlinStringTemplateSurrounder extends KotlinExpressionSurrounder {
     @Override
     public String getTemplateDescription() {
-        return JetBundle.message("surround.with.string.template");
+        return KotlinBundle.message("surround.with.string.template");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
index 2f0ab4c6466..8fb1926f08b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassKind;
 import org.jetbrains.kotlin.descriptors.ClassifierDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.types.KotlinType;
 public class KotlinWhenSurrounder extends KotlinExpressionSurrounder {
     @Override
     public String getTemplateDescription() {
-        return JetBundle.message("surround.with.when.template");
+        return KotlinBundle.message("surround.with.when.template");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
index 8e69377f971..e6033baa064 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.codeInsight.surroundWith.KotlinSurrounderUtils;
 import org.jetbrains.kotlin.idea.codeInsight.surroundWith.MoveDeclarationsOutHelper;
 import org.jetbrains.kotlin.psi.*;
@@ -62,6 +62,6 @@ public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder
 
     @Override
     public String getTemplateDescription() {
-        return JetBundle.message("surround.with.function.template");
+        return KotlinBundle.message("surround.with.function.template");
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
index d5f8836b549..521e38ac70d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrapRemoveBase.java
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.psi.KtBlockExpression;
 import org.jetbrains.kotlin.psi.KtElement;
@@ -44,7 +44,7 @@ public abstract class KotlinUnwrapRemoveBase extends AbstractUnwrapper<KotlinUnw
     @Override
     public String getDescription(PsiElement e) {
         assert e instanceof KtElement;
-        return JetBundle.message(key, JetRefactoringUtil.getExpressionShortText((KtElement) e));
+        return KotlinBundle.message(key, JetRefactoringUtil.getExpressionShortText((KtElement) e));
     }
 
     protected boolean canExtractExpression(@NotNull KtExpression expression, @NotNull KtElement parent) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractKotlinUpDownMover.java
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java
rename to idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractKotlinUpDownMover.java
index c6c90a74742..2ba1498717a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractKotlinUpDownMover.java
@@ -33,8 +33,8 @@ import org.jetbrains.kotlin.psi.KtBlockExpression;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtFunctionLiteral;
 
-public abstract class AbstractJetUpDownMover extends LineMover {
-    protected AbstractJetUpDownMover() {
+public abstract class AbstractKotlinUpDownMover extends LineMover {
+    protected AbstractKotlinUpDownMover() {
     }
 
     protected abstract boolean checkSourceElement(@NotNull PsiElement element);
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
rename to idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
index 8b5e338acc0..18e6efcccc5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinDeclarationMover.java
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.*;
 import java.util.ArrayList;
 import java.util.List;
 
-public class JetDeclarationMover extends AbstractJetUpDownMover {
+public class KotlinDeclarationMover extends AbstractKotlinUpDownMover {
 
     private boolean moveEnumConstant = false;
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java
rename to idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
index a0c93bf18a1..328c133f316 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/KotlinExpressionMover.java
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
 
 import java.util.List;
 
-public class JetExpressionMover extends AbstractJetUpDownMover {
+public class KotlinExpressionMover extends AbstractKotlinUpDownMover {
 
     private static final Predicate<KtElement> IS_CALL_EXPRESSION = new Predicate<KtElement>() {
         @Override
@@ -43,7 +43,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover {
         }
     };
 
-    public JetExpressionMover() {
+    public KotlinExpressionMover() {
     }
 
     private final static Class[] MOVABLE_ELEMENT_CLASSES = {
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
rename to idea/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java
index 47999f42cba..50f71771bb0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/JetCompilerManager.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/KotlinCompilerManager.java
@@ -38,14 +38,14 @@ import java.util.Set;
 import static org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
 import static org.jetbrains.kotlin.config.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
 
-public class JetCompilerManager extends AbstractProjectComponent {
-    private static final Logger LOG = Logger.getInstance(JetCompilerManager.class);
+public class KotlinCompilerManager extends AbstractProjectComponent {
+    private static final Logger LOG = Logger.getInstance(KotlinCompilerManager.class);
 
     // Comes from external make
     private static final String PREFIX_WITH_COMPILER_NAME = KOTLIN_COMPILER_NAME + ": " + INTERNAL_ERROR_PREFIX;
     private static final Set<String> FILE_EXTS_WHICH_NEEDS_REFRESH = ContainerUtil.immutableSet(JavaScript.DOT_EXTENSION, ".map");
 
-    public JetCompilerManager(Project project, CompilerManager manager) {
+    public KotlinCompilerManager(Project project, CompilerManager manager) {
         super(project);
         manager.addCompilableFileType(KotlinFileType.INSTANCE);
         manager.addCompilationStatusListener(new CompilationStatusListener() {
@@ -80,7 +80,7 @@ public class JetCompilerManager extends AbstractProjectComponent {
         private final String text;
 
         public KotlinCompilerException(String text) {
-            super("", PluginManagerCore.getPluginByClassName(JetCompilerManager.class.getName()));
+            super("", PluginManagerCore.getPluginByClassName(KotlinCompilerManager.class.getName()));
             this.text = text;
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
index 77a16fa2f02..5fdeaa8d945 100644
--- a/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
+++ b/idea/src/org/jetbrains/kotlin/idea/compiler/configuration/KotlinCompilerConfigurableTab.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments;
 import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments;
 import org.jetbrains.kotlin.config.CompilerSettings;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.PluginStartupComponent;
 
 import javax.swing.*;
@@ -69,9 +69,9 @@ public class KotlinCompilerConfigurableTab implements SearchableConfigurable, Co
         additionalArgsOptionsField.attachLabel(additionalArgsLabel);
 
         setupFileChooser(labelForOutputPrefixFile, outputPrefixFile,
-                         JetBundle.message("kotlin.compiler.js.option.output.prefix.browse.title"));
+                         KotlinBundle.message("kotlin.compiler.js.option.output.prefix.browse.title"));
         setupFileChooser(labelForOutputPostfixFile, outputPostfixFile,
-                         JetBundle.message("kotlin.compiler.js.option.output.postfix.browse.title"));
+                         KotlinBundle.message("kotlin.compiler.js.option.output.postfix.browse.title"));
 
         labelForOutputDirectory.setLabelFor(outputDirectory);
         copyRuntimeFilesCheckBox.addChangeListener(new ChangeListener() {
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java
index 5226a0cb2ea..fcb4415e32b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinAndroidGradleModuleConfigurator.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
@@ -49,7 +49,7 @@ public class KotlinAndroidGradleModuleConfigurator extends KotlinWithGradleConfi
 
     @Override
     public boolean isApplicable(@NotNull Module module) {
-        return JetPluginUtil.isAndroidGradleModule(module);
+        return KotlinPluginUtil.isAndroidGradleModule(module);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
index ae54d46047c..8eefed9d652 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleModuleConfigurator.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.configuration;
 
 import com.intellij.openapi.module.Module;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.resolve.TargetPlatform;
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
@@ -49,8 +49,8 @@ public class KotlinGradleModuleConfigurator extends KotlinWithGradleConfigurator
 
     @Override
     public boolean isApplicable(@NotNull Module module) {
-        return JetPluginUtil.isGradleModule(module) &&
-               !JetPluginUtil.isAndroidGradleModule(module);
+        return KotlinPluginUtil.isGradleModule(module) &&
+               !KotlinPluginUtil.isAndroidGradleModule(module);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
index 888e484a334..53960cc15fc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java
@@ -44,7 +44,7 @@ import org.jetbrains.idea.maven.dom.model.*;
 import org.jetbrains.idea.maven.project.MavenProjectsManager;
 import org.jetbrains.jps.model.java.JavaSourceRootType;
 import org.jetbrains.kotlin.cli.common.KotlinVersion;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
 
 import java.util.List;
@@ -81,7 +81,7 @@ public abstract class KotlinMavenConfigurator implements KotlinProjectConfigurat
 
     @Override
     public boolean isApplicable(@NotNull Module module) {
-        return JetPluginUtil.isMavenModule(module);
+        return KotlinPluginUtil.isMavenModule(module);
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
index 9c65ead4fb8..425779d083e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.java
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.configuration;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.libraries.Library;
@@ -36,7 +35,7 @@ import com.intellij.util.Processor;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialogWithModules;
 import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils;
 import org.jetbrains.kotlin.idea.project.ProjectStructureUtil;
@@ -70,9 +69,9 @@ public abstract class KotlinWithLibraryConfigurator implements KotlinProjectConf
 
     @Override
     public boolean isApplicable(@NotNull Module module) {
-        return !JetPluginUtil.isAndroidGradleModule(module) &&
-               !JetPluginUtil.isMavenModule(module) &&
-               !JetPluginUtil.isGradleModule(module);
+        return !KotlinPluginUtil.isAndroidGradleModule(module) &&
+               !KotlinPluginUtil.isMavenModule(module) &&
+               !KotlinPluginUtil.isGradleModule(module);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
index 68fee7d2d81..18fd9d9434b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertJavaCopyPastePostProcessor.kt
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.TestOnly
 import org.jetbrains.kotlin.idea.caches.resolve.resolveImportReference
 import org.jetbrains.kotlin.idea.codeInsight.KotlinCopyPasteReferenceProcessor
 import org.jetbrains.kotlin.idea.codeInsight.KotlinReferenceData
-import org.jetbrains.kotlin.idea.editor.JetEditorOptions
+import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
 import org.jetbrains.kotlin.idea.j2k.IdeaJavaToKotlinServices
 import org.jetbrains.kotlin.idea.j2k.J2kPostProcessor
 import org.jetbrains.kotlin.idea.util.ImportInsertHelper
@@ -71,7 +71,7 @@ public class ConvertJavaCopyPastePostProcessor : CopyPastePostProcessor<TextBloc
 
     public override fun processTransferableData(project: Project, editor: Editor, bounds: RangeMarker, caretOffset: Int, indented: Ref<Boolean>, values: List<TextBlockTransferableData>) {
         if (DumbService.getInstance(project).isDumb()) return
-        val jetEditorOptions = JetEditorOptions.getInstance()
+        val jetEditorOptions = KotlinEditorOptions.getInstance()
         if (!jetEditorOptions.isEnableJavaToKotlinConversion()) return
 
         val data = values.single()
diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
index 59e132dcfdb..f37bafee1d4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/KotlinPasteFromJavaDialog.java
@@ -20,7 +20,7 @@ import com.intellij.CommonBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.editor.JetEditorOptions;
+import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions;
 
 import javax.swing.*;
 import java.awt.*;
@@ -63,7 +63,7 @@ public class KotlinPasteFromJavaDialog extends DialogWrapper {
     @Override
     protected void doOKAction() {
         if (donTShowThisCheckBox.isSelected()) {
-            JetEditorOptions.getInstance().setDonTShowConversionDialog(true);
+            KotlinEditorOptions.getInstance().setDonTShowConversionDialog(true);
         }
         super.doOKAction();
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
index 7ac123766f0..cd338295bfd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManager.kt
@@ -55,7 +55,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyzeAndGetResult
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
 import org.jetbrains.kotlin.idea.debugger.breakpoints.getLambdasAtLineIfAny
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile
 import org.jetbrains.kotlin.idea.search.usagesSearch.isImportUsage
 import org.jetbrains.kotlin.idea.util.DebuggerUtils
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
@@ -71,7 +71,7 @@ import com.intellij.debugger.engine.DebuggerUtils as JDebuggerUtils
 
 class PositionedElement(val className: String?, val element: PsiElement?)
 
-public class JetPositionManager(private val myDebugProcess: DebugProcess) : MultiRequestPositionManager, PositionManagerEx() {
+public class KotlinPositionManager(private val myDebugProcess: DebugProcess) : MultiRequestPositionManager, PositionManagerEx() {
 
     private val myTypeMappers = WeakHashMap<String, CachedValue<JetTypeMapper>>()
 
@@ -220,7 +220,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult
 
         if (psiFile is ClsFileImpl) {
             val decompiledPsiFile = runReadAction { psiFile.decompiledPsiFile }
-            if (decompiledPsiFile is JetClsFile && sourcePosition.line == -1) {
+            if (decompiledPsiFile is KtClsFile && sourcePosition.line == -1) {
                 val className = JvmFileClassUtil.getFileClassInfoNoResolve(decompiledPsiFile).fileClassFqName.getInternalName()
                 return myDebugProcess.virtualMachineProxy.classesByName(className)
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.java b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.java
rename to idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
index bc75e860f00..cfd92bfd536 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManagerFactory.java
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinPositionManagerFactory.java
@@ -20,9 +20,9 @@ import com.intellij.debugger.PositionManager;
 import com.intellij.debugger.PositionManagerFactory;
 import com.intellij.debugger.engine.DebugProcess;
 
-public class JetPositionManagerFactory extends PositionManagerFactory {
+public class KotlinPositionManagerFactory extends PositionManagerFactory {
     @Override
     public PositionManager createPositionManager(DebugProcess process) {
-        return new JetPositionManager(process);
+        return new KotlinPositionManager(process);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointPropertiesPanel.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointPropertiesPanel.kt
index ddeeda20bdf..5337bef808c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointPropertiesPanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointPropertiesPanel.kt
@@ -22,7 +22,7 @@ import com.intellij.util.ui.DialogUtil
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointCustomPropertiesPanel
 import com.intellij.xdebugger.impl.breakpoints.XBreakpointBase
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import java.awt.BorderLayout
 import java.awt.event.ActionEvent
 import java.awt.event.ActionListener
@@ -38,9 +38,9 @@ public class KotlinFieldBreakpointPropertiesPanel: XBreakpointCustomPropertiesPa
     private var myWatchModificationCheckBox: JCheckBox by Delegates.notNull()
 
     override fun getComponent(): JComponent {
-        myWatchInitializationCheckBox = JCheckBox(JetBundle.message("debugger.field.watchpoints.properties.panel.field.initialization.label"))
-        myWatchAccessCheckBox = JCheckBox(JetBundle.message("debugger.field.watchpoints.properties.panel.field.access.label"))
-        myWatchModificationCheckBox = JCheckBox(JetBundle.message("debugger.field.watchpoints.properties.panel.field.modification.label"))
+        myWatchInitializationCheckBox = JCheckBox(KotlinBundle.message("debugger.field.watchpoints.properties.panel.field.initialization.label"))
+        myWatchAccessCheckBox = JCheckBox(KotlinBundle.message("debugger.field.watchpoints.properties.panel.field.access.label"))
+        myWatchModificationCheckBox = JCheckBox(KotlinBundle.message("debugger.field.watchpoints.properties.panel.field.modification.label"))
 
         DialogUtil.registerMnemonic(myWatchInitializationCheckBox)
         DialogUtil.registerMnemonic(myWatchAccessCheckBox)
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
index b57a3e07ea9..652eab06e71 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinFieldBreakpointType.kt
@@ -35,12 +35,12 @@ import com.intellij.xdebugger.breakpoints.XBreakpoint
 import com.intellij.xdebugger.breakpoints.XLineBreakpoint
 import com.intellij.xdebugger.breakpoints.XLineBreakpointType
 import com.intellij.xdebugger.breakpoints.ui.XBreakpointCustomPropertiesPanel
-import org.jetbrains.kotlin.asJava.KotlinLightClass
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.debugger.breakpoints.dialog.AddFieldBreakpointDialog
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import javax.swing.JComponent
 
 public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakpointProperties>, XLineBreakpointType<KotlinPropertyBreakpointProperties>(
-        "kotlin-field", JetBundle.message("debugger.field.watchpoints.tab.title")
+        "kotlin-field", KotlinBundle.message("debugger.field.watchpoints.tab.title")
 ) {
     override fun createJavaBreakpoint(project: Project, breakpoint: XBreakpoint<KotlinPropertyBreakpointProperties>): Breakpoint<KotlinPropertyBreakpointProperties> {
         return KotlinFieldBreakpoint(project, breakpoint)
@@ -78,7 +78,7 @@ public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakp
                 }
 
                 val psiClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project))
-                if (psiClass !is KotlinLightClass) {
+                if (psiClass !is KtLightClass) {
                     reportError(project, "Couldn't find '$className' class")
                     return false
                 }
@@ -90,10 +90,10 @@ public class KotlinFieldBreakpointType : JavaBreakpointType<KotlinPropertyBreakp
                 }
 
                 result = when (psiClass) {
-                    is KotlinLightClassForFacade -> {
+                    is KtLightClassForFacade -> {
                         psiClass.files.asSequence().map { createBreakpointIfPropertyExists(it, it, className, fieldName) }.filterNotNull().firstOrNull()
                     }
-                    is KotlinLightClassForExplicitDeclaration -> {
+                    is KtLightClassForExplicitDeclaration -> {
                         val jetClass = psiClass.getOrigin()
                         createBreakpointIfPropertyExists(jetClass, jetClass.getContainingJetFile(), className, fieldName)
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt
index cbf1dfbd13c..fecff1fecee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/fieldBreakpointDialogUtil.kt
@@ -17,14 +17,14 @@
 package org.jetbrains.kotlin.idea.debugger.breakpoints.dialog
 
 import com.intellij.psi.PsiClass
-import org.jetbrains.kotlin.asJava.KotlinLightClass
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.idea.core.util.DescriptorMemberChooserObject
 import org.jetbrains.kotlin.psi.KtProperty
 
 fun PsiClass.collectProperties(): Array<DescriptorMemberChooserObject> {
-    if (this is KotlinLightClassForFacade) {
+    if (this is KtLightClassForFacade) {
         val result = arrayListOf<DescriptorMemberChooserObject>()
         this.files.forEach {
             it.getDeclarations().filterIsInstance<KtProperty>().forEach {
@@ -33,7 +33,7 @@ fun PsiClass.collectProperties(): Array<DescriptorMemberChooserObject> {
         }
         return result.toTypedArray()
     }
-    if (this is KotlinLightClass) {
+    if (this is KtLightClass) {
         val origin = this.getOrigin()
         if (origin != null) {
             return origin.getDeclarations().filterIsInstance<KtProperty>().map {
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
index ee93373dd5f..447a4ce5a07 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/debuggerUtil.kt
@@ -33,7 +33,7 @@ fun isInsideInlineArgument(inlineArgument: KtFunction, location: Location, debug
 }
 
 private fun lambdaOrdinalIndex(elementAt: KtFunction): Int {
-    val typeMapper = JetPositionManager.createTypeMapper(elementAt.getContainingJetFile())
+    val typeMapper = KotlinPositionManager.createTypeMapper(elementAt.getContainingJetFile())
 
     val type = CodegenBinding.asmTypeForAnonymousClass(typeMapper.bindingContext, elementAt)
     return type.className.substringAfterLast("$").toInt()
diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
index 5a212d1c585..e26d0826ce5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
@@ -37,7 +37,7 @@ import com.intellij.xdebugger.impl.ui.tree.ValueMarkup
 import com.sun.jdi.*
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.eval4j.jdi.asValue
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
@@ -204,7 +204,7 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
                 return getContextElement(elementAt.context?.context)
             }
 
-            if (elementAt is KotlinLightClass) {
+            if (elementAt is KtLightClass) {
                 return getContextElement(elementAt.getOrigin())
             }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java
index ad39318c140..37d86e06a49 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinBackspaceHandler.java
@@ -27,7 +27,7 @@ public class KotlinBackspaceHandler extends BackspaceHandlerDelegate {
     @Override
     public void beforeCharDeleted(char c, PsiFile file, Editor editor) {
         int offset = editor.getCaretModel().getOffset() - 1;
-        deleteGt = c =='<' && file instanceof KtFile && JetLtGtTypingUtils.shouldAutoCloseAngleBracket(offset, editor);
+        deleteGt = c =='<' && file instanceof KtFile && LtGtTypingUtils.shouldAutoCloseAngleBracket(offset, editor);
     }
 
     @Override
@@ -39,7 +39,7 @@ public class KotlinBackspaceHandler extends BackspaceHandlerDelegate {
         char c1 = chars.charAt(offset);
         if (c == '<' && deleteGt) {
             if (c1 == '>') {
-                JetLtGtTypingUtils.handleJetLTDeletion(editor, offset);
+                LtGtTypingUtils.handleJetLTDeletion(editor, offset);
             }
             return true;
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptions.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java
rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptions.java
index 445096aae81..e012cad6b5a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/JetEditorOptions.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptions.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
                         file = "$APP_CONFIG$/editor.xml"
                 )}
 )
-public class JetEditorOptions implements PersistentStateComponent<JetEditorOptions> {
+public class KotlinEditorOptions implements PersistentStateComponent<KotlinEditorOptions> {
     private boolean donTShowConversionDialog = false;
     private boolean enableJavaToKotlinConversion = true;
 
@@ -52,17 +52,17 @@ public class JetEditorOptions implements PersistentStateComponent<JetEditorOptio
     }
 
     @Override
-    public JetEditorOptions getState() {
+    public KotlinEditorOptions getState() {
         return this;
     }
 
     @Override
-    public void loadState(JetEditorOptions state) {
+    public void loadState(KotlinEditorOptions state) {
         XmlSerializerUtil.copyBean(state, this);
     }
 
-    public static JetEditorOptions getInstance() {
-        return ServiceManager.getService(JetEditorOptions.class);
+    public static KotlinEditorOptions getInstance() {
+        return ServiceManager.getService(KotlinEditorOptions.class);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
similarity index 81%
rename from idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java
rename to idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
index 00722a5bcef..2d20cab33a0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/JetSettingEditorConfigurable.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinEditorOptionsConfigurable.java
@@ -19,9 +19,9 @@ package org.jetbrains.kotlin.idea.editor;
 import com.intellij.openapi.options.BeanConfigurable;
 import com.intellij.openapi.options.UnnamedConfigurable;
 
-public class JetSettingEditorConfigurable extends BeanConfigurable<JetEditorOptions> implements UnnamedConfigurable {
-    public JetSettingEditorConfigurable() {
-        super(JetEditorOptions.getInstance());
+public class KotlinEditorOptionsConfigurable extends BeanConfigurable<KotlinEditorOptions> implements UnnamedConfigurable {
+    public KotlinEditorOptionsConfigurable() {
+        super(KotlinEditorOptions.getInstance());
         checkBox("enableJavaToKotlinConversion", "Enable Java To Kotlin Conversion");
         checkBox("donTShowConversionDialog", "Don't show Java to Kotlin conversion dialog");
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java
index 54920b2c99e..30d94bb16e3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/KotlinTypedHandler.java
@@ -65,12 +65,12 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
         switch (c) {
             case '<':
                 jetLTTyped = CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET &&
-                             JetLtGtTypingUtils.shouldAutoCloseAngleBracket(editor.getCaretModel().getOffset(), editor);
+                             LtGtTypingUtils.shouldAutoCloseAngleBracket(editor.getCaretModel().getOffset(), editor);
                 return Result.CONTINUE;
 
             case '>':
                 if (CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET) {
-                    if (JetLtGtTypingUtils.handleJetGTInsert(editor)) {
+                    if (LtGtTypingUtils.handleJetGTInsert(editor)) {
                         return Result.STOP;
                     }
                 }
@@ -209,7 +209,7 @@ public class KotlinTypedHandler extends TypedHandlerDelegate {
 
         if (jetLTTyped) {
             jetLTTyped = false;
-            JetLtGtTypingUtils.handleJetAutoCloseLT(editor);
+            LtGtTypingUtils.handleJetAutoCloseLT(editor);
             return Result.STOP;
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java b/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java
rename to idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java
index 8d725434357..93ad0d1ddc0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/editor/JetLtGtTypingUtils.java
+++ b/idea/src/org/jetbrains/kotlin/idea/editor/LtGtTypingUtils.java
@@ -24,10 +24,10 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.kotlin.lexer.KtTokens;
 
-final class JetLtGtTypingUtils {
+final class LtGtTypingUtils {
     private static final TokenSet INVALID_INSIDE_REFERENCE = TokenSet.create(KtTokens.SEMICOLON, KtTokens.LBRACE, KtTokens.RBRACE);
 
-    private JetLtGtTypingUtils() {
+    private LtGtTypingUtils() {
     }
 
     static void handleJetAutoCloseLT(Editor editor) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.java
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java
rename to idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.java
index a882aaaa80c..81bed467d78 100644
--- a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilter.java
@@ -34,11 +34,11 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class JetExceptionFilter implements Filter {
+public class KotlinExceptionFilter implements Filter {
     private final ExceptionFilter exceptionFilter;
     private final GlobalSearchScope searchScope;
 
-    public JetExceptionFilter(@NotNull GlobalSearchScope searchScope) {
+    public KotlinExceptionFilter(@NotNull GlobalSearchScope searchScope) {
         this.exceptionFilter = new ExceptionFilter(searchScope);
         this.searchScope = searchScope;
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.java b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterFactory.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.java
rename to idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterFactory.java
index 0162b063cee..47b753fcc34 100644
--- a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilterFactory.java
+++ b/idea/src/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterFactory.java
@@ -21,10 +21,10 @@ import com.intellij.execution.filters.Filter;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
 
-public class JetExceptionFilterFactory implements ExceptionFilterFactory {
+public class KotlinExceptionFilterFactory implements ExceptionFilterFactory {
     @NotNull
     @Override
     public Filter create(@NotNull GlobalSearchScope searchScope) {
-        return new JetExceptionFilter(searchScope);
+        return new KotlinExceptionFilter(searchScope);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt
deleted file mode 100644
index f55721cb1e9..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetUsageTypeProvider.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.idea.findUsages
-
-import com.intellij.psi.PsiElement
-import com.intellij.usages.UsageTarget
-import com.intellij.usages.impl.rules.UsageType
-import com.intellij.usages.impl.rules.UsageTypeProviderEx
-import org.jetbrains.kotlin.idea.JetBundle
-import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
-
-public object JetUsageTypeProvider : UsageTypeProviderEx {
-    public override fun getUsageType(element: PsiElement?): UsageType? {
-        return getUsageType(element, UsageTarget.EMPTY_ARRAY)
-    }
-
-    public override fun getUsageType(element: PsiElement?, targets: Array<out UsageTarget>): UsageType? {
-        val usageType = UsageTypeUtils.getUsageType(element)
-        if (usageType == null) return null
-        return convertEnumToUsageType(usageType)
-    }
-
-    fun convertEnumToUsageType(usageType: UsageTypeEnum): UsageType {
-        return when (usageType) {
-            TYPE_CONSTRAINT -> JetUsageTypes.TYPE_CONSTRAINT
-            VALUE_PARAMETER_TYPE -> JetUsageTypes.VALUE_PARAMETER_TYPE
-            NON_LOCAL_PROPERTY_TYPE -> JetUsageTypes.NON_LOCAL_PROPERTY_TYPE
-            FUNCTION_RETURN_TYPE -> JetUsageTypes.FUNCTION_RETURN_TYPE
-            SUPER_TYPE -> JetUsageTypes.SUPER_TYPE
-            TYPE_DEFINITION -> JetUsageTypes.TYPE_DEFINITION
-            IS -> JetUsageTypes.IS
-            CLASS_OBJECT_ACCESS -> JetUsageTypes.CLASS_OBJECT_ACCESS
-            COMPANION_OBJECT_ACCESS -> JetUsageTypes.COMPANION_OBJECT_ACCESS
-            EXTENSION_RECEIVER_TYPE -> JetUsageTypes.EXTENSION_RECEIVER_TYPE
-            SUPER_TYPE_QUALIFIER -> JetUsageTypes.SUPER_TYPE_QUALIFIER
-
-            FUNCTION_CALL -> JetUsageTypes.FUNCTION_CALL
-            IMPLICIT_GET -> JetUsageTypes.IMPLICIT_GET
-            IMPLICIT_SET -> JetUsageTypes.IMPLICIT_SET
-            IMPLICIT_INVOKE -> JetUsageTypes.IMPLICIT_INVOKE
-            IMPLICIT_ITERATION -> JetUsageTypes.IMPLICIT_ITERATION
-            PROPERTY_DELEGATION -> JetUsageTypes.PROPERTY_DELEGATION
-
-            RECEIVER -> JetUsageTypes.RECEIVER
-            DELEGATE -> JetUsageTypes.DELEGATE
-
-            PACKAGE_DIRECTIVE -> JetUsageTypes.PACKAGE_DIRECTIVE
-            PACKAGE_MEMBER_ACCESS -> JetUsageTypes.PACKAGE_MEMBER_ACCESS
-
-            CALLABLE_REFERENCE -> JetUsageTypes.CALLABLE_REFERENCE
-
-            READ -> UsageType.READ
-            WRITE -> UsageType.WRITE
-            CLASS_IMPORT -> UsageType.CLASS_IMPORT
-            CLASS_LOCAL_VAR_DECLARATION -> UsageType.CLASS_LOCAL_VAR_DECLARATION
-            TYPE_PARAMETER -> UsageType.TYPE_PARAMETER
-            CLASS_CAST_TO -> UsageType.CLASS_CAST_TO
-            ANNOTATION -> UsageType.ANNOTATION
-            CLASS_NEW_OPERATOR -> UsageType.CLASS_NEW_OPERATOR
-            NAMED_ARGUMENT -> JetUsageTypes.NAMED_ARGUMENT
-
-            USAGE_IN_STRING_LITERAL -> UsageType.LITERAL_USAGE
-        }
-    }
-}
-
-object JetUsageTypes {
-    // types
-    val TYPE_CONSTRAINT = UsageType(JetBundle.message("usageType.type.constraint"))
-    val VALUE_PARAMETER_TYPE = UsageType(JetBundle.message("usageType.value.parameter.type"))
-    val NON_LOCAL_PROPERTY_TYPE = UsageType(JetBundle.message("usageType.nonLocal.property.type"))
-    val FUNCTION_RETURN_TYPE = UsageType(JetBundle.message("usageType.function.return.type"))
-    val SUPER_TYPE = UsageType(JetBundle.message("usageType.superType"))
-    val TYPE_DEFINITION = UsageType(JetBundle.message("usageType.type.definition"))
-    val IS = UsageType(JetBundle.message("usageType.is"))
-    val CLASS_OBJECT_ACCESS = UsageType(JetBundle.message("usageType.class.object"))
-    val COMPANION_OBJECT_ACCESS = UsageType(JetBundle.message("usageType.companion.object"))
-    val EXTENSION_RECEIVER_TYPE = UsageType(JetBundle.message("usageType.extension.receiver.type"))
-    val SUPER_TYPE_QUALIFIER = UsageType(JetBundle.message("usageType.super.type.qualifier"))
-
-    // functions
-    val FUNCTION_CALL = UsageType(JetBundle.message("usageType.function.call"))
-    val IMPLICIT_GET = UsageType(JetBundle.message("usageType.implicit.get"))
-    val IMPLICIT_SET = UsageType(JetBundle.message("usageType.implicit.set"))
-    val IMPLICIT_INVOKE = UsageType(JetBundle.message("usageType.implicit.invoke"))
-    val IMPLICIT_ITERATION = UsageType(JetBundle.message("usageType.implicit.iteration"))
-    val PROPERTY_DELEGATION = UsageType(JetBundle.message("usageType.property.delegation"))
-
-    // values
-    val RECEIVER = UsageType(JetBundle.message("usageType.receiver"))
-    val DELEGATE = UsageType(JetBundle.message("usageType.delegate"))
-
-    // packages
-    val PACKAGE_DIRECTIVE = UsageType(JetBundle.message("usageType.packageDirective"))
-    val PACKAGE_MEMBER_ACCESS = UsageType(JetBundle.message("usageType.packageMemberAccess"))
-
-    // common usage types
-    val CALLABLE_REFERENCE = UsageType(JetBundle.message("usageType.callable.reference"))
-    val NAMED_ARGUMENT = UsageType("Named argument")
-}
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt
rename to idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
index cb720cca211..118600a56ff 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetElementDescriptionProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinElementDescriptionProvider.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 
-public class JetElementDescriptionProvider : ElementDescriptionProvider {
+public class KotlinElementDescriptionProvider : ElementDescriptionProvider {
     public override fun getElementDescription(element: PsiElement, location: ElementDescriptionLocation): String? {
         val targetElement = element.unwrapped
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinImportFilteringRule.kt
similarity index 94%
rename from idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.kt
rename to idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinImportFilteringRule.kt
index 2ba2c3624f4..371efaa5092 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/JetImportFilteringRule.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinImportFilteringRule.kt
@@ -22,7 +22,7 @@ import com.intellij.usages.rules.PsiElementUsage
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 
-public class JetImportFilteringRule : ImportFilteringRule() {
+public class KotlinImportFilteringRule : ImportFilteringRule() {
     public override fun isVisible(usage: Usage): Boolean {
         if (usage is PsiElementUsage) {
             return usage.getElement()?.getNonStrictParentOfType<KtImportDirective>() == null
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
new file mode 100644
index 00000000000..38b2c1eb307
--- /dev/null
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/KotlinUsageTypeProvider.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.findUsages
+
+import com.intellij.psi.PsiElement
+import com.intellij.usages.UsageTarget
+import com.intellij.usages.impl.rules.UsageType
+import com.intellij.usages.impl.rules.UsageTypeProviderEx
+import org.jetbrains.kotlin.idea.KotlinBundle
+import org.jetbrains.kotlin.idea.findUsages.UsageTypeEnum.*
+
+public object KotlinUsageTypeProvider : UsageTypeProviderEx {
+    public override fun getUsageType(element: PsiElement?): UsageType? {
+        return getUsageType(element, UsageTarget.EMPTY_ARRAY)
+    }
+
+    public override fun getUsageType(element: PsiElement?, targets: Array<out UsageTarget>): UsageType? {
+        val usageType = UsageTypeUtils.getUsageType(element)
+        if (usageType == null) return null
+        return convertEnumToUsageType(usageType)
+    }
+
+    fun convertEnumToUsageType(usageType: UsageTypeEnum): UsageType {
+        return when (usageType) {
+            TYPE_CONSTRAINT -> KotlinUsageTypes.TYPE_CONSTRAINT
+            VALUE_PARAMETER_TYPE -> KotlinUsageTypes.VALUE_PARAMETER_TYPE
+            NON_LOCAL_PROPERTY_TYPE -> KotlinUsageTypes.NON_LOCAL_PROPERTY_TYPE
+            FUNCTION_RETURN_TYPE -> KotlinUsageTypes.FUNCTION_RETURN_TYPE
+            SUPER_TYPE -> KotlinUsageTypes.SUPER_TYPE
+            TYPE_DEFINITION -> KotlinUsageTypes.TYPE_DEFINITION
+            IS -> KotlinUsageTypes.IS
+            CLASS_OBJECT_ACCESS -> KotlinUsageTypes.CLASS_OBJECT_ACCESS
+            COMPANION_OBJECT_ACCESS -> KotlinUsageTypes.COMPANION_OBJECT_ACCESS
+            EXTENSION_RECEIVER_TYPE -> KotlinUsageTypes.EXTENSION_RECEIVER_TYPE
+            SUPER_TYPE_QUALIFIER -> KotlinUsageTypes.SUPER_TYPE_QUALIFIER
+
+            FUNCTION_CALL -> KotlinUsageTypes.FUNCTION_CALL
+            IMPLICIT_GET -> KotlinUsageTypes.IMPLICIT_GET
+            IMPLICIT_SET -> KotlinUsageTypes.IMPLICIT_SET
+            IMPLICIT_INVOKE -> KotlinUsageTypes.IMPLICIT_INVOKE
+            IMPLICIT_ITERATION -> KotlinUsageTypes.IMPLICIT_ITERATION
+            PROPERTY_DELEGATION -> KotlinUsageTypes.PROPERTY_DELEGATION
+
+            RECEIVER -> KotlinUsageTypes.RECEIVER
+            DELEGATE -> KotlinUsageTypes.DELEGATE
+
+            PACKAGE_DIRECTIVE -> KotlinUsageTypes.PACKAGE_DIRECTIVE
+            PACKAGE_MEMBER_ACCESS -> KotlinUsageTypes.PACKAGE_MEMBER_ACCESS
+
+            CALLABLE_REFERENCE -> KotlinUsageTypes.CALLABLE_REFERENCE
+
+            READ -> UsageType.READ
+            WRITE -> UsageType.WRITE
+            CLASS_IMPORT -> UsageType.CLASS_IMPORT
+            CLASS_LOCAL_VAR_DECLARATION -> UsageType.CLASS_LOCAL_VAR_DECLARATION
+            TYPE_PARAMETER -> UsageType.TYPE_PARAMETER
+            CLASS_CAST_TO -> UsageType.CLASS_CAST_TO
+            ANNOTATION -> UsageType.ANNOTATION
+            CLASS_NEW_OPERATOR -> UsageType.CLASS_NEW_OPERATOR
+            NAMED_ARGUMENT -> KotlinUsageTypes.NAMED_ARGUMENT
+
+            USAGE_IN_STRING_LITERAL -> UsageType.LITERAL_USAGE
+        }
+    }
+}
+
+object KotlinUsageTypes {
+    // types
+    val TYPE_CONSTRAINT = UsageType(KotlinBundle.message("usageType.type.constraint"))
+    val VALUE_PARAMETER_TYPE = UsageType(KotlinBundle.message("usageType.value.parameter.type"))
+    val NON_LOCAL_PROPERTY_TYPE = UsageType(KotlinBundle.message("usageType.nonLocal.property.type"))
+    val FUNCTION_RETURN_TYPE = UsageType(KotlinBundle.message("usageType.function.return.type"))
+    val SUPER_TYPE = UsageType(KotlinBundle.message("usageType.superType"))
+    val TYPE_DEFINITION = UsageType(KotlinBundle.message("usageType.type.definition"))
+    val IS = UsageType(KotlinBundle.message("usageType.is"))
+    val CLASS_OBJECT_ACCESS = UsageType(KotlinBundle.message("usageType.class.object"))
+    val COMPANION_OBJECT_ACCESS = UsageType(KotlinBundle.message("usageType.companion.object"))
+    val EXTENSION_RECEIVER_TYPE = UsageType(KotlinBundle.message("usageType.extension.receiver.type"))
+    val SUPER_TYPE_QUALIFIER = UsageType(KotlinBundle.message("usageType.super.type.qualifier"))
+
+    // functions
+    val FUNCTION_CALL = UsageType(KotlinBundle.message("usageType.function.call"))
+    val IMPLICIT_GET = UsageType(KotlinBundle.message("usageType.implicit.get"))
+    val IMPLICIT_SET = UsageType(KotlinBundle.message("usageType.implicit.set"))
+    val IMPLICIT_INVOKE = UsageType(KotlinBundle.message("usageType.implicit.invoke"))
+    val IMPLICIT_ITERATION = UsageType(KotlinBundle.message("usageType.implicit.iteration"))
+    val PROPERTY_DELEGATION = UsageType(KotlinBundle.message("usageType.property.delegation"))
+
+    // values
+    val RECEIVER = UsageType(KotlinBundle.message("usageType.receiver"))
+    val DELEGATE = UsageType(KotlinBundle.message("usageType.delegate"))
+
+    // packages
+    val PACKAGE_DIRECTIVE = UsageType(KotlinBundle.message("usageType.packageDirective"))
+    val PACKAGE_MEMBER_ACCESS = UsageType(KotlinBundle.message("usageType.packageMemberAccess"))
+
+    // common usage types
+    val CALLABLE_REFERENCE = UsageType(KotlinBundle.message("usageType.callable.reference"))
+    val NAMED_ARGUMENT = UsageType("Named argument")
+}
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
index ab2e260104a..49a342f4eb3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java
@@ -32,7 +32,7 @@ import com.intellij.ui.StateRestoringCheckBox;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.LightClassUtil;
 import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.psi.KtClass;
@@ -106,31 +106,31 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog {
         Utils.renameCheckbox(
                 findWhatPanel,
                 FindBundle.message("find.what.methods.usages.checkbox"),
-                JetBundle.message("find.what.functions.usages.checkbox")
+                KotlinBundle.message("find.what.functions.usages.checkbox")
         );
         Utils.renameCheckbox(
                 findWhatPanel,
                 FindBundle.message("find.what.fields.usages.checkbox"),
-                JetBundle.message("find.what.properties.usages.checkbox")
+                KotlinBundle.message("find.what.properties.usages.checkbox")
         );
         Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.implementing.classes.checkbox"));
         Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.derived.interfaces.checkbox"));
         Utils.removeCheckbox(findWhatPanel, FindBundle.message("find.what.derived.classes.checkbox"));
 
         derivedClasses = addCheckboxToPanel(
-                JetBundle.message("find.what.derived.classes.checkbox"),
+                KotlinBundle.message("find.what.derived.classes.checkbox"),
                 getFindUsagesOptions().isDerivedClasses,
                 findWhatPanel,
                 true
         );
         derivedTraits = addCheckboxToPanel(
-                JetBundle.message("find.what.derived.interfaces.checkbox"),
+                KotlinBundle.message("find.what.derived.interfaces.checkbox"),
                 getFindUsagesOptions().isDerivedInterfaces,
                 findWhatPanel,
                 true
         );
         constructorUsages = addCheckboxToPanel(
-                JetBundle.message("find.what.constructor.usages.checkbox"),
+                KotlinBundle.message("find.what.constructor.usages.checkbox"),
                 getFindUsagesOptions().getSearchConstructorUsages(),
                 findWhatPanel,
                 true
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
index 61caf22cb5d..1c7e5fa93dc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindFunctionUsagesDialog.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiMethod;
 import com.intellij.ui.SimpleColoredComponent;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.findUsages.KotlinFunctionFindUsagesOptions;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 
@@ -61,12 +61,12 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog {
             Utils.renameCheckbox(
                     findWhatPanel,
                     FindBundle.message("find.what.implementing.methods.checkbox"),
-                    JetBundle.message("find.what.implementing.methods.checkbox")
+                    KotlinBundle.message("find.what.implementing.methods.checkbox")
             );
             Utils.renameCheckbox(
                     findWhatPanel,
                     FindBundle.message("find.what.overriding.methods.checkbox"),
-                    JetBundle.message("find.what.overriding.methods.checkbox")
+                    KotlinBundle.message("find.what.overriding.methods.checkbox")
             );
         }
 
@@ -80,10 +80,10 @@ public class KotlinFindFunctionUsagesDialog extends FindMethodUsagesDialog {
         if (!Utils.renameCheckbox(
                 optionsPanel,
                 FindBundle.message("find.options.include.overloaded.methods.checkbox"),
-                JetBundle.message("find.options.include.overloaded.methods.checkbox")
+                KotlinBundle.message("find.options.include.overloaded.methods.checkbox")
         )) {
             addCheckboxToPanel(
-                    JetBundle.message("find.options.include.overloaded.methods.checkbox"),
+                    KotlinBundle.message("find.options.include.overloaded.methods.checkbox"),
                     FindSettings.getInstance().isSearchOverloadedMethods(),
                     optionsPanel,
                     false
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
index aaa3b041ef6..b103b4a01f5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindPropertyUsagesDialog.java
@@ -26,7 +26,7 @@ import com.intellij.ui.IdeBorderFactory;
 import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.StateRestoringCheckBox;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.findUsages.KotlinPropertyFindUsagesOptions;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.KtNamedDeclaration;
@@ -78,13 +78,13 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
         KotlinPropertyFindUsagesOptions options = getFindUsagesOptions();
 
         cbReaders = addCheckboxToPanel(
-                JetBundle.message("find.what.property.readers.checkbox"),
+                KotlinBundle.message("find.what.property.readers.checkbox"),
                 options.isReadAccess,
                 findWhatPanel,
                 true
         );
         cbWriters = addCheckboxToPanel(
-                JetBundle.message("find.what.property.writers.checkbox"),
+                KotlinBundle.message("find.what.property.writers.checkbox"),
                 options.isWriteAccess,
                 findWhatPanel,
                 true
@@ -109,8 +109,8 @@ public class KotlinFindPropertyUsagesDialog extends JavaFindUsagesDialog<KotlinP
         if (isOpen || isAbstract) {
             cbOverrides = addCheckboxToPanel(
                     isAbstract
-                    ? JetBundle.message("find.what.implementing.properties.checkbox")
-                    : JetBundle.message("find.what.overriding.properties.checkbox"),
+                    ? KotlinBundle.message("find.what.implementing.properties.checkbox")
+                    : KotlinBundle.message("find.what.overriding.properties.checkbox"),
                     FindSettings.getInstance().isSearchOverloadedMethods(),
                     optionsPanel,
                     false
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
index 5bf9967c192..56637c61c19 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindClassUsagesHandler.kt
@@ -30,7 +30,7 @@ import com.intellij.psi.search.searches.ReferencesSearch
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.FilteredQuery
 import com.intellij.util.Processor
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -112,7 +112,7 @@ public class KotlinFindClassUsagesHandler(
         if (kotlinOptions.searchConstructorUsages) {
             val result = runReadAction {
                 val constructors = classOrObject.toLightClass()?.getConstructors() ?: PsiMethod.EMPTY_ARRAY
-                constructors.filterIsInstance<KotlinLightMethod>().all { constructor ->
+                constructors.filterIsInstance<KtLightMethod>().all { constructor ->
                     constructor.processDelegationCallConstructorUsages(constructor.getUseScope()) {
                         it.getCalleeExpression()?.mainReference?.let { referenceProcessor.process(it) } ?: false
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
index cb3414c03bc..8574b8cb18c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/ImportSettingsPanel.kt
@@ -26,7 +26,7 @@ import com.intellij.psi.codeStyle.PackageEntryTable
 import com.intellij.ui.OptionGroup
 import com.intellij.ui.components.JBScrollPane
 import org.jdom.Element
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import java.awt.BorderLayout
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
@@ -37,7 +37,7 @@ import javax.swing.table.AbstractTableModel
 class ImportSettingsPanelWrapper(settings: CodeStyleSettings) : CodeStyleAbstractPanel(settings) {
     private val importsPanel = ImportSettingsPanel(settings)
 
-    private fun CodeStyleSettings.kotlinSettings() = getCustomSettings(JetCodeStyleSettings::class.java)
+    private fun CodeStyleSettings.kotlinSettings() = getCustomSettings(KotlinCodeStyleSettings::class.java)
 
     override fun getRightMargin() = throw UnsupportedOperationException()
 
@@ -97,7 +97,7 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
         }), BorderLayout.CENTER)
     }
 
-    fun reset(settings: JetCodeStyleSettings) {
+    fun reset(settings: KotlinCodeStyleSettings) {
         nameCountToUseStarImportSelector.value = settings.NAME_COUNT_TO_USE_STAR_IMPORT
         nameCountToUseStarImportForMembersSelector.value = settings.NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS
 
@@ -110,7 +110,7 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
         }
     }
 
-    fun apply(settings: JetCodeStyleSettings, dropEmptyPackages: Boolean = true) {
+    fun apply(settings: KotlinCodeStyleSettings, dropEmptyPackages: Boolean = true) {
         settings.NAME_COUNT_TO_USE_STAR_IMPORT = nameCountToUseStarImportSelector.value
         settings.NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS = nameCountToUseStarImportForMembersSelector.value
         settings.IMPORT_NESTED_CLASSES = cbImportNestedClasses.isSelected()
@@ -121,8 +121,8 @@ class ImportSettingsPanel(private val commonSettings: CodeStyleSettings) : JPane
         settings.PACKAGES_TO_USE_STAR_IMPORTS.copyFrom(starImportPackageEntryTable)
     }
 
-    fun isModified(settings: JetCodeStyleSettings): Boolean {
-        val tempSettings = JetCodeStyleSettings(commonSettings)
+    fun isModified(settings: KotlinCodeStyleSettings): Boolean {
+        val tempSettings = KotlinCodeStyleSettings(commonSettings)
         apply(tempSettings, dropEmptyPackages = false)
         val root = Element("fake")
         tempSettings.writeExternal(root, settings)
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java
index 13e1457e2ed..6cb60ab3851 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetBlock.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinBlock.java
@@ -30,7 +30,7 @@ import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
 import org.jetbrains.kotlin.kdoc.parser.KDocElementTypes;
 import org.jetbrains.kotlin.lexer.KtTokens;
@@ -48,7 +48,7 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
 /**
  * @see Block for good JavaDoc documentation
  */
-public class JetBlock extends AbstractBlock {
+public class KotlinBlock extends AbstractBlock {
     private static final int KDOC_COMMENT_INDENT = 1;
     private final NodeAlignmentStrategy myAlignmentStrategy;
     private final Indent myIndent;
@@ -73,7 +73,7 @@ public class JetBlock extends AbstractBlock {
 
     // private static final List<IndentWhitespaceRule>
 
-    public JetBlock(
+    public KotlinBlock(
             @NotNull ASTNode node,
             @NotNull NodeAlignmentStrategy alignmentStrategy,
             Indent indent,
@@ -154,11 +154,11 @@ public class JetBlock extends AbstractBlock {
         if (child.getElementType() == OPERATION_REFERENCE) {
             ASTNode operationNode = child.getFirstChildNode();
             if (operationNode != null) {
-                return new JetBlock(operationNode, alignmentStrategy, createChildIndent(child), wrap, mySettings, mySpacingBuilder);
+                return new KotlinBlock(operationNode, alignmentStrategy, createChildIndent(child), wrap, mySettings, mySpacingBuilder);
             }
         }
 
-        return new JetBlock(child, alignmentStrategy, createChildIndent(child), wrap, mySettings, mySpacingBuilder);
+        return new KotlinBlock(child, alignmentStrategy, createChildIndent(child), wrap, mySettings, mySpacingBuilder);
     }
 
     private static ASTNode getPrevWithoutWhitespace(ASTNode node) {
@@ -269,7 +269,7 @@ public class JetBlock extends AbstractBlock {
 
     private NodeAlignmentStrategy getChildrenAlignmentStrategy() {
         final CommonCodeStyleSettings jetCommonSettings = mySettings.getCommonSettings(KotlinLanguage.INSTANCE);
-        JetCodeStyleSettings jetSettings = mySettings.getCustomSettings(JetCodeStyleSettings.class);
+        KotlinCodeStyleSettings jetSettings = mySettings.getCustomSettings(KotlinCodeStyleSettings.class);
 
         // Redefine list of strategies for some special elements
         IElementType parentType = myNode.getElementType();
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
index a796426a3e9..080bdb16909 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
@@ -26,9 +26,9 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsProvider;
 import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 
-public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
+public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
 
     @Override
     public String getConfigurableDisplayName() {
@@ -42,7 +42,7 @@ public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
 
     @Override
     public CustomCodeStyleSettings createCustomSettings(CodeStyleSettings settings) {
-        return new JetCodeStyleSettings(settings);
+        return new KotlinCodeStyleSettings(settings);
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormattingModelBuilder.java
similarity index 95%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormattingModelBuilder.java
index 97c4ce9cf17..2444504ea11 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinFormattingModelBuilder.java
@@ -31,12 +31,12 @@ import com.intellij.psi.formatter.PsiBasedFormattingModel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
 
-public class JetFormattingModelBuilder implements FormattingModelBuilder {
+public class KotlinFormattingModelBuilder implements FormattingModelBuilder {
     @NotNull
     @Override
     public FormattingModel createModel(PsiElement element, CodeStyleSettings settings) {
         PsiFile containingFile = element.getContainingFile().getViewProvider().getPsi(KotlinLanguage.INSTANCE);
-        JetBlock block = new JetBlock(
+        KotlinBlock block = new KotlinBlock(
                 containingFile.getNode(), NodeAlignmentStrategy.getNullStrategy(), Indent.getNoneIndent(), null, settings,
                 KotlinSpacingRulesKt.createSpacingBuilder(settings));
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java
similarity index 85%
rename from idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java
index 87087e52ec3..0b39f6ae378 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetLanguageCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinLanguageCodeStyleSettingsProvider.java
@@ -24,9 +24,9 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
 import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 
-public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
+public class KotlinLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
     @NotNull
     @Override
     public Language getLanguage() {
@@ -109,38 +109,38 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
                         "SPACE_BEFORE_COMMA"
                 );
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AROUND_RANGE", "Around range (..)",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_AROUND_RANGE", "Around range (..)",
                                           CodeStyleSettingsCustomizable.SPACES_AROUND_OPERATORS);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_TYPE_COLON",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_BEFORE_TYPE_COLON",
                                           "Space before colon, after declarations' name",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_TYPE_COLON",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_AFTER_TYPE_COLON",
                                           "Space after colon, before declarations' type",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_EXTEND_COLON",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_BEFORE_EXTEND_COLON",
                                           "Space before colon in new type definition",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AFTER_EXTEND_COLON",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_AFTER_EXTEND_COLON",
                                           "Space after colon in new type definition",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD",
                                           "Insert whitespaces in simple one line methods",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AROUND_FUNCTION_TYPE_ARROW",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_AROUND_FUNCTION_TYPE_ARROW",
                                           "Surround arrow in function types with spaces",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_AROUND_WHEN_ARROW",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_AROUND_WHEN_ARROW",
                                           "Surround arrow in \"when\" clause with spaces",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "SPACE_BEFORE_LAMBDA_ARROW",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "SPACE_BEFORE_LAMBDA_ARROW",
                                           "Before lambda arrow",
                                           CodeStyleSettingsCustomizable.SPACES_OTHER);
 
@@ -161,10 +161,10 @@ public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSetti
                         "METHOD_PARAMETERS_WRAP"
                 );
                 consumer.renameStandardOption(CodeStyleSettingsCustomizable.WRAPPING_SWITCH_STATEMENT, "'when' statements");
-                consumer.showCustomOption(JetCodeStyleSettings.class, "ALIGN_IN_COLUMNS_CASE_BRANCH", "Align in columns 'case' branches",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "ALIGN_IN_COLUMNS_CASE_BRANCH", "Align in columns 'case' branches",
                                           CodeStyleSettingsCustomizable.WRAPPING_SWITCH_STATEMENT);
 
-                consumer.showCustomOption(JetCodeStyleSettings.class, "LBRACE_ON_NEXT_LINE",
+                consumer.showCustomOption(KotlinCodeStyleSettings.class, "LBRACE_ON_NEXT_LINE",
                                           "Put left brace on new line",
                                           CodeStyleSettingsCustomizable.WRAPPING_BRACES);
                 break;
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 0d5a00147f3..4b0194050cb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -27,7 +27,7 @@ import com.intellij.psi.tree.IElementType
 import com.intellij.psi.tree.TokenSet
 import org.jetbrains.kotlin.KtNodeTypes.*
 import org.jetbrains.kotlin.idea.KotlinLanguage
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.formatter.KotlinSpacingBuilder.CustomSpacingBuilder
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.lexer.KtTokens.*
@@ -44,7 +44,7 @@ fun SpacingBuilder.afterInside(element: IElementType, tokenSet: TokenSet, spacin
 }
 
 fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
-    val jetSettings = settings.getCustomSettings(javaClass<JetCodeStyleSettings>())!!
+    val jetSettings = settings.getCustomSettings(javaClass<KotlinCodeStyleSettings>())!!
     val jetCommonSettings = settings.getCommonSettings(KotlinLanguage.INSTANCE)!!
 
     return rules(settings) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java
index 01b9c36a403..99ac56465fc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/KotlinTypeHierarchyProvider.java
@@ -32,8 +32,8 @@ import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
-import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper;
-import org.jetbrains.kotlin.idea.stubindex.JetClassShortNameIndex;
+import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper;
+import org.jetbrains.kotlin.idea.stubindex.KotlinClassShortNameIndex;
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
@@ -63,7 +63,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
             }
 
             if (target instanceof KtClassOrObject) {
-                return JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass((KtClassOrObject) target);
+                return SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass((KtClassOrObject) target);
             }
             // Factory methods
             else if (target instanceof KtNamedFunction) {
@@ -77,10 +77,10 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
                         String returnTypeText = DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(type);
                         if (returnTypeText.equals(functionName)) {
                             Collection<KtClassOrObject> classOrObjects =
-                                    JetClassShortNameIndex.getInstance().get(functionName, project, GlobalSearchScope.allScope(project));
+                                    KotlinClassShortNameIndex.getInstance().get(functionName, project, GlobalSearchScope.allScope(project));
                             if (classOrObjects.size() == 1) {
                                 KtClassOrObject classOrObject = classOrObjects.iterator().next();
-                                return JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(classOrObject);
+                                return SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(classOrObject);
                             }
                         }
                     }
@@ -93,13 +93,13 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider {
 
             KtClassOrObject classOrObject = PsiTreeUtil.getParentOfType(element, KtClassOrObject.class);
             if (classOrObject != null) {
-                return JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(classOrObject);
+                return SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(classOrObject);
             }
         }
         else {
             PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
             if (element instanceof KtClassOrObject) {
-                return JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass((KtClassOrObject) element);
+                return SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass((KtClassOrObject) element);
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
index a1fcabbd355..cd6cc9c6bc0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiReference;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.asJava.KotlinLightMethod;
+import org.jetbrains.kotlin.asJava.KtLightMethod;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.references.ReferenceUtilKt;
 import org.jetbrains.kotlin.psi.*;
@@ -119,8 +119,8 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure {
         }
 
         // Kotlin function or property invoked from Java code
-        if (targetElement instanceof KotlinLightMethod) {
-            return buildChildrenByKotlinTarget(descriptor, ((KotlinLightMethod) targetElement).getOrigin());
+        if (targetElement instanceof KtLightMethod) {
+            return buildChildrenByKotlinTarget(descriptor, ((KtLightMethod) targetElement).getOrigin());
         }
 
         if (targetElement instanceof KtElement) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
index 5dce0d471b0..02200d3be28 100644
--- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/overrides/KotlinOverrideHierarchyBrowser.kt
@@ -22,7 +22,7 @@ import javax.swing.JPanel
 import com.intellij.ide.hierarchy.HierarchyTreeStructure
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import com.intellij.ide.hierarchy.method.MethodHierarchyBrowser
 import org.jetbrains.kotlin.asJava.getRepresentativeLightMethod
 import com.intellij.psi.PsiMethod
@@ -37,9 +37,9 @@ class KotlinOverrideHierarchyBrowser(
 ) : MethodHierarchyBrowser(project, baseElement.getRepresentativeLightMethod()) {
     override fun createLegendPanel(): JPanel? =
             MethodHierarchyBrowserBase.createStandardLegendPanel(
-                    JetBundle.message("hierarchy.legend.member.is.defined.in.class"),
-                    JetBundle.message("hierarchy.legend.member.defined.in.superclass"),
-                    JetBundle.message("hierarchy.legend.member.should.be.defined")
+                    KotlinBundle.message("hierarchy.legend.member.is.defined.in.class"),
+                    KotlinBundle.message("hierarchy.legend.member.defined.in.superclass"),
+                    KotlinBundle.message("hierarchy.legend.member.should.be.defined")
             )
 
     override fun isApplicableElement(psiElement: PsiElement): Boolean =
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
index 76e1c918e87..e2aeae9b911 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinColorSettingsPage.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.options.OptionsBundle
 import com.intellij.openapi.options.colors.AttributesDescriptor
 import com.intellij.openapi.options.colors.ColorDescriptor
 import com.intellij.openapi.options.colors.ColorSettingsPage
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.KotlinIcons
 import org.jetbrains.kotlin.idea.KotlinLanguage
 
@@ -33,7 +33,7 @@ import java.util.HashMap
 
 public class KotlinColorSettingsPage : ColorSettingsPage {
     override fun getIcon() = KotlinIcons.SMALL_LOGO
-    override fun getHighlighter(): SyntaxHighlighter = JetHighlighter()
+    override fun getHighlighter(): SyntaxHighlighter = KotlinHighlighter()
 
     override fun getDemoText(): String {
         return """/* Block comment */
@@ -80,7 +80,7 @@ var <PROPERTY_WITH_BACKING_FIELD><PACKAGE_PROPERTY><MUTABLE_VARIABLE>globalCount
 
     override fun getAdditionalHighlightingTagToDescriptorMap(): Map<String, TextAttributesKey> {
         val map = HashMap<String, TextAttributesKey>()
-        for (field in javaClass<JetHighlightingColors>().getFields()) {
+        for (field in javaClass<KotlinHighlightingColors>().getFields()) {
             if (Modifier.isStatic(field.getModifiers())) {
                 try {
                     map.put(field.getName(), field.get(null) as TextAttributesKey)
@@ -97,56 +97,56 @@ var <PROPERTY_WITH_BACKING_FIELD><PACKAGE_PROPERTY><MUTABLE_VARIABLE>globalCount
     override fun getAttributeDescriptors(): Array<AttributesDescriptor> {
         infix fun String.to(key: TextAttributesKey) = AttributesDescriptor(this, key)
         
-        return arrayOf(OptionsBundle.message("options.java.attribute.descriptor.keyword") to JetHighlightingColors.KEYWORD, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.builtin.annotation") to JetHighlightingColors.BUILTIN_ANNOTATION, 
-                       OptionsBundle.message("options.java.attribute.descriptor.number") to JetHighlightingColors.NUMBER,
-                       OptionsBundle.message("options.java.attribute.descriptor.string") to JetHighlightingColors.STRING, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.string.escape") to JetHighlightingColors.STRING_ESCAPE, 
-                       OptionsBundle.message("options.java.attribute.descriptor.invalid.escape.in.string") to JetHighlightingColors.INVALID_STRING_ESCAPE,
-                       OptionsBundle.message("options.java.attribute.descriptor.operator.sign") to JetHighlightingColors.OPERATOR_SIGN, 
-                       OptionsBundle.message("options.java.attribute.descriptor.parentheses") to JetHighlightingColors.PARENTHESIS, 
-                       OptionsBundle.message("options.java.attribute.descriptor.braces") to JetHighlightingColors.BRACES, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.closure.braces") to JetHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.arrow") to JetHighlightingColors.ARROW, 
-                       OptionsBundle.message("options.java.attribute.descriptor.brackets") to JetHighlightingColors.BRACKETS, 
-                       OptionsBundle.message("options.java.attribute.descriptor.comma") to JetHighlightingColors.COMMA, 
-                       OptionsBundle.message("options.java.attribute.descriptor.semicolon") to JetHighlightingColors.SEMICOLON, 
-                       OptionsBundle.message("options.java.attribute.descriptor.dot") to JetHighlightingColors.DOT, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.safe.access") to JetHighlightingColors.SAFE_ACCESS,
-                       OptionsBundle.message("options.java.attribute.descriptor.line.comment") to JetHighlightingColors.LINE_COMMENT, 
-                       OptionsBundle.message("options.java.attribute.descriptor.block.comment") to JetHighlightingColors.BLOCK_COMMENT,
-                       JetBundle.message("options.kotlin.attribute.descriptor.kdoc.comment") to JetHighlightingColors.DOC_COMMENT, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.kdoc.tag") to JetHighlightingColors.KDOC_TAG, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.kdoc.value") to JetHighlightingColors.KDOC_LINK,
-                       OptionsBundle.message("options.java.attribute.descriptor.class") to JetHighlightingColors.CLASS, 
-                       OptionsBundle.message("options.java.attribute.descriptor.type.parameter") to JetHighlightingColors.TYPE_PARAMETER, 
-                       OptionsBundle.message("options.java.attribute.descriptor.abstract.class") to JetHighlightingColors.ABSTRACT_CLASS, 
-                       "Interface" to JetHighlightingColors.TRAIT, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.annotation") to JetHighlightingColors.ANNOTATION, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.object") to JetHighlightingColors.OBJECT, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.enumEntry") to JetHighlightingColors.ENUM_ENTRY,
-                       JetBundle.message("options.kotlin.attribute.descriptor.var") to JetHighlightingColors.MUTABLE_VARIABLE,
-                       JetBundle.message("options.kotlin.attribute.descriptor.local.variable") to JetHighlightingColors.LOCAL_VARIABLE, 
-                       OptionsBundle.message("options.java.attribute.descriptor.parameter") to JetHighlightingColors.PARAMETER, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.captured.variable") to JetHighlightingColors.WRAPPED_INTO_REF,
-                       JetBundle.message("options.kotlin.attribute.descriptor.instance.property") to JetHighlightingColors.INSTANCE_PROPERTY, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.package.property") to JetHighlightingColors.PACKAGE_PROPERTY, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.property.with.backing") to JetHighlightingColors.PROPERTY_WITH_BACKING_FIELD,
-                       JetBundle.message("options.kotlin.attribute.descriptor.field") to JetHighlightingColors.BACKING_FIELD_VARIABLE,
-                       JetBundle.message("options.kotlin.attribute.descriptor.extension.property") to JetHighlightingColors.EXTENSION_PROPERTY,
-                       JetBundle.message("options.kotlin.attribute.descriptor.dynamic.property") to JetHighlightingColors.DYNAMIC_PROPERTY_CALL,
-                       JetBundle.message("options.kotlin.attribute.descriptor.it") to JetHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
-                       JetBundle.message("options.kotlin.attribute.descriptor.fun") to JetHighlightingColors.FUNCTION_DECLARATION, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.fun.call") to JetHighlightingColors.FUNCTION_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.dynamic.fun.call") to JetHighlightingColors.DYNAMIC_FUNCTION_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.package.fun.call") to JetHighlightingColors.PACKAGE_FUNCTION_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.extension.fun.call") to JetHighlightingColors.EXTENSION_FUNCTION_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.constructor.call") to JetHighlightingColors.CONSTRUCTOR_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.variable.as.function.call") to JetHighlightingColors.VARIABLE_AS_FUNCTION_CALL, 
-                       JetBundle.message("options.kotlin.attribute.descriptor.variable.as.function.like.call") to JetHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
-                       OptionsBundle.message("options.java.attribute.descriptor.bad.character") to JetHighlightingColors.BAD_CHARACTER,
-                       JetBundle.message("options.kotlin.attribute.descriptor.smart.cast") to JetHighlightingColors.SMART_CAST_VALUE,
-                       JetBundle.message("options.kotlin.attribute.descriptor.label") to JetHighlightingColors.LABEL)
+        return arrayOf(OptionsBundle.message("options.java.attribute.descriptor.keyword") to KotlinHighlightingColors.KEYWORD,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.builtin.annotation") to KotlinHighlightingColors.BUILTIN_ANNOTATION,
+                       OptionsBundle.message("options.java.attribute.descriptor.number") to KotlinHighlightingColors.NUMBER,
+                       OptionsBundle.message("options.java.attribute.descriptor.string") to KotlinHighlightingColors.STRING,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.string.escape") to KotlinHighlightingColors.STRING_ESCAPE,
+                       OptionsBundle.message("options.java.attribute.descriptor.invalid.escape.in.string") to KotlinHighlightingColors.INVALID_STRING_ESCAPE,
+                       OptionsBundle.message("options.java.attribute.descriptor.operator.sign") to KotlinHighlightingColors.OPERATOR_SIGN,
+                       OptionsBundle.message("options.java.attribute.descriptor.parentheses") to KotlinHighlightingColors.PARENTHESIS,
+                       OptionsBundle.message("options.java.attribute.descriptor.braces") to KotlinHighlightingColors.BRACES,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.closure.braces") to KotlinHighlightingColors.FUNCTION_LITERAL_BRACES_AND_ARROW,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.arrow") to KotlinHighlightingColors.ARROW,
+                       OptionsBundle.message("options.java.attribute.descriptor.brackets") to KotlinHighlightingColors.BRACKETS,
+                       OptionsBundle.message("options.java.attribute.descriptor.comma") to KotlinHighlightingColors.COMMA,
+                       OptionsBundle.message("options.java.attribute.descriptor.semicolon") to KotlinHighlightingColors.SEMICOLON,
+                       OptionsBundle.message("options.java.attribute.descriptor.dot") to KotlinHighlightingColors.DOT,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.safe.access") to KotlinHighlightingColors.SAFE_ACCESS,
+                       OptionsBundle.message("options.java.attribute.descriptor.line.comment") to KotlinHighlightingColors.LINE_COMMENT,
+                       OptionsBundle.message("options.java.attribute.descriptor.block.comment") to KotlinHighlightingColors.BLOCK_COMMENT,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.comment") to KotlinHighlightingColors.DOC_COMMENT,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.tag") to KotlinHighlightingColors.KDOC_TAG,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.kdoc.value") to KotlinHighlightingColors.KDOC_LINK,
+                       OptionsBundle.message("options.java.attribute.descriptor.class") to KotlinHighlightingColors.CLASS,
+                       OptionsBundle.message("options.java.attribute.descriptor.type.parameter") to KotlinHighlightingColors.TYPE_PARAMETER,
+                       OptionsBundle.message("options.java.attribute.descriptor.abstract.class") to KotlinHighlightingColors.ABSTRACT_CLASS,
+                       "Interface" to KotlinHighlightingColors.TRAIT,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.annotation") to KotlinHighlightingColors.ANNOTATION,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.object") to KotlinHighlightingColors.OBJECT,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.enumEntry") to KotlinHighlightingColors.ENUM_ENTRY,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.var") to KotlinHighlightingColors.MUTABLE_VARIABLE,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.local.variable") to KotlinHighlightingColors.LOCAL_VARIABLE,
+                       OptionsBundle.message("options.java.attribute.descriptor.parameter") to KotlinHighlightingColors.PARAMETER,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.captured.variable") to KotlinHighlightingColors.WRAPPED_INTO_REF,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.instance.property") to KotlinHighlightingColors.INSTANCE_PROPERTY,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.package.property") to KotlinHighlightingColors.PACKAGE_PROPERTY,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.property.with.backing") to KotlinHighlightingColors.PROPERTY_WITH_BACKING_FIELD,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.field") to KotlinHighlightingColors.BACKING_FIELD_VARIABLE,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.extension.property") to KotlinHighlightingColors.EXTENSION_PROPERTY,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.dynamic.property") to KotlinHighlightingColors.DYNAMIC_PROPERTY_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.it") to KotlinHighlightingColors.FUNCTION_LITERAL_DEFAULT_PARAMETER,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.fun") to KotlinHighlightingColors.FUNCTION_DECLARATION,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.fun.call") to KotlinHighlightingColors.FUNCTION_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.dynamic.fun.call") to KotlinHighlightingColors.DYNAMIC_FUNCTION_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.package.fun.call") to KotlinHighlightingColors.PACKAGE_FUNCTION_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.extension.fun.call") to KotlinHighlightingColors.EXTENSION_FUNCTION_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.constructor.call") to KotlinHighlightingColors.CONSTRUCTOR_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.variable.as.function.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_CALL,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.variable.as.function.like.call") to KotlinHighlightingColors.VARIABLE_AS_FUNCTION_LIKE_CALL,
+                       OptionsBundle.message("options.java.attribute.descriptor.bad.character") to KotlinHighlightingColors.BAD_CHARACTER,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.smart.cast") to KotlinHighlightingColors.SMART_CAST_VALUE,
+                       KotlinBundle.message("options.kotlin.attribute.descriptor.label") to KotlinHighlightingColors.LABEL)
     }
 
     override fun getColorDescriptors(): Array<ColorDescriptor> = ColorDescriptor.EMPTY_ARRAY
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiCheckerAndHighlightingUpdater.java
similarity index 96%
rename from idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
rename to idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiCheckerAndHighlightingUpdater.java
index 6439fe8034e..065c3e55b0d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinPsiCheckerAndHighlightingUpdater.java
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtNamedFunction;
 import org.jetbrains.kotlin.psi.KtParameter;
 
-public class JetPsiCheckerAndHighlightingUpdater extends JetPsiChecker {
+public class KotlinPsiCheckerAndHighlightingUpdater extends KotlinPsiChecker {
     @Override
     public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
         try {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
index 76f473cebe6..3e7b55b0d43 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt
@@ -23,7 +23,7 @@ import com.intellij.execution.lineMarker.RunLineMarkerContributor
 import com.intellij.execution.testframework.TestIconMapper
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
@@ -60,7 +60,7 @@ class KotlinTestRunLineMarkerContributor : RunLineMarkerContributor() {
 
             is KtNamedFunction -> {
                 val lightMethod = declaration.toLightMethods().firstOrNull() ?: return null
-                val lightClass = lightMethod.containingClass as? KotlinLightClass ?: return null
+                val lightClass = lightMethod.containingClass as? KtLightClass ?: return null
                 val framework = TestFrameworks.detectFramework(lightClass) ?: return null
                 if (!framework.isTestMethod(lightMethod)) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
index fac30174454..f26a30563e0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenFunctionMarker.kt
@@ -38,14 +38,14 @@ import com.intellij.psi.util.PsiUtil
 import com.intellij.util.CommonProcessors
 import com.intellij.util.Processor
 import gnu.trove.THashSet
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.isTraitFakeOverride
 import java.awt.event.MouseEvent
 import java.util.*
 import javax.swing.JComponent
 
 private fun PsiMethod.isMethodWithDeclarationInOtherClass(): Boolean {
-    return this is KotlinLightMethod && this.isTraitFakeOverride()
+    return this is KtLightMethod && this.isTraitFakeOverride()
 }
 
 internal fun <T> getOverriddenDeclarations(mappingToJava: MutableMap<PsiMethod, T>, classes: Set<PsiClass>): Set<T> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
index ed6ff154882..72c5dd76874 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/OverridenPropertyMarker.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.highlighter.markers
 
 import com.intellij.psi.search.PsiElementProcessor
 import com.intellij.psi.PsiClass
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import com.intellij.psi.PsiMethod
@@ -59,18 +59,18 @@ fun getOverriddenPropertyTooltip(property: KtProperty): String? {
     val isImplemented = isImplemented(property)
     if (overriddenInClassesProcessor.isOverflow()) {
         return if (isImplemented)
-            JetBundle.message("property.is.implemented.too.many")
+            KotlinBundle.message("property.is.implemented.too.many")
         else
-            JetBundle.message("property.is.overridden.too.many")
+            KotlinBundle.message("property.is.overridden.too.many")
     }
 
     val collectedClasses = overriddenInClassesProcessor.getCollection()
     if (collectedClasses.isEmpty()) return null
 
     val start = if (isImplemented)
-        JetBundle.message("property.is.implemented.header")
+        KotlinBundle.message("property.is.implemented.header")
     else
-        JetBundle.message("property.is.overridden.header")
+        KotlinBundle.message("property.is.overridden.header")
 
     val pattern = "&nbsp;&nbsp;&nbsp;&nbsp;{0}"
     return GutterIconTooltipHelper.composeText(collectedClasses.sortedWith(PsiClassListCellRenderer().comparator), start, pattern)
@@ -110,8 +110,8 @@ fun navigateToPropertyOverriddenDeclarations(e: MouseEvent?, property: KtPropert
 
     PsiElementListNavigator.openTargets(e,
                                         navigatingOverrides.toTypedArray(),
-                                        JetBundle.message("navigation.title.overriding.property", property.getName()),
-                                        JetBundle.message("navigation.findUsages.title.overriding.property", property.getName()), renderer)
+                                        KotlinBundle.message("navigation.title.overriding.property", property.getName()),
+                                        KotlinBundle.message("navigation.findUsages.title.overriding.property", property.getName()), renderer)
 }
 
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
index a0b2cb9d704..029fe1af9fb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/SuperDeclarationMarker.kt
@@ -26,11 +26,11 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
 import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
-import org.jetbrains.kotlin.idea.codeInsight.JetFunctionPsiElementCellRenderer
+import org.jetbrains.kotlin.idea.codeInsight.KtFunctionPsiElementCellRenderer
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.renderer.DescriptorRenderer
 import org.jetbrains.kotlin.renderer.RenderingFormat
@@ -97,9 +97,9 @@ public class SuperDeclarationMarkerNavigationHandler : GutterIconNavigationHandl
             PsiElementListNavigator.openTargets(
                     e,
                     superDeclarations.toTypedArray(),
-                    JetBundle.message("navigation.title.super.declaration", elementName),
-                    JetBundle.message("navigation.findUsages.title.super.declaration", elementName),
-                    JetFunctionPsiElementCellRenderer())
+                    KotlinBundle.message("navigation.title.super.declaration", elementName),
+                    KotlinBundle.message("navigation.findUsages.title.super.declaration", elementName),
+                    KtFunctionPsiElementCellRenderer())
         }
         else {
             // Only store elements for retrieve in test
diff --git a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
index 9c337d791bd..b63d4e25c42 100644
--- a/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/imports/KotlinImportOptimizer.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.util.getFileResolutionScope
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.util.getResolutionScope
 import org.jetbrains.kotlin.idea.references.KtReference
 import org.jetbrains.kotlin.idea.references.canBeResolvedViaImport
@@ -153,7 +153,7 @@ public class KotlinImportOptimizer() : ImportOptimizer {
                 descriptorsToImport: Collection<DeclarationDescriptor>
         ): List<ImportPath>? {
             val importInsertHelper = ImportInsertHelper.getInstance(file.project)
-            val codeStyleSettings = JetCodeStyleSettings.getInstance(file.project)
+            val codeStyleSettings = KotlinCodeStyleSettings.getInstance(file.project)
             val aliasImports = buildAliasImportMap(file)
 
             val importsToGenerate = HashSet<ImportPath>()
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddModifierFixFactory.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddModifierFixFactory.kt
index b360e4b0b39..862527731c7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddModifierFixFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddModifierFixFactory.kt
@@ -23,11 +23,11 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.quickfix.AddModifierFix
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.lexer.KtModifierKeywordToken
 import org.jetbrains.kotlin.psi.KtModifierListOwner
 
-class AddModifierFixFactory(val token: KtModifierKeywordToken) : JetSingleIntentionActionFactory() {
+class AddModifierFixFactory(val token: KtModifierKeywordToken) : KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic): IntentionAction? {
         val functionDescriptor = (diagnostic as? DiagnosticWithParameters2<*, *, *>)?.a as? FunctionDescriptor ?: return null
         val target = DescriptorToSourceUtilsIde.getAnyDeclaration(diagnostic.psiFile.project, functionDescriptor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/AddReflectionQuickFix.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/AddReflectionQuickFix.kt
index 5ded2bfa782..d67c51a9be1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/AddReflectionQuickFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/AddReflectionQuickFix.kt
@@ -23,13 +23,13 @@ import com.intellij.openapi.roots.OrderRootType
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.vfs.VfsUtilCore
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils
 import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator
 import org.jetbrains.kotlin.idea.configuration.KotlinProjectConfigurator
 import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.quickfix.quickfixUtil.createIntentionForFirstParentOfType
 import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryUtil
 import org.jetbrains.kotlin.psi.KtElement
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 import java.io.File
 
 public class AddReflectionQuickFix(element: KtElement) : KotlinQuickFixAction<KtElement>(element) {
-    override fun getText() = JetBundle.message("add.reflection.to.classpath")
+    override fun getText() = KotlinBundle.message("add.reflection.to.classpath")
     override fun getFamilyName() = getText()
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) {
@@ -73,7 +73,7 @@ public class AddReflectionQuickFix(element: KtElement) : KotlinQuickFixAction<Kt
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) = diagnostic.createIntentionForFirstParentOfType(::AddReflectionQuickFix)
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
index 336b56c0d54..714a18f4241 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/ConflictingExtensionPropertyInspection.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.idea.core.targetDescriptors
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.idea.util.getFileResolutionScope
@@ -193,7 +193,7 @@ public class ConflictingExtensionPropertyInspection : AbstractKotlinInspection()
                         object : Task.Modal(project, "Searching for imports to delete", true) {
                             override fun run(indicator: ProgressIndicator) {
                                 val importsToDelete = runReadAction {
-                                    val searchScope = JetSourceFilterScope.kotlinSources(GlobalSearchScope.projectScope(project), project)
+                                    val searchScope = KotlinSourceFilterScope.kotlinSources(GlobalSearchScope.projectScope(project), project)
                                     ReferencesSearch.search(declaration, searchScope)
                                             .filterIsInstance<KtSimpleNameReference>()
                                             .map { ref -> ref.expression.getStrictParentOfType<KtImportDirective>() }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedObjectInstanceFieldReference.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedObjectInstanceFieldReference.kt
index 93fcbe18777..a1017c6f07c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedObjectInstanceFieldReference.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedObjectInstanceFieldReference.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.psi.codeStyle.JavaCodeStyleManager
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.psi.KtObjectDeclaration
 
@@ -32,7 +32,7 @@ public class DeprecatedObjectInstanceFieldReferenceInspection : LocalInspectionT
                 if (!(resolvedTo is PsiField && resolvedTo.name == JvmAbi.DEPRECATED_INSTANCE_FIELD)) return
 
                 val containingClass = resolvedTo.containingClass
-                if (containingClass !is KotlinLightClass || containingClass.getOrigin() !is KtObjectDeclaration) return
+                if (containingClass !is KtLightClass || containingClass.getOrigin() !is KtObjectDeclaration) return
 
                 holder.registerProblem(
                         expression, "Use of deprecated '${JvmAbi.DEPRECATED_INSTANCE_FIELD}' field",
@@ -52,7 +52,7 @@ public class DeprecatedObjectInstanceFieldReferenceFix : LocalQuickFix {
         val reference = descriptor.psiElement.reference ?: return
         val deprecatedField = reference.resolve() as? PsiField ?: return
 
-        val lightClassForObject = deprecatedField.containingClass as? KotlinLightClass ?: return
+        val lightClassForObject = deprecatedField.containingClass as? KtLightClass ?: return
         val correctField = lightClassForObject.findFieldByName(JvmAbi.INSTANCE_FIELD, false) ?: return
 
         val newReference = reference.bindToElement(correctField)
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt
index 533aa91ac13..1ea2703cd3b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/DeprecatedUsageOfStaticField.kt
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.inspections
 import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
-import org.jetbrains.kotlin.asJava.KotlinLightClass
-import org.jetbrains.kotlin.asJava.KotlinLightField
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightField
 import org.jetbrains.kotlin.idea.quickfix.AddConstModifierFix
 import org.jetbrains.kotlin.idea.quickfix.AddConstModifierIntention
 import org.jetbrains.kotlin.idea.quickfix.replaceReferencesToGetterByReferenceToField
@@ -39,12 +39,12 @@ class DeprecatedUsageOfStaticFieldInspection : LocalInspectionTool(), CleanupLoc
                 val resolvedTo = expression.reference?.resolve() as? PsiField ?: return
                 if (!resolvedTo.hasModifierProperty(PsiModifier.STATIC) || !resolvedTo.isDeprecated) return
 
-                val kotlinProperty = (resolvedTo as? KotlinLightField)?.getOrigin() as? KtProperty
+                val kotlinProperty = (resolvedTo as? KtLightField)?.getOrigin() as? KtProperty
 
                 // NOTE: this is hack to avoid test failing with "action is still available" error
                 if (kotlinProperty?.hasJvmFieldAnnotationOrConstModifier() ?: false) return
 
-                val kotlinClassOrObject = (resolvedTo.containingClass as? KotlinLightClass)?.getOrigin() ?: return
+                val kotlinClassOrObject = (resolvedTo.containingClass as? KtLightClass)?.getOrigin() ?: return
 
                 val containingObject = when (kotlinClassOrObject) {
                     is KtObjectDeclaration -> kotlinClassOrObject as KtObjectDeclaration // KT-9578
@@ -88,7 +88,7 @@ class DeprecatedUsageOfStaticFieldInspection : LocalInspectionTool(), CleanupLoc
 abstract class StaticFieldUsageFix: LocalQuickFix {
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val deprecatedField = descriptor.psiElement.reference?.resolve() as? PsiField ?: return
-        val kotlinProperty = (deprecatedField as? KotlinLightField)?.getOrigin() as? KtProperty
+        val kotlinProperty = (deprecatedField as? KtLightField)?.getOrigin() as? KtProperty
 
         if (kotlinProperty != null && kotlinProperty.hasJvmFieldAnnotationOrConstModifier()) return
 
@@ -123,7 +123,7 @@ class ReplaceWithGetterInvocationFix : StaticFieldUsageFix() {
     override fun getFamilyName(): String = name
 
     override fun doFix(deprecatedField: PsiField, property: KtProperty?, problemDescriptor: ProblemDescriptor) {
-        val lightClass = deprecatedField.containingClass as? KotlinLightClass ?: return
+        val lightClass = deprecatedField.containingClass as? KtLightClass ?: return
 
         fun replaceWithGetterInvocation(objectField: PsiField) {
             val factory = PsiElementFactory.SERVICE.getInstance(deprecatedField.project)
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
index 1f3caa6affe..0006abbcae9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult
-import org.jetbrains.kotlin.idea.highlighter.JetPsiChecker
+import org.jetbrains.kotlin.idea.highlighter.KotlinPsiChecker
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.quickfix.ReplaceObsoleteLabelSyntaxFix
@@ -105,7 +105,7 @@ public class KotlinCleanupInspection(): LocalInspectionTool(), CleanupLocalInspe
     }
 
     private fun Diagnostic.toCleanupFixes(): Collection<CleanupFix> {
-        return JetPsiChecker.createQuickFixes(this).filterIsInstance<CleanupFix>()
+        return KotlinPsiChecker.createQuickFixes(this).filterIsInstance<CleanupFix>()
     }
 
     private class Wrapper(val intention: IntentionAction, file: KtFile) : IntentionWrapper(intention, file) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
index 1d081408883..acda9da2e7f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedReceiverParameterInspection.kt
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElementVisitor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
 import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.idea.util.getThisReceiverOwner
@@ -73,7 +73,7 @@ public class UnusedReceiverParameterInspection : AbstractKotlinInspection() {
                 if (!used) {
                     holder.registerProblem(
                             receiverTypeReference,
-                            JetBundle.message("unused.receiver.parameter"),
+                            KotlinBundle.message("unused.receiver.parameter"),
                             ProblemHighlightType.LIKE_UNUSED_SYMBOL,
                             MyQuickFix(callableDeclaration)
                     )
@@ -92,7 +92,7 @@ public class UnusedReceiverParameterInspection : AbstractKotlinInspection() {
 
     private class MyQuickFix(val declaration: KtCallableDeclaration): LocalQuickFix {
         override fun getName(): String {
-            return JetBundle.message("unused.receiver.parameter.remove")
+            return KotlinBundle.message("unused.receiver.parameter.remove")
         }
 
         override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
index 2bcee720505..7df8a0bea97 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
@@ -41,7 +41,7 @@ import com.intellij.util.Processor
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.descriptors.annotations.Annotated
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.findUsages.KotlinFindUsagesHandlerFactory
@@ -185,7 +185,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() {
                 val problemDescriptor = holder.getManager().createProblemDescriptor(
                         inspectionTarget,
                         textRange,
-                        JetBundle.message(messageKey, declaration.getName()),
+                        KotlinBundle.message(messageKey, declaration.getName()),
                         ProblemHighlightType.LIKE_UNUSED_SYMBOL,
                         true,
                         createQuickFix(declaration)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt
index 991699df6c9..d76634594f1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddBracesIntention.kt
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class AddBracesIntention : JetSelfTargetingIntention<KtExpression>(javaClass(), "Add braces") {
+public class AddBracesIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Add braces") {
     override fun isApplicableTo(element: KtExpression, caretOffset: Int): Boolean {
         val expression = element.getTargetExpression(caretOffset) ?: return false
         if (expression is KtBlockExpression) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt
index d29d9ea3746..0a1fd878072 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddForLoopIndicesIntention.kt
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameUnsafe
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-public class AddForLoopIndicesIntention : JetSelfTargetingRangeIntention<KtForExpression>(javaClass(), "Add indices to 'for' loop"), LowPriorityAction {
+public class AddForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(javaClass(), "Add indices to 'for' loop"), LowPriorityAction {
     private val WITH_INDEX_FQ_NAME = "kotlin.withIndex"
 
     override fun applicabilityRange(element: KtForExpression): TextRange? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddNameToArgumentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddNameToArgumentIntention.kt
index d178aaf5743..58feb5d434d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddNameToArgumentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddNameToArgumentIntention.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 public class AddNameToArgumentIntention
-  : JetSelfTargetingIntention<KtValueArgument>(javaClass(), "Add name to argument"), LowPriorityAction {
+  : SelfTargetingIntention<KtValueArgument>(javaClass(), "Add name to argument"), LowPriorityAction {
 
     override fun isApplicableTo(element: KtValueArgument, caretOffset: Int): Boolean {
         val expression = element.getArgumentExpression() ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
index 25f8b722b2b..bd88baff2f9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/AddOperatorModifierIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.util.OperatorChecks
 
-class AddOperatorModifierIntention : JetSelfTargetingRangeIntention<KtNamedFunction>(KtNamedFunction::class.java, "Add 'operator' modifier") {
+class AddOperatorModifierIntention : SelfTargetingRangeIntention<KtNamedFunction>(KtNamedFunction::class.java, "Add 'operator' modifier") {
     override fun applicabilityRange(element: KtNamedFunction): TextRange? {
         val nameIdentifier = element.nameIdentifier ?: return null
         val functionDescriptor = element.resolveToDescriptor() as? FunctionDescriptor ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
index e9943e23b0e..1d3f34f2e1e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 
 public open class ChangeVisibilityModifierIntention protected constructor(
         val modifier: KtModifierKeywordToken
-) : JetSelfTargetingRangeIntention<KtDeclaration>(javaClass(), "Make ${modifier.getValue()}") {
+) : SelfTargetingRangeIntention<KtDeclaration>(javaClass(), "Make ${modifier.getValue()}") {
 
     override fun applicabilityRange(element: KtDeclaration): TextRange? {
         val modifierList = element.getModifierList()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
index ed9c25f912f..b8fb94b4679 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertAssertToIfWithThrowIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 
-public class ConvertAssertToIfWithThrowIntention : JetSelfTargetingIntention<KtCallExpression>(javaClass(), "Replace 'assert' with 'if' statement"), LowPriorityAction {
+public class ConvertAssertToIfWithThrowIntention : SelfTargetingIntention<KtCallExpression>(javaClass(), "Replace 'assert' with 'if' statement"), LowPriorityAction {
     override fun isApplicableTo(element: KtCallExpression, caretOffset: Int): Boolean {
         val callee = element.getCalleeExpression() ?: return false
         if (!callee.getTextRange().containsOffset(caretOffset)) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt
index d9243fa4ae0..9dc6b7f2ef1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertForEachToForLoopIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
 
-public class ConvertForEachToForLoopIntention : JetSelfTargetingOffsetIndependentIntention<KtSimpleNameExpression>(javaClass(), "Replace with a 'for' loop") {
+public class ConvertForEachToForLoopIntention : SelfTargetingOffsetIndependentIntention<KtSimpleNameExpression>(javaClass(), "Replace with a 'for' loop") {
     override fun isApplicableTo(element: KtSimpleNameExpression): Boolean {
         if (element.getReferencedName() != "forEach") return false
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
index e277921b8d6..528cb9e92d3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
@@ -56,7 +56,7 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions
 import org.jetbrains.kotlin.types.typeUtil.supertypes
 import java.util.*
 
-public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention<KtNamedFunction>(javaClass(), "Convert function to property"), LowPriorityAction {
+public class ConvertFunctionToPropertyIntention : SelfTargetingIntention<KtNamedFunction>(javaClass(), "Convert function to property"), LowPriorityAction {
     private var KtNamedFunction.typeFqNameToAdd: String? by UserDataProperty(Key.create("TYPE_FQ_NAME_TO_ADD"))
 
     private inner class Converter(
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt
index 3d22308f32c..7a6d02b8e4e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertIfWithThrowToAssertIntention.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.idea.core.copied
 import org.jetbrains.kotlin.idea.core.replaced
 
-public class ConvertIfWithThrowToAssertIntention : JetSelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' with 'assert' statement") {
+public class ConvertIfWithThrowToAssertIntention : SelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' with 'assert' statement") {
 
     override fun isApplicableTo(element: KtIfExpression): Boolean {
         if (element.getElse() != null) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt
index d65d7b603c1..5113838e219 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedBooleanSequenceIntention.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.*
 import java.util.LinkedList
 
 
-public class ConvertNegatedBooleanSequenceIntention : JetSelfTargetingOffsetIndependentIntention<KtBinaryExpression>(
+public class ConvertNegatedBooleanSequenceIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(
         javaClass(), "Replace negated sequence with DeMorgan equivalent") {
 
     override fun isApplicableTo(element: KtBinaryExpression): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
index 3f6ac25c6ab..70e31d04741 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertNegatedExpressionWithDemorgansLawIntention.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import java.util.*
 
-public class ConvertNegatedExpressionWithDemorgansLawIntention : JetSelfTargetingOffsetIndependentIntention<KtPrefixExpression>(javaClass(), "DeMorgan Law") {
+public class ConvertNegatedExpressionWithDemorgansLawIntention : SelfTargetingOffsetIndependentIntention<KtPrefixExpression>(javaClass(), "DeMorgan Law") {
 
     override fun isApplicableTo(element: KtPrefixExpression): Boolean {
         val prefixOperator = element.getOperationReference().getReferencedNameElementType()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertParameterToReceiverIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertParameterToReceiverIntention.kt
index 1720a8eab9e..5f5cd7ed4c1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertParameterToReceiverIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertParameterToReceiverIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtParameter
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 
-public class ConvertParameterToReceiverIntention : JetSelfTargetingIntention<KtParameter>(javaClass(), "Convert parameter to receiver") {
+public class ConvertParameterToReceiverIntention : SelfTargetingIntention<KtParameter>(javaClass(), "Convert parameter to receiver") {
     override fun isApplicableTo(element: KtParameter, caretOffset: Int): Boolean {
         val identifier = element.getNameIdentifier() ?: return false
         if (!identifier.getTextRange().containsOffset(caretOffset)) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
index a30c1083e3b..c4f46001a89 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
@@ -50,7 +50,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.utils.findFunction
 import java.util.*
 
-public class ConvertPropertyToFunctionIntention : JetSelfTargetingIntention<KtProperty>(javaClass(), "Convert property to function"), LowPriorityAction {
+public class ConvertPropertyToFunctionIntention : SelfTargetingIntention<KtProperty>(javaClass(), "Convert property to function"), LowPriorityAction {
     private inner class Converter(
             project: Project,
             descriptor: CallableDescriptor
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
index 2139a48a485..afd2d4c4fd6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertReceiverToParameterIntention.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtTypeReference
 import org.jetbrains.kotlin.resolve.BindingContext
 
-public class ConvertReceiverToParameterIntention : JetSelfTargetingOffsetIndependentIntention<KtTypeReference>(javaClass(), "Convert receiver to parameter"), LowPriorityAction {
+public class ConvertReceiverToParameterIntention : SelfTargetingOffsetIndependentIntention<KtTypeReference>(javaClass(), "Convert receiver to parameter"), LowPriorityAction {
     override fun isApplicableTo(element: KtTypeReference): Boolean {
         return (element.getParent() as? KtNamedFunction)?.getReceiverTypeReference() == element
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
index 7893787ce50..9b39a88a944 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToBlockBodyIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.KotlinType
 
-public class ConvertToBlockBodyIntention : JetSelfTargetingIntention<KtDeclarationWithBody>(
+public class ConvertToBlockBodyIntention : SelfTargetingIntention<KtDeclarationWithBody>(
         javaClass(), "Convert to block body"
 ), LowPriorityAction {
     override fun isApplicableTo(element: KtDeclarationWithBody, caretOffset: Int): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt
index 2cf91b6d94a..db9500110d8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToConcatenatedStringIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContextUtils
 
-public class ConvertToConcatenatedStringIntention : JetSelfTargetingOffsetIndependentIntention<KtStringTemplateExpression>(javaClass(), "Convert template to concatenated string"), LowPriorityAction {
+public class ConvertToConcatenatedStringIntention : SelfTargetingOffsetIndependentIntention<KtStringTemplateExpression>(javaClass(), "Convert template to concatenated string"), LowPriorityAction {
     override fun isApplicableTo(element: KtStringTemplateExpression): Boolean {
         if (element.getLastChild().getNode().getElementType() != KtTokens.CLOSING_QUOTE) return false // not available for unclosed literal
         return element.getEntries().any { it is KtStringTemplateEntryWithExpression }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyIntention.kt
index 1f56814a612..e9557d004cc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToExpressionBodyIntention.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.utils.addToStdlib.check
 
-public class ConvertToExpressionBodyIntention : JetSelfTargetingOffsetIndependentIntention<KtDeclarationWithBody>(
+public class ConvertToExpressionBodyIntention : SelfTargetingOffsetIndependentIntention<KtDeclarationWithBody>(
         javaClass(), "Convert to expression body"
 ) {
     override fun isApplicableTo(element: KtDeclarationWithBody): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt
index 880346e4bf1..de147f3ea1e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToForEachFunctionCallIntention.kt
@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.createExpressionByPattern
 import org.jetbrains.kotlin.psi.psiUtil.contentRange
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 
-public class ConvertToForEachFunctionCallIntention : JetSelfTargetingIntention<KtForExpression>(javaClass(), "Replace with a 'forEach' function call") {
+public class ConvertToForEachFunctionCallIntention : SelfTargetingIntention<KtForExpression>(javaClass(), "Replace with a 'forEach' function call") {
     override fun isApplicableTo(element: KtForExpression, caretOffset: Int): Boolean {
         val rParen = element.getRightParenthesis() ?: return false
         if (caretOffset > rParen.endOffset) return false // available only on the loop header, not in the body
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
index a9f03da3fe1..480e6f48757 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertToStringTemplateIntention.kt
@@ -32,7 +32,7 @@ public class ConvertToStringTemplateInspection : IntentionBasedInspection<KtBina
         { ConvertToStringTemplateIntention().shouldSuggestToConvert(it) }
 )
 
-public class ConvertToStringTemplateIntention : JetSelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Convert concatenation to template") {
+public class ConvertToStringTemplateIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Convert concatenation to template") {
     override fun isApplicableTo(element: KtBinaryExpression): Boolean {
         if (!isApplicableToNoParentCheck(element)) return false
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt
index 6086c77480d..3473f315640 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/DeprecatedCallableAddReplaceWithIntention.kt
@@ -44,7 +44,7 @@ import java.util.*
 
 public class DeprecatedCallableAddReplaceWithInspection : IntentionBasedInspection<KtCallableDeclaration>(DeprecatedCallableAddReplaceWithIntention())
 
-public class DeprecatedCallableAddReplaceWithIntention : JetSelfTargetingRangeIntention<KtCallableDeclaration>(
+public class DeprecatedCallableAddReplaceWithIntention : SelfTargetingRangeIntention<KtCallableDeclaration>(
         javaClass(), "Add 'replaceWith' argument to specify replacement pattern", "Add 'replaceWith' argument to 'Deprecated' annotation"
 ) {
     private class ReplaceWith(val expression: String, vararg val imports: String)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
index cfe22aa2224..e877453d1d9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IfNullToElvisIntention.kt
@@ -36,7 +36,7 @@ import java.util.*
 
 public class IfNullToElvisInspection : IntentionBasedInspection<KtIfExpression>(IfNullToElvisIntention())
 
-public class IfNullToElvisIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' with elvis operator"){
+public class IfNullToElvisIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' with elvis operator"){
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         val data = calcData(element) ?: return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt
index 67828a2573a..4818f13100f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InfixCallToOrdinaryIntention.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 
-public class InfixCallToOrdinaryIntention : JetSelfTargetingIntention<KtBinaryExpression>(javaClass(), "Replace infix call with ordinary call") {
+public class InfixCallToOrdinaryIntention : SelfTargetingIntention<KtBinaryExpression>(javaClass(), "Replace infix call with ordinary call") {
     override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
         if (element.getOperationToken() != KtTokens.IDENTIFIER || element.getLeft() == null || element.getRight() == null) return false
         return element.getOperationReference().getTextRange().containsOffset(caretOffset)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt
index 0b91b73a747..412780a42d1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertCurlyBracesToTemplateIntention.kt
@@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.KtSimpleNameStringTemplateEntry
 
-public class InsertCurlyBracesToTemplateIntention : JetSelfTargetingOffsetIndependentIntention<KtSimpleNameStringTemplateEntry> (
+public class InsertCurlyBracesToTemplateIntention : SelfTargetingOffsetIndependentIntention<KtSimpleNameStringTemplateEntry> (
         javaClass(), "Insert curly braces around variable"), LowPriorityAction {
 
     override fun isApplicableTo(element: KtSimpleNameStringTemplateEntry): Boolean = true
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
index f8ad70c3f37..8aff54428e4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InsertExplicitTypeArgumentsIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.types.ErrorUtils
 
-public class InsertExplicitTypeArgumentsIntention : JetSelfTargetingRangeIntention<KtCallExpression>(javaClass(), "Add explicit type arguments"), LowPriorityAction {
+public class InsertExplicitTypeArgumentsIntention : SelfTargetingRangeIntention<KtCallExpression>(javaClass(), "Add explicit type arguments"), LowPriorityAction {
     override fun applicabilityRange(element: KtCallExpression): TextRange? {
         return if (isApplicableTo(element, element.analyze())) element.getCalleeExpression()!!.getTextRange() else null
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IntroduceBackingPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IntroduceBackingPropertyIntention.kt
index f209129bba7..d6daee40752 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/IntroduceBackingPropertyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IntroduceBackingPropertyIntention.kt
@@ -27,13 +27,13 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 
-class IntroduceBackingPropertyIntention(): JetSelfTargetingIntention<KtProperty>(javaClass(), "Introduce backing property") {
+class IntroduceBackingPropertyIntention(): SelfTargetingIntention<KtProperty>(javaClass(), "Introduce backing property") {
     override fun isApplicableTo(element: KtProperty, caretOffset: Int): Boolean {
         if (!canIntroduceBackingProperty(element)) return false
         return element.nameIdentifier?.textRange?.containsOffset(caretOffset) == true
@@ -145,7 +145,7 @@ class IntroduceBackingPropertyFix(prop: KtProperty): KotlinQuickFixAction<KtProp
         IntroduceBackingPropertyIntention.introduceBackingProperty(element)
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val resolveResult = diagnostic.psiElement.reference?.resolve()
             if (resolveResult is KtProperty &&
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt
index 5ae00c09132..020ec398798 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/InvertIfConditionIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.typeUtil.isUnit
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance
 import org.jetbrains.kotlin.utils.addToStdlib.lastIsInstanceOrNull
 
-public class InvertIfConditionIntention : JetSelfTargetingIntention<KtIfExpression>(javaClass(), "Invert 'if' condition") {
+public class InvertIfConditionIntention : SelfTargetingIntention<KtIfExpression>(javaClass(), "Invert 'if' condition") {
     override fun isApplicableTo(element: KtIfExpression, caretOffset: Int): Boolean {
         if (!element.getIfKeyword().getTextRange().containsOffset(caretOffset)) return false
         return element.getCondition() != null && element.getThen() != null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt
index bc8b8bbe337..5dc3506b022 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/IterateExpressionIntention.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.siblings
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.KotlinType
 
-public class IterateExpressionIntention : JetSelfTargetingIntention<KtExpression>(javaClass(), "Iterate over collection"), HighPriorityAction {
+public class IterateExpressionIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Iterate over collection"), HighPriorityAction {
     override fun isApplicableTo(element: KtExpression, caretOffset: Int): Boolean {
         if (element.getParent() !is KtBlockExpression) return false
         val range = element.getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
index ab3ba397af9..ada1e6466ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveAssignmentToInitializerIntention.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.psiUtil.*
 import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
 
 public class MoveAssignmentToInitializerIntention :
-        JetSelfTargetingIntention<KtBinaryExpression>(javaClass(), "Move assignment to initializer") {
+        SelfTargetingIntention<KtBinaryExpression>(javaClass(), "Move assignment to initializer") {
 
     override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
         if (element.operationToken != KtTokens.EQ) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt
index 4b3de4ecd76..a878f067083 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaInsideParenthesesIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.core.moveInsideParentheses
 import org.jetbrains.kotlin.psi.KtFunctionLiteralArgument
 import org.jetbrains.kotlin.psi.psiUtil.containsInside
 
-public class MoveLambdaInsideParenthesesIntention : JetSelfTargetingIntention<KtFunctionLiteralArgument>(javaClass(), "Move lambda argument into parentheses"), LowPriorityAction {
+public class MoveLambdaInsideParenthesesIntention : SelfTargetingIntention<KtFunctionLiteralArgument>(javaClass(), "Move lambda argument into parentheses"), LowPriorityAction {
     override fun isApplicableTo(element: KtFunctionLiteralArgument, caretOffset: Int): Boolean {
         val body = element.getFunctionLiteral().getBodyExpression() ?: return true
         return !body.getTextRange().containsInside(caretOffset)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
index 667f13fe0af..351a93abbb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/MoveLambdaOutsideParenthesesIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.unpackFunctionLiteral
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-public class MoveLambdaOutsideParenthesesIntention : JetSelfTargetingIntention<KtCallExpression>(javaClass(), "Move lambda argument out of parentheses") {
+public class MoveLambdaOutsideParenthesesIntention : SelfTargetingIntention<KtCallExpression>(javaClass(), "Move lambda argument out of parentheses") {
     override fun isApplicableTo(element: KtCallExpression, caretOffset: Int): Boolean {
         if (element.getFunctionLiteralArguments().isNotEmpty()) return false
         val argument = element.getValueArguments().lastOrNull() ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
index 4ff402d29f1..213fc641bdd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ObjectLiteralToLambdaIntention.kt
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.types.KotlinType
 
 class ObjectLiteralToLambdaInspection : IntentionBasedInspection<KtObjectLiteralExpression>(ObjectLiteralToLambdaIntention())
 
-class ObjectLiteralToLambdaIntention : JetSelfTargetingRangeIntention<KtObjectLiteralExpression>(
+class ObjectLiteralToLambdaIntention : SelfTargetingRangeIntention<KtObjectLiteralExpression>(
         KtObjectLiteralExpression::class.java,
         "Convert to lambda",
         "Convert object literal to lambda"
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsIntention.kt
index b7abc997f8e..91518e57e27 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReconstructTypeInCastOrIsIntention.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.types.KotlinType
 
-public class ReconstructTypeInCastOrIsIntention : JetSelfTargetingOffsetIndependentIntention<KtTypeReference>(javaClass(), "Replace by reconstructed type"), LowPriorityAction {
+public class ReconstructTypeInCastOrIsIntention : SelfTargetingOffsetIndependentIntention<KtTypeReference>(javaClass(), "Replace by reconstructed type"), LowPriorityAction {
     override fun isApplicableTo(element: KtTypeReference): Boolean {
         // Only user types (like Foo) are interesting
         val typeElement = element.typeElement as? KtUserType ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveArgumentNameIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveArgumentNameIntention.kt
index b852c909a71..f3ed4b7a998 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveArgumentNameIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveArgumentNameIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 public class RemoveArgumentNameIntention
-  : JetSelfTargetingRangeIntention<KtValueArgument>(javaClass(), "Remove argument name") {
+  : SelfTargetingRangeIntention<KtValueArgument>(javaClass(), "Remove argument name") {
 
     override fun applicabilityRange(element: KtValueArgument): TextRange? {
         if (!element.isNamed()) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt
index be63b44c8a9..ce41a363508 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveBracesIntention.kt
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
 
-public class RemoveBracesIntention : JetSelfTargetingIntention<KtBlockExpression>(javaClass(), "Remove braces") {
+public class RemoveBracesIntention : SelfTargetingIntention<KtBlockExpression>(javaClass(), "Remove braces") {
     override fun isApplicableTo(element: KtBlockExpression, caretOffset: Int): Boolean {
         if (element.getStatements().size() != 1) return false
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
index 692cfbaed11..0e1178101d3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveCurlyBracesFromTemplateIntention.kt
@@ -27,7 +27,7 @@ import java.util.regex.Pattern
 
 public class RemoveCurlyBracesFromTemplateInspection : IntentionBasedInspection<KtBlockStringTemplateEntry>(RemoveCurlyBracesFromTemplateIntention())
 
-public class RemoveCurlyBracesFromTemplateIntention : JetSelfTargetingOffsetIndependentIntention<KtBlockStringTemplateEntry>(javaClass(), "Remove curly braces") {
+public class RemoveCurlyBracesFromTemplateIntention : SelfTargetingOffsetIndependentIntention<KtBlockStringTemplateEntry>(javaClass(), "Remove curly braces") {
     override fun isApplicableTo(element: KtBlockStringTemplateEntry): Boolean {
         if (element.getExpression() !is KtNameReferenceExpression) return false
         val nextSiblingText = element.getNextSibling()?.getText()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt
index a11a3bc27e4..16e054c17f2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitLambdaParameterTypesIntention.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 
-public class RemoveExplicitLambdaParameterTypesIntention : JetSelfTargetingIntention<KtFunctionLiteralExpression>(javaClass(), "Remove explicit lambda parameter types (may break code)") {
+public class RemoveExplicitLambdaParameterTypesIntention : SelfTargetingIntention<KtFunctionLiteralExpression>(javaClass(), "Remove explicit lambda parameter types (may break code)") {
     override fun isApplicableTo(element: KtFunctionLiteralExpression, caretOffset: Int): Boolean {
         if (element.getValueParameters().none { it.getTypeReference() != null }) return false
         val arrow = element.getFunctionLiteral().getArrow() ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
index 66ad8caf1c0..7cd81120695 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitSuperQualifierIntention.kt
@@ -44,7 +44,7 @@ public class RemoveExplicitSuperQualifierInspection : IntentionBasedInspection<K
         get() = ProblemHighlightType.LIKE_UNUSED_SYMBOL
 }
 
-public class RemoveExplicitSuperQualifierIntention : JetSelfTargetingRangeIntention<KtSuperExpression>(javaClass(), "Remove explicit supertype qualification") {
+public class RemoveExplicitSuperQualifierIntention : SelfTargetingRangeIntention<KtSuperExpression>(javaClass(), "Remove explicit supertype qualification") {
     override fun applicabilityRange(element: KtSuperExpression): TextRange? {
         if (element.superTypeQualifier == null) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
index 7a709c3967b..040680caa10 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeArgumentsIntention.kt
@@ -39,7 +39,7 @@ public class RemoveExplicitTypeArgumentsInspection : IntentionBasedInspection<Kt
         get() = ProblemHighlightType.LIKE_UNUSED_SYMBOL
 }
 
-public class RemoveExplicitTypeArgumentsIntention : JetSelfTargetingOffsetIndependentIntention<KtTypeArgumentList>(javaClass(), "Remove explicit type arguments") {
+public class RemoveExplicitTypeArgumentsIntention : SelfTargetingOffsetIndependentIntention<KtTypeArgumentList>(javaClass(), "Remove explicit type arguments") {
     companion object {
         public fun isApplicableTo(element: KtTypeArgumentList, approximateFlexible: Boolean): Boolean {
             val callExpression = element.getParent() as? KtCallExpression ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
index 83992c4b35b..9b1a04cd27c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveExplicitTypeIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.psi.*
 
-public class RemoveExplicitTypeIntention : JetSelfTargetingIntention<KtCallableDeclaration>(javaClass(), "Remove explicit type specification") {
+public class RemoveExplicitTypeIntention : SelfTargetingIntention<KtCallableDeclaration>(javaClass(), "Remove explicit type specification") {
     override fun isApplicableTo(element: KtCallableDeclaration, caretOffset: Int): Boolean {
         if (element.getContainingFile() is KtCodeFragment) return false
         if (element.getTypeReference() == null) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt
index a8939563ac6..20a2c875c02 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveForLoopIndicesIntention.kt
@@ -40,7 +40,7 @@ public class RemoveForLoopIndicesInspection : IntentionBasedInspection<KtForExpr
         get() = ProblemHighlightType.LIKE_UNUSED_SYMBOL
 }
 
-public class RemoveForLoopIndicesIntention : JetSelfTargetingRangeIntention<KtForExpression>(javaClass(), "Remove indices in 'for' loop") {
+public class RemoveForLoopIndicesIntention : SelfTargetingRangeIntention<KtForExpression>(javaClass(), "Remove indices in 'for' loop") {
     private val WITH_INDEX_FQ_NAME = "kotlin.withIndex"
 
     override fun applicabilityRange(element: KtForExpression): TextRange? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
index 5c02beb5b18..176fd972983 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/RemoveUnnecessaryParenthesesIntention.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.KtParenthesizedExpression
 import org.jetbrains.kotlin.psi.KtPsiUtil
 import org.jetbrains.kotlin.psi.psiUtil.containsInside
 
-public class RemoveUnnecessaryParenthesesIntention : JetSelfTargetingIntention<KtParenthesizedExpression>(javaClass(), "Remove unnecessary parentheses") {
+public class RemoveUnnecessaryParenthesesIntention : SelfTargetingIntention<KtParenthesizedExpression>(javaClass(), "Remove unnecessary parentheses") {
     override fun isApplicableTo(element: KtParenthesizedExpression, caretOffset: Int): Boolean {
         val expression = element.getExpression() ?: return false
         if (!KtPsiUtil.areParenthesesUseless(element)) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
index e3a548ec77b..9dbc659372e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
 
-public class ReplaceItWithExplicitFunctionLiteralParamIntention() : JetSelfTargetingOffsetIndependentIntention<KtNameReferenceExpression> (
+public class ReplaceItWithExplicitFunctionLiteralParamIntention() : SelfTargetingOffsetIndependentIntention<KtNameReferenceExpression> (
         javaClass(), "Replace 'it' with explicit parameter"
 ), LowPriorityAction {
     override fun isApplicableTo(element: KtNameReferenceExpression)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
index 50e7ff1d142..028be282498 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOperatorAssignmentIntention.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 
 public class ReplaceWithOperatorAssignmentInspection : IntentionBasedInspection<KtBinaryExpression>(ReplaceWithOperatorAssignmentIntention())
 
-public class ReplaceWithOperatorAssignmentIntention : JetSelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Replace with operator-assignment") {
+public class ReplaceWithOperatorAssignmentIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Replace with operator-assignment") {
 
     override fun isApplicableTo(element: KtBinaryExpression): Boolean {
         if (element.getOperationToken() != KtTokens.EQ) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
index 6858f50c0a2..a9aecfcb392 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ReplaceWithOrdinaryAssignmentIntention.kt
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
 
-public class ReplaceWithOrdinaryAssignmentIntention : JetSelfTargetingIntention<KtBinaryExpression>(javaClass(), "Replace with ordinary assignment"), LowPriorityAction {
+public class ReplaceWithOrdinaryAssignmentIntention : SelfTargetingIntention<KtBinaryExpression>(javaClass(), "Replace with ordinary assignment"), LowPriorityAction {
     override fun isApplicableTo(element: KtBinaryExpression, caretOffset: Int): Boolean {
         if (element.getOperationToken() !in KtTokens.AUGMENTED_ASSIGNMENTS) return false
         if (element.getLeft() !is KtNameReferenceExpression) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
index 19ce3affbe2..2d3a253438a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyBooleanWithConstantsIntention.kt
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.DelegatingBindingTrace
 
 public class SimplifyBooleanWithConstantsInspection : IntentionBasedInspection<KtBinaryExpression>(SimplifyBooleanWithConstantsIntention())
 
-public class SimplifyBooleanWithConstantsIntention : JetSelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Simplify boolean expression") {
+public class SimplifyBooleanWithConstantsIntention : SelfTargetingOffsetIndependentIntention<KtBinaryExpression>(javaClass(), "Simplify boolean expression") {
 
     override fun isApplicableTo(element: KtBinaryExpression): Boolean {
         val topBinary = PsiTreeUtil.getTopmostParentOfType(element, javaClass<KtBinaryExpression>()) ?: element
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
index 8de65fc3dce..c56c7e0a7c2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SimplifyNegatedBinaryExpressionIntention.kt
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.*
 
 public class SimplifyNegatedBinaryExpressionInspection : IntentionBasedInspection<KtPrefixExpression>(SimplifyNegatedBinaryExpressionIntention())
 
-public class SimplifyNegatedBinaryExpressionIntention : JetSelfTargetingRangeIntention<KtPrefixExpression>(javaClass(), "Simplify negated binary expression") {
+public class SimplifyNegatedBinaryExpressionIntention : SelfTargetingRangeIntention<KtPrefixExpression>(javaClass(), "Simplify negated binary expression") {
 
     private fun IElementType.negate(): KtSingleValueToken? = when (this) {
         KtTokens.IN_KEYWORD -> KtTokens.NOT_IN
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
index f40942be1cd..0b703ba05be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyExplicitLambdaSignatureIntention.kt
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.resolve.BindingContext
 
-public class SpecifyExplicitLambdaSignatureIntention : JetSelfTargetingIntention<KtFunctionLiteralExpression>(javaClass(), "Specify explicit lambda signature"), LowPriorityAction {
+public class SpecifyExplicitLambdaSignatureIntention : SelfTargetingIntention<KtFunctionLiteralExpression>(javaClass(), "Specify explicit lambda signature"), LowPriorityAction {
 
     override fun isApplicableTo(element: KtFunctionLiteralExpression, caretOffset: Int): Boolean {
         val arrow = element.getFunctionLiteral().getArrow()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
index 4e3c0943d69..b35841c8e14 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyIntention.kt
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.TypeUtils
 import java.util.*
 
-public class SpecifyTypeExplicitlyIntention : JetSelfTargetingIntention<KtCallableDeclaration>(javaClass(), "Specify type explicitly"), LowPriorityAction {
+public class SpecifyTypeExplicitlyIntention : SelfTargetingIntention<KtCallableDeclaration>(javaClass(), "Specify type explicitly"), LowPriorityAction {
     override fun isApplicableTo(element: KtCallableDeclaration, caretOffset: Int): Boolean {
         if (element.getContainingFile() is KtCodeFragment) return false
         if (element is KtFunctionLiteral) return false // TODO: should JetFunctionLiteral be JetCallableDeclaration at all?
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
index e5e5d154556..62804e1e0b0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class SplitIfIntention : JetSelfTargetingIntention<KtExpression>(javaClass(), "Split if into 2 if's") {
+public class SplitIfIntention : SelfTargetingIntention<KtExpression>(javaClass(), "Split if into 2 if's") {
     override fun isApplicableTo(element: KtExpression, caretOffset: Int): Boolean {
         return when (element) {
             is KtOperationReferenceExpression -> isOperatorValid(element)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpressionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpressionIntention.kt
index a34d72e9e51..75ef334170e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpressionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SwapBinaryExpressionIntention.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions
 
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.idea.util.JetPsiPrecedences
+import org.jetbrains.kotlin.idea.util.PsiPrecedences
 import org.jetbrains.kotlin.lexer.KtTokens.*
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtExpression
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.createExpressionByPattern
 import org.jetbrains.kotlin.idea.core.copied
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 
-public class SwapBinaryExpressionIntention : JetSelfTargetingIntention<KtBinaryExpression>(javaClass(), "Flip binary expression"), LowPriorityAction {
+public class SwapBinaryExpressionIntention : SelfTargetingIntention<KtBinaryExpression>(javaClass(), "Flip binary expression"), LowPriorityAction {
     companion object {
         private val SUPPORTED_OPERATIONS = setOf(PLUS, MUL, OROR, ANDAND, EQEQ, EXCLEQ, EQEQEQ, EXCLEQEQEQ, GT, LT, GTEQ, LTEQ)
 
@@ -73,17 +73,17 @@ public class SwapBinaryExpressionIntention : JetSelfTargetingIntention<KtBinaryE
     }
 
     private fun leftSubject(element: KtBinaryExpression): KtExpression? {
-        return firstDescendantOfTighterPrecedence(element.getLeft(), JetPsiPrecedences.getPrecedence(element), KtBinaryExpression::getRight)
+        return firstDescendantOfTighterPrecedence(element.getLeft(), PsiPrecedences.getPrecedence(element), KtBinaryExpression::getRight)
     }
 
     private fun rightSubject(element: KtBinaryExpression): KtExpression? {
-        return firstDescendantOfTighterPrecedence(element.getRight(), JetPsiPrecedences.getPrecedence(element), KtBinaryExpression::getLeft)
+        return firstDescendantOfTighterPrecedence(element.getRight(), PsiPrecedences.getPrecedence(element), KtBinaryExpression::getLeft)
     }
 
     private fun firstDescendantOfTighterPrecedence(expression: KtExpression?, precedence: Int, getChild: KtBinaryExpression.() -> KtExpression?): KtExpression? {
         if (expression is KtBinaryExpression) {
-            val expressionPrecedence = JetPsiPrecedences.getPrecedence(expression)
-            if (!JetPsiPrecedences.isTighter(expressionPrecedence, precedence)) {
+            val expressionPrecedence = PsiPrecedences.getPrecedence(expression)
+            if (!PsiPrecedences.isTighter(expressionPrecedence, precedence)) {
                 return firstDescendantOfTighterPrecedence(expression.getChild(), precedence, getChild)
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ToInfixCallIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ToInfixCallIntention.kt
index 2c6d84ab2c4..42a25fbfbde 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ToInfixCallIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ToInfixCallIntention.kt
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-public class ToInfixCallIntention : JetSelfTargetingIntention<KtCallExpression>(javaClass(), "Replace with infix function call") {
+public class ToInfixCallIntention : SelfTargetingIntention<KtCallExpression>(javaClass(), "Replace with infix function call") {
     override fun isApplicableTo(element: KtCallExpression, caretOffset: Int): Boolean {
         val calleeExpr = element.getCalleeExpression() as? KtNameReferenceExpression ?: return false
         if (!calleeExpr.getTextRange().containsOffset(caretOffset)) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
index e6d1ee01f8b..b12fc15a951 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/UsePropertyAccessSyntaxIntention.kt
@@ -55,7 +55,7 @@ import org.jetbrains.kotlin.types.TypeUtils
 
 class UsePropertyAccessSyntaxInspection : IntentionBasedInspection<KtCallExpression>(UsePropertyAccessSyntaxIntention()), CleanupLocalInspectionTool
 
-class UsePropertyAccessSyntaxIntention : JetSelfTargetingOffsetIndependentIntention<KtCallExpression>(javaClass(), "Use property access syntax") {
+class UsePropertyAccessSyntaxIntention : SelfTargetingOffsetIndependentIntention<KtCallExpression>(javaClass(), "Use property access syntax") {
     override fun isApplicableTo(element: KtCallExpression): Boolean {
         return detectPropertyNameToUse(element) != null
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
index 280b95746ea..4fb3c857ec1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/DoubleBangToIfThenIntention.kt
@@ -27,7 +27,7 @@ import com.intellij.psi.PsiDocumentManager
 import org.apache.commons.lang.StringEscapeUtils.escapeJava
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.intentions.ChooseStringExpression
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.psi.KtPsiUtil
 import org.jetbrains.kotlin.psi.KtThrowExpression
 import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement
 
-public class DoubleBangToIfThenIntention : JetSelfTargetingRangeIntention<KtPostfixExpression>(javaClass(), "Replace '!!' expression with 'if' expression"), LowPriorityAction {
+public class DoubleBangToIfThenIntention : SelfTargetingRangeIntention<KtPostfixExpression>(javaClass(), "Replace '!!' expression with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtPostfixExpression): TextRange? {
         return if (element.getOperationToken() == KtTokens.EXCLEXCL && element.getBaseExpression() != null)
             element.getOperationReference().getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
index 075fab32c71..f6d6f78974e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.toExpression
 import org.jetbrains.kotlin.psi.KtNameReferenceExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.KtWhenExpression
 import org.jetbrains.kotlin.psi.buildExpression
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class EliminateWhenSubjectIntention : JetSelfTargetingIntention<KtWhenExpression>(javaClass(), "Eliminate argument of 'when'"), LowPriorityAction {
+public class EliminateWhenSubjectIntention : SelfTargetingIntention<KtWhenExpression>(javaClass(), "Eliminate argument of 'when'"), LowPriorityAction {
     override fun isApplicableTo(element: KtWhenExpression, caretOffset: Int): Boolean {
         if (element.getSubjectExpression() !is KtNameReferenceExpression) return false
         val lBrace = element.getOpenBrace() ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt
index 5def61f7843..3eaa56cf0ad 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/ElvisToIfThenIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
 import org.jetbrains.kotlin.psi.KtPsiUtil
 
-public class ElvisToIfThenIntention : JetSelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace elvis expression with 'if' expression"), LowPriorityAction {
+public class ElvisToIfThenIntention : SelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace elvis expression with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtBinaryExpression): TextRange? {
         return if (element.getOperationToken() == KtTokens.ELVIS && element.getLeft() != null && element.getRight() != null)
             element.getOperationReference().getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt
index 39c6a2ceda5..092dcf92db6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt
@@ -18,14 +18,14 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingIntention
 import org.jetbrains.kotlin.idea.quickfix.moveCaret
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class FlattenWhenIntention : JetSelfTargetingIntention<KtWhenExpression>(javaClass(), "Flatten 'when' expression") {
+public class FlattenWhenIntention : SelfTargetingIntention<KtWhenExpression>(javaClass(), "Flatten 'when' expression") {
     override fun isApplicableTo(element: KtWhenExpression, caretOffset: Int): Boolean {
         val subject = element.getSubjectExpression()
         if (subject != null && subject !is KtNameReferenceExpression) return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToAssignmentIntention.kt
index b78aa0c76be..1f5ea324e0f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToAssignmentIntention.kt
@@ -18,13 +18,13 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils
 import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
 
-public class FoldIfToAssignmentIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with assignment") {
+public class FoldIfToAssignmentIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with assignment") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         val thenAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(element.getThen()) ?: return null
         val elseAssignment = BranchedFoldingUtils.getFoldableBranchedAssignment(element.getElse()) ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnAsymmetricallyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnAsymmetricallyIntention.kt
index 9a6d0758eb6..3bad9906f9b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnAsymmetricallyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnAsymmetricallyIntention.kt
@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils
 import org.jetbrains.kotlin.psi.*
 
-public class FoldIfToReturnAsymmetricallyIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with return") {
+public class FoldIfToReturnAsymmetricallyIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with return") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         if (BranchedFoldingUtils.getFoldableBranchedReturn(element.getThen()) == null || element.getElse() != null) {
             return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnIntention.kt
index 37938bcdefd..bee7cc2d01a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldIfToReturnIntention.kt
@@ -18,13 +18,13 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils
 import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
 
-public class FoldIfToReturnIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with return") {
+public class FoldIfToReturnIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with return") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         if (BranchedFoldingUtils.getFoldableBranchedReturn(element.getThen()) == null) return null
         if (BranchedFoldingUtils.getFoldableBranchedReturn(element.getElse()) == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToAssignmentIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToAssignmentIntention.kt
index 38521f695e5..68e57ceeb5c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToAssignmentIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToAssignmentIntention.kt
@@ -18,12 +18,12 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils
 import org.jetbrains.kotlin.psi.*
 import java.util.*
 
-public class FoldWhenToAssignmentIntention : JetSelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' expression with assignment") {
+public class FoldWhenToAssignmentIntention : SelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' expression with assignment") {
     override fun applicabilityRange(element: KtWhenExpression): TextRange? {
         if (!KtPsiUtil.checkWhenExpressionHasSingleElse(element)) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToReturnIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToReturnIntention.kt
index 341bb8e63d1..0da4ad830e5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToReturnIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToReturnIntention.kt
@@ -18,11 +18,11 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedFoldingUtils
 import org.jetbrains.kotlin.psi.*
 
-public class FoldWhenToReturnIntention : JetSelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' expression with return") {
+public class FoldWhenToReturnIntention : SelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' expression with return") {
     override fun applicabilityRange(element: KtWhenExpression): TextRange? {
         if (!KtPsiUtil.checkWhenExpressionHasSingleElse(element)) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
index 40619303a14..b40ff70d6db 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToDoubleBangIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement
 
-public class IfThenToDoubleBangIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with '!!' expression") {
+public class IfThenToDoubleBangIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with '!!' expression") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         val condition = element.getCondition() as? KtBinaryExpression ?: return null
         val thenClause = element.getThen() ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
index f032f0d1df5..4bee7d1c11a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToElvisIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.KtNodeTypes
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.core.replaced
 
 public class IfThenToElvisInspection : IntentionBasedInspection<KtIfExpression>(IfThenToElvisIntention())
 
-public class IfThenToElvisIntention : JetSelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with elvis expression") {
+public class IfThenToElvisIntention : SelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with elvis expression") {
 
     override fun isApplicableTo(element: KtIfExpression): Boolean {
         val condition = element.getCondition() as? KtBinaryExpression ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
index 3f81eb2ebb8..4cabaa03766 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfThenToSafeAccessIntention.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.*
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.core.replaced
 
 public class IfThenToSafeAccessInspection : IntentionBasedInspection<KtIfExpression>(IfThenToSafeAccessIntention())
 
-public class IfThenToSafeAccessIntention : JetSelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with safe access expression") {
+public class IfThenToSafeAccessIntention : SelfTargetingOffsetIndependentIntention<KtIfExpression>(javaClass(), "Replace 'if' expression with safe access expression") {
 
     override fun isApplicableTo(element: KtIfExpression): Boolean {
         val condition = element.getCondition() as? KtBinaryExpression ?: return false
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
index 63d661a3a97..08a7ba22141 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IfToWhenIntention.kt
@@ -18,14 +18,14 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getSubjectToIntroduce
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceSubject
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import java.util.*
 
-public class IfToWhenIntention : JetSelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' with 'when'") {
+public class IfToWhenIntention : SelfTargetingRangeIntention<KtIfExpression>(javaClass(), "Replace 'if' with 'when'") {
     override fun applicabilityRange(element: KtIfExpression): TextRange? {
         if (element.getThen() == null) return null
         return element.getIfKeyword().getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt
index bfde9de5c4d..0503820c6c3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt
@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.getSubjectToIntroduce
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceSubject
 import org.jetbrains.kotlin.psi.KtWhenExpression
 
 public class IntroduceWhenSubjectInspection : IntentionBasedInspection<KtWhenExpression>(IntroduceWhenSubjectIntention())
 
-public class IntroduceWhenSubjectIntention : JetSelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Introduce argument to 'when'") {
+public class IntroduceWhenSubjectIntention : SelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Introduce argument to 'when'") {
     override fun applicabilityRange(element: KtWhenExpression): TextRange? {
         val subject = element.getSubjectToIntroduce() ?: return null
         setText("Introduce '${subject.getText()}' as argument to 'when'")
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt
index 7e9111dcc4b..7ef5617a442 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/MergeWhenIntention.kt
@@ -22,14 +22,14 @@ import com.intellij.psi.PsiWhiteSpace
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.idea.core.appendElement
 import org.jetbrains.kotlin.idea.core.replaced
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.matches
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
 
-public class MergeWhenIntention : JetSelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Merge with next 'when'", "Merge 'when' expressions") {
+public class MergeWhenIntention : SelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Merge with next 'when'", "Merge 'when' expressions") {
     override fun applicabilityRange(element: KtWhenExpression): TextRange? {
         val next = PsiTreeUtil.skipSiblingsForward(element, javaClass<PsiWhiteSpace>()) as? KtWhenExpression ?: return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt
index a85ed522ad9..baa18576924 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/SafeAccessToIfThenIntention.kt
@@ -20,14 +20,14 @@ import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.convertToIfNotNullExpression
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.introduceValueForCondition
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.isStableVariable
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement
 
-public class SafeAccessToIfThenIntention : JetSelfTargetingRangeIntention<KtSafeQualifiedExpression>(javaClass(), "Replace safe access expression with 'if' expression"), LowPriorityAction {
+public class SafeAccessToIfThenIntention : SelfTargetingRangeIntention<KtSafeQualifiedExpression>(javaClass(), "Replace safe access expression with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtSafeQualifiedExpression): TextRange? {
         if (element.getSelectorExpression() == null) return null
         return element.getOperationTokenNode().getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt
index 08d08ed0171..c5cd9f47213 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToIfIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldAssignmentToIfIntention : JetSelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace assignment with 'if' expression"), LowPriorityAction {
+public class UnfoldAssignmentToIfIntention : SelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace assignment with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtBinaryExpression): TextRange? {
         if (element.getOperationToken() !in KtTokens.ALL_ASSIGNMENTS) return null
         if (element.getLeft() == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
index b983e6a90b3..bf7a71fcd8a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtBinaryExpression
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtWhenExpression
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldAssignmentToWhenIntention : JetSelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace assignment with 'when' expression" ), LowPriorityAction {
+public class UnfoldAssignmentToWhenIntention : SelfTargetingRangeIntention<KtBinaryExpression>(javaClass(), "Replace assignment with 'when' expression" ), LowPriorityAction {
     override fun applicabilityRange(element: KtBinaryExpression): TextRange? {
         if (element.getOperationToken() !in KtTokens.ALL_ASSIGNMENTS) return null
         if (element.getLeft() == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
index 9bb1f6d2585..142369656ef 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToIfIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
 import org.jetbrains.kotlin.psi.KtIfExpression
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldPropertyToIfIntention : JetSelfTargetingRangeIntention<KtProperty>(javaClass(), "Replace property initializer with 'if' expression"), LowPriorityAction {
+public class UnfoldPropertyToIfIntention : SelfTargetingRangeIntention<KtProperty>(javaClass(), "Replace property initializer with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtProperty): TextRange? {
         if (!element.isLocal()) return null
         val initializer = element.getInitializer() as? KtIfExpression ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
index c57f5260be4..42477da27c6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.BranchedUnfoldingUtils
 import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
 import org.jetbrains.kotlin.psi.KtProperty
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.KtWhenExpression
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldPropertyToWhenIntention : JetSelfTargetingRangeIntention<KtProperty>(javaClass(), "Replace property initializer with 'when' expression"), LowPriorityAction {
+public class UnfoldPropertyToWhenIntention : SelfTargetingRangeIntention<KtProperty>(javaClass(), "Replace property initializer with 'when' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtProperty): TextRange? {
         if (!element.isLocal()) return null
         val initializer = element.getInitializer() as? KtWhenExpression ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt
index d7e05c0e165..daa778fe416 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToIfIntention.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.core.copied
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.psi.KtIfExpression
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.KtReturnExpression
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldReturnToIfIntention : JetSelfTargetingRangeIntention<KtReturnExpression>(javaClass(), "Replace return with 'if' expression"), LowPriorityAction {
+public class UnfoldReturnToIfIntention : SelfTargetingRangeIntention<KtReturnExpression>(javaClass(), "Replace return with 'if' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtReturnExpression): TextRange? {
         val ifExpression = element.getReturnedExpression() as? KtIfExpression ?: return null
         return TextRange(element.startOffset, ifExpression.getIfKeyword().endOffset)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt
index beac0a1a543..373a6a27417 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt
@@ -20,13 +20,13 @@ import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.idea.core.copied
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.lastBlockStatementOrThis
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class UnfoldReturnToWhenIntention : JetSelfTargetingRangeIntention<KtReturnExpression>(javaClass(), "Replace return with 'when' expression"), LowPriorityAction {
+public class UnfoldReturnToWhenIntention : SelfTargetingRangeIntention<KtReturnExpression>(javaClass(), "Replace return with 'when' expression"), LowPriorityAction {
     override fun applicabilityRange(element: KtReturnExpression): TextRange? {
         val whenExpr = element.getReturnedExpression() as? KtWhenExpression ?: return null
         if (!KtPsiUtil.checkWhenExpressionHasSingleElse(whenExpr)) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
index 6fd84d31c9d..c8160a188ea 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt
@@ -19,11 +19,11 @@ package org.jetbrains.kotlin.idea.intentions.branchedTransformations.intentions
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.branchedTransformations.toExpression
 import org.jetbrains.kotlin.psi.*
 
-public class WhenToIfIntention : JetSelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' with 'if'"), LowPriorityAction {
+public class WhenToIfIntention : SelfTargetingRangeIntention<KtWhenExpression>(javaClass(), "Replace 'when' with 'if'"), LowPriorityAction {
     override fun applicabilityRange(element: KtWhenExpression): TextRange? {
         val entries = element.getEntries()
         if (entries.isEmpty()) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt
index 1dcd2b99bcd..52908dbcbaf 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithBinaryOperatorIntention.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.model.isReallySuccess
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 
-public class ReplaceCallWithBinaryOperatorIntention : JetSelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace call with binary operator"), HighPriorityAction {
+public class ReplaceCallWithBinaryOperatorIntention : SelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace call with binary operator"), HighPriorityAction {
     override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? {
         val operation = operation(element.calleeName) ?: return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt
index 7dfbae4174a..619ceb550b1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceCallWithUnaryOperatorIntention.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls
 import com.intellij.codeInsight.intention.HighPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.intentions.calleeName
 import org.jetbrains.kotlin.idea.intentions.isReceiverExpressionWithValue
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.createExpressionByPattern
 import org.jetbrains.kotlin.types.expressions.OperatorConventions
 
-public class ReplaceCallWithUnaryOperatorIntention : JetSelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace call with unary operator"), HighPriorityAction {
+public class ReplaceCallWithUnaryOperatorIntention : SelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace call with unary operator"), HighPriorityAction {
     override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? {
         val operation = operation(element.calleeName) ?: return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
index 1fc4664795a..e253dabb84a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceContainsIntention.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
-public class ReplaceContainsIntention : JetSelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace 'contains' call with 'in' operator"), HighPriorityAction {
+public class ReplaceContainsIntention : SelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace 'contains' call with 'in' operator"), HighPriorityAction {
     override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? {
         if (element.calleeName != OperatorNameConventions.CONTAINS.asString()) return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
index c2379cc03da..bcf324c2001 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceGetOrSetIntention.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.inspections.IntentionBasedInspection
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.intentions.isReceiverExpressionWithValue
 import org.jetbrains.kotlin.idea.intentions.toResolvedCall
@@ -55,7 +55,7 @@ private fun FunctionDescriptor.isExplicitOperator(): Boolean {
         overriddenDescriptors.any { it.isExplicitOperator() }
 }
 
-class ReplaceGetOrSetIntention : JetSelfTargetingRangeIntention<KtDotQualifiedExpression>(
+class ReplaceGetOrSetIntention : SelfTargetingRangeIntention<KtDotQualifiedExpression>(
         KtDotQualifiedExpression::class.java,
         "Replace 'get' or 'set' call with indexing operator"
 ), HighPriorityAction {
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt
index 916c0711e8e..c3b6ecb69bc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/conventionNameCalls/ReplaceInvokeIntention.kt
@@ -19,14 +19,14 @@ package org.jetbrains.kotlin.idea.intentions.conventionNameCalls
 import com.intellij.codeInsight.intention.HighPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.callExpression
 import org.jetbrains.kotlin.idea.intentions.calleeName
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.psi.KtDotQualifiedExpression
 import org.jetbrains.kotlin.util.OperatorNameConventions
 
-public class ReplaceInvokeIntention : JetSelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace 'invoke' with direct call"), HighPriorityAction {
+public class ReplaceInvokeIntention : SelfTargetingRangeIntention<KtDotQualifiedExpression>(javaClass(), "Replace 'invoke' with direct call"), HighPriorityAction {
     override fun applicabilityRange(element: KtDotQualifiedExpression): TextRange? {
         if (element.calleeName != OperatorNameConventions.INVOKE.asString()) return null
         return element.callExpression!!.getCalleeExpression()!!.getTextRange()
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
index f3dac4dfa47..f0b8dc4acfa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/ConvertMemberToExtensionIntention.kt
@@ -23,13 +23,13 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.setReceiverType
 import org.jetbrains.kotlin.idea.quickfix.moveCaret
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 
-public class ConvertMemberToExtensionIntention : JetSelfTargetingRangeIntention<KtCallableDeclaration>(javaClass(), "Convert member to extension"), LowPriorityAction {
+public class ConvertMemberToExtensionIntention : SelfTargetingRangeIntention<KtCallableDeclaration>(javaClass(), "Convert member to extension"), LowPriorityAction {
     override fun applicabilityRange(element: KtCallableDeclaration): TextRange? {
         val classBody = element.getParent() as? KtClassBody ?: return null
         if (classBody.getParent() !is KtClass) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt
index 88938b08365..29b947c19a4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/declarations/SplitPropertyDeclarationIntention.kt
@@ -19,12 +19,12 @@ package org.jetbrains.kotlin.idea.intentions.declarations
 import com.intellij.codeInsight.intention.LowPriorityAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.intentions.splitPropertyDeclaration
 import org.jetbrains.kotlin.psi.KtProperty
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public class SplitPropertyDeclarationIntention : JetSelfTargetingRangeIntention<KtProperty>(javaClass(), "Split property declaration"), LowPriorityAction {
+public class SplitPropertyDeclarationIntention : SelfTargetingRangeIntention<KtProperty>(javaClass(), "Split property declaration"), LowPriorityAction {
     override fun applicabilityRange(element: KtProperty): TextRange? {
         if (!element.isLocal()) return null
         val initializer = element.getInitializer() ?: return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
index 82ea0f6477a..5ed39bf61b9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/j2k/J2kPostProcessings.kt
@@ -101,7 +101,7 @@ object J2KPostProcessingRegistrar {
         )
     }
 
-    private inline fun <reified TElement : KtElement, TIntention: JetSelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
+    private inline fun <reified TElement : KtElement, TIntention: SelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
             intention: TIntention,
             crossinline apply: TIntention.(TElement) -> Unit
     ) {
@@ -109,7 +109,7 @@ object J2KPostProcessingRegistrar {
         return registerIntentionBasedProcessing<TElement, TIntention>(intention, { true }, apply)
     }
 
-    private inline fun <reified TElement : KtElement, TIntention: JetSelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
+    private inline fun <reified TElement : KtElement, TIntention: SelfTargetingRangeIntention<TElement>> registerIntentionBasedProcessing(
             intention: TIntention,
             noinline additionalChecker: (TElement) -> Boolean,
             crossinline apply: TIntention.(TElement) -> Unit
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
index 127010d521d..39b6c0a974b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetLiveTemplatesProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinLiveTemplatesProvider.java
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.liveTemplates;
 
 import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider;
 
-public class JetLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
+public class KotlinLiveTemplatesProvider implements DefaultLiveTemplatesProvider {
     @Override
     public String[] getDefaultLiveTemplateFiles() {
         return new String[]{"liveTemplates/Kotlin"};
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
similarity index 91%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
index 25018d638f6..4976245ddb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/JetTemplateContextType.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/KotlinTemplateContextType.java
@@ -34,8 +34,8 @@ import org.jetbrains.kotlin.idea.KotlinLanguage;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.*;
 
-public abstract class JetTemplateContextType extends TemplateContextType {
-    protected JetTemplateContextType(@NotNull @NonNls String id, @NotNull String presentableName, @Nullable java.lang.Class<? extends TemplateContextType> baseContextType) {
+public abstract class KotlinTemplateContextType extends TemplateContextType {
+    protected KotlinTemplateContextType(@NotNull @NonNls String id, @NotNull String presentableName, @Nullable java.lang.Class<? extends TemplateContextType> baseContextType) {
         super(id, presentableName, baseContextType);
     }
 
@@ -81,7 +81,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
 
     protected abstract boolean isInContext(@NotNull PsiElement element);
 
-    public static class Generic extends JetTemplateContextType {
+    public static class Generic extends KotlinTemplateContextType {
         public Generic() {
             super("KOTLIN", KotlinLanguage.NAME, EverywhereContextType.class);
         }
@@ -97,7 +97,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
         }
     }
 
-    public static class TopLevel extends JetTemplateContextType {
+    public static class TopLevel extends KotlinTemplateContextType {
         public TopLevel() {
             super("KOTLIN_TOPLEVEL", "Top-level", Generic.class);
         }
@@ -124,7 +124,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
         }
     }
 
-    public static class Class extends JetTemplateContextType {
+    public static class Class extends KotlinTemplateContextType {
         public Class() {
             super("KOTLIN_CLASS", "Class", Generic.class);
         }
@@ -150,7 +150,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
         }
     }
 
-    public static class Statement extends JetTemplateContextType {
+    public static class Statement extends KotlinTemplateContextType {
         public Statement() {
             super("KOTLIN_STATEMENT", "Statement", Generic.class);
         }
@@ -171,7 +171,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
         }
     }
 
-    public static class Expression extends JetTemplateContextType {
+    public static class Expression extends KotlinTemplateContextType {
         public Expression() {
             super("KOTLIN_EXPRESSION", "Expression", Generic.class);
         }
@@ -184,7 +184,7 @@ public abstract class JetTemplateContextType extends TemplateContextType {
         }
     }
 
-    public static class Comment extends JetTemplateContextType {
+    public static class Comment extends KotlinTemplateContextType {
         public Comment() {
             super("KOTLIN_COMMENT", "Comment", Generic.class);
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.kt b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
similarity index 97%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.kt
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
index 9f4f991f6ca..c81a2842545 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnonymousSuperMacro.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered
 
-class JetAnonymousSuperMacro : Macro() {
+class AnonymousSuperMacro : Macro() {
     override fun getName() = "anonymousSuper"
     override fun getPresentableName() = "anonymousSuper()"
 
@@ -49,7 +49,7 @@ class JetAnonymousSuperMacro : Macro() {
 
         val vars = getSupertypes(params, context)
         if (vars == null || vars.size == 0) return null
-        return JetPsiElementResult(vars.first())
+        return KotlinPsiElementResult(vars.first())
     }
 
     override fun calculateLookupItems(params: Array<Expression>, context: ExpressionContext): Array<LookupElement>? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.java
index ee30b136fb4..6753a01b6cb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetAnyVariableMacro.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnyVariableMacro.java
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.liveTemplates.macro;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.IterableTypesDetector;
 
-public class JetAnyVariableMacro extends BaseJetVariableMacro {
+public class AnyVariableMacro extends BaseKotlinVariableMacro {
     @Override
     public String getName() {
         return "kotlinVariable";
@@ -30,7 +30,7 @@ public class JetAnyVariableMacro extends BaseJetVariableMacro {
 
     @Override
     public String getPresentableName() {
-        return JetBundle.message("macro.variable.of.type");
+        return KotlinBundle.message("macro.variable.of.type");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java
similarity index 98%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java
index b0931f0cc10..59cf81c0e83 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.java
@@ -52,7 +52,7 @@ import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt;
 
 import java.util.*;
 
-public abstract class BaseJetVariableMacro extends Macro {
+public abstract class BaseKotlinVariableMacro extends Macro {
     @Nullable
     private KtNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) {
         if (params.length != 0) return null;
@@ -137,7 +137,7 @@ public abstract class BaseJetVariableMacro extends Macro {
     public Result calculateResult(@NotNull Expression[] params, ExpressionContext context) {
         KtNamedDeclaration[] vars = getVariables(params, context);
         if (vars == null || vars.length == 0) return null;
-        return new JetPsiElementResult(vars[0]);
+        return new KotlinPsiElementResult(vars[0]);
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.java
similarity index 93%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.java
index e16772faf01..960e5c7bf2f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetFunctionParametersMacro.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.java
@@ -22,14 +22,14 @@ import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.KtFunction;
 import org.jetbrains.kotlin.psi.KtParameter;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class JetFunctionParametersMacro extends Macro {
+public class FunctionParametersMacro extends Macro {
     @Override
     public String getName() {
         return "functionParameters";
@@ -37,7 +37,7 @@ public class JetFunctionParametersMacro extends Macro {
 
     @Override
     public String getPresentableName() {
-        return JetBundle.message("macro.fun.parameters");
+        return KotlinBundle.message("macro.fun.parameters");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/IterableVariableMacro.java
similarity index 88%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/IterableVariableMacro.java
index 6db48ec3190..ac03d37374a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetIterableVariableMacro.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/IterableVariableMacro.java
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.liveTemplates.macro;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.IterableTypesDetector;
 
-public class JetIterableVariableMacro extends BaseJetVariableMacro {
+public class IterableVariableMacro extends BaseKotlinVariableMacro {
 
     @Override
     public String getName() {
@@ -31,7 +31,7 @@ public class JetIterableVariableMacro extends BaseJetVariableMacro {
 
     @Override
     public String getPresentableName() {
-        return JetBundle.message("macro.iterable.variable");
+        return KotlinBundle.message("macro.iterable.variable");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.java
similarity index 87%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.java
index 358f711b537..2c9a5ab25c6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetPsiElementResult.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinPsiElementResult.java
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.liveTemplates.macro;
 import com.intellij.codeInsight.template.JavaPsiElementResult;
 import com.intellij.psi.PsiNamedElement;
 
-public class JetPsiElementResult extends JavaPsiElementResult {
-    public JetPsiElementResult(PsiNamedElement element) {
+public class KotlinPsiElementResult extends JavaPsiElementResult {
+    public KotlinPsiElementResult(PsiNamedElement element) {
         super(element);
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.java
similarity index 88%
rename from idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.java
rename to idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.java
index 59ebd5035a3..f16d9db7d11 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/JetSuggestVariableNameMacro.java
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.java
@@ -19,10 +19,10 @@ package org.jetbrains.kotlin.idea.liveTemplates.macro;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.IterableTypesDetector;
 
-public class JetSuggestVariableNameMacro extends BaseJetVariableMacro {
+public class SuggestVariableNameMacro extends BaseKotlinVariableMacro {
     @Override
     public String getName() {
         return "kotlinSuggestVariableName";
@@ -30,7 +30,7 @@ public class JetSuggestVariableNameMacro extends BaseJetVariableMacro {
 
     @Override
     public String getPresentableName() {
-        return JetBundle.message("macro.suggest.variable.name");
+        return KotlinBundle.message("macro.suggest.variable.name");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.java
similarity index 83%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.java
index d5614656673..cb2ea100469 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetDefaultNamedDeclarationPresentation.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KotlinDefaultNamedDeclarationPresentation.java
@@ -20,17 +20,17 @@ import com.intellij.navigation.ColoredItemPresentation;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.util.Iconable;
-import org.jetbrains.kotlin.idea.JetIconProvider;
+import org.jetbrains.kotlin.idea.KotlinIconProvider;
 import org.jetbrains.kotlin.name.FqName;
 import org.jetbrains.kotlin.psi.KtNamedDeclaration;
 import org.jetbrains.kotlin.psi.KtPsiUtil;
 
 import javax.swing.*;
 
-public class JetDefaultNamedDeclarationPresentation implements ColoredItemPresentation {
+public class KotlinDefaultNamedDeclarationPresentation implements ColoredItemPresentation {
     private final KtNamedDeclaration declaration;
 
-    JetDefaultNamedDeclarationPresentation(KtNamedDeclaration declaration) {
+    KotlinDefaultNamedDeclarationPresentation(KtNamedDeclaration declaration) {
         this.declaration = declaration;
     }
 
@@ -59,6 +59,6 @@ public class JetDefaultNamedDeclarationPresentation implements ColoredItemPresen
 
     @Override
     public Icon getIcon(boolean unused) {
-        return JetIconProvider.INSTANCE.getIcon(declaration, Iconable.ICON_FLAG_VISIBILITY | Iconable.ICON_FLAG_READ_STATUS);
+        return KotlinIconProvider.INSTANCE.getIcon(declaration, Iconable.ICON_FLAG_VISIBILITY | Iconable.ICON_FLAG_READ_STATUS);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.java
similarity index 85%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.java
index 646128efcb2..15ae4ca71b4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetClassPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtClassPresenter.java
@@ -20,9 +20,9 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProvider;
 import org.jetbrains.kotlin.psi.KtClass;
 
-public class JetClassPresenter implements ItemPresentationProvider<KtClass> {
+public class KtClassPresenter implements ItemPresentationProvider<KtClass> {
     @Override
     public ItemPresentation getPresentation(KtClass item) {
-        return new JetDefaultNamedDeclarationPresentation(item);
+        return new KotlinDefaultNamedDeclarationPresentation(item);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.java
similarity index 95%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.java
index a1fe1179d11..45d9f2bc8af 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetFunctionPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtFunctionPresenter.java
@@ -27,12 +27,12 @@ import org.jetbrains.kotlin.psi.*;
 
 import java.util.Collection;
 
-public class JetFunctionPresenter implements ItemPresentationProvider<KtFunction> {
+public class KtFunctionPresenter implements ItemPresentationProvider<KtFunction> {
     @Override
     public ItemPresentation getPresentation(@NotNull final KtFunction function) {
         if (function instanceof KtFunctionLiteral) return null;
 
-        return new JetDefaultNamedDeclarationPresentation(function) {
+        return new KotlinDefaultNamedDeclarationPresentation(function) {
             @Override
             public String getPresentableText() {
                 StringBuilder presentation = new StringBuilder(function.getName() != null ? function.getName() : "");
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.java
similarity index 75%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.java
index 874334e0d24..e2198bf6cea 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetLightClassListCellRenderer.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtLightClassListCellRenderer.java
@@ -20,21 +20,21 @@ import com.intellij.ide.util.PsiElementListCellRenderer;
 import com.intellij.psi.presentation.java.ClassPresentationUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightClass;
+import org.jetbrains.kotlin.asJava.KtLightClass;
 
-public class JetLightClassListCellRenderer extends PsiElementListCellRenderer<KotlinLightClass> {
+public class KtLightClassListCellRenderer extends PsiElementListCellRenderer<KtLightClass> {
     @Override
-    public String getElementText(@NotNull KotlinLightClass element) {
+    public String getElementText(@NotNull KtLightClass element) {
         return ClassPresentationUtil.getNameForClass(element, false);
     }
 
     @Override
-    protected String getContainerText(KotlinLightClass element, String name) {
+    protected String getContainerText(KtLightClass element, String name) {
         return getContainerTextStatic(element);
     }
 
     @Nullable
-    public static String getContainerTextStatic(KotlinLightClass element) {
+    public static String getContainerTextStatic(KtLightClass element) {
         return "(" + element.getFqName().parent() + ")";
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.java
similarity index 85%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.java
index 93a8a39eaef..b4e00c9c510 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetObjectPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtObjectPresenter.java
@@ -20,9 +20,9 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProvider;
 import org.jetbrains.kotlin.psi.KtObjectDeclaration;
 
-public class JetObjectPresenter implements ItemPresentationProvider<KtObjectDeclaration> {
+public class KtObjectPresenter implements ItemPresentationProvider<KtObjectDeclaration> {
     @Override
     public ItemPresentation getPresentation(KtObjectDeclaration item) {
-        return new JetDefaultNamedDeclarationPresentation(item);
+        return new KotlinDefaultNamedDeclarationPresentation(item);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.java
similarity index 85%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.java
index f9c2bf462b3..241f07c93ad 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetParameterPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtParameterPresenter.java
@@ -20,9 +20,9 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProvider;
 import org.jetbrains.kotlin.psi.KtParameter;
 
-public class JetParameterPresenter implements ItemPresentationProvider<KtParameter> {
+public class KtParameterPresenter implements ItemPresentationProvider<KtParameter> {
     @Override
     public ItemPresentation getPresentation(KtParameter item) {
-        return new JetDefaultNamedDeclarationPresentation(item);
+        return new KotlinDefaultNamedDeclarationPresentation(item);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.java b/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.java
similarity index 85%
rename from idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.java
rename to idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.java
index aa3ba92c506..6d9f7fe558e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/presentation/JetPropertyPresenter.java
+++ b/idea/src/org/jetbrains/kotlin/idea/presentation/KtPropertyPresenter.java
@@ -20,9 +20,9 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProvider;
 import org.jetbrains.kotlin.psi.KtProperty;
 
-public class JetPropertyPresenter implements ItemPresentationProvider<KtProperty> {
+public class KtPropertyPresenter implements ItemPresentationProvider<KtProperty> {
     @Override
     public ItemPresentation getPresentation(KtProperty item) {
-        return new JetDefaultNamedDeclarationPresentation(item);
+        return new KotlinDefaultNamedDeclarationPresentation(item);
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
index 67554c2b56f..e0bec5268fe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/project/PluginJetFilesProvider.java
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.idea.project;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.stubindex.JetExactPackagesIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope;
+import org.jetbrains.kotlin.idea.stubindex.KotlinExactPackagesIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope;
 import org.jetbrains.kotlin.psi.KtFile;
 
 import java.util.ArrayList;
@@ -31,9 +31,9 @@ public class PluginJetFilesProvider  {
     @NotNull
     public static Collection<KtFile> allFilesInProject(@NotNull Project project) {
         Collection<KtFile> result = new ArrayList<KtFile>();
-        GlobalSearchScope scope = JetSourceFilterScope.kotlinSources(GlobalSearchScope.allScope(project), project);
-        for (String packageWithFiles : JetExactPackagesIndex.getInstance().getAllKeys(project)) {
-            result.addAll(JetExactPackagesIndex.getInstance().get(packageWithFiles, project, scope));
+        GlobalSearchScope scope = KotlinSourceFilterScope.kotlinSources(GlobalSearchScope.allScope(project), project);
+        for (String packageWithFiles : KotlinExactPackagesIndex.getInstance().getAllKeys(project)) {
+            result.addAll(KotlinExactPackagesIndex.getInstance().get(packageWithFiles, project, scope));
         }
         return result;
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewProvider.java
similarity index 90%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.java
rename to idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewProvider.java
index 07b6347eba6..883c0f04b5d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewProvider.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import org.jetbrains.kotlin.idea.JetIconProvider;
+import org.jetbrains.kotlin.idea.KotlinIconProvider;
 import org.jetbrains.kotlin.psi.KtClassBody;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
 import org.jetbrains.kotlin.psi.KtDeclaration;
@@ -36,10 +36,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-public class JetProjectViewProvider implements SelectableTreeStructureProvider, DumbAware {
+public class KotlinProjectViewProvider implements SelectableTreeStructureProvider, DumbAware {
     private final Project myProject;
 
-    public JetProjectViewProvider(Project project) {
+    public KotlinProjectViewProvider(Project project) {
         myProject = project;
     }
 
@@ -54,12 +54,12 @@ public class JetProjectViewProvider implements SelectableTreeStructureProvider,
                 KtFile file = (KtFile) childValue;
                 List<KtDeclaration> declarations = file.getDeclarations();
 
-                KtClassOrObject mainClass = JetIconProvider.getMainClass(file);
+                KtClassOrObject mainClass = KotlinIconProvider.getMainClass(file);
                 if (mainClass != null && declarations.size() == 1) {
-                    result.add(new JetClassOrObjectTreeNode(file.getProject(), mainClass, settings));
+                    result.add(new KtClassOrObjectTreeNode(file.getProject(), mainClass, settings));
                 }
                 else {
-                    result.add(new JetFileTreeNode(file.getProject(), file, settings));
+                    result.add(new KtFileTreeNode(file.getProject(), file, settings));
                 }
             }
             else {
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewUtil.java
similarity index 90%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.java
rename to idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewUtil.java
index 62c708b02dd..8a870295b7a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/JetProjectViewUtil.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KotlinProjectViewUtil.java
@@ -29,9 +29,9 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public final class JetProjectViewUtil {
+public final class KotlinProjectViewUtil {
 
-    private JetProjectViewUtil() {
+    private KotlinProjectViewUtil() {
     }
 
     public static Collection<AbstractTreeNode> getClassOrObjectChildren(
@@ -42,10 +42,10 @@ public final class JetProjectViewUtil {
             List<KtDeclaration> declarations = classOrObject.getDeclarations();
             for (KtDeclaration declaration : declarations) {
                 if (declaration instanceof KtClassOrObject) {
-                    result.add(new JetClassOrObjectTreeNode(project, (KtClassOrObject) declaration, settings));
+                    result.add(new KtClassOrObjectTreeNode(project, (KtClassOrObject) declaration, settings));
                 }
                 else {
-                    result.add(new JetDeclarationTreeNode(project, declaration, settings));
+                    result.add(new KtDeclarationTreeNode(project, declaration, settings));
                 }
             }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java
similarity index 78%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.java
rename to idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java
index 6c6641d0639..5c8de6218c6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/JetClassOrObjectTreeNode.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtClassOrObjectTreeNode.java
@@ -23,17 +23,17 @@ import com.intellij.ide.projectView.impl.nodes.AbstractPsiBasedNode;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import org.jetbrains.kotlin.idea.JetIconProvider;
+import org.jetbrains.kotlin.idea.KotlinIconProvider;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
 import org.jetbrains.kotlin.psi.KtPsiUtil;
 
 import java.util.Collection;
 
-import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.canRepresentPsiElement;
-import static org.jetbrains.kotlin.idea.projectView.JetProjectViewUtil.getClassOrObjectChildren;
+import static org.jetbrains.kotlin.idea.projectView.KotlinProjectViewUtil.canRepresentPsiElement;
+import static org.jetbrains.kotlin.idea.projectView.KotlinProjectViewUtil.getClassOrObjectChildren;
 
-public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<KtClassOrObject> {
-    protected JetClassOrObjectTreeNode(Project project, KtClassOrObject ktClassOrObject, ViewSettings viewSettings) {
+public class KtClassOrObjectTreeNode extends AbstractPsiBasedNode<KtClassOrObject> {
+    protected KtClassOrObjectTreeNode(Project project, KtClassOrObject ktClassOrObject, ViewSettings viewSettings) {
         super(project, ktClassOrObject, viewSettings);
     }
 
@@ -61,13 +61,13 @@ public class JetClassOrObjectTreeNode extends AbstractPsiBasedNode<KtClassOrObje
             data.setPresentableText(classOrObject.getName());
 
             AbstractTreeNode parent = getParent();
-            if (JetIconProvider.getMainClass(classOrObject.getContainingJetFile()) != null) {
-                if (parent instanceof JetFileTreeNode) {
+            if (KotlinIconProvider.getMainClass(classOrObject.getContainingJetFile()) != null) {
+                if (parent instanceof KtFileTreeNode) {
                     update(parent.getParent());
                 }
             }
             else {
-                if (!(parent instanceof JetClassOrObjectTreeNode) && !(parent instanceof JetFileTreeNode)) {
+                if (!(parent instanceof KtClassOrObjectTreeNode) && !(parent instanceof KtFileTreeNode)) {
                     update(parent);
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
similarity index 89%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.java
rename to idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
index ecd0e97ae1f..da8452e4132 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/JetDeclarationTreeNode.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtDeclarationTreeNode.java
@@ -23,17 +23,17 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 import org.jetbrains.kotlin.psi.*;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public class JetDeclarationTreeNode extends AbstractPsiBasedNode<KtDeclaration> {
+public class KtDeclarationTreeNode extends AbstractPsiBasedNode<KtDeclaration> {
     public static final String CLASS_INITIALIZER = "<class initializer>";
 
-    protected JetDeclarationTreeNode(Project project, KtDeclaration ktDeclaration, ViewSettings viewSettings) {
+    protected KtDeclarationTreeNode(Project project, KtDeclaration ktDeclaration, ViewSettings viewSettings) {
         super(project, ktDeclaration, viewSettings);
     }
 
@@ -54,8 +54,8 @@ public class JetDeclarationTreeNode extends AbstractPsiBasedNode<KtDeclaration>
             String text = declaration instanceof KtClassInitializer ? CLASS_INITIALIZER : declaration.getName();
             if (text == null) return;
 
-            JetCodeStyleSettings settings = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings()
-                    .getCustomSettings(JetCodeStyleSettings.class);
+            KotlinCodeStyleSettings settings = CodeStyleSettingsManager.getInstance(getProject()).getCurrentSettings()
+                    .getCustomSettings(KotlinCodeStyleSettings.class);
 
             if (declaration instanceof KtProperty) {
                 KtProperty property = (KtProperty) declaration;
diff --git a/idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.java b/idea/src/org/jetbrains/kotlin/idea/projectView/KtFileTreeNode.java
similarity index 83%
rename from idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.java
rename to idea/src/org/jetbrains/kotlin/idea/projectView/KtFileTreeNode.java
index fde48149e2c..833d0087f19 100644
--- a/idea/src/org/jetbrains/kotlin/idea/projectView/JetFileTreeNode.java
+++ b/idea/src/org/jetbrains/kotlin/idea/projectView/KtFileTreeNode.java
@@ -29,8 +29,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public class JetFileTreeNode extends PsiFileNode {
-    public JetFileTreeNode(Project project, KtFile value, ViewSettings viewSettings) {
+public class KtFileTreeNode extends PsiFileNode {
+    public KtFileTreeNode(Project project, KtFile value, ViewSettings viewSettings) {
         super(project, value, viewSettings);
     }
 
@@ -46,10 +46,10 @@ public class JetFileTreeNode extends PsiFileNode {
 
             for (KtDeclaration declaration : declarations) {
                 if (declaration instanceof KtClassOrObject) {
-                    result.add(new JetClassOrObjectTreeNode(file.getProject(), (KtClassOrObject) declaration, getSettings()));
+                    result.add(new KtClassOrObjectTreeNode(file.getProject(), (KtClassOrObject) declaration, getSettings()));
                 }
                 else if (getSettings().isShowMembers()) {
-                    result.add(new JetDeclarationTreeNode(getProject(), declaration, getSettings()));
+                    result.add(new KtDeclarationTreeNode(getProject(), declaration, getSettings()));
                 }
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
index 1b89b6f284a..178c7a131f1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddConstModifierFix.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingIntention
 import org.jetbrains.kotlin.idea.search.allScope
 import org.jetbrains.kotlin.idea.search.usagesSearch.descriptor
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -54,7 +54,7 @@ public class AddConstModifierFix(val property: KtProperty) : AddModifierFix(prop
     }
 }
 
-public class AddConstModifierIntention : JetSelfTargetingIntention<KtProperty>(javaClass(), "Add 'const' modifier") {
+public class AddConstModifierIntention : SelfTargetingIntention<KtProperty>(javaClass(), "Add 'const' modifier") {
     override fun applyTo(element: KtProperty, editor: Editor) {
         AddConstModifierFix.addConstModifier(element)
     }
@@ -76,7 +76,7 @@ public class AddConstModifierIntention : JetSelfTargetingIntention<KtProperty>(j
 }
 
 
-public object ConstFixFactory : JetSingleIntentionActionFactory() {
+public object ConstFixFactory : KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic): IntentionAction? {
         val expr = diagnostic.psiElement as? KtReferenceExpression ?: return null
         val bindingContext = expr.analyze(BodyResolveMode.PARTIAL)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java
index fa9b4ba6408..ee42b92341b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtFunction;
 import org.jetbrains.kotlin.psi.KtPsiFactory;
@@ -40,13 +40,13 @@ public class AddFunctionBodyFix extends KotlinQuickFixAction<KtFunction> {
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("add.function.body");
+        return KotlinBundle.message("add.function.body");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("add.function.body");
+        return KotlinBundle.message("add.function.body");
     }
 
     @Override
@@ -67,8 +67,8 @@ public class AddFunctionBodyFix extends KotlinQuickFixAction<KtFunction> {
         getElement().replace(newElement);
     }
     
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public KotlinQuickFixAction createAction(Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
index 5cc442c687c..46b9988c4b9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt
@@ -111,7 +111,7 @@ class AddFunctionToSupertypeFix private constructor(
     private fun actionName(functionData: FunctionData)
             = "Add '${functionData.signaturePreview}' to '${functionData.targetClass.name}'"
 
-    companion object: JetSingleIntentionActionFactory() {
+    companion object: KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val function = diagnostic.psiElement as? KtNamedFunction ?: return null
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
index 5143fce27e4..22f0da5b26a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddGenericUpperBoundFix.kt
@@ -61,7 +61,7 @@ public class AddGenericUpperBoundFix(
         ShortenReferences.DEFAULT.process(insertedTypeReference)
     }
 
-    companion object Factory : JetIntentionActionsFactory() {
+    companion object Factory : KotlinIntentionActionsFactory() {
         override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
             return when (diagnostic.factory) {
                 Errors.UPPER_BOUND_VIOLATED -> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
index adf8a25c3fe..5cb8ca53d53 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddLoopLabelFix.kt
@@ -73,7 +73,7 @@ public class AddLoopLabelFix(loop: KtLoopExpression, val jumpExpression: KtEleme
         return result
     }
 
-    companion object: JetSingleIntentionActionFactory() {
+    companion object: KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val element = diagnostic.getPsiElement() as? KtElement
             assert(element is KtBreakExpression || element is KtContinueExpression)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
index 3e58f04cffc..287205f77f0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddModifierFix.kt
@@ -70,12 +70,12 @@ open class AddModifierFix(
             return "'$name'"
         }
 
-        fun createFactory(modifier: KtModifierKeywordToken): JetSingleIntentionActionFactory {
+        fun createFactory(modifier: KtModifierKeywordToken): KotlinSingleIntentionActionFactory {
             return createFactory(modifier, KtModifierListOwner::class.java)
         }
 
-        fun <T : KtModifierListOwner> createFactory(modifier: KtModifierKeywordToken, modifierOwnerClass: Class<T>): JetSingleIntentionActionFactory {
-            return object : JetSingleIntentionActionFactory() {
+        fun <T : KtModifierListOwner> createFactory(modifier: KtModifierKeywordToken, modifierOwnerClass: Class<T>): KotlinSingleIntentionActionFactory {
+            return object : KotlinSingleIntentionActionFactory() {
                 public override fun createAction(diagnostic: Diagnostic): IntentionAction? {
                     val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, modifierOwnerClass) ?: return null
 
@@ -87,7 +87,7 @@ open class AddModifierFix(
         }
     }
 
-    object MakeClassOpenFactory : JetSingleIntentionActionFactory() {
+    object MakeClassOpenFactory : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val typeReference = diagnostic.psiElement as KtTypeReference
             val bindingContext = typeReference.analyze(BodyResolveMode.PARTIAL)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
index 05542d471aa..95bf9c482f8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddNameToArgumentFix.kt
@@ -115,7 +115,7 @@ public class AddNameToArgumentFix(argument: KtValueArgument) : KotlinQuickFixAct
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val argument = diagnostic.psiElement.getParentOfType<KtValueArgument>(false) ?: return null
             return AddNameToArgumentFix(argument)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
index bb976cad202..a0832a1ad65 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOverrideToEqualsHashCodeToStringFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.project.PluginJetFilesProvider;
 import org.jetbrains.kotlin.psi.*;
@@ -44,13 +44,13 @@ public class AddOverrideToEqualsHashCodeToStringFix extends KotlinQuickFixAction
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("add.override.to.equals.hashCode.toString");
+        return KotlinBundle.message("add.override.to.equals.hashCode.toString");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("add.override.to.equals.hashCode.toString");
+        return KotlinBundle.message("add.override.to.equals.hashCode.toString");
     }
 
     @Override
@@ -95,8 +95,8 @@ public class AddOverrideToEqualsHashCodeToStringFix extends KotlinQuickFixAction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public AddOverrideToEqualsHashCodeToStringFix createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java
index e10a8f29e6d..c10b575f9bc 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java
@@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
@@ -44,7 +44,7 @@ public abstract class AddStarProjectionsFix extends KotlinQuickFixAction<KtUserT
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("add.star.projections", TypeReconstructionUtil.getTypeNameAndStarProjectionsString("", argumentCount));
+        return KotlinBundle.message("add.star.projections", TypeReconstructionUtil.getTypeNameAndStarProjectionsString("", argumentCount));
     }
 
     @NotNull
@@ -69,8 +69,8 @@ public abstract class AddStarProjectionsFix extends KotlinQuickFixAction<KtUserT
         return true;
     }
 
-    public static JetSingleIntentionActionFactory createFactoryForIsExpression() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForIsExpression() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public IntentionAction createAction(Diagnostic diagnostic) {
                 DiagnosticWithParameters2<KtTypeReference, Integer, String> diagnosticWithParameters =
@@ -86,8 +86,8 @@ public abstract class AddStarProjectionsFix extends KotlinQuickFixAction<KtUserT
         };
     }
 
-    public static JetSingleIntentionActionFactory createFactoryForJavaClass() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForJavaClass() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public IntentionAction createAction(Diagnostic diagnostic) {
                 DiagnosticWithParameters1<KtElement, Integer> diagnosticWithParameters = Errors.WRONG_NUMBER_OF_TYPE_ARGUMENTS.cast(diagnostic);
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeToLHSOfCallableReferenceFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeToLHSOfCallableReferenceFix.kt
index 3f197e7d414..c3045403037 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeToLHSOfCallableReferenceFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddTypeToLHSOfCallableReferenceFix.kt
@@ -47,7 +47,7 @@ class AddTypeToLHSOfCallableReferenceFix(
         ShortenReferences.DEFAULT.process(element)
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             return AddTypeToLHSOfCallableReferenceFix(diagnostic.psiElement.parent as KtCallableReferenceExpression)
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java
index aa76f5d3952..40d296bb91d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java
@@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.*;
 
 public class AddWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression> {
@@ -41,13 +41,13 @@ public class AddWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression>
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("add.when.else.branch.action");
+        return KotlinBundle.message("add.when.else.branch.action");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("add.when.else.branch.action.family.name");
+        return KotlinBundle.message("add.when.else.branch.action.family.name");
     }
 
     @Override
@@ -73,8 +73,8 @@ public class AddWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression>
         editor.getCaretModel().moveToOffset(textRange.getStartOffset() + indexOfOpenBrace + 1);
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public KotlinQuickFixAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
index d875848f77e..8b379528e2c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AutoImportFix.kt
@@ -32,7 +32,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Errors
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.actions.KotlinAddImportAction
 import org.jetbrains.kotlin.idea.actions.createGroupedImportsAction
 import org.jetbrains.kotlin.idea.actions.createSingleImportAction
@@ -85,9 +85,9 @@ internal abstract class AutoImportFixBase<T: KtExpression>(expression: T, val di
         return createAction(element.project, editor).showHint()
     }
 
-    override fun getText() = JetBundle.message("import.fix")
+    override fun getText() = KotlinBundle.message("import.fix")
 
-    override fun getFamilyName() = JetBundle.message("import.fix")
+    override fun getFamilyName() = KotlinBundle.message("import.fix")
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile)
             = super.isAvailable(project, editor, file) && suggestionCount > 0
@@ -218,7 +218,7 @@ internal class AutoImportFix(expression: KtSimpleNameExpression, diagnostic: Dia
 
     override fun getSupportedErrors() = ERRORS
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 (diagnostic.getPsiElement() as? KtSimpleNameExpression)?.let { AutoImportFix(it, diagnostic) }
 
@@ -236,7 +236,7 @@ internal class MissingInvokeAutoImportFix(expression: KtExpression, diagnostic:
 
     override fun getSupportedErrors() = ERRORS
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 (diagnostic.psiElement as? KtExpression)?.let { MissingInvokeAutoImportFix(it, diagnostic) }
 
@@ -261,7 +261,7 @@ internal class MissingArrayAccessorAutoImportFix(element: KtArrayAccessExpressio
 
     override fun getSupportedErrors() = ERRORS
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtArrayAccessExpression>? {
             assert(diagnostic.factory == Errors.NO_GET_METHOD || diagnostic.factory == Errors.NO_SET_METHOD)
 
@@ -301,7 +301,7 @@ internal class MissingDelegateAccessorsAutoImportFix(element: KtExpression, diag
 
     override fun getSupportedErrors() = ERRORS
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtExpression>? {
             assert(diagnostic.factory == Errors.DELEGATE_SPECIAL_FUNCTION_MISSING)
             return (diagnostic.psiElement as? KtExpression)?.let { MissingDelegateAccessorsAutoImportFix(it, listOf(diagnostic)) }
@@ -332,7 +332,7 @@ internal class MissingComponentsAutoImportFix(element: KtExpression, diagnostics
 
     override fun getSupportedErrors() = ERRORS
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtExpression>? {
             assert(diagnostic.factory == Errors.COMPONENT_FUNCTION_MISSING)
             return (diagnostic.psiElement as? KtExpression)?.let { MissingComponentsAutoImportFix(it, listOf(diagnostic)) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java
index d89ed21d66c..2e43e67b0cd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
@@ -47,7 +47,7 @@ public class CastExpressionFix extends KotlinQuickFixAction<KtExpression> {
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message(
+        return KotlinBundle.message(
                 "cast.expression.to.type",
                 getElement().getText(),
                 IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
@@ -57,7 +57,7 @@ public class CastExpressionFix extends KotlinQuickFixAction<KtExpression> {
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("cast.expression.family");
+        return KotlinBundle.message("cast.expression.family");
     }
 
     @Override
@@ -99,8 +99,8 @@ public class CastExpressionFix extends KotlinQuickFixAction<KtExpression> {
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForSmartCastImpossible() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForSmartCastImpossible() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -112,8 +112,8 @@ public class CastExpressionFix extends KotlinQuickFixAction<KtExpression> {
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForGenericVarianceConversion() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForGenericVarianceConversion() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java
index bcae45da277..0c7643f9eb2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java
@@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
@@ -52,7 +52,7 @@ public class ChangeAccessorTypeFix extends KotlinQuickFixAction<KtPropertyAccess
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message(
+        return KotlinBundle.message(
                 getElement().isGetter() ? "change.getter.type" : "change.setter.type",
                 IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type)
         );
@@ -61,7 +61,7 @@ public class ChangeAccessorTypeFix extends KotlinQuickFixAction<KtPropertyAccess
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.accessor.type");
+        return KotlinBundle.message("change.accessor.type");
     }
 
     @Override
@@ -84,8 +84,8 @@ public class ChangeAccessorTypeFix extends KotlinQuickFixAction<KtPropertyAccess
         ShortenReferences.DEFAULT.process(newTypeReference);
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtPropertyAccessor> createAction(@NotNull Diagnostic diagnostic) {
                 KtPropertyAccessor accessor = QuickFixUtil.getParentElementOfType(diagnostic, KtPropertyAccessor.class);
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java
index 05aa5a6802a..ec9510cbaa3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
@@ -116,13 +116,14 @@ public class ChangeFunctionLiteralReturnTypeFix extends KotlinQuickFixAction<KtF
         if (appropriateQuickFix != null) {
             return appropriateQuickFix.getText();
         }
-        return JetBundle.message("change.function.literal.return.type", IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type));
+        return KotlinBundle
+                .message("change.function.literal.return.type", IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type));
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.type.family");
+        return KotlinBundle.message("change.type.family");
     }
 
     @Override
@@ -144,8 +145,8 @@ public class ChangeFunctionLiteralReturnTypeFix extends KotlinQuickFixAction<KtF
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForExpectedOrAssignmentTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForExpectedOrAssignmentTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
index 488cc09f12d..e8cbaf40097 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
@@ -85,19 +85,19 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
 
         if (KotlinBuiltIns.isUnit(type) && getElement().hasBlockBody()) {
             return functionName == null ?
-                   JetBundle.message("remove.no.name.function.return.type") :
-                   JetBundle.message("remove.function.return.type", functionName);
+                   KotlinBundle.message("remove.no.name.function.return.type") :
+                   KotlinBundle.message("remove.function.return.type", functionName);
         }
         String renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
         return functionName == null ?
-               JetBundle.message("change.no.name.function.return.type", renderedType) :
-               JetBundle.message("change.function.return.type", functionName, renderedType);
+               KotlinBundle.message("change.no.name.function.return.type", renderedType) :
+               KotlinBundle.message("change.function.return.type", functionName, renderedType);
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.type.family");
+        return KotlinBundle.message("change.type.family");
     }
 
     @Override
@@ -134,8 +134,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForComponentFunctionReturnTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForComponentFunctionReturnTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -155,8 +155,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForHasNextFunctionTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForHasNextFunctionTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -177,8 +177,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForCompareToTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForCompareToTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -196,8 +196,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetIntentionActionsFactory createFactoryForReturnTypeMismatchOnOverride() {
-        return new JetIntentionActionsFactory() {
+    public static KotlinIntentionActionsFactory createFactoryForReturnTypeMismatchOnOverride() {
+        return new KotlinIntentionActionsFactory() {
             @NotNull
             @Override
             protected List<IntentionAction> doCreateActions(@NotNull Diagnostic diagnostic) {
@@ -238,8 +238,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForChangingReturnTypeToUnit() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForChangingReturnTypeToUnit() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -250,8 +250,8 @@ public class ChangeFunctionReturnTypeFix extends KotlinQuickFixAction<KtFunction
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForChangingReturnTypeToNothing() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForChangingReturnTypeToNothing() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
index 99782a8db07..76325d76ff0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.kt
@@ -78,7 +78,7 @@ class ChangeMemberFunctionSignatureFix private constructor(
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val function = diagnostic.psiElement as? KtNamedFunction ?: return null
             val signatures = computePossibleSignatures(function)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java
index 4c40e740436..2e15e6385c7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
 import org.jetbrains.kotlin.name.FqName;
@@ -53,14 +53,15 @@ public class ChangeParameterTypeFix extends KotlinQuickFixAction<KtParameter> {
     public String getText() {
         String renderedType = IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type);
         return isPrimaryConstructorParameter ?
-            JetBundle.message("change.primary.constructor.parameter.type", getElement().getName(), containingDeclarationName, renderedType) :
-            JetBundle.message("change.function.parameter.type", getElement().getName(), containingDeclarationName, renderedType);
+               KotlinBundle
+                       .message("change.primary.constructor.parameter.type", getElement().getName(), containingDeclarationName, renderedType) :
+               KotlinBundle.message("change.function.parameter.type", getElement().getName(), containingDeclarationName, renderedType);
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.type.family");
+        return KotlinBundle.message("change.type.family");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangePrivateTopLevelToInternalFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangePrivateTopLevelToInternalFix.kt
index 655ebc5c1ac..7848fc2ca5c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangePrivateTopLevelToInternalFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangePrivateTopLevelToInternalFix.kt
@@ -38,7 +38,7 @@ public class ChangePrivateTopLevelToInternalFix(element: KtModifierListOwner, pr
         element.addModifier(KtTokens.INTERNAL_KEYWORD)
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             @Suppress("UNCHECKED_CAST")
             val factory = diagnostic.factory as DiagnosticFactory3<*, DeclarationDescriptor, *, DeclarationDescriptor>
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java
index dc3b010d3df..9cc0930372d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.KtExpression;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtPsiFactoryKt;
@@ -35,13 +35,13 @@ public class ChangeToFunctionInvocationFix extends KotlinQuickFixAction<KtExpres
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("change.to.function.invocation");
+        return KotlinBundle.message("change.to.function.invocation");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.to.function.invocation");
+        return KotlinBundle.message("change.to.function.invocation");
     }
 
     @Override
@@ -50,8 +50,8 @@ public class ChangeToFunctionInvocationFix extends KotlinQuickFixAction<KtExpres
         getElement().replace(KtPsiFactoryKt.KtPsiFactory(file).createExpression(reference.getText() + "()"));
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtExpression> createAction(Diagnostic diagnostic) {
                 if (diagnostic.getPsiElement() instanceof KtExpression) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java
index ee510ef5753..aade2247cee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
@@ -36,13 +36,13 @@ public class ChangeToStarProjectionFix extends KotlinQuickFixAction<KtTypeElemen
     @Override
     public String getText() {
         String stars = TypeReconstructionUtil.getTypeNameAndStarProjectionsString("", getElement().getTypeArgumentsAsTypes().size());
-        return JetBundle.message("change.to.star.projection", stars);
+        return KotlinBundle.message("change.to.star.projection", stars);
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.to.star.projection.family");
+        return KotlinBundle.message("change.to.star.projection.family");
     }
 
     @Override
@@ -54,8 +54,8 @@ public class ChangeToStarProjectionFix extends KotlinQuickFixAction<KtTypeElemen
         }
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public IntentionAction createAction(Diagnostic diagnostic) {
                 KtBinaryExpressionWithTypeRHS expression = QuickFixUtil
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
index a44701c1278..8d4be68998b 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
 import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1;
 import org.jetbrains.kotlin.diagnostics.Errors;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
@@ -49,13 +49,13 @@ public class ChangeTypeFix extends KotlinQuickFixAction<KtTypeReference> {
     @Override
     public String getText() {
         String currentTypeText = getElement().getText();
-        return JetBundle.message("change.type", currentTypeText, QuickFixUtil.renderTypeWithFqNameOnClash(type, currentTypeText));
+        return KotlinBundle.message("change.type", currentTypeText, QuickFixUtil.renderTypeWithFqNameOnClash(type, currentTypeText));
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.type.family");
+        return KotlinBundle.message("change.type.family");
     }
 
     @Override
@@ -65,8 +65,8 @@ public class ChangeTypeFix extends KotlinQuickFixAction<KtTypeReference> {
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForExpectedParameterTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForExpectedParameterTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
index 62be0a8a0b3..2fc8021f867 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
@@ -45,7 +45,7 @@ public class ChangeVariableMutabilityFix(element: KtProperty, private val makeVa
     }
 
     companion object {
-        public val VAL_WITH_SETTER_FACTORY: JetSingleIntentionActionFactory = object: JetSingleIntentionActionFactory() {
+        public val VAL_WITH_SETTER_FACTORY: KotlinSingleIntentionActionFactory = object: KotlinSingleIntentionActionFactory() {
             override fun createAction(diagnostic: Diagnostic): IntentionAction? {
                 val accessor = diagnostic.getPsiElement() as KtPropertyAccessor
                 val property = accessor.getParent() as KtProperty
@@ -53,7 +53,7 @@ public class ChangeVariableMutabilityFix(element: KtProperty, private val makeVa
             }
         }
 
-        public val VAL_REASSIGNMENT_FACTORY: JetSingleIntentionActionFactory = object: JetSingleIntentionActionFactory() {
+        public val VAL_REASSIGNMENT_FACTORY: KotlinSingleIntentionActionFactory = object: KotlinSingleIntentionActionFactory() {
             override fun createAction(diagnostic: Diagnostic): IntentionAction? {
                 val propertyDescriptor = Errors.VAL_REASSIGNMENT.cast(diagnostic).getA()
                 val declaration = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor) as? KtProperty ?: return null
@@ -61,7 +61,7 @@ public class ChangeVariableMutabilityFix(element: KtProperty, private val makeVa
             }
         }
 
-        public val VAR_OVERRIDDEN_BY_VAL_FACTORY: JetSingleIntentionActionFactory = object: JetSingleIntentionActionFactory() {
+        public val VAR_OVERRIDDEN_BY_VAL_FACTORY: KotlinSingleIntentionActionFactory = object: KotlinSingleIntentionActionFactory() {
             override fun createAction(diagnostic: Diagnostic): IntentionAction? {
                 return ChangeVariableMutabilityFix(diagnostic.getPsiElement() as KtProperty, true)
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java
index 6037d3fd130..ef1cd60f2aa 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
@@ -64,13 +64,14 @@ public class ChangeVariableTypeFix extends KotlinQuickFixAction<KtVariableDeclar
         FqName fqName = getElement().getFqName();
         if (fqName != null) propertyName = fqName.asString();
 
-        return JetBundle.message("change.element.type", propertyName, IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type));
+        return KotlinBundle
+                .message("change.element.type", propertyName, IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(type));
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.type.family");
+        return KotlinBundle.message("change.type.family");
     }
 
     @Override
@@ -108,8 +109,8 @@ public class ChangeVariableTypeFix extends KotlinQuickFixAction<KtVariableDeclar
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactoryForComponentFunctionReturnTypeMismatch() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactoryForComponentFunctionReturnTypeMismatch() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
@@ -128,8 +129,8 @@ public class ChangeVariableTypeFix extends KotlinQuickFixAction<KtVariableDeclar
     }
 
     @NotNull
-    public static JetIntentionActionsFactory createFactoryForPropertyOrReturnTypeMismatchOnOverride() {
-        return new JetIntentionActionsFactory() {
+    public static KotlinIntentionActionsFactory createFactoryForPropertyOrReturnTypeMismatchOnOverride() {
+        return new KotlinIntentionActionsFactory() {
             @NotNull
             @Override
             protected List<IntentionAction> doCreateActions(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
index 699abec4d3f..5e3a3885fc3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.Visibilities;
 import org.jetbrains.kotlin.descriptors.Visibility;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.DescriptorUtilsKt;
 import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt;
@@ -46,13 +46,13 @@ public class ChangeVisibilityModifierFix extends KotlinQuickFixAction<KtDeclarat
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("change.visibility.modifier");
+        return KotlinBundle.message("change.visibility.modifier");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("change.visibility.modifier");
+        return KotlinBundle.message("change.visibility.modifier");
     }
 
     @Override
@@ -107,8 +107,8 @@ public class ChangeVisibilityModifierFix extends KotlinQuickFixAction<KtDeclarat
         return DescriptorUtilsKt.toKeywordToken(maxVisibility);
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtDeclaration> createAction(Diagnostic diagnostic) {
                 PsiElement element = diagnostic.getPsiElement();
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedFunctionConventionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedFunctionConventionFix.kt
index 8237b00bd39..f894b231469 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedFunctionConventionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/DeprecatedFunctionConventionFix.kt
@@ -42,7 +42,7 @@ class DeprecatedFunctionConventionFix(
         FilteredRenameProcessor(project, element, newName, false, false).run()
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val (functionDescriptor, newName) = when (diagnostic) {
                 is DiagnosticWithParameters3<*, *, *, *> -> Pair(diagnostic.a, diagnostic.c)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
index 538f57cc947..ffcc5538b15 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ExclExclCallFixes.kt
@@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -51,7 +51,7 @@ public abstract class ExclExclCallFix : IntentionAction {
 }
 
 public class RemoveExclExclCallFix(val psiElement: PsiElement) : ExclExclCallFix(), CleanupFix {
-    override fun getText(): String = JetBundle.message("remove.unnecessary.non.null.assertion")
+    override fun getText(): String = KotlinBundle.message("remove.unnecessary.non.null.assertion")
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean
         = super.isAvailable(project, editor, file) && getExclExclPostfixExpression() != null
@@ -72,14 +72,14 @@ public class RemoveExclExclCallFix(val psiElement: PsiElement) : ExclExclCallFix
         return null
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction
             = RemoveExclExclCallFix(diagnostic.getPsiElement())
     }
 }
 
 public class AddExclExclCallFix(val psiElement: PsiElement) : ExclExclCallFix() {
-    override fun getText() = JetBundle.message("introduce.non.null.assertion")
+    override fun getText() = KotlinBundle.message("introduce.non.null.assertion")
 
     override fun isAvailable(project: Project, editor: Editor?, file: PsiFile): Boolean
             = super.isAvailable(project, editor, file) &&
@@ -105,13 +105,13 @@ public class AddExclExclCallFix(val psiElement: PsiElement) : ExclExclCallFix()
         return null
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction
                 = AddExclExclCallFix(diagnostic.getPsiElement())
     }
 }
 
-object MissingIteratorExclExclFixFactory : JetSingleIntentionActionFactory() {
+object MissingIteratorExclExclFixFactory : KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic): IntentionAction? {
         val element = diagnostic.psiElement
         if (element !is KtExpression) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
index 45a24fd8ff3..b3c5d36b4c9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/InsertDelegationCallQuickfix.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.idea.quickfix.quickfixUtil.createIntentionForFirstParentOfType
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.calls.model.isReallySuccess
 
 
 public class InsertDelegationCallQuickfix(val isThis: Boolean, element: KtSecondaryConstructor) : KotlinQuickFixAction<KtSecondaryConstructor>(element) {
-    override fun getText() = JetBundle.message("insert.delegation.call", keywordToUse)
+    override fun getText() = KotlinBundle.message("insert.delegation.call", keywordToUse)
     override fun getFamilyName() = "Insert explicit delegation call"
 
     private val keywordToUse = if (isThis) "this" else "super"
@@ -60,7 +60,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: KtSecond
         return super.isAvailable(project, editor, file) && element.hasImplicitDelegationCall()
     }
 
-    object InsertThisDelegationCallFactory : JetSingleIntentionActionFactory() {
+    object InsertThisDelegationCallFactory : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) = diagnostic.createIntentionForFirstParentOfType<KtSecondaryConstructor> {
             secondaryConstructor ->
             if (secondaryConstructor.getContainingClassOrObject().getConstructorsCount() <= 1 ||
@@ -72,7 +72,7 @@ public class InsertDelegationCallQuickfix(val isThis: Boolean, element: KtSecond
         private fun KtClassOrObject.getConstructorsCount() = (descriptor as ClassDescriptor).getConstructors().size()
     }
 
-    object InsertSuperDelegationCallFactory : JetSingleIntentionActionFactory() {
+    object InsertSuperDelegationCallFactory : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val secondaryConstructor = diagnostic.getPsiElement().getNonStrictParentOfType<KtSecondaryConstructor>() ?: return null
             if (!secondaryConstructor.hasImplicitDelegationCall()) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt
index 0132cb05299..9c4ebd08878 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinAddOrderEntryActionFactory.kt
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.KtSimpleNameExpression
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
-public object KotlinAddOrderEntryActionFactory : JetIntentionActionsFactory() {
+public object KotlinAddOrderEntryActionFactory : KotlinIntentionActionsFactory() {
     override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
         val simpleExpression = diagnostic.psiElement as? KtSimpleNameExpression ?: return emptyList()
         val refElement = simpleExpression.getQualifiedElement()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
index f3a45ea5d47..a9be5d62381 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinIntentionActionFactoryWithDelegate.kt
@@ -51,7 +51,7 @@ abstract class KotlinSingleIntentionActionFactoryWithDelegate<E : KtElement, D :
     }
 }
 
-abstract class KotlinIntentionActionFactoryWithDelegate<E : KtElement, D : Any> : JetIntentionActionsFactory() {
+abstract class KotlinIntentionActionFactoryWithDelegate<E : KtElement, D : Any> : KotlinIntentionActionsFactory() {
     protected abstract fun getElementOfInterest(diagnostic: Diagnostic): E?
 
     protected abstract fun createFixes(
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinSingleIntentionActionFactory.kt
similarity index 91%
rename from idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt
rename to idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinSingleIntentionActionFactory.kt
index 0325e7a668d..d1dba733464 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/JetSingleIntentionActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/KotlinSingleIntentionActionFactory.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 
-public abstract class JetSingleIntentionActionFactory : JetIntentionActionsFactory() {
+public abstract class KotlinSingleIntentionActionFactory : KotlinIntentionActionsFactory() {
     protected abstract fun createAction(diagnostic: Diagnostic): IntentionAction?
 
     final override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> = createAction(diagnostic).singletonOrEmptyList()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java
index 0ebc4f415f6..d7b067f2a9f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeClassAnAnnotationClassFix.java
@@ -27,7 +27,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.references.ReferenceUtilKt;
 import org.jetbrains.kotlin.lexer.KtTokens;
@@ -71,13 +71,13 @@ public class MakeClassAnAnnotationClassFix extends KotlinQuickFixAction<KtAnnota
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("make.class.annotation.class", annotationClass.getName());
+        return KotlinBundle.message("make.class.annotation.class", annotationClass.getName());
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("make.class.annotation.class.family");
+        return KotlinBundle.message("make.class.annotation.class.family");
     }
 
     @Override
@@ -97,8 +97,8 @@ public class MakeClassAnAnnotationClassFix extends KotlinQuickFixAction<KtAnnota
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
index f4d0681b81f..2703768979c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MakeOverriddenMemberOpenFix.kt
@@ -86,7 +86,7 @@ public class MakeOverriddenMemberOpenFix(declaration: KtDeclaration) : KotlinQui
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
 
         private fun getAllDeclaredNonOverridableOverriddenDescriptors(
                 callableMemberDescriptor: CallableMemberDescriptor): Collection<CallableMemberDescriptor> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt
index c42ea1c8b5a..c1c31101e09 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MissingConstructorKeywordFix.kt
@@ -34,11 +34,11 @@ public class MissingConstructorKeywordFix(element: KtPrimaryConstructor) : Kotli
         element.addConstructorKeyword()
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? =
                 diagnostic.createIntentionForFirstParentOfType(::MissingConstructorKeywordFix)
 
-        public fun createWholeProjectFixFactory(): JetSingleIntentionActionFactory = createIntentionFactory {
+        public fun createWholeProjectFixFactory(): KotlinSingleIntentionActionFactory = createIntentionFactory {
             JetWholeProjectForEachElementOfTypeFix.createByPredicate<KtPrimaryConstructor>(
                     predicate = { it.getModifierList() != null && !it.hasConstructorKeyword() },
                     taskProcessor = { it.addConstructorKeyword() },
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveTypeParameterConstraintFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveTypeParameterConstraintFix.kt
index 175f692607b..e7b14b19dc8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveTypeParameterConstraintFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveTypeParameterConstraintFix.kt
@@ -51,7 +51,7 @@ class MoveTypeParameterConstraintFix(element: KtTypeParameter) : KotlinQuickFixA
         colon?.psi?.delete()
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val typeParameter = diagnostic.psiElement as? KtTypeParameter ?: return null
             return MoveTypeParameterConstraintFix(typeParameter)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java
index b7a616dbe8e..6d9ee914053 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.*;
 
 public class MoveWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression> {
@@ -37,13 +37,13 @@ public class MoveWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("move.when.else.branch.to.the.end.action");
+        return KotlinBundle.message("move.when.else.branch.to.the.end.action");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("move.when.else.branch.to.the.end.family.name");
+        return KotlinBundle.message("move.when.else.branch.to.the.end.family.name");
     }
 
     @Override
@@ -75,8 +75,8 @@ public class MoveWhenElseBranchFix extends KotlinQuickFixAction<KtWhenExpression
         editor.getCaretModel().moveToOffset(insertedWhenEntry.getTextOffset() + cursorOffset);
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public KotlinQuickFixAction createAction(Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java
index 7bce13519a5..b9c24c594b0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java
@@ -46,7 +46,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 //TODO: should use change signature to deal with cases of multiple overridden descriptors
-public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFactory {
+public class QuickFixFactoryForTypeMismatchError extends KotlinIntentionActionsFactory {
     private final static Logger LOG = Logger.getInstance(QuickFixFactoryForTypeMismatchError.class);
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
index 52c5c08fa3f..8a9dcba9a6c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
@@ -43,7 +43,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.POSITIONED_VALUE_A
 
 public class QuickFixRegistrar : QuickFixContributor {
     public override fun registerQuickFixes(quickFixes: QuickFixes) {
-        fun DiagnosticFactory<*>.registerFactory(vararg factory: JetIntentionActionsFactory) {
+        fun DiagnosticFactory<*>.registerFactory(vararg factory: KotlinIntentionActionsFactory) {
             quickFixes.register(this, *factory)
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java
index aff13eb5e1c..1ece0747e91 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionBodyFix.java
@@ -26,7 +26,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.KtExpression;
@@ -42,13 +42,13 @@ public class RemoveFunctionBodyFix extends KotlinQuickFixAction<KtFunction> {
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("remove.function.body");
+        return KotlinBundle.message("remove.function.body");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.function.body");
+        return KotlinBundle.message("remove.function.body");
     }
 
     @Override
@@ -88,8 +88,8 @@ public class RemoveFunctionBodyFix extends KotlinQuickFixAction<KtFunction> {
         return false;
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtFunction> createAction(Diagnostic diagnostic) {
                 KtFunction function = QuickFixUtil.getParentElementOfType(diagnostic, KtFunction.class);
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt
index 50b94375e94..db6ab6bb112 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveModifierFix.kt
@@ -67,8 +67,8 @@ public class RemoveModifierFix(
     }
 
     companion object {
-        public fun createRemoveModifierFromListOwnerFactory(modifier: KtModifierKeywordToken, isRedundant: Boolean = false): JetSingleIntentionActionFactory {
-            return object : JetSingleIntentionActionFactory() {
+        public fun createRemoveModifierFromListOwnerFactory(modifier: KtModifierKeywordToken, isRedundant: Boolean = false): KotlinSingleIntentionActionFactory {
+            return object : KotlinSingleIntentionActionFactory() {
                 override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? {
                     val modifierListOwner = QuickFixUtil.getParentElementOfType(diagnostic, javaClass<KtModifierListOwner>()) ?: return null
                     return RemoveModifierFix(modifierListOwner, modifier, isRedundant)
@@ -76,8 +76,8 @@ public class RemoveModifierFix(
             }
         }
 
-        public fun createRemoveModifierFactory(isRedundant: Boolean = false): JetSingleIntentionActionFactory {
-            return object : JetSingleIntentionActionFactory() {
+        public fun createRemoveModifierFactory(isRedundant: Boolean = false): KotlinSingleIntentionActionFactory {
+            return object : KotlinSingleIntentionActionFactory() {
                 override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? {
                     val psiElement = diagnostic.psiElement
                     val elementType = psiElement.node.elementType as? KtModifierKeywordToken ?: return null
@@ -87,8 +87,8 @@ public class RemoveModifierFix(
             }
         }
 
-        public fun createRemoveProjectionFactory(isRedundant: Boolean): JetSingleIntentionActionFactory {
-            return object : JetSingleIntentionActionFactory() {
+        public fun createRemoveProjectionFactory(isRedundant: Boolean): KotlinSingleIntentionActionFactory {
+            return object : KotlinSingleIntentionActionFactory() {
                 override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? {
                     val projection = diagnostic.psiElement as KtTypeProjection
                     val elementType = projection.projectionToken?.node?.elementType as? KtModifierKeywordToken ?: return null
@@ -97,8 +97,8 @@ public class RemoveModifierFix(
             }
         }
 
-        public fun createRemoveVarianceFactory(): JetSingleIntentionActionFactory {
-            return object : JetSingleIntentionActionFactory() {
+        public fun createRemoveVarianceFactory(): KotlinSingleIntentionActionFactory {
+            return object : KotlinSingleIntentionActionFactory() {
                 override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtModifierListOwner>? {
                     val psiElement = diagnostic.psiElement as KtTypeParameter
                     val modifier = when (psiElement.variance) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNameFromFunctionExpressionFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNameFromFunctionExpressionFix.kt
index bb03995d342..8809d69dad6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNameFromFunctionExpressionFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNameFromFunctionExpressionFix.kt
@@ -31,7 +31,7 @@ public class RemoveNameFromFunctionExpressionFix(element: KtNamedFunction) : Kot
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) = removeNameFromFunction(element)
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
 
         override fun createAction(diagnostic: Diagnostic) =
                 diagnostic.createIntentionForFirstParentOfType(::RemoveNameFromFunctionExpressionFix)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java
index 20d9d935ead..45b2aa25bb1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveNullableFix.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtNullableType;
@@ -43,18 +43,18 @@ public class RemoveNullableFix extends KotlinQuickFixAction<KtNullableType> {
     public String getText() {
         switch (typeOfError) {
             case REDUNDANT:
-                return JetBundle.message("remove.redundant.nullable");
+                return KotlinBundle.message("remove.redundant.nullable");
             case SUPERTYPE:
-                return JetBundle.message("remove.supertype.nullable");
+                return KotlinBundle.message("remove.supertype.nullable");
             default:
-                return JetBundle.message("remove.useless.nullable");
+                return KotlinBundle.message("remove.useless.nullable");
         }
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.nullable.family");
+        return KotlinBundle.message("remove.nullable.family");
     }
 
     @Override
@@ -64,8 +64,8 @@ public class RemoveNullableFix extends KotlinQuickFixAction<KtNullableType> {
         super.getElement().replace(type);
     }
 
-    public static JetSingleIntentionActionFactory createFactory(final NullableKind typeOfError) {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory(final NullableKind typeOfError) {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtNullableType> createAction(Diagnostic diagnostic) {
                 KtNullableType nullType = QuickFixUtil.getParentElementOfType(diagnostic, KtNullableType.class);
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java
index 849e19d7021..006b7258eb9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePartsFromPropertyFix.java
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention;
 import org.jetbrains.kotlin.psi.*;
@@ -74,13 +74,13 @@ public class RemovePartsFromPropertyFix extends KotlinQuickFixAction<KtProperty>
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("remove.parts.from.property", partsToRemove(removeGetter, removeSetter, removeInitializer));
+        return KotlinBundle.message("remove.parts.from.property", partsToRemove(removeGetter, removeSetter, removeInitializer));
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.parts.from.property.family");
+        return KotlinBundle.message("remove.parts.from.property.family");
     }
 
     @Override
@@ -120,8 +120,8 @@ public class RemovePartsFromPropertyFix extends KotlinQuickFixAction<KtProperty>
         }
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtProperty> createAction(Diagnostic diagnostic) {
                 PsiElement element = diagnostic.getPsiElement();
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java
index fecddce264e..5cff21cf66c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemovePsiElementSimpleFix.java
@@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.*;
@@ -49,7 +49,7 @@ public class RemovePsiElementSimpleFix extends KotlinQuickFixAction<PsiElement>
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.psi.element.family");
+        return KotlinBundle.message("remove.psi.element.family");
     }
 
     @Override
@@ -57,8 +57,8 @@ public class RemovePsiElementSimpleFix extends KotlinQuickFixAction<PsiElement>
         element.delete();
     }
 
-    public static JetSingleIntentionActionFactory createRemoveImportFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveImportFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
                 KtImportDirective directive = QuickFixUtil.getParentElementOfType(diagnostic, KtImportDirective.class);
@@ -67,48 +67,48 @@ public class RemovePsiElementSimpleFix extends KotlinQuickFixAction<PsiElement>
                     KtExpression exp = directive.getImportedReference();
                     if (exp != null) {
                         return new RemovePsiElementSimpleFix(directive,
-                                                             JetBundle.message("remove.conflicting.import", exp.getText()));
+                                                             KotlinBundle.message("remove.conflicting.import", exp.getText()));
                     }
                     return new RemovePsiElementSimpleFix(directive,
-                                                         JetBundle.message("remove.conflicting.import",""));
+                                                         KotlinBundle.message("remove.conflicting.import", ""));
                 }
             }
         };
     }
 
-    public static JetSingleIntentionActionFactory createRemoveSpreadFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveSpreadFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
                 PsiElement element = diagnostic.getPsiElement();
                 if ((element instanceof LeafPsiElement) && ((LeafPsiElement) element).getElementType() == KtTokens.MUL) {
-                    return new RemovePsiElementSimpleFix(element, JetBundle.message("remove.spread.sign"));
+                    return new RemovePsiElementSimpleFix(element, KotlinBundle.message("remove.spread.sign"));
                 }
                 else return null;
             }
         };
     }
 
-    public static JetSingleIntentionActionFactory createRemoveTypeArgumentsFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveTypeArgumentsFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
                 KtTypeArgumentList element = QuickFixUtil.getParentElementOfType(diagnostic, KtTypeArgumentList.class);
                 if (element == null) return null;
                 return new RemovePsiElementSimpleFix(element,
-                                                     JetBundle.message("remove.type.arguments"));
+                                                     KotlinBundle.message("remove.type.arguments"));
             }
         };
     }
 
-    public static JetSingleIntentionActionFactory createRemoveVariableFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveVariableFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<PsiElement> createAction(Diagnostic diagnostic) {
                 final KtProperty expression = QuickFixUtil.getParentElementOfType(diagnostic, KtProperty.class);
                 if (expression == null) return null;
                 return new RemovePsiElementSimpleFix(expression,
-                                                     JetBundle.message("remove.variable.action", (expression.getName()))) {
+                                                     KotlinBundle.message("remove.variable.action", (expression.getName()))) {
                     @Override
                     public void invoke(@NotNull Project project, Editor editor, KtFile file) throws IncorrectOperationException {
                         KtExpression initializer = expression.getInitializer();
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
index 5d0b7ce2cf0..e139f686d3c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveRightPartOfBinaryExpressionFix.java
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.psi.*;
 
@@ -42,7 +42,7 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends KtExpression> extend
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.right.part.of.binary.expression");
+        return KotlinBundle.message("remove.right.part.of.binary.expression");
     }
 
     @Override
@@ -70,8 +70,8 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends KtExpression> extend
         return newExpression;
     }
 
-    public static JetSingleIntentionActionFactory createRemoveTypeFromBinaryExpressionFactory(final String message) {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveTypeFromBinaryExpressionFactory(final String message) {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtBinaryExpressionWithTypeRHS> createAction(Diagnostic diagnostic) {
                 KtBinaryExpressionWithTypeRHS expression = QuickFixUtil.getParentElementOfType(diagnostic, KtBinaryExpressionWithTypeRHS.class);
@@ -81,12 +81,12 @@ public class RemoveRightPartOfBinaryExpressionFix<T extends KtExpression> extend
         };
     }
 
-    public static JetSingleIntentionActionFactory createRemoveElvisOperatorFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createRemoveElvisOperatorFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtBinaryExpression> createAction(Diagnostic diagnostic) {
                 KtBinaryExpression expression = (KtBinaryExpression) diagnostic.getPsiElement();
-                return new RemoveRightPartOfBinaryExpressionFix<KtBinaryExpression>(expression, JetBundle.message("remove.elvis.operator"));
+                return new RemoveRightPartOfBinaryExpressionFix<KtBinaryExpression>(expression, KotlinBundle.message("remove.elvis.operator"));
             }
         };
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java
index d3e3a12c8c2..9bcdc1942ce 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveSupertypeFix.java
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.KtDelegationSpecifier;
@@ -41,13 +41,13 @@ public class RemoveSupertypeFix extends KotlinQuickFixAction<KtDelegationSpecifi
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("remove.supertype", superClass.getText());
+        return KotlinBundle.message("remove.supertype", superClass.getText());
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.supertype.family");
+        return KotlinBundle.message("remove.supertype.family");
     }
 
     @Override
@@ -64,8 +64,8 @@ public class RemoveSupertypeFix extends KotlinQuickFixAction<KtDelegationSpecifi
         superClass.delete();
     }
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Override
             public KotlinQuickFixAction<KtDelegationSpecifier> createAction(Diagnostic diagnostic) {
                 KtDelegationSpecifier superClass = QuickFixUtil.getParentElementOfType(diagnostic, KtDelegationSpecifier.class);
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
index 31a249e8a65..e7f60ce3ff3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveUnusedFunctionParameterFix.kt
@@ -35,7 +35,7 @@ class RemoveUnusedFunctionParameterFix(parameter: KtParameter) : KotlinQuickFixA
         ChangeFunctionSignatureFix.runRemoveParameter(parameterDescriptor, element)
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): KotlinQuickFixAction<KtParameter> {
             return RemoveUnusedFunctionParameterFix(Errors.UNUSED_PARAMETER.cast(diagnostic).psiElement)
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
index 668cb5d77dc..bfb9f91a540 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
@@ -24,7 +24,7 @@ import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.KtFile;
 import org.jetbrains.kotlin.psi.KtParameter;
 import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
@@ -42,13 +42,13 @@ public class RemoveValVarFromParameterFix extends KotlinQuickFixAction<KtParamet
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("remove.val.var.from.parameter", varOrVal);
+        return KotlinBundle.message("remove.val.var.from.parameter", varOrVal);
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("remove.val.var.from.parameter", "val/var");
+        return KotlinBundle.message("remove.val.var.from.parameter", "val/var");
     }
 
     @Override
@@ -59,8 +59,8 @@ public class RemoveValVarFromParameterFix extends KotlinQuickFixAction<KtParamet
     }
 
 
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(@NotNull Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java
index 6594af7dc4a..84b27f3e297 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameParameterToMatchOverriddenMethodFix.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.VariableDescriptor;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
 import org.jetbrains.kotlin.psi.KtFile;
@@ -69,13 +69,13 @@ public class RenameParameterToMatchOverriddenMethodFix extends KotlinQuickFixAct
     @NotNull
     @Override
     public String getText() {
-        return JetBundle.message("rename.parameter.to.match.overridden.method");
+        return KotlinBundle.message("rename.parameter.to.match.overridden.method");
     }
 
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("rename.family");
+        return KotlinBundle.message("rename.family");
     }
 
     @Override
@@ -84,8 +84,8 @@ public class RenameParameterToMatchOverriddenMethodFix extends KotlinQuickFixAct
     }
 
     @NotNull
-    public static JetSingleIntentionActionFactory createFactory() {
-        return new JetSingleIntentionActionFactory() {
+    public static KotlinSingleIntentionActionFactory createFactory() {
+        return new KotlinSingleIntentionActionFactory() {
             @Nullable
             @Override
             public IntentionAction createAction(Diagnostic diagnostic) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
index 2b8fcf1237a..a158bee5d3d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RenameUnderscoreFix.kt
@@ -43,7 +43,7 @@ class RenameUnderscoreFix(declaration: KtDeclaration) : KotlinQuickFixAction<KtD
     override fun getText(): String = "Rename"
     override fun getFamilyName(): String = getText()
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val declaration = diagnostic.psiElement.getNonStrictParentOfType<KtDeclaration>() ?: return null
             if (diagnostic.psiElement == (declaration as? PsiNameIdentifierOwner)?.nameIdentifier) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt
index b254619eb27..07ed790f5c8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceCallFix.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.psi.*
 
 public abstract class ReplaceCallFix protected constructor(val psiElement: PsiElement) : IntentionAction {
@@ -64,18 +64,18 @@ public class ReplaceWithSafeCallFix(psiElement: PsiElement): ReplaceCallFix(psiE
     override val operation: String get() = "?."
     override val classToReplace: Class<out KtQualifiedExpression> get() = javaClass<KtDotQualifiedExpression>()
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction
                 = ReplaceWithSafeCallFix(diagnostic.getPsiElement())
     }
 }
 
 public class ReplaceWithDotCallFix(psiElement: PsiElement): ReplaceCallFix(psiElement), CleanupFix {
-    override fun getText(): String = JetBundle.message("replace.with.dot.call")
+    override fun getText(): String = KotlinBundle.message("replace.with.dot.call")
     override val operation: String get() = "."
     override val classToReplace: Class<out KtQualifiedExpression> get() = javaClass<KtSafeQualifiedExpression>()
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction
                 = ReplaceWithDotCallFix(diagnostic.getPsiElement())
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt
index fa8767df622..363f03eb1bd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceInfixCallFix.kt
@@ -40,7 +40,7 @@ public class ReplaceInfixCallFix(element: KtBinaryExpression) : KotlinQuickFixAc
 
     override fun startInWriteAction() = true
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val expression = diagnostic.psiElement.getNonStrictParentOfType<KtBinaryExpression>()!!
             if (expression.left == null || expression.right == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceJavaAnnotationPositionedArgumentsFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceJavaAnnotationPositionedArgumentsFix.kt
index 9415165d732..7f593bea41d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceJavaAnnotationPositionedArgumentsFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceJavaAnnotationPositionedArgumentsFix.kt
@@ -47,7 +47,7 @@ public class ReplaceJavaAnnotationPositionedArgumentsFix(element: KtAnnotationEn
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic) =
                 diagnostic.createIntentionForFirstParentOfType(::ReplaceJavaAnnotationPositionedArgumentsFix)
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt
index 3705710dfe2..ba22e3cd557 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceObsoleteLabelSyntaxFix.kt
@@ -35,7 +35,7 @@ public class ReplaceObsoleteLabelSyntaxFix(element: KtAnnotationEntry) : KotlinQ
 
     override fun invoke(project: Project, editor: Editor?, file: KtFile) = replaceWithLabel(element)
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val annotationEntry = diagnostic.getPsiElement().getNonStrictParentOfType<KtAnnotationEntry>() ?: return null
 
@@ -44,7 +44,7 @@ public class ReplaceObsoleteLabelSyntaxFix(element: KtAnnotationEntry) : KotlinQ
             return ReplaceObsoleteLabelSyntaxFix(annotationEntry)
         }
 
-        public fun createWholeProjectFixFactory(): JetSingleIntentionActionFactory = createIntentionFactory factory@ {
+        public fun createWholeProjectFixFactory(): KotlinSingleIntentionActionFactory = createIntentionFactory factory@ {
             diagnostic ->
 
             if (!(diagnostic.getPsiElement().getNonStrictParentOfType<KtAnnotationEntry>()?.looksLikeObsoleteLabelWithReferencesInCode()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java
index c923ad0d197..016893ad5f2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.psi.*;
 
 public abstract class ReplaceOperationInBinaryExpressionFix<T extends KtExpression> extends KotlinQuickFixAction<T> {
@@ -34,7 +34,7 @@ public abstract class ReplaceOperationInBinaryExpressionFix<T extends KtExpressi
     @NotNull
     @Override
     public String getFamilyName() {
-        return JetBundle.message("replace.operation.in.binary.expression");
+        return KotlinBundle.message("replace.operation.in.binary.expression");
     }
 
     @Override
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
index df9e4e744c2..62fab84d1b0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf
 import org.jetbrains.kotlin.utils.addIfNotNull
 import java.util.*
 
-public object SuperClassNotInitialized : JetIntentionActionsFactory() {
+public object SuperClassNotInitialized : KotlinIntentionActionsFactory() {
     private val DISPLAY_MAX_PARAMS = 5
 
     override fun doCreateActions(diagnostic: Diagnostic): List<IntentionAction> {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
index 5895b42b1bb..6411c2eb88d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/CreateFromUsageFixBase.kt
@@ -16,10 +16,10 @@
 
 package org.jetbrains.kotlin.idea.quickfix.createFromUsage
 
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.psi.KtElement
 
 public abstract class CreateFromUsageFixBase<T: KtElement>(element: T) : KotlinQuickFixAction<T>(element) {
-    override fun getFamilyName(): String = JetBundle.message("create.from.usage.family")
+    override fun getFamilyName(): String = KotlinBundle.message("create.from.usage.family")
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
index 641f79ee764..eca7711e320 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createClass/createClassUtils.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiPackage
 import org.jetbrains.kotlin.descriptors.*
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
 import org.jetbrains.kotlin.idea.core.refactoring.canRefactor
 import org.jetbrains.kotlin.idea.quickfix.DelegatingIntentionAction
@@ -125,7 +125,7 @@ internal fun KtSimpleNameExpression.getCreatePackageFixIfApplicable(targetParent
     val javaFix = CreateClassOrPackageFix.createFix(fullName, getResolveScope(), this, basePackage, null, null, null) ?: return null
 
     return object: DelegatingIntentionAction(javaFix) {
-        override fun getFamilyName(): String = JetBundle.message("create.from.usage.family")
+        override fun getFamilyName(): String = KotlinBundle.message("create.from.usage.family")
 
         override fun getText(): String = "Create package '${fullName}'"
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
index 50a8936d3b6..2c98cbbe0c7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt
@@ -20,10 +20,10 @@ import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
 import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase
 import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.*
 import org.jetbrains.kotlin.idea.util.application.executeCommand
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.Variance
 import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
 import java.util.*
 
-object CreateLocalVariableActionFactory: JetSingleIntentionActionFactory() {
+object CreateLocalVariableActionFactory: KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic): IntentionAction? {
         val refExpr = QuickFixUtil.getParentElementOfType(diagnostic, javaClass<KtSimpleNameExpression>()) ?: return null
         if (refExpr.getQualifiedElement() != refExpr) return null
@@ -49,7 +49,7 @@ object CreateLocalVariableActionFactory: JetSingleIntentionActionFactory() {
                 .firstOrNull() as? KtElement ?: return null
 
         return object: CreateFromUsageFixBase<KtSimpleNameExpression>(refExpr) {
-            override fun getText(): String = JetBundle.message("create.local.variable.from.usage", propertyName)
+            override fun getText(): String = KotlinBundle.message("create.local.variable.from.usage", propertyName)
 
             override fun invoke(project: Project, editor: Editor?, file: KtFile) {
                 val assignment = refExpr.getAssignmentByLHS()
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateTypeParameterListFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateTypeParameterListFix.kt
index a81d6cf9916..dd4a765cc0d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateTypeParameterListFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/migration/MigrateTypeParameterListFix.kt
@@ -22,7 +22,7 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtTypeParameterList
@@ -40,7 +40,7 @@ class MigrateTypeParameterListFix(typeParameterList: KtTypeParameterList)
         element.delete()
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val typeParameterList = diagnostic.psiElement as? KtTypeParameterList ?: return null
             return MigrateTypeParameterListFix(typeParameterList)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/quickfixUtil/quickfixUtil.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/quickfixUtil/quickfixUtil.kt
index 641b4a97fac..050db6ed730 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/quickfixUtil/quickfixUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/quickfixUtil/quickfixUtil.kt
@@ -20,7 +20,7 @@ import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.psi.KtPrimaryConstructor
 import org.jetbrains.kotlin.psi.KtPsiFactory
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
@@ -32,7 +32,7 @@ inline fun <reified T : PsiElement> Diagnostic.createIntentionForFirstParentOfTy
 
 fun createIntentionFactory(
     factory: (Diagnostic) -> IntentionAction?
-) = object : JetSingleIntentionActionFactory() {
+) = object : KotlinSingleIntentionActionFactory() {
     override fun createAction(diagnostic: Diagnostic) = factory(diagnostic)
 }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
index e70434dab06..42ab76ee668 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageFix.kt
@@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.core.targetDescriptors
 import org.jetbrains.kotlin.idea.quickfix.CleanupFix
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.quickfix.moveCaret
 import org.jetbrains.kotlin.psi.KtImportDirective
 import org.jetbrains.kotlin.psi.KtSimpleNameExpression
@@ -44,7 +44,7 @@ public class DeprecatedSymbolUsageFix(
         editor?.moveCaret(offset)
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         override fun createAction(diagnostic: Diagnostic): IntentionAction? {
             val (nameExpression, replacement) = DeprecatedSymbolUsageFixBase.extractDataFromDiagnostic(diagnostic) ?: return null
             return DeprecatedSymbolUsageFix(nameExpression, replacement)
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
index d68a7733028..b270d444f5a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/replaceWith/DeprecatedSymbolUsageInWholeProjectFix.kt
@@ -29,10 +29,10 @@ import com.intellij.psi.search.searches.ReferencesSearch
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.idea.core.targetDescriptors
-import org.jetbrains.kotlin.idea.quickfix.JetSingleIntentionActionFactory
+import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
@@ -67,7 +67,7 @@ public class DeprecatedSymbolUsageInWholeProjectFix(
                 object : Task.Modal(project, "Applying '$text'", true) {
                     override fun run(indicator: ProgressIndicator) {
                         val usages = runReadAction {
-                            val searchScope = JetSourceFilterScope.kotlinSources(GlobalSearchScope.projectScope(project), project)
+                            val searchScope = KotlinSourceFilterScope.kotlinSources(GlobalSearchScope.projectScope(project), project)
                             ReferencesSearch.search(psiElement, searchScope)
                                     .filterIsInstance<KtSimpleNameReference>()
                                     .map { ref -> ref.expression }
@@ -118,7 +118,7 @@ public class DeprecatedSymbolUsageInWholeProjectFix(
         }
     }
 
-    companion object : JetSingleIntentionActionFactory() {
+    companion object : KotlinSingleIntentionActionFactory() {
         //TODO: better rendering needed
         private val RENDERER = DescriptorRenderer.withOptions {
             modifiers = emptySet()
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
index 3ae9f91d641..04991923ab2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/CallableRefactoring.kt
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
@@ -78,10 +78,10 @@ public abstract class CallableRefactoring<T: CallableDescriptor>(
         val superString = superCallables.map {
             it.getContainingDeclaration().getName().asString()
         }.joinToString(prefix = "\n    ", separator = ",\n    ", postfix = ".\n\n")
-        val message = JetBundle.message("x.overrides.y.in.class.list",
-                                        DescriptorRenderer.COMPACT.render(callableFromEditor),
-                                        callableFromEditor.getContainingDeclaration().getName().asString(), superString,
-                                        "refactor")
+        val message = KotlinBundle.message("x.overrides.y.in.class.list",
+                                           DescriptorRenderer.COMPACT.render(callableFromEditor),
+                                           callableFromEditor.getContainingDeclaration().getName().asString(), superString,
+                                           "refactor")
         val title = IdeBundle.message("title.warning")!!
         val icon = Messages.getQuestionIcon()
         return Messages.showDialog(message, title, options.toTypedArray(), 0, icon)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
index 464a2f02cea..49cfbdb5d7a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/JetRefactoringUtil.java
@@ -36,14 +36,14 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightMethod;
+import org.jetbrains.kotlin.asJava.KtLightMethod;
 import org.jetbrains.kotlin.asJava.LightClassUtilsKt;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.CallableDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde;
@@ -147,12 +147,12 @@ public class JetRefactoringUtil {
         }
 
         String superClassesStr = "\n" + StringUtil.join(superClasses, "");
-        String message = JetBundle.message(
+        String message = KotlinBundle.message(
                 "x.overrides.y.in.class.list",
                 DescriptorRenderer.COMPACT_WITH_SHORT_TYPES.render(declarationDescriptor),
                 IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(declarationDescriptor.getContainingDeclaration()),
                 superClassesStr,
-                JetBundle.message(actionStringKey)
+                KotlinBundle.message(actionStringKey)
         );
 
         int exitCode = Messages.showYesNoCancelDialog(declaration.getProject(), message, IdeBundle.message("title.warning"), Messages.getQuestionIcon());
@@ -270,7 +270,7 @@ public class JetRefactoringUtil {
             }
 
             String message =
-                    JetBundle.message("delete.param.in.method.hierarchy", formatJavaOrLightMethod(method));
+                    KotlinBundle.message("delete.param.in.method.hierarchy", formatJavaOrLightMethod(method));
             int exitCode = Messages.showOkCancelDialog(
                     parameter.getProject(), message, IdeBundle.message("title.warning"), Messages.getQuestionIcon()
             );
@@ -316,8 +316,8 @@ public class JetRefactoringUtil {
     private static void addParameter(@NotNull PsiMethod method, @NotNull Set<PsiElement> result, @NotNull PsiParameter parameter) {
         int parameterIndex = JetPsiUtilKt.parameterIndex(LightClassUtilsKt.getUnwrapped(parameter));
 
-        if (method instanceof KotlinLightMethod) {
-            KtDeclaration declaration = ((KotlinLightMethod) method).getOrigin();
+        if (method instanceof KtLightMethod) {
+            KtDeclaration declaration = ((KtLightMethod) method).getOrigin();
             if (declaration instanceof KtFunction) {
                 result.add(((KtFunction) declaration).getValueParameters().get(parameterIndex));
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
index 38242dd71bb..165c63a1dba 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
@@ -21,7 +21,7 @@ import com.intellij.psi.search.searches.OverridingMethodsSearch
 import com.intellij.refactoring.changeSignature.MethodDescriptor
 import com.intellij.refactoring.changeSignature.OverriderUsageInfo
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.descriptors.*
@@ -112,7 +112,7 @@ public class JetChangeSignatureData(
                 OverridingMethodsSearch
                         .search(baseMethod)
                         .map { overridingMethod ->
-                            if (overridingMethod is KotlinLightMethod) {
+                            if (overridingMethod is KtLightMethod) {
                                 val overridingDeclaration = overridingMethod.namedUnwrappedElement as KtNamedDeclaration
                                 val overridingDescriptor = overridingDeclaration.resolveToDescriptor() as CallableDescriptor
                                 JetCallableDefinitionUsage<PsiElement>(overridingDeclaration, overridingDescriptor, primaryFunction, null)
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt
index dcdde15bbd8..a0bcebe288f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.kt
@@ -35,7 +35,7 @@ import com.intellij.refactoring.util.TextOccurrencesUtil
 import com.intellij.usageView.UsageInfo
 import com.intellij.util.containers.HashSet
 import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightMethods
 import org.jetbrains.kotlin.descriptors.*
@@ -45,7 +45,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.getJavaMethodDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
-import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver
+import org.jetbrains.kotlin.idea.codeInsight.KotlinFileReferencesResolver
 import org.jetbrains.kotlin.idea.core.compareDescriptors
 import org.jetbrains.kotlin.idea.core.refactoring.createTempCopy
 import org.jetbrains.kotlin.idea.core.refactoring.isTrueJavaMethod
@@ -507,7 +507,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
         // Delete OverriderUsageInfo and CallerUsageInfo for Kotlin declarations since they can't be processed correctly
         // TODO (OverriderUsageInfo only): Drop when OverriderUsageInfo.getElement() gets deleted
         val usageInfos = refUsages.get()
-        val adjustedUsages = usageInfos.filterNot { getOverriderOrCaller(it) is KotlinLightMethod }
+        val adjustedUsages = usageInfos.filterNot { getOverriderOrCaller(it) is KtLightMethod }
         if (adjustedUsages.size < usageInfos.size) {
             refUsages.set(adjustedUsages.toTypedArray())
         }
@@ -680,7 +680,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
             callable: PsiElement,
             newReceiverInfo: JetParameterInfo?) {
         if (newReceiverInfo != null && (callable is KtNamedFunction) && callable.bodyExpression != null) {
-            val noReceiverRefToContext = JetFileReferencesResolver.resolve(callable, true, true).filter {
+            val noReceiverRefToContext = KotlinFileReferencesResolver.resolve(callable, true, true).filter {
                 val resolvedCall = it.key.getResolvedCall(it.value)
                 resolvedCall != null && !resolvedCall.dispatchReceiver.exists() && !resolvedCall.extensionReceiver.exists()
             }
@@ -818,7 +818,7 @@ class JetChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
                     }
                     if (usage is OverriderUsageInfo && usage.isOriginalOverrider) {
                         val overridingMethod = usage.overridingMethod
-                        if (overridingMethod != null && overridingMethod !is KotlinLightMethod) {
+                        if (overridingMethod != null && overridingMethod !is KtLightMethod) {
                             nullabilityPropagator.processMethod(overridingMethod)
                         }
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
index 3390a00cdb3..9d4a0ee341a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractableCodeDescriptor.kt
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.references.mainReference
 import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
 import org.jetbrains.kotlin.idea.util.isAnnotatedNotNull
 import org.jetbrains.kotlin.idea.util.isAnnotatedNullable
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
 import org.jetbrains.kotlin.incremental.components.NoLookupLocation
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.psi.*
@@ -422,7 +422,7 @@ data class ExtractionGeneratorConfiguration(
 data class ExtractionResult(
         val config: ExtractionGeneratorConfiguration,
         val declaration: KtNamedDeclaration,
-        val duplicateReplacers: Map<JetPsiRange, () -> Unit>,
+        val duplicateReplacers: Map<KotlinPsiRange, () -> Unit>,
         val nameByOffset: Map<Int, KtElement>
 )
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
index c67c5028125..abc2bed0b6f 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/ExtractionData.kt
@@ -25,11 +25,11 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
-import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver
+import org.jetbrains.kotlin.idea.codeInsight.KotlinFileReferencesResolver
 import org.jetbrains.kotlin.idea.core.compareDescriptors
 import org.jetbrains.kotlin.idea.core.refactoring.getContextForContainingDeclarationBody
 import org.jetbrains.kotlin.idea.util.getResolutionScope
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.getQualifiedExpressionForSelector
 import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
@@ -78,7 +78,7 @@ data class ResolvedReferenceInfo(
 
 data class ExtractionData(
         val originalFile: KtFile,
-        val originalRange: JetPsiRange,
+        val originalRange: KotlinPsiRange,
         val targetSibling: PsiElement,
         val duplicateContainer: PsiElement? = null,
         val options: ExtractionOptions = ExtractionOptions.DEFAULT
@@ -192,7 +192,7 @@ data class ExtractionData(
         val startOffset = body.getBlockContentOffset()
 
         val referencesInfo = ArrayList<ResolvedReferenceInfo>()
-        val refToContextMap = JetFileReferencesResolver.resolve(body)
+        val refToContextMap = KotlinFileReferencesResolver.resolve(body)
         for ((ref, context) in refToContextMap) {
             if (ref !is KtSimpleNameExpression) continue
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
index 5c243628274..254da240998 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/duplicateUtil.kt
@@ -16,7 +16,7 @@
 
 package org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine
 
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.ui.Messages
 import com.intellij.openapi.project.Project
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import com.intellij.refactoring.util.duplicates.MethodDuplicatesHandler
 import com.intellij.refactoring.RefactoringBundle
 
-public fun JetPsiRange.highlight(project: Project, editor: Editor): RangeHighlighter? {
+public fun KotlinPsiRange.highlight(project: Project, editor: Editor): RangeHighlighter? {
     val textRange = getTextRange()
     val highlighters = ArrayList<RangeHighlighter>()
     val attributes = EditorColorsManager.getInstance().getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES)!!
@@ -46,7 +46,7 @@ public fun JetPsiRange.highlight(project: Project, editor: Editor): RangeHighlig
     return highlighters.firstOrNull()
 }
 
-public fun JetPsiRange.preview(project: Project, editor: Editor): RangeHighlighter? {
+public fun KotlinPsiRange.preview(project: Project, editor: Editor): RangeHighlighter? {
     return highlight(project, editor)?.let {
         val startOffset = getTextRange().getStartOffset()
         val foldedRegions =
@@ -63,7 +63,7 @@ public fun JetPsiRange.preview(project: Project, editor: Editor): RangeHighlight
 }
 
 public fun processDuplicates(
-        duplicateReplacers: Map<JetPsiRange, () -> Unit>,
+        duplicateReplacers: Map<KotlinPsiRange, () -> Unit>,
         project: Project,
         editor: Editor
 ) {
@@ -114,7 +114,7 @@ public fun processDuplicates(
     }
 }
 
-public fun processDuplicatesSilently(duplicateReplacers: Map<JetPsiRange, () -> Unit>, project: Project) {
+public fun processDuplicatesSilently(duplicateReplacers: Map<KotlinPsiRange, () -> Unit>, project: Project) {
     project.executeWriteCommand(MethodDuplicatesHandler.REFACTORING_NAME) {
         duplicateReplacers.values().forEach { it() }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
index fa750ecb077..ec24b94828a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractorUtil.kt
@@ -33,9 +33,9 @@ import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputVa
 import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.OutputValueBoxer.AsTuple
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.ShortenReferences
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange.Match
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.StronglyMatched
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.WeaklyMatched
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnifierParameter
@@ -147,7 +147,7 @@ fun createNameCounterpartMap(from: KtElement, to: KtElement): Map<KtSimpleNameEx
 }
 
 class DuplicateInfo(
-        val range: JetPsiRange,
+        val range: KotlinPsiRange,
         val controlFlow: ControlFlow,
         val arguments: List<String>
 )
@@ -202,7 +202,7 @@ fun ExtractableCodeDescriptor.findDuplicates(): List<DuplicateInfo> {
 
     val unifierParameters = parameters.map { UnifierParameter(it.originalDescriptor, it.getParameterType(extractionData.options.allowSpecialClassNames)) }
 
-    val unifier = JetPsiUnifier(unifierParameters, true)
+    val unifier = KotlinPsiUnifier(unifierParameters, true)
 
     val scopeElement = getOccurrenceContainer() ?: return Collections.emptyList()
     val originalTextRange = extractionData.originalRange.getTextRange()
@@ -227,7 +227,7 @@ private fun makeCall(
         extractableDescriptor: ExtractableCodeDescriptor,
         declaration: KtNamedDeclaration,
         controlFlow: ControlFlow,
-        rangeToReplace: JetPsiRange,
+        rangeToReplace: KotlinPsiRange,
         arguments: List<String>) {
     fun insertCall(anchor: PsiElement, wrappedCall: KtExpression) {
         val firstExpression = rangeToReplace.elements.firstOrNull { it is KtExpression } as? KtExpression
@@ -253,7 +253,7 @@ private fun makeCall(
         anchor.replace(wrappedCall)
     }
 
-    if (rangeToReplace !is JetPsiRange.ListRange) return
+    if (rangeToReplace !is KotlinPsiRange.ListRange) return
 
     val anchor = rangeToReplace.startElement
     val anchorParent = anchor.getParent()!!
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 0c43de6f035..9ca30e0f3e3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -51,8 +51,8 @@ import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.application.executeCommand
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
 import org.jetbrains.kotlin.idea.util.approximateWithResolvableType
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.*
@@ -66,7 +66,7 @@ import java.util.*
 import kotlin.test.fail
 
 public data class IntroduceParameterDescriptor(
-        val originalRange: JetPsiRange,
+        val originalRange: KotlinPsiRange,
         val callable: KtNamedDeclaration,
         val callableDescriptor: FunctionDescriptor,
         val newParameterName: String,
@@ -74,11 +74,11 @@ public data class IntroduceParameterDescriptor(
         val newArgumentValue: KtExpression,
         val withDefaultValue: Boolean,
         val parametersUsages: MultiMap<KtElement, KtElement>,
-        val occurrencesToReplace: List<JetPsiRange>,
+        val occurrencesToReplace: List<KotlinPsiRange>,
         val parametersToRemove: List<KtElement> = getParametersToRemove(withDefaultValue, parametersUsages, occurrencesToReplace),
-        val occurrenceReplacer: IntroduceParameterDescriptor.(JetPsiRange) -> Unit = {}
+        val occurrenceReplacer: IntroduceParameterDescriptor.(KotlinPsiRange) -> Unit = {}
 ) {
-    val originalOccurrence: JetPsiRange
+    val originalOccurrence: KotlinPsiRange
         get() = occurrencesToReplace.first { it.getTextRange().intersects(originalRange.getTextRange()) }
     val valVar: JetValVar
 
@@ -107,7 +107,7 @@ public data class IntroduceParameterDescriptor(
 fun getParametersToRemove(
         withDefaultValue: Boolean,
         parametersUsages: MultiMap<KtElement, KtElement>,
-        occurrencesToReplace: List<JetPsiRange>
+        occurrencesToReplace: List<KotlinPsiRange>
 ): List<KtElement> {
     if (withDefaultValue) return Collections.emptyList()
 
@@ -244,7 +244,7 @@ public open class KotlinIntroduceParameterHandler(
                     Collections.emptyList()
                 }
         val occurrencesToReplace = expression.toRange()
-                .match(body, JetPsiUnifier.DEFAULT)
+                .match(body, KotlinPsiUnifier.DEFAULT)
                 .filterNot {
                     val textRange = it.range.getTextRange()
                     forbiddenRanges.any { it.intersects(textRange) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
index 970d7715d5d..88c357a31e3 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
@@ -36,7 +36,6 @@ import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.analyzer.AnalysisResult;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.idea.analysis.AnalyzerUtilKt;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
@@ -54,9 +53,9 @@ import org.jetbrains.kotlin.idea.resolve.ResolutionFacade;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
 import org.jetbrains.kotlin.idea.util.ScopeUtils;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange;
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRangeKt;
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier;
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange;
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRangeKt;
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt;
@@ -524,11 +523,11 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
 
     private static List<KtExpression> findOccurrences(PsiElement occurrenceContainer, @NotNull KtExpression originalExpression) {
         return CollectionsKt.map(
-                JetPsiRangeKt.toRange(originalExpression).match(occurrenceContainer, JetPsiUnifier.DEFAULT),
-                new Function1<JetPsiRange.Match, KtExpression>() {
+                KotlinPsiRangeKt.toRange(originalExpression).match(occurrenceContainer, KotlinPsiUnifier.DEFAULT),
+                new Function1<KotlinPsiRange.Match, KtExpression>() {
                     @Override
-                    public KtExpression invoke(JetPsiRange.Match match) {
-                        PsiElement candidate = ((JetPsiRange.ListRange) match.getRange()).getStartElement();
+                    public KtExpression invoke(KotlinPsiRange.Match match) {
+                        PsiElement candidate = ((KotlinPsiRange.ListRange) match.getRange()).getStartElement();
                         if (candidate instanceof KtExpression) return (KtExpression) candidate;
                         if (candidate instanceof KtStringTemplateEntryWithExpression)
                             return ((KtStringTemplateEntryWithExpression) candidate).getExpression();
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
index 07d3de708e6..b7777ee8205 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/jetRefactoringUtil.kt
@@ -56,7 +56,7 @@ import com.intellij.refactoring.util.RefactoringUIUtil
 import com.intellij.ui.components.JBList
 import com.intellij.util.VisibilityUtil
 import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -424,7 +424,7 @@ public fun chooseContainerElementIfNecessary<T>(
     }
 }
 
-public fun PsiElement.isTrueJavaMethod(): Boolean = this is PsiMethod && this !is KotlinLightMethod
+public fun PsiElement.isTrueJavaMethod(): Boolean = this is PsiMethod && this !is KtLightMethod
 
 public fun PsiElement.canRefactor(): Boolean {
     return when {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt
index c356c71e61d..cd32bf29e05 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinMemberSelectionTable.kt
@@ -20,7 +20,7 @@ import com.intellij.icons.AllIcons
 import com.intellij.refactoring.classMembers.MemberInfoModel
 import com.intellij.refactoring.ui.AbstractMemberSelectionTable
 import com.intellij.ui.RowIcon
-import org.jetbrains.kotlin.idea.JetIconProvider
+import org.jetbrains.kotlin.idea.KotlinIconProvider
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.KtNamedDeclaration
 import org.jetbrains.kotlin.psi.KtNamedFunction
@@ -61,7 +61,7 @@ public class KotlinMemberSelectionTable(
     }
 
     override fun setVisibilityIcon(memberInfo: KotlinMemberInfo, icon: RowIcon) {
-        icon.setIcon(JetIconProvider.getVisibilityIcon(memberInfo.member.modifierList), 1);
+        icon.setIcon(KotlinIconProvider.getVisibilityIcon(memberInfo.member.modifierList), 1);
     }
 
     override fun getOverrideIcon(memberInfo: KotlinMemberInfo): Icon? {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
index 5f056e5e0ae..d5b79b4d4dd 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageIntention.kt
@@ -25,13 +25,13 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils
 import org.jetbrains.kotlin.idea.core.refactoring.hasIdentifiersOnly
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.FqNameUnsafe
 import org.jetbrains.kotlin.psi.KtPackageDirective
 
-public class ChangePackageIntention: JetSelfTargetingOffsetIndependentIntention<KtPackageDirective>(javaClass(), "Change package") {
+public class ChangePackageIntention: SelfTargetingOffsetIndependentIntention<KtPackageDirective>(javaClass(), "Change package") {
     companion object {
         private val PACKAGE_NAME_VAR = "PACKAGE_NAME"
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageToMatchDirectoryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageToMatchDirectoryIntention.kt
index 025125ae9c1..0dc42ab17c9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageToMatchDirectoryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/ChangePackageToMatchDirectoryIntention.kt
@@ -20,10 +20,10 @@ import com.intellij.openapi.editor.Editor
 import org.jetbrains.kotlin.idea.core.getFqNameByDirectory
 import org.jetbrains.kotlin.idea.core.packageMatchesDirectory
 import org.jetbrains.kotlin.idea.core.refactoring.hasIdentifiersOnly
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
 import org.jetbrains.kotlin.psi.KtPackageDirective
 
-public class ChangePackageToMatchDirectoryIntention : JetSelfTargetingOffsetIndependentIntention<KtPackageDirective>(
+public class ChangePackageToMatchDirectoryIntention : SelfTargetingOffsetIndependentIntention<KtPackageDirective>(
         KtPackageDirective::class.java, "", "Change file's package to match directory"
 ) {
     override fun isApplicableTo(element: KtPackageDirective): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/MoveFileToPackageMatchingDirectoryIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/MoveFileToPackageMatchingDirectoryIntention.kt
index 3b6880de758..324e49dc7d5 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/MoveFileToPackageMatchingDirectoryIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/changePackage/MoveFileToPackageMatchingDirectoryIntention.kt
@@ -25,11 +25,11 @@ import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackages
 import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesUtil
 import com.intellij.refactoring.util.RefactoringMessageUtil
 import org.jetbrains.kotlin.idea.core.refactoring.canRefactor
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingOffsetIndependentIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingOffsetIndependentIntention
 import org.jetbrains.kotlin.psi.KtPackageDirective
 import org.jetbrains.kotlin.idea.core.packageMatchesDirectory
 
-public class MoveFileToPackageMatchingDirectoryIntention : JetSelfTargetingOffsetIndependentIntention<KtPackageDirective>(
+public class MoveFileToPackageMatchingDirectoryIntention : SelfTargetingOffsetIndependentIntention<KtPackageDirective>(
         javaClass(), "", "Move file to package-matching directory"
 ) {
     override fun isApplicableTo(element: KtPackageDirective): Boolean {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt
index 348aa9e8253..cc3b8eb4ea7 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveDeclarationToSeparateFileIntention.kt
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.TextRange
 import com.intellij.refactoring.move.MoveCallback
 import com.intellij.refactoring.util.CommonRefactoringUtil
 import org.jetbrains.kotlin.idea.core.refactoring.createKotlinFile
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.quickfix.moveCaret
 import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.ui.MoveKotlinTopLevelDeclarationsDialog
 import org.jetbrains.kotlin.lexer.KtTokens
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
 import org.jetbrains.kotlin.psi.psiUtil.startOffset
 
 public class MoveDeclarationToSeparateFileIntention :
-        JetSelfTargetingRangeIntention<KtClassOrObject>(KtClassOrObject::class.java, "Move declaration to separate file"),
+        SelfTargetingRangeIntention<KtClassOrObject>(KtClassOrObject::class.java, "Move declaration to separate file"),
         LowPriorityAction {
     override fun applicabilityRange(element: KtClassOrObject): TextRange? {
         if (element.name == null) return null
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
index d6cf65d1994..d847ca7636c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt
@@ -39,11 +39,11 @@ import com.intellij.util.VisibilityUtil
 import com.intellij.util.containers.MultiMap
 import gnu.trove.THashMap
 import gnu.trove.TObjectHashingStrategy
-import org.jetbrains.kotlin.asJava.KotlinLightElement
+import org.jetbrains.kotlin.asJava.KtLightElement
 import org.jetbrains.kotlin.asJava.namedUnwrappedElement
 import org.jetbrains.kotlin.asJava.toLightElements
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
-import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver
+import org.jetbrains.kotlin.idea.codeInsight.KotlinFileReferencesResolver
 import org.jetbrains.kotlin.idea.codeInsight.shorten.addToShorteningWaitSet
 import org.jetbrains.kotlin.idea.core.deleteSingle
 import org.jetbrains.kotlin.idea.core.getPackage
@@ -186,7 +186,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
 
             val declarationToReferenceTargets = HashMap<KtNamedDeclaration, MutableSet<PsiElement>>()
             for (declaration in elementsToMove) {
-                val referenceToContext = JetFileReferencesResolver.resolve(element = declaration, resolveQualifiers = false)
+                val referenceToContext = KotlinFileReferencesResolver.resolve(element = declaration, resolveQualifiers = false)
                 for ((refExpr, bindingContext) in referenceToContext) {
                     val refTarget = bindingContext[BindingContext.REFERENCE_TARGET, refExpr]?.let { descriptor ->
                         DescriptorToSourceUtilsIde.getAnyDeclaration(declaration.getProject(), descriptor)
@@ -274,7 +274,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
                         override fun equals(e1: PsiElement?, e2: PsiElement?): Boolean {
                             if (e1 === e2) return true
                             // Name should be enough to distinguish different light elements based on the same original declaration
-                            if (e1 is KotlinLightElement<*, *> && e2 is KotlinLightElement<*, *>) {
+                            if (e1 is KtLightElement<*, *> && e2 is KtLightElement<*, *>) {
                                 return e1.getOrigin() == e2.getOrigin() && e1.name == e2.name
                             }
                             return e1 == e2
@@ -283,7 +283,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(
                         override fun computeHashCode(e: PsiElement?): Int {
                             return when (e) {
                                 null -> 0
-                                is KotlinLightElement<*, *> -> e.getOrigin().hashCode()*31 + (e.name?.hashCode() ?: 0)
+                                is KtLightElement<*, *> -> e.getOrigin().hashCode() * 31 + (e.name?.hashCode() ?: 0)
                                 else -> e.hashCode()
                             }
                         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
index d1f77cf4eea..762fe8ceb77 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
 import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
-import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver
+import org.jetbrains.kotlin.idea.codeInsight.KotlinFileReferencesResolver
 import org.jetbrains.kotlin.idea.core.refactoring.isInJavaSourceRoot
 import org.jetbrains.kotlin.idea.imports.importableFqName
 import org.jetbrains.kotlin.idea.refactoring.fqName.isImported
@@ -139,7 +139,7 @@ public fun KtElement.getInternalReferencesToUpdateOnPackageNameChange(packageNam
         }
     }
 
-    val referenceToContext = JetFileReferencesResolver.resolve(file = file, elements = listOf(this))
+    val referenceToContext = KotlinFileReferencesResolver.resolve(file = file, elements = listOf(this))
 
     val usages = ArrayList<UsageInfo>()
     for ((refExpr, bindingContext) in referenceToContext) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
index b6a99a886bd..45c86ffc123 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpHelper.kt
@@ -39,7 +39,7 @@ import org.jetbrains.kotlin.idea.core.refactoring.createPrimaryConstructorIfAbse
 import org.jetbrains.kotlin.idea.intentions.setType
 import org.jetbrains.kotlin.idea.refactoring.safeDelete.removeOverrideModifier
 import org.jetbrains.kotlin.idea.util.anonymousObjectSuperTypeOrNull
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.allChildren
@@ -118,13 +118,13 @@ class KotlinPullUpHelper(
                         elementsToRemove.add(statement)
                     }
                     else {
-                        if (!JetPsiUnifier.DEFAULT.unify(statement, currentInitializer).matched) return null
+                        if (!KotlinPsiUnifier.DEFAULT.unify(statement, currentInitializer).matched) return null
 
                         initializerCandidate = currentInitializer
                         elementsToRemove.add(statement)
                     }
                 }
-                else if (!JetPsiUnifier.DEFAULT.unify(statement, initializerCandidate).matched) return null
+                else if (!KotlinPsiUnifier.DEFAULT.unify(statement, initializerCandidate).matched) return null
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
index 35a0e23bd35..e8b195ad455 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt
@@ -26,8 +26,8 @@ import com.intellij.refactoring.RefactoringBundle
 import com.intellij.refactoring.rename.naming.AutomaticRenamer
 import com.intellij.refactoring.rename.naming.AutomaticRenamerFactory
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionByPackageIndex
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionByPackageIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
 import org.jetbrains.kotlin.psi.KtClassBody
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.KtFile
@@ -54,7 +54,7 @@ private fun KtNamedFunction.getOverloads(): Collection<KtNamedFunction> {
                 val searchScope = GlobalSearchScope.moduleScope(module)
                 val fqName = getFqName()
                 if (fqName != null) {
-                    return JetTopLevelFunctionFqnNameIndex.getInstance().get(fqName.asString(), getProject(), searchScope)
+                    return KotlinTopLevelFunctionFqnNameIndex.getInstance().get(fqName.asString(), getProject(), searchScope)
                 }
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt
index 88211b71d59..77b3e70ed2e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinClassProcessor.kt
@@ -23,10 +23,10 @@ import com.intellij.refactoring.RefactoringBundle
 import com.intellij.refactoring.listeners.RefactoringElementListener
 import com.intellij.refactoring.util.CommonRefactoringUtil
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.asJava.KotlinLightClass
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
 public class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
     override fun canProcessElement(element: PsiElement): Boolean {
-        return element is KtClassOrObject || element is KotlinLightClass || element is KtConstructor<*>
+        return element is KtClassOrObject || element is KtLightClass || element is KtConstructor<*>
     }
 
     override fun substituteElementToRename(element: PsiElement, editor: Editor?): PsiElement? {
@@ -74,15 +74,15 @@ public class RenameKotlinClassProcessor : RenameKotlinPsiProcessor() {
     }
 
     private fun getJetClassOrObject(element: PsiElement?, showErrors: Boolean, editor: Editor?): KtClassOrObject? = when (element) {
-        is KotlinLightClass ->
-            if (element is KotlinLightClassForExplicitDeclaration) {
+        is KtLightClass ->
+            if (element is KtLightClassForExplicitDeclaration) {
                 element.getOrigin()
             }
-            else if (element is KotlinLightClassForFacade) {
+            else if (element is KtLightClassForFacade) {
                 if (showErrors) {
                     CommonRefactoringUtil.showErrorHint(
                             element.project, editor,
-                            JetBundle.message("rename.kotlin.package.class.error"),
+                            KotlinBundle.message("rename.kotlin.package.class.error"),
                             RefactoringBundle.message("rename.title"),
                             null)
                 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
index fba58a86daa..75e463b48b1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/rename/RenameKotlinFunctionProcessor.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.search.SearchScope
 import com.intellij.refactoring.listeners.RefactoringElementListener
 import com.intellij.refactoring.rename.RenameJavaMethodProcessor
 import com.intellij.usageView.UsageInfo
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.asJava.unwrapped
 import org.jetbrains.kotlin.idea.util.application.runReadAction
@@ -36,7 +36,7 @@ public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
     private val javaMethodProcessorInstance = RenameJavaMethodProcessor()
 
     override fun canProcessElement(element: PsiElement): Boolean {
-        return element is KtNamedFunction || (element is KotlinLightMethod && element.getOrigin() is KtNamedFunction)
+        return element is KtNamedFunction || (element is KtLightMethod && element.getOrigin() is KtNamedFunction)
     }
 
     override fun substituteElementToRename(element: PsiElement?, editor: Editor?): PsiElement?  {
@@ -49,7 +49,7 @@ public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
         val substitutedJavaElement = javaMethodProcessorInstance.substituteElementToRename(wrappedMethod, editor)
 
         return when (substitutedJavaElement) {
-            is KotlinLightMethod -> substitutedJavaElement.getOrigin() as? KtNamedFunction
+            is KtLightMethod -> substitutedJavaElement.getOrigin() as? KtNamedFunction
             else -> substitutedJavaElement
         }
     }
@@ -68,7 +68,7 @@ public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() {
     }
 
     private fun wrapPsiMethod(element: PsiElement?): PsiMethod? = when (element) {
-        is KotlinLightMethod -> element
+        is KtLightMethod -> element
         is KtNamedFunction, is KtSecondaryConstructor -> runReadAction {
             LightClassUtil.getLightClassMethod(element as KtFunction)
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
index f5d7f21caa0..f707de49a8c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinOverridingDialog.java
@@ -35,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
-import org.jetbrains.kotlin.idea.JetBundle;
+import org.jetbrains.kotlin.idea.KotlinBundle;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
@@ -86,7 +86,7 @@ class KotlinOverridingDialog extends DialogWrapper {
             myMethodText[i] = formatElement(((KotlinSafeDeleteOverridingUsageInfo) myOverridingMethods.get(i)).getOverridingElement());
         }
         myUsagePreviewPanel = new UsagePreviewPanel(project, new UsageViewPresentation());
-        setTitle(JetBundle.message("unused.overriding.methods.title"));
+        setTitle(KotlinBundle.message("unused.overriding.methods.title"));
         init();
     }
 
@@ -99,7 +99,7 @@ class KotlinOverridingDialog extends DialogWrapper {
             if (declarationDescriptor instanceof CallableMemberDescriptor) {
                 DeclarationDescriptor containingDescriptor = declarationDescriptor.getContainingDeclaration();
                 if (containingDescriptor instanceof ClassDescriptor) {
-                    return JetBundle.message(
+                    return KotlinBundle.message(
                             "x.in.y",
                             DescriptorRenderer.COMPACT.render(declarationDescriptor),
                             IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.render(containingDescriptor)
@@ -144,8 +144,8 @@ class KotlinOverridingDialog extends DialogWrapper {
     protected JComponent createNorthPanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));
-        panel.add(new JLabel(JetBundle.message("there.are.unused.methods.that.override.methods.you.delete")));
-        panel.add(new JLabel(JetBundle.message("choose.the.ones.you.want.to.be.deleted")));
+        panel.add(new JLabel(KotlinBundle.message("there.are.unused.methods.that.override.methods.you.delete")));
+        panel.add(new JLabel(KotlinBundle.message("choose.the.ones.you.want.to.be.deleted")));
         return panel;
     }
 
@@ -251,7 +251,7 @@ class KotlinOverridingDialog extends DialogWrapper {
                 case CHECK_COLUMN:
                     return " ";
                 default:
-                    return JetBundle.message("method.column");
+                    return KotlinBundle.message("method.column");
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
index 3737b5b147d..1a544aa46f1 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt
@@ -35,7 +35,7 @@ import com.intellij.usageView.UsageInfo
 import org.jetbrains.kotlin.asJava.*
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.Modality
-import org.jetbrains.kotlin.idea.JetBundle
+import org.jetbrains.kotlin.idea.KotlinBundle
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.core.deleteElementAndCleanParent
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil
@@ -234,7 +234,7 @@ public class KotlinSafeDeleteProcessor : JavaSafeDeleteProcessor() {
                     .asSequence()
                     .filter { overridenDescriptor -> overridenDescriptor.getModality() == Modality.ABSTRACT }
                     .mapTo(ArrayList<String>()) { overridenDescriptor ->
-                        JetBundle.message(
+                        KotlinBundle.message(
                                 "x.implements.y",
                                 JetRefactoringUtil.formatFunction(declarationDescriptor, true),
                                 JetRefactoringUtil.formatClass(declarationDescriptor.getContainingDeclaration(), true),
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
index eff63329205..b2faca53e64 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
@@ -49,8 +49,8 @@ import kotlin.jvm.functions.Function1;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
-import org.jetbrains.kotlin.asJava.KotlinLightMethod;
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration;
+import org.jetbrains.kotlin.asJava.KtLightMethod;
 import org.jetbrains.kotlin.idea.MainFunctionDetector;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.name.FqName;
@@ -315,9 +315,9 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
                         new Function1<PsiMethod, KtNamedFunction>() {
                             @Override
                             public KtNamedFunction invoke(PsiMethod method) {
-                                if (!(method instanceof KotlinLightMethod)) return null;
+                                if (!(method instanceof KtLightMethod)) return null;
 
-                                KtDeclaration declaration = ((KotlinLightMethod) method).getOrigin();
+                                KtDeclaration declaration = ((KtLightMethod) method).getOrigin();
                                 return declaration instanceof KtNamedFunction ? (KtNamedFunction) declaration : null;
                             }
                         }
@@ -397,7 +397,7 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
         private String noFunctionFoundMessage(@NotNull PsiClass psiClass) {
             //noinspection ConstantConditions
             FqName classFqName = new FqName(psiClass.getQualifiedName());
-            if (psiClass instanceof KotlinLightClassForExplicitDeclaration) {
+            if (psiClass instanceof KtLightClassForExplicitDeclaration) {
                 return String.format("Function 'main' not found in class '%s'", classFqName);
             }
             return String.format("Top-level function 'main' not found in package '%s'", classFqName.parent());
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.java b/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
similarity index 99%
rename from idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.java
rename to idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
index 7ae887ad842..5c4c8fb5997 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetTestNgConfigurationProducer.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
@@ -44,7 +44,7 @@ import org.jetbrains.kotlin.psi.*;
 
 import java.util.List;
 
-public class JetTestNgConfigurationProducer extends TestNGConfigurationProducer {
+public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProducer {
     @Override
     protected boolean setupConfigurationFromContext(
             TestNGConfiguration configuration, ConfigurationContext context, Ref<PsiElement> sourceElement
diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt
index 5bb7b2162f1..0a214d93dee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinAnnotatedElementsSearcher.kt
@@ -30,7 +30,7 @@ import com.intellij.util.QueryExecutor
 import com.intellij.util.indexing.FileBasedIndex
 import org.jetbrains.kotlin.asJava.LightClassUtil
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
-import org.jetbrains.kotlin.idea.stubindex.JetAnnotationsIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinAnnotationsIndex
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.collectDescendantsOfType
@@ -95,7 +95,7 @@ public class KotlinAnnotatedElementsSearcher : QueryExecutor<PsiModifierListOwne
             return runReadAction(fun(): Collection<PsiElement> {
                 if (useScope is GlobalSearchScope) {
                     val name = annClass.getName() ?: return emptyList()
-                    return JetAnnotationsIndex.getInstance().get(name, annClass.getProject(), useScope)
+                    return KotlinAnnotationsIndex.getInstance().get(name, annClass.getProject(), useScope)
                 }
 
                 return (useScope as LocalSearchScope).scope.flatMap { it.collectDescendantsOfType<KtAnnotationEntry>() }
diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java
index a26f2b5ea62..d2c79d00e25 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.java
@@ -29,7 +29,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.QueryExecutor;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.asJava.KotlinLightMethod;
+import org.jetbrains.kotlin.asJava.KtLightMethod;
 import org.jetbrains.kotlin.asJava.LightClassUtil;
 import org.jetbrains.kotlin.psi.*;
 
@@ -122,8 +122,8 @@ public class KotlinDefinitionsSearcher implements QueryExecutor<PsiElement, Defi
             MethodImplementationsSearch.getOverridingMethods(method, implementations, scope);
 
             for (PsiMethod implementation : implementations) {
-                PsiElement mirrorElement = implementation instanceof KotlinLightMethod
-                                           ? ((KotlinLightMethod) implementation).getOrigin() : null;
+                PsiElement mirrorElement = implementation instanceof KtLightMethod
+                                           ? ((KtLightMethod) implementation).getOrigin() : null;
                 if (mirrorElement instanceof KtProperty || mirrorElement instanceof KtParameter) {
                     if (!consumer.process(mirrorElement)) {
                         return false;
diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
index ef96f1dd45d..f44acf4021e 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDirectInheritorsSearcher.kt
@@ -22,10 +22,10 @@ import com.intellij.psi.PsiClass
 import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.search.searches.DirectClassInheritorsSearch
 import com.intellij.util.Processor
-import org.jetbrains.kotlin.idea.decompiler.navigation.JetSourceNavigationHelper
-import org.jetbrains.kotlin.idea.stubindex.JetSuperClassIndex
+import org.jetbrains.kotlin.idea.decompiler.navigation.SourceNavigationHelper
+import org.jetbrains.kotlin.idea.stubindex.KotlinSuperClassIndex
 import org.jetbrains.kotlin.idea.search.fileScope
-import org.jetbrains.kotlin.idea.stubindex.JetSourceFilterScope
+import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
 import org.jetbrains.kotlin.idea.util.application.runReadAction
 
 public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase<PsiClass, DirectClassInheritorsSearch.SearchParameters>(true) {
@@ -45,9 +45,9 @@ public open class KotlinDirectInheritorsSearcher() : QueryExecutorBase<PsiClass,
         if (scope == null) return
 
         runReadAction {
-            val noLibrarySourceScope = JetSourceFilterScope.kotlinSourceAndClassFiles(scope, baseClass.getProject())
-            JetSuperClassIndex.getInstance().get(name, baseClass.getProject(), noLibrarySourceScope).asSequence()
-                    .map { candidate -> JetSourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate)}
+            val noLibrarySourceScope = KotlinSourceFilterScope.kotlinSourceAndClassFiles(scope, baseClass.getProject())
+            KotlinSuperClassIndex.getInstance().get(name, baseClass.getProject(), noLibrarySourceScope).asSequence()
+                    .map { candidate -> SourceNavigationHelper.getOriginalPsiClassOrCreateLightClass(candidate)}
                     .filterNotNull()
                     .filter { candidate -> candidate.isInheritor(baseClass, false) }
                     .forEach { candidate -> consumer.process(candidate) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt
index 7fd51c4df75..638c1def41d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinOverridingMethodsWithGenericsSearcher.kt
@@ -22,8 +22,8 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch
 import com.intellij.psi.search.searches.OverridingMethodsSearch
 import com.intellij.util.Processor
 import com.intellij.util.QueryExecutor
-import org.jetbrains.kotlin.asJava.KotlinLightClass
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightClass
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.OverrideResolver
 public class KotlinOverridingMethodsWithGenericsSearcher : QueryExecutor<PsiMethod, OverridingMethodsSearch.SearchParameters> {
     override fun execute(p: OverridingMethodsSearch.SearchParameters, consumer: Processor<PsiMethod>): Boolean {
         val method = p.method
-        if (method !is KotlinLightMethod) return true
+        if (method !is KtLightMethod) return true
 
         val declaration = method.getOrigin() as? KtCallableDeclaration
         if (declaration == null) return true
@@ -61,13 +61,13 @@ public class KotlinOverridingMethodsWithGenericsSearcher : QueryExecutor<PsiMeth
 
     private fun findOverridingMethod(inheritor: PsiClass, callableDeclaration: KtCallableDeclaration): PsiMethod? {
         // Leave Java classes search to JavaOverridingMethodsSearcher
-        if (inheritor !is KotlinLightClass) return null
+        if (inheritor !is KtLightClass) return null
 
         val name = callableDeclaration.name
         val methodsByName = inheritor.findMethodsByName(name, false)
 
         for (lightMethodCandidate in methodsByName) {
-            val candidateDescriptor = (lightMethodCandidate as? KotlinLightMethod)?.getOrigin()?.resolveToDescriptor() ?: continue
+            val candidateDescriptor = (lightMethodCandidate as? KtLightMethod)?.getOrigin()?.resolveToDescriptor() ?: continue
             if (candidateDescriptor !is CallableMemberDescriptor) continue
 
             val overriddenDescriptors = OverrideResolver.getDirectlyOverriddenDeclarations(candidateDescriptor)
diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt
rename to idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
index 63a933b1234..bc1b5b18dcb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/JetTargetElementEvaluator.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinTargetElementEvaluator.kt
@@ -16,17 +16,16 @@
 
 package org.jetbrains.kotlin.idea.search.ideaExtensions
 
-import com.intellij.codeInsight.TargetElementEvaluator
 import com.intellij.codeInsight.TargetElementEvaluatorEx
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.psi.psiUtil.isAbstract
 import com.intellij.psi.PsiReference
 import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtPrimaryConstructor
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
+import org.jetbrains.kotlin.psi.psiUtil.isAbstract
 
-public class JetTargetElementEvaluator : TargetElementEvaluatorEx {
+public class KotlinTargetElementEvaluator : TargetElementEvaluatorEx {
     override fun includeSelfInGotoImplementation(element: PsiElement): Boolean = !(element is KtClass && element.isAbstract())
 
     override fun getElementByReference(ref: PsiReference, flags: Int): PsiElement? = null
diff --git a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
index bf56ccd21d0..14f9830bba0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinCreateTestIntention.kt
@@ -32,14 +32,14 @@ import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScopesCore
 import com.intellij.testIntegration.createTest.CreateTestAction
 import com.intellij.testIntegration.createTest.TestGenerators
-import org.jetbrains.kotlin.asJava.KotlinLightClass
+import org.jetbrains.kotlin.asJava.KtLightClass
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.idea.actions.JavaToKotlinAction
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.core.getPackage
 import org.jetbrains.kotlin.idea.core.refactoring.j2k
 import org.jetbrains.kotlin.idea.core.refactoring.toPsiDirectory
-import org.jetbrains.kotlin.idea.intentions.JetSelfTargetingRangeIntention
+import org.jetbrains.kotlin.idea.intentions.SelfTargetingRangeIntention
 import org.jetbrains.kotlin.idea.util.application.executeCommand
 import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.psi.psiUtil.startOffset
 import org.jetbrains.kotlin.utils.addToStdlib.singletonList
 import java.util.*
 
-class KotlinCreateTestIntention : JetSelfTargetingRangeIntention<KtClassOrObject>(KtClassOrObject::class.java, "Create test") {
+class KotlinCreateTestIntention : SelfTargetingRangeIntention<KtClassOrObject>(KtClassOrObject::class.java, "Create test") {
     override fun applicabilityRange(element: KtClassOrObject): TextRange? {
         if (element.isLocal()) return null
         if (element is KtEnumEntry) return null
@@ -110,7 +110,7 @@ class KotlinCreateTestIntention : JetSelfTargetingRangeIntention<KtClassOrObject
                 val dialog = KotlinCreateTestDialog(project, text, srcClass, srcPackage, srcModule)
                 if (!dialog.showAndGet()) return
 
-                val existingClass = (findTestClass(dialog.targetDirectory, dialog.className) as? KotlinLightClass)?.getOrigin()
+                val existingClass = (findTestClass(dialog.targetDirectory, dialog.className) as? KtLightClass)?.getOrigin()
                 if (existingClass != null) {
                     // TODO: Override dialog method when it becomes protected
                     val answer = Messages.showYesNoDialog(
diff --git a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestFinder.kt b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestFinder.kt
index 60e36637a20..33cacbb61a0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestFinder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/testIntegration/KotlinTestFinder.kt
@@ -27,7 +27,7 @@ import com.intellij.testIntegration.JavaTestFinder
 import com.intellij.testIntegration.TestFinderHelper
 import com.intellij.util.CommonProcessors
 import com.intellij.util.containers.HashSet
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration
 import org.jetbrains.kotlin.asJava.toLightClass
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.psi.KtClassOrObject
@@ -63,7 +63,7 @@ class KotlinTestFinder : JavaTestFinder() {
         for (candidateNameWithWeight in TestFinderHelper.collectPossibleClassNamesWithWeights(klass.name)) {
             for (eachClass in cache.getClassesByName(candidateNameWithWeight.first, scope)) {
                 if (eachClass.isAnnotationType || frameworks.isTestClass(eachClass)) continue
-                if (!eachClass.isPhysical && eachClass !is KotlinLightClassForExplicitDeclaration) continue
+                if (!eachClass.isPhysical && eachClass !is KtLightClassForExplicitDeclaration) continue
 
                 classesWithWeights.add(Pair.create(eachClass, candidateNameWithWeight.second))
             }
@@ -92,7 +92,7 @@ class KotlinTestFinder : JavaTestFinder() {
             if (!pattern.matcher(candidateName).matches()) continue
             for (candidateClass in cache.getClassesByName(candidateName, scope)) {
                 if (!(frameworks.isTestClass(candidateClass) || frameworks.isPotentialTestClass(candidateClass))) continue
-                if (!candidateClass.isPhysical && candidateClass !is KotlinLightClassForExplicitDeclaration) continue
+                if (!candidateClass.isPhysical && candidateClass !is KtLightClassForExplicitDeclaration) continue
                 processor.process(Pair.create(candidateClass, TestFinderHelper.calcTestNameProximity(klassName, candidateName)))
             }
         }
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
index 6c747f7852f..0dcd525fa98 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/ImportInsertHelperImpl.kt
@@ -23,7 +23,7 @@ import com.intellij.psi.util.PsiModificationTracker
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.util.getFileResolutionScope
 import org.jetbrains.kotlin.idea.caches.resolve.getResolutionFacade
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.core.targetDescriptors
 import org.jetbrains.kotlin.idea.imports.getImportableTargets
 import org.jetbrains.kotlin.idea.imports.importableFqName
@@ -51,8 +51,8 @@ import java.util.*
 
 public class ImportInsertHelperImpl(private val project: Project) : ImportInsertHelper() {
 
-    private val codeStyleSettings: JetCodeStyleSettings
-        get() = JetCodeStyleSettings.getInstance(project)
+    private val codeStyleSettings: KotlinCodeStyleSettings
+        get() = KotlinCodeStyleSettings.getInstance(project)
 
     override val importSortComparator: Comparator<ImportPath>
         get() = ImportPathComparator
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt
similarity index 81%
rename from idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.kt
rename to idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt
index 64dcd88406d..dc41b388478 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiRange.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiRange.kt
@@ -16,27 +16,25 @@
 
 package org.jetbrains.kotlin.idea.util.psi.patternMatching
 
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
-import org.jetbrains.kotlin.psi.KtElement
-import java.util.ArrayList
-import com.intellij.psi.PsiWhiteSpace
-import com.intellij.psi.PsiComment
-import java.util.Collections
-import org.jetbrains.kotlin.psi.psiUtil.siblings
 import com.intellij.openapi.util.TextRange
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Match
+import com.intellij.psi.PsiComment
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiWhiteSpace
+import org.jetbrains.kotlin.psi.KtElement
+import org.jetbrains.kotlin.psi.KtTreeVisitorVoid
+import org.jetbrains.kotlin.psi.psiUtil.siblings
+import java.util.*
 
 private val SIGNIFICANT_FILTER = { e: PsiElement -> e !is PsiWhiteSpace && e !is PsiComment && e.getTextLength() > 0 }
 
-public interface JetPsiRange {
-    public object Empty : JetPsiRange {
+public interface KotlinPsiRange {
+    public object Empty : KotlinPsiRange {
         override val elements: List<PsiElement> get() = Collections.emptyList<PsiElement>()
 
         override fun getTextRange(): TextRange = TextRange.EMPTY_RANGE
     }
 
-    public class ListRange(override val elements: List<PsiElement>): JetPsiRange {
+    public class ListRange(override val elements: List<PsiElement>): KotlinPsiRange {
         val startElement: PsiElement = elements.first()
         val endElement: PsiElement = elements.last()
 
@@ -49,7 +47,7 @@ public interface JetPsiRange {
         }
     }
 
-    public class Match(val range: JetPsiRange, val result: UnificationResult.Matched)
+    public class Match(val range: KotlinPsiRange, val result: UnificationResult.Matched)
 
     val elements: List<PsiElement>
 
@@ -61,7 +59,7 @@ public interface JetPsiRange {
 
     fun contains(element: PsiElement): Boolean = getTextRange().contains(element.getTextRange() ?: TextRange.EMPTY_RANGE)
 
-    fun match(scope: PsiElement, unifier: JetPsiUnifier): List<Match> {
+    fun match(scope: PsiElement, unifier: KotlinPsiUnifier): List<Match> {
         val elements = elements.filter(SIGNIFICANT_FILTER)
         if (elements.isEmpty()) return Collections.emptyList()
 
@@ -76,7 +74,7 @@ public interface JetPsiRange {
                                 .toList()
                                 .toRange()
 
-                        val result = unifier.unify(range, this@JetPsiRange)
+                        val result = unifier.unify(range, this@KotlinPsiRange)
 
                         if (result is UnificationResult.StronglyMatched) {
                             matches.add(Match(range, result))
@@ -95,8 +93,8 @@ public interface JetPsiRange {
     }
 }
 
-public fun List<PsiElement>.toRange(significantOnly: Boolean = true): JetPsiRange {
-    return if (isEmpty()) JetPsiRange.Empty else JetPsiRange.ListRange(if (significantOnly) filter(SIGNIFICANT_FILTER) else this)
+public fun List<PsiElement>.toRange(significantOnly: Boolean = true): KotlinPsiRange {
+    return if (isEmpty()) KotlinPsiRange.Empty else KotlinPsiRange.ListRange(if (significantOnly) filter(SIGNIFICANT_FILTER) else this)
 }
 
-public fun PsiElement?.toRange(): JetPsiRange = this?.let { JetPsiRange.ListRange(Collections.singletonList(it)) } ?: JetPsiRange.Empty
+public fun PsiElement?.toRange(): KotlinPsiRange = this?.let { KotlinPsiRange.ListRange(Collections.singletonList(it)) } ?: KotlinPsiRange.Empty
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
similarity index 92%
rename from idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
rename to idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
index 0878cfe2e10..0abddf62cc6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/KotlinPsiUnifier.kt
@@ -16,79 +16,38 @@
 
 package org.jetbrains.kotlin.idea.util.psi.patternMatching
 
-import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.*
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.Status.*
-import java.util.HashMap
-import org.jetbrains.kotlin.psi.KtExpression
-import org.jetbrains.kotlin.psi.KtPsiUtil
-import com.intellij.psi.PsiElement
-import org.jetbrains.kotlin.resolve.BindingContext
-import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
-import org.jetbrains.kotlin.types.KotlinType
-import com.intellij.util.containers.ContainerUtil
-import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
-import java.util.Collections
-import org.jetbrains.kotlin.psi.KtReferenceExpression
-import org.jetbrains.kotlin.psi.Call
-import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
-import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
-import com.intellij.psi.impl.source.tree.LeafPsiElement
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtTypeReference
-import org.jetbrains.kotlin.types.TypeUtils
-import org.jetbrains.kotlin.psi.ValueArgument
-import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
-import org.jetbrains.kotlin.psi.KtIfExpression
-import org.jetbrains.kotlin.psi.KtUnaryExpression
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.KtBinaryExpression
-import org.jetbrains.kotlin.psi.KtConstantExpression
-import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
-import org.jetbrains.kotlin.psi.KtSimpleNameExpression
-import org.jetbrains.kotlin.psi.KtArrayAccessExpression
-import org.jetbrains.kotlin.lexer.KtToken
-import org.jetbrains.kotlin.types.expressions.OperatorConventions
-import org.jetbrains.kotlin.psi.KtLabelReferenceExpression
-import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
-import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
-import org.jetbrains.kotlin.psi.KtDeclaration
-import org.jetbrains.kotlin.types.ErrorUtils
 import com.intellij.lang.ASTNode
+import com.intellij.psi.PsiElement
+import com.intellij.psi.impl.source.tree.LeafPsiElement
+import com.intellij.util.containers.ContainerUtil
 import com.intellij.util.containers.MultiMap
-import org.jetbrains.kotlin.psi.KtCallableReferenceExpression
-import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver
-import org.jetbrains.kotlin.psi.KtThisExpression
-import org.jetbrains.kotlin.psi.KtStringTemplateEntryWithExpression
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange.Empty
-import org.jetbrains.kotlin.psi.KtMultiDeclaration
-import org.jetbrains.kotlin.psi.KtFunction
-import org.jetbrains.kotlin.psi.KtClassBody
-import org.jetbrains.kotlin.descriptors.CallableDescriptor
-import org.jetbrains.kotlin.psi.KtDeclarationWithBody
-import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor
-import org.jetbrains.kotlin.psi.KtWithExpressionInitializer
-import org.jetbrains.kotlin.psi.KtParameter
-import org.jetbrains.kotlin.descriptors.ClassDescriptor
-import org.jetbrains.kotlin.psi.KtClassOrObject
-import org.jetbrains.kotlin.psi.KtCallableDeclaration
-import org.jetbrains.kotlin.psi.KtTypeParameter
-import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
-import org.jetbrains.kotlin.renderer.DescriptorRenderer
-import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
-import org.jetbrains.kotlin.psi.KtClass
-import org.jetbrains.kotlin.descriptors.VariableDescriptor
-import org.jetbrains.kotlin.psi.KtFile
-import org.jetbrains.kotlin.psi.KtClassInitializer
-import org.jetbrains.kotlin.psi.KtTypeParameterListOwner
-import org.jetbrains.kotlin.psi.doNotAnalyze
-import org.jetbrains.kotlin.psi.KtReturnExpression
-import org.jetbrains.kotlin.psi.KtProperty
-import org.jetbrains.kotlin.psi.KtDelegatorToSuperClass
-import org.jetbrains.kotlin.psi.KtDelegationSpecifier
+import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.idea.core.refactoring.getContextForContainingDeclarationBody
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
-import org.jetbrains.kotlin.psi.KtOperationReferenceExpression
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiRange.Empty
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.*
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.Status.MATCHED
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.UnificationResult.Status.UNMATCHED
+import org.jetbrains.kotlin.lexer.KtToken
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.*
+import org.jetbrains.kotlin.renderer.DescriptorRenderer
+import org.jetbrains.kotlin.resolve.BindingContext
+import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils
+import org.jetbrains.kotlin.resolve.calls.callUtil.getCall
+import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall
+import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
+import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall
+import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind
+import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver
+import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue
+import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver
+import org.jetbrains.kotlin.types.ErrorUtils
+import org.jetbrains.kotlin.types.KotlinType
+import org.jetbrains.kotlin.types.TypeUtils
+import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
+import org.jetbrains.kotlin.types.expressions.OperatorConventions
+import java.util.*
 
 public interface UnificationResult {
     public enum class Status {
@@ -128,17 +87,17 @@ public class UnifierParameter(
         val expectedType: KotlinType
 )
 
-public class JetPsiUnifier(
+public class KotlinPsiUnifier(
         parameters: Collection<UnifierParameter> = Collections.emptySet(),
         val allowWeakMatches: Boolean = false
 ) {
     companion object {
-        val DEFAULT = JetPsiUnifier()
+        val DEFAULT = KotlinPsiUnifier()
     }
 
     private inner class Context(
-            val originalTarget: JetPsiRange,
-            val originalPattern: JetPsiRange
+            val originalTarget: KotlinPsiRange,
+            val originalPattern: KotlinPsiRange
     ) {
         val patternContext: BindingContext = originalPattern.getBindingContext()
         val targetContext: BindingContext = originalTarget.getBindingContext()
@@ -147,8 +106,8 @@ public class JetPsiUnifier(
         val weakMatches = HashMap<KtElement, KtElement>()
         var checkEquivalence: Boolean = false
 
-        private fun JetPsiRange.getBindingContext(): BindingContext {
-            val element = (this as? JetPsiRange.ListRange)?.startElement as? KtElement
+        private fun KotlinPsiRange.getBindingContext(): BindingContext {
+            val element = (this as? KotlinPsiRange.ListRange)?.startElement as? KtElement
             if ((element?.getContainingFile() as? KtFile)?.doNotAnalyze != null) return BindingContext.EMPTY
             return element?.getContextForContainingDeclarationBody() ?: BindingContext.EMPTY
         }
@@ -737,7 +696,7 @@ public class JetPsiUnifier(
             return targetElementType != null && KotlinTypeChecker.DEFAULT.isSubtypeOf(targetElementType, parameter.expectedType)
         }
 
-        fun doUnify(target: JetPsiRange, pattern: JetPsiRange): Status {
+        fun doUnify(target: KotlinPsiRange, pattern: KotlinPsiRange): Status {
             val targetElements = target.elements
             val patternElements = pattern.elements
             if (targetElements.size() != patternElements.size()) return UNMATCHED
@@ -747,7 +706,7 @@ public class JetPsiUnifier(
             }
         }
 
-        private fun ASTNode.getChildrenRange(): JetPsiRange =
+        private fun ASTNode.getChildrenRange(): KotlinPsiRange =
                 getChildren(null).map { it.getPsi() }.filterNotNull().toRange()
 
         private fun PsiElement.unwrapWeakly(): KtElement? {
@@ -857,7 +816,7 @@ public class JetPsiUnifier(
         return if (this is LeafPsiElement) KtPsiUtil.unquoteIdentifier(text) else text
     }
 
-    public fun unify(target: JetPsiRange, pattern: JetPsiRange): UnificationResult {
+    public fun unify(target: KotlinPsiRange, pattern: KotlinPsiRange): UnificationResult {
         return with(Context(target, pattern)) {
             val status = doUnify(target, pattern)
             when {
@@ -875,5 +834,5 @@ public class JetPsiUnifier(
             unify(targetElement.toRange(), patternElement.toRange())
 }
 
-public fun PsiElement?.matches(e: PsiElement?): Boolean = JetPsiUnifier.DEFAULT.unify(this, e).matched
-public fun JetPsiRange.matches(r: JetPsiRange): Boolean = JetPsiUnifier.DEFAULT.unify(this, r).matched
+public fun PsiElement?.matches(e: PsiElement?): Boolean = KotlinPsiUnifier.DEFAULT.unify(this, e).matched
+public fun KotlinPsiRange.matches(r: KotlinPsiRange): Boolean = KotlinPsiUnifier.DEFAULT.unify(this, r).matched
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java
index b98c2ab5ca7..99fc6e9e1fe 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java
@@ -38,7 +38,7 @@ import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils;
 import org.jetbrains.kotlin.idea.configuration.KotlinJavaModuleConfigurator;
 import org.jetbrains.kotlin.idea.configuration.KotlinJsModuleConfigurator;
@@ -219,7 +219,7 @@ public class KotlinRuntimeLibraryUtil {
 
     @NotNull
     public static String bundledRuntimeVersion() {
-        return bundledRuntimeVersion(JetPluginUtil.getPluginVersion());
+        return bundledRuntimeVersion(KotlinPluginUtil.getPluginVersion());
     }
 
     @NotNull
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
index 9e05ffa9baa..f159be05cb6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinUpdatePluginComponent.kt
@@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFileVisitor
 import com.intellij.openapi.vfs.newvfs.NewVirtualFile
 import com.intellij.util.indexing.FileBasedIndex
-import org.jetbrains.kotlin.idea.JetPluginUtil
+import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.vfilefinder.KotlinClassFileIndex
 import org.jetbrains.kotlin.idea.vfilefinder.KotlinJavaScriptMetaFileIndex
 import org.jetbrains.kotlin.idea.vfilefinder.KotlinModuleMappingIndex
@@ -46,7 +46,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
 
         val installedKotlinVersion = PropertiesComponent.getInstance()?.getValue(INSTALLED_KOTLIN_VERSION)
 
-        if (installedKotlinVersion == null || JetPluginUtil.getPluginVersion() != installedKotlinVersion) {
+        if (installedKotlinVersion == null || KotlinPluginUtil.getPluginVersion() != installedKotlinVersion) {
             val ideaPluginPaths = PathUtil.getKotlinPathsForIdeaPlugin()
 
             // Force refresh jar handlers
@@ -68,7 +68,7 @@ class KotlinUpdatePluginComponent : ApplicationComponent {
             fileBasedIndex.requestRebuild(KotlinJavaScriptMetaFileIndex.KEY)
             fileBasedIndex.requestRebuild(KotlinModuleMappingIndex.KEY)
 
-            PropertiesComponent.getInstance()?.setValue(INSTALLED_KOTLIN_VERSION, JetPluginUtil.getPluginVersion())
+            PropertiesComponent.getInstance()?.setValue(INSTALLED_KOTLIN_VERSION, KotlinPluginUtil.getPluginVersion())
         }
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java
index d6c9798af62..8077091ae35 100644
--- a/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java
+++ b/idea/src/org/jetbrains/kotlin/idea/versions/OutdatedKotlinRuntimeNotification.java
@@ -37,7 +37,7 @@ import com.intellij.util.Function;
 import com.intellij.util.text.VersionComparatorUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.JetPluginUtil;
+import org.jetbrains.kotlin.idea.KotlinPluginUtil;
 import org.jetbrains.kotlin.idea.framework.JSLibraryStdPresentationProvider;
 import org.jetbrains.kotlin.idea.framework.JavaRuntimePresentationProvider;
 import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtil;
@@ -78,7 +78,7 @@ public class OutdatedKotlinRuntimeNotification extends AbstractProjectComponent
         StartupManager.getInstance(myProject).registerPostStartupActivity(new Runnable() {
             @Override
             public void run() {
-                final String pluginVersion = JetPluginUtil.getPluginVersion();
+                final String pluginVersion = KotlinPluginUtil.getPluginVersion();
                 if ("@snapshot@".equals(pluginVersion)) return; // plugin is run from sources, can't compare versions
 
                 // user already clicked suppress
diff --git a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt
index 3c959db2221..51ec484ba5d 100644
--- a/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/AbstractImportsTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin
 
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager
 import com.intellij.psi.codeStyle.PackageEntry
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
@@ -36,7 +36,7 @@ public abstract class AbstractImportsTest : JetLightCodeInsightFixtureTestCase()
         val tempSettings = settingManager.getCurrentSettings().clone()
         settingManager.setTemporarySettings(tempSettings)
 
-        val codeStyleSettings = JetCodeStyleSettings.getInstance(getProject())
+        val codeStyleSettings = KotlinCodeStyleSettings.getInstance(getProject())
 
         try {
             val fixture = myFixture
diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
index c7152bb52a3..5fe20e8817d 100644
--- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava
 
 import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.impl.ResolveScopeManager
-import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration
+import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
@@ -54,8 +54,8 @@ class LightClassesClasspathSortingTest : KotlinCodeInsightTestCase() {
 
         assertNotNull(psiClass, "Can't find class for $fqName")
         psiClass!!
-        assert(psiClass is KotlinLightClassForExplicitDeclaration || psiClass is KotlinLightClassForFacade) { "Should be an explicit light class, but was $fqName ${psiClass.javaClass}" }
-        assert(psiClass !is KotlinLightClassForDecompiledDeclaration) { "Should not be decompiled light class: $fqName ${psiClass.javaClass}" }
+        assert(psiClass is KtLightClassForExplicitDeclaration || psiClass is KtLightClassForFacade) { "Should be an explicit light class, but was $fqName ${psiClass.javaClass}" }
+        assert(psiClass !is KtLightClassForDecompiledDeclaration) { "Should not be decompiled light class: $fqName ${psiClass.javaClass}" }
     }
 
     private fun getProjectDescriptor(dir: String) =
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
index 37bb0851ea9..8904eb2d89b 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
@@ -141,14 +141,14 @@ public abstract class AbstractJetFormatterTest extends LightIdeaTestCase {
         String testFileName = expectedFileNameWithExtension.substring(0, expectedFileNameWithExtension.indexOf("."));
         String testFileExtension = expectedFileNameWithExtension.substring(expectedFileNameWithExtension.lastIndexOf("."));
         String originalFileText = FileUtil.loadFile(new File(testFileName + testFileExtension), true);
-        CodeStyleSettings codeStyleSettings = JetFormatSettingsUtil.getSettings();
+        CodeStyleSettings codeStyleSettings = FormatSettingsUtil.getSettings();
 
         Integer rightMargin = InTextDirectivesUtils.getPrefixedInt(originalFileText, "// RIGHT_MARGIN: ");
         if (rightMargin != null) {
             codeStyleSettings.setRightMargin(KotlinLanguage.INSTANCE, rightMargin);
         }
 
-        SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText, codeStyleSettings);
+        SettingsConfigurator configurator = FormatSettingsUtil.createConfigurator(originalFileText, codeStyleSettings);
         if (!inverted) {
             configurator.configureSettings();
         }
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
index 98e1fe00e6d..5a2fddbbf6c 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
@@ -45,7 +45,7 @@ public abstract class AbstractJetTypingIndentationTestBase extends LightCodeInsi
         String originalFileText = FileUtil.loadFile(new File(originFilePath), true);
 
         try {
-            SettingsConfigurator configurator = JetFormatSettingsUtil.createConfigurator(originalFileText);
+            SettingsConfigurator configurator = FormatSettingsUtil.createConfigurator(originalFileText);
             if (!inverted) {
                 configurator.configureSettings();
             }
diff --git a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatSettingsUtil.java
similarity index 89%
rename from idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
rename to idea/tests/org/jetbrains/kotlin/formatter/FormatSettingsUtil.java
index 5c29751e786..a5b21538e14 100644
--- a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
+++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatSettingsUtil.java
@@ -20,11 +20,11 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.testFramework.LightPlatformTestCase;
 import org.jetbrains.kotlin.idea.KotlinLanguage;
-import org.jetbrains.kotlin.idea.core.formatter.JetCodeStyleSettings;
+import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings;
 import org.jetbrains.kotlin.test.SettingsConfigurator;
 
-public class JetFormatSettingsUtil {
-    private JetFormatSettingsUtil() {
+public class FormatSettingsUtil {
+    private FormatSettingsUtil() {
     }
 
     public static CodeStyleSettings getSettings() {
@@ -33,7 +33,7 @@ public class JetFormatSettingsUtil {
 
     public static SettingsConfigurator createConfigurator(String fileText, CodeStyleSettings settings) {
         return new SettingsConfigurator(fileText,
-                                        settings.getCustomSettings(JetCodeStyleSettings.class),
+                                        settings.getCustomSettings(KotlinCodeStyleSettings.class),
                                         settings.getCommonSettings(KotlinLanguage.INSTANCE));
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt
index 6bca71ab2db..ef33dfbe3c9 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LiveTemplatesContextTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.codeInsight
 
 import com.intellij.codeInsight.template.TemplateContextType
 import com.intellij.testFramework.UsefulTestCase
-import org.jetbrains.kotlin.idea.liveTemplates.JetTemplateContextType
+import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import java.io.File
@@ -30,26 +30,26 @@ public class LiveTemplatesContextTest : JetLightCodeInsightFixtureTestCase() {
     public fun testInDocComment() {
         myFixture.configureByFile(getTestName(false) + ".kt")
         assertInContexts(
-                JetTemplateContextType.Generic::class.java,
-                JetTemplateContextType.Comment::class.java)
+                KotlinTemplateContextType.Generic::class.java,
+                KotlinTemplateContextType.Comment::class.java)
     }
 
     public fun testTopLevel() {
         myFixture.configureByFile(getTestName(false) + ".kt")
         assertInContexts(
-                JetTemplateContextType.Generic::class.java,
-                JetTemplateContextType.TopLevel::class.java)
+                KotlinTemplateContextType.Generic::class.java,
+                KotlinTemplateContextType.TopLevel::class.java)
     }
 
     public fun testInExpression() {
         myFixture.configureByFile(getTestName(false) + ".kt")
         assertInContexts(
-                JetTemplateContextType.Generic::class.java,
-                JetTemplateContextType.Expression::class.java)
+                KotlinTemplateContextType.Generic::class.java,
+                KotlinTemplateContextType.Expression::class.java)
     }
 
-    private fun assertInContexts(vararg expectedContexts: Class<out JetTemplateContextType>) {
-        val allContexts = TemplateContextType.EP_NAME.getExtensions().filter { it is JetTemplateContextType }
+    private fun assertInContexts(vararg expectedContexts: Class<out KotlinTemplateContextType>) {
+        val allContexts = TemplateContextType.EP_NAME.getExtensions().filter { it is KotlinTemplateContextType }
         val enabledContexts = allContexts.filter { it.isInContext(myFixture.getFile(), myFixture.getCaretOffset()) }.map { it.javaClass }
         UsefulTestCase.assertSameElements(enabledContexts, *expectedContexts)
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.java
index 1af260e8eaf..65a5f826dbc 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/AbstractCodeMoverTest.java
@@ -25,19 +25,19 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.LightCodeInsightTestCase;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetDeclarationMover;
-import org.jetbrains.kotlin.idea.codeInsight.upDownMover.JetExpressionMover;
+import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinDeclarationMover;
+import org.jetbrains.kotlin.idea.codeInsight.upDownMover.KotlinExpressionMover;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 
 import java.io.File;
 
 public abstract class AbstractCodeMoverTest extends LightCodeInsightTestCase {
     public void doTestClassBodyDeclaration(@NotNull String path) throws Exception {
-        doTest(path, JetDeclarationMover.class);
+        doTest(path, KotlinDeclarationMover.class);
     }
 
     public void doTestExpression(@NotNull String path) throws Exception {
-        doTest(path, JetExpressionMover.class);
+        doTest(path, KotlinExpressionMover.class);
     }
 
     private void doTest(@NotNull String path, @NotNull Class<? extends StatementUpDownMover> defaultMoverClass) throws Exception {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt
index ced73660f7f..24c0a855e19 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.actionSystem.IdeActions
 import org.jetbrains.kotlin.idea.AbstractCopyPasteTest
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
-import org.jetbrains.kotlin.idea.editor.JetEditorOptions
+import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions
 import org.jetbrains.kotlin.test.InTextDirectivesUtils
 import org.jetbrains.kotlin.test.JetTestUtils
 import java.io.File
@@ -29,7 +29,7 @@ import kotlin.test.assertEquals
 public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopyPasteTest() {
     private val BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/conversion"
 
-    private var oldEditorOptions: JetEditorOptions? = null
+    private var oldEditorOptions: KotlinEditorOptions? = null
 
     override fun getTestDataPath() = BASE_PATH
 
@@ -37,13 +37,13 @@ public abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractCopy
 
     override fun setUp() {
         super.setUp()
-        oldEditorOptions = JetEditorOptions.getInstance().getState()
-        JetEditorOptions.getInstance().setEnableJavaToKotlinConversion(true)
-        JetEditorOptions.getInstance().setDonTShowConversionDialog(true)
+        oldEditorOptions = KotlinEditorOptions.getInstance().getState()
+        KotlinEditorOptions.getInstance().setEnableJavaToKotlinConversion(true)
+        KotlinEditorOptions.getInstance().setDonTShowConversionDialog(true)
     }
 
     override fun tearDown() {
-        JetEditorOptions.getInstance().loadState(oldEditorOptions)
+        KotlinEditorOptions.getInstance().loadState(oldEditorOptions)
         super.tearDown()
     }
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
index 6af31edb4bf..9c6f71869aa 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java
@@ -83,12 +83,12 @@ public abstract class AbstractJetPositionManagerTest extends JetLightCodeInsight
     }
 
     @NotNull
-    private static JetPositionManager createPositionManager(
+    private static KotlinPositionManager createPositionManager(
             @NotNull DebugProcess process,
             @NotNull List<KtFile> files,
             @NotNull GenerationState state
     ) {
-        JetPositionManager positionManager = (JetPositionManager) new JetPositionManagerFactory().createPositionManager(process);
+        KotlinPositionManager positionManager = (KotlinPositionManager) new KotlinPositionManagerFactory().createPositionManager(process);
         assertNotNull(positionManager);
 
         for (KtFile file : files) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
index c402cbd9b27..1a1203be83d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
@@ -37,7 +37,7 @@ import com.intellij.testFramework.IdeaTestUtil;
 import com.intellij.xdebugger.XDebugSession;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade;
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade;
 import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
@@ -200,8 +200,8 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
         });
 
         for (PsiClass psiClass : psiClasses) {
-            if (psiClass instanceof KotlinLightClassForFacade) {
-                Collection<KtFile> files = ((KotlinLightClassForFacade) psiClass).getFiles();
+            if (psiClass instanceof KtLightClassForFacade) {
+                Collection<KtFile> files = ((KtLightClassForFacade) psiClass).getFiles();
                 for (KtFile jetFile : files) {
                     createBreakpoints(jetFile);
                 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt
index ae756772a88..5b051f3585f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateToLibrarySourceTest.kt
@@ -51,7 +51,7 @@ public abstract class AbstractNavigateToLibrarySourceTest : KotlinCodeInsightTes
     }
 
     override fun tearDown() {
-        JetSourceNavigationHelper.setForceResolve(false)
+        SourceNavigationHelper.setForceResolve(false)
         super.tearDown()
     }
 
@@ -59,7 +59,7 @@ public abstract class AbstractNavigateToLibrarySourceTest : KotlinCodeInsightTes
             JetTestUtils.getHomeDirectory() + File.separator
 
     private fun checkAnnotatedLibraryCode(forceResolve: Boolean) {
-        JetSourceNavigationHelper.setForceResolve(forceResolve)
+        SourceNavigationHelper.setForceResolve(forceResolve)
         val actualCode = NavigationTestUtils.getNavigateElementsText(getProject(), collectInterestingNavigationElements())
         val expectedCode = getExpectedAnnotatedLibraryCode()
         UsefulTestCase.assertSameLines(expectedCode, actualCode)
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
index 3a641ed99e0..77ad28b51c4 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.testFramework.LightProjectDescriptor
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.asJava.LightClassUtil
-import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration
+import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.psi.KtClass
@@ -53,7 +53,7 @@ public class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() {
         val navigationElement = navigationElementForReferenceInLibrarySource("Foo")
         assertTrue(navigationElement is KtClassOrObject, "Foo should navigate to JetClassOrObject")
         val lightClass = LightClassUtil.getPsiClass(navigationElement as KtClassOrObject)
-        assertTrue(lightClass is KotlinLightClassForDecompiledDeclaration,
+        assertTrue(lightClass is KtLightClassForDecompiledDeclaration,
                    "Light classes for decompiled declaration should be provided for library source")
         assertEquals("Foo", lightClass!!.getName())
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java
index bcfb0d94fb6..10dce9dda96 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToDecompiledLibraryTest.java
@@ -36,7 +36,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.test.JdkAndMockLibraryProjectDescriptor;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile;
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile;
 import org.jetbrains.kotlin.psi.KtDeclaration;
 import org.jetbrains.kotlin.psi.KtFile;
 
@@ -100,9 +100,9 @@ public class NavigateToDecompiledLibraryTest extends LightCodeInsightFixtureTest
         classFile = getClassFile(PACKAGE, getTestName(false), myModule);
         PsiFile decompiledPsiFile = PsiManager.getInstance(getProject()).findFile(classFile);
         assertNotNull(decompiledPsiFile);
-        assertTrue("Expecting kotlin class file, was: " + decompiledPsiFile.getClass(), decompiledPsiFile instanceof JetClsFile);
+        assertTrue("Expecting kotlin class file, was: " + decompiledPsiFile.getClass(), decompiledPsiFile instanceof KtClsFile);
         Map<String, KtDeclaration> map = getRenderedDescriptorToKotlinPsiMap(
-                (KtFile) decompiledPsiFile, ((JetClsFile) decompiledPsiFile).getRenderedDescriptorsToRange()
+                (KtFile) decompiledPsiFile, ((KtClsFile) decompiledPsiFile).getRenderedDescriptorsToRange()
         );
         String decompiledTextWithMarks = getDecompiledTextWithMarks(map);
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
index bb5bef58afa..4d90aab9397 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder
 
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile
 import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest
 import kotlin.test.assertTrue
 
@@ -27,7 +27,7 @@ public abstract class AbstractDecompiledTextTest(baseDirectory: String) : Abstra
         NavigateToDecompiledLibraryTest.getClassFile(TEST_PACKAGE, getTestName(false), myModule!!)
 
     protected override fun checkPsiFile(psiFile: PsiFile) =
-            assertTrue(psiFile is JetClsFile, "Expecting decompiled kotlin file, was: " + psiFile.javaClass)
+            assertTrue(psiFile is KtClsFile, "Expecting decompiled kotlin file, was: " + psiFile.javaClass)
 }
 
 public abstract class AbstractCommonDecompiledTextTest : AbstractDecompiledTextTest("/decompiler/decompiledText")
diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
index 6474edac6f6..f0819fa5cb6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt
@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiManager
 import com.intellij.testFramework.LightProjectDescriptor
 import org.jetbrains.kotlin.idea.decompiler.AbstractInternalCompiledClassesTest
-import org.jetbrains.kotlin.idea.decompiler.JetClsFile
+import org.jetbrains.kotlin.idea.decompiler.KtClsFile
 import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest
 import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName
 import org.jetbrains.kotlin.idea.test.JetJdkAndLibraryProjectDescriptor
@@ -47,7 +47,7 @@ public class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClas
 
     private fun checkFileWithWrongAbiVersion(file: VirtualFile) {
         val psiFile = PsiManager.getInstance(getProject()!!).findFile(file)
-        Assert.assertTrue(psiFile is JetClsFile)
+        Assert.assertTrue(psiFile is KtClsFile)
         val decompiledText = psiFile!!.getText()!!
         Assert.assertTrue(decompiledText.contains(INCOMPATIBLE_ABI_VERSION_GENERAL_COMMENT))
     }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java
similarity index 96%
rename from idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java
rename to idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java
index 6e0eb59580f..bcaf0565bc5 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/editor/JetCommenterTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/editor/KotlinCommenterTest.java
@@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
 
 import java.io.File;
 
-public class JetCommenterTest  extends LightCodeInsightTestCase {
+public class KotlinCommenterTest extends LightCodeInsightTestCase {
     private static final String BASE_PATH =
             new File(PluginTestCaseBase.getTestDataPathBase(), "/editor/commenter/").getAbsolutePath();
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt
similarity index 97%
rename from idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
rename to idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt
index 0c4cbda947b..93984d63d6d 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/filters/KotlinExceptionFilterTest.kt
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.test.MockLibraryUtil
 import java.io.File
 
-public class JetExceptionFilterTest : MultiFileTestCase() {
+public class KotlinExceptionFilterTest : MultiFileTestCase() {
     private var rootDir: VirtualFile? = null
 
     override fun tearDown() {
@@ -74,7 +74,7 @@ public class JetExceptionFilterTest : MultiFileTestCase() {
         }
         assert(rootDir != null)
 
-        val filter = JetExceptionFilterFactory().create(GlobalSearchScope.allScope(myProject))
+        val filter = KotlinExceptionFilterFactory().create(GlobalSearchScope.allScope(myProject))
 
         val expectedFile = if (libRootUrl != null) {
             VirtualFileManager.getInstance().findFileByUrl(libRootUrl + relativePath);
diff --git a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java
index ef5a55d7160..7708219c5b6 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/javaFacade/JetJavaFacadeTest.java
@@ -21,8 +21,8 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.asJava.KotlinLightClass;
-import org.jetbrains.kotlin.asJava.KotlinLightMethod;
+import org.jetbrains.kotlin.asJava.KtLightClass;
+import org.jetbrains.kotlin.asJava.KtLightMethod;
 import org.jetbrains.kotlin.asJava.LightClassUtil;
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.JetLightProjectDescriptor;
@@ -276,8 +276,8 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase {
     private static void checkDeclarationMethodWrapped(boolean shouldBeWrapped, KtDeclaration declaration, PsiMethod psiMethod) {
         if (shouldBeWrapped) {
             assertNotNull(String.format("Failed to wrap declaration '%s' to method", declaration.getText()), psiMethod);
-            assertInstanceOf(psiMethod, KotlinLightMethod.class);
-            assertEquals("Invalid original element for generated method", ((KotlinLightMethod) psiMethod).getOrigin(), declaration);
+            assertInstanceOf(psiMethod, KtLightMethod.class);
+            assertEquals("Invalid original element for generated method", ((KtLightMethod) psiMethod).getOrigin(), declaration);
         }
         else {
             assertNull("There should be no wrapper for given method", psiMethod);
@@ -296,7 +296,7 @@ public class JetJavaFacadeTest extends JetLightCodeInsightFixtureTestCase {
         assertNotNull("Caret should be placed to class definition", ktClass);
 
         // Should not fail!
-        KotlinLightClass lightClass = (KotlinLightClass) LightClassUtil.INSTANCE$.getPsiClass(ktClass);
+        KtLightClass lightClass = (KtLightClass) LightClassUtil.INSTANCE$.getPsiClass(ktClass);
 
         assertNotNull(String.format("Failed to wrap jetClass '%s' to class", ktClass.getText()), lightClass);
 
diff --git a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
index 6ccc02f01ea..5355f8219a2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/lightClasses/LightClassEqualsTest.java
@@ -20,10 +20,10 @@ import com.intellij.psi.PsiClass;
 import com.intellij.testFramework.LightProjectDescriptor;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.asJava.KotlinLightClass;
-import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration;
+import org.jetbrains.kotlin.asJava.KtLightClass;
+import org.jetbrains.kotlin.asJava.KtLightClassForExplicitDeclaration;
 import org.jetbrains.kotlin.asJava.LightClassUtil;
-import org.jetbrains.kotlin.idea.caches.resolve.KotlinLightClassForDecompiledDeclaration;
+import org.jetbrains.kotlin.idea.caches.resolve.KtLightClassForDecompiledDeclaration;
 import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor;
 import org.jetbrains.kotlin.psi.KtClassOrObject;
@@ -40,9 +40,9 @@ public class LightClassEqualsTest extends JetLightCodeInsightFixtureTestCase {
 
         PsiClass theClass = myFixture.getJavaFacade().findClass("A");
         assertNotNull(theClass);
-        assertInstanceOf(theClass, KotlinLightClassForExplicitDeclaration.class);
+        assertInstanceOf(theClass, KtLightClassForExplicitDeclaration.class);
 
-        doTestEquals(((KotlinLightClass) theClass).getOrigin());
+        doTestEquals(((KtLightClass) theClass).getOrigin());
     }
 
     public void testEqualsForDecompiledClass() throws Exception {
@@ -50,9 +50,9 @@ public class LightClassEqualsTest extends JetLightCodeInsightFixtureTestCase {
 
         PsiClass theClass = myFixture.getJavaFacade().findClass("kotlin.Unit");
         assertNotNull(theClass);
-        assertInstanceOf(theClass, KotlinLightClassForDecompiledDeclaration.class);
+        assertInstanceOf(theClass, KtLightClassForDecompiledDeclaration.class);
 
-        doTestEquals(((KotlinLightClass) theClass).getOrigin());
+        doTestEquals(((KtLightClass) theClass).getOrigin());
     }
 
     private static void doTestEquals(@Nullable KtClassOrObject origin) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
index 5955c3f3369..10448a1582c 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java
@@ -45,8 +45,8 @@ import org.jetbrains.kotlin.descriptors.Visibilities;
 import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
 import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinMethodNode;
-import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex;
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex;
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex;
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
 import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase;
@@ -1114,7 +1114,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         changeInfo.addParameter(newParameter2);
 
         KtClassOrObject classA =
-                JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
         KtDeclaration functionBar = CollectionsKt.first(
                 classA.getDeclarations(),
@@ -1126,7 +1126,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
                 }
         );
         KtNamedFunction functionTest =
-                JetTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
 
         changeInfo.setPrimaryPropagationTargets(Arrays.asList(functionBar, functionTest));
@@ -1172,7 +1172,8 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
                                 }
                         );
                         KtNamedFunction functionTest =
-                                JetTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
+                                KotlinTopLevelFunctionFqnNameIndex
+                                        .getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
                                         .iterator().next();
 
                         return SetsKt.setOf(methodBar, LightClassUtilsKt.getRepresentativeLightMethod(functionTest));
@@ -1190,7 +1191,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         changeInfo.addParameter(newParameter);
 
         KtNamedFunction functionBar =
-                JetTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
 
         changeInfo.setPrimaryPropagationTargets(Collections.singletonList(functionBar));
@@ -1207,7 +1208,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         changeInfo.addParameter(newParameter);
 
         KtNamedFunction functionBar =
-                JetTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
 
         changeInfo.setPrimaryPropagationTargets(Collections.singletonList(functionBar));
@@ -1224,7 +1225,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         changeInfo.addParameter(newParameter);
 
         KtClassOrObject classA =
-                JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
         KtDeclaration functionBar = CollectionsKt.first(
                 classA.getDeclarations(),
@@ -1249,7 +1250,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
         changeInfo.addParameter(newParameter);
 
         KtNamedFunction functionBar =
-                JetTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
+                KotlinTopLevelFunctionFqnNameIndex.getInstance().get("bar", getProject(), GlobalSearchScope.allScope(getProject()))
                         .iterator().next();
 
         changeInfo.setPrimaryPropagationTargets(Collections.singletonList(functionBar));
diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
index 35eeec442e8..b8f1184af04 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
@@ -40,8 +40,8 @@ import com.intellij.testFramework.PsiTestUtil
 import org.jetbrains.kotlin.idea.MainFunctionDetector
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.search.allScope
-import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex
-import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinFullClassNameIndex
+import org.jetbrains.kotlin.idea.stubindex.KotlinTopLevelFunctionFqnNameIndex
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinJsRuntimeAndSdk
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil.configureKotlinRuntimeAndSdk
@@ -154,7 +154,7 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() {
 
         val runConfiguration = createConfigurationFromObject("renameTest.Foo", save = true)
 
-        val obj = JetFullClassNameIndex.getInstance().get("renameTest.Foo", getTestProject(), getTestProject().allScope()).single()
+        val obj = KotlinFullClassNameIndex.getInstance().get("renameTest.Foo", getTestProject(), getTestProject().allScope()).single()
         val rename = RefactoringFactory.getInstance(getTestProject()).createRename(obj, "Bar")
         rename.run()
 
@@ -214,13 +214,13 @@ class RunConfigurationTest: KotlinCodeInsightTestCase() {
     }
 
     private fun createConfigurationFromMain(mainFqn: String): JetRunConfiguration {
-        val mainFunction = JetTopLevelFunctionFqnNameIndex.getInstance().get(mainFqn, getTestProject(), getTestProject().allScope()).first()
+        val mainFunction = KotlinTopLevelFunctionFqnNameIndex.getInstance().get(mainFqn, getTestProject(), getTestProject().allScope()).first()
 
         return createConfigurationFromElement(mainFunction)
     }
 
     private fun createConfigurationFromObject(objectFqn: String, save: Boolean = false): JetRunConfiguration {
-        val obj = JetFullClassNameIndex.getInstance().get(objectFqn, getTestProject(), getTestProject().allScope()).single()
+        val obj = KotlinFullClassNameIndex.getInstance().get(objectFqn, getTestProject(), getTestProject().allScope()).single()
         val mainFunction = obj.getDeclarations().single { it is KtFunction && it.getName() == "main" }
         return createConfigurationFromElement(mainFunction, save)
     }
diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
index 968b3899b38..d6474c00e8a 100644
--- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.psiUtil.parents
 import com.intellij.openapi.util.TextRange
 import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier
+import org.jetbrains.kotlin.idea.util.psi.patternMatching.KotlinPsiUnifier
 import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange
 import java.io.File
 import org.jetbrains.kotlin.test.JetTestUtils
@@ -53,7 +53,7 @@ public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestC
         val actualText =
                 findPattern(file)
                         .toRange()
-                        .match(file, JetPsiUnifier.DEFAULT)
+                        .match(file, KotlinPsiUnifier.DEFAULT)
                         .map { it.range.getTextRange().substring(file.getText()!!) }
                         .joinToString("\n\n")
         JetTestUtils.assertEqualsToFile(File("$filePath.match"), actualText)
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
index f7d9c17a02d..ca97ab0ab1a 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt
@@ -24,8 +24,8 @@ import com.intellij.psi.tree.IElementType
 import com.intellij.psi.util.MethodSignature
 import com.intellij.psi.util.MethodSignatureUtil
 import com.intellij.psi.util.PsiTreeUtil
-import org.jetbrains.kotlin.asJava.KotlinLightField
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightField
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.builtins.PrimitiveType
 import org.jetbrains.kotlin.j2k.ast.*
 import org.jetbrains.kotlin.name.FqName
@@ -253,7 +253,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
         val isNullable = if (target is PsiMethod) typeConverter.methodNullability(target).isNullable(codeConverter.settings) else false
         val typeArguments = convertTypeArguments(expression)
 
-        if (target is KotlinLightMethod) {
+        if (target is KtLightMethod) {
             val origin = target.getOrigin()
             val isTopLevel = origin?.getStrictParentOfType<KtClassOrObject>() == null
             if (origin is KtProperty || origin is KtPropertyAccessor || origin is KtParameter) {
@@ -422,7 +422,7 @@ class DefaultExpressionConverter : JavaElementVisitor(), ExpressionConverter {
             identifier = Identifier("size()", isNullable).assignNoPrototype()
         }
         else if (qualifier != null) {
-            if (target is KotlinLightField && target.getOrigin() is KtObjectDeclaration) {
+            if (target is KtLightField && target.getOrigin() is KtObjectDeclaration) {
                 result = codeConverter.convertExpression(qualifier)
                 return
             }
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
index 09b8b427fcd..8a589b39a46 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.j2k
 import com.intellij.codeInsight.NullableNotNullManager
 import com.intellij.psi.*
 import com.intellij.psi.CommonClassNames.JAVA_LANG_OBJECT
-import org.jetbrains.kotlin.asJava.KotlinLightElement
+import org.jetbrains.kotlin.asJava.KtLightElement
 import org.jetbrains.kotlin.descriptors.CallableDescriptor
 import org.jetbrains.kotlin.j2k.ast.*
 import org.jetbrains.kotlin.psi.KtCallableDeclaration
@@ -373,7 +373,7 @@ class TypeConverter(val converter: Converter) {
         }
 
         override fun fromAnnotations(owner: PsiModifierListOwner): Mutability {
-            if (owner is KotlinLightElement<*, *>) {
+            if (owner is KtLightElement<*, *>) {
                 val jetDeclaration = owner.getOrigin() as? KtCallableDeclaration ?: return Mutability.Default
                 val descriptor = converter.services.resolverForConverter.resolveToDescriptor(jetDeclaration) as? CallableDescriptor ?: return Mutability.Default
                 val type = descriptor.getReturnType() ?: return Mutability.Default
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt
index 70ff07d1c3b..7ada5a68d21 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiImportList
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
 import com.intellij.psi.PsiJavaCodeReferenceElement
-import org.jetbrains.kotlin.asJava.KotlinLightClassForFacade
+import org.jetbrains.kotlin.asJava.KtLightClassForFacade
 
 class Import(val name: String) : Element() {
     override fun generateCode(builder: CodeBuilder) {
@@ -71,7 +71,7 @@ private fun Converter.filterImport(name: String, ref: PsiJavaCodeReferenceElemen
     if (!JavaToKotlinClassMap.INSTANCE.mapPlatformClass(FqName(name)).isEmpty()) return null
 
     val target = ref.resolve()
-    if (target is KotlinLightClassForFacade) {
+    if (target is KtLightClassForFacade) {
         return quoteKeywords(target.getFqName().parent().toString()) + ".*"
     }
 
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt b/j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt
index 4cc5cf88b62..7ce38bd9db9 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/propertyDetection.kt
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.j2k
 
 import com.intellij.psi.*
 import com.intellij.psi.util.MethodSignatureUtil
-import org.jetbrains.kotlin.asJava.KotlinLightMethod
+import org.jetbrains.kotlin.asJava.KtLightMethod
 import org.jetbrains.kotlin.j2k.ast.*
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.name.Name
@@ -368,7 +368,7 @@ private class PropertyDetector(
             val propertyInfo = converter.propertyDetectionCache[containingClass][superMethod]
             return if (propertyInfo != null) SuperInfo.Property(propertyInfo.isVar, propertyInfo.name) else SuperInfo.Function
         }
-        else if (superMethod is KotlinLightMethod) {
+        else if (superMethod is KtLightMethod) {
             val origin = superMethod.getOrigin()
             return if (origin is KtProperty) SuperInfo.Property(origin.isVar, origin.name ?: "") else SuperInfo.Function
         }