diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
index b948db91c49..1e9b6fa2f50 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/AnonymousSuperMacro.kt
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 import org.jetbrains.kotlin.resolve.scopes.utils.collectDescriptorsFiltered
 
-class AnonymousSuperMacro : Macro() {
+class AnonymousSuperMacro : KotlinMacro() {
     override fun getName() = "anonymousSuper"
     override fun getPresentableName() = "anonymousSuper()"
 
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
index f5adbc79f86..5009e7dd654 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseKotlinVariableMacro.kt
@@ -17,7 +17,10 @@
 package org.jetbrains.kotlin.idea.liveTemplates.macro
 
 import com.intellij.codeInsight.lookup.LookupElement
-import com.intellij.codeInsight.template.*
+import com.intellij.codeInsight.template.Expression
+import com.intellij.codeInsight.template.ExpressionContext
+import com.intellij.codeInsight.template.Result
+import com.intellij.codeInsight.template.TextResult
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -39,7 +42,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter
 
-abstract class BaseKotlinVariableMacro<TState> : Macro() {
+abstract class BaseKotlinVariableMacro<TState> : KotlinMacro() {
     private fun getVariables(params: Array<Expression>, context: ExpressionContext): Collection<VariableDescriptor> {
         if (params.size != 0) return emptyList()
 
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
index 82c4fc88995..cc585db9a83 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/FunctionParametersMacro.kt
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.psi.KtFunction
 import java.util.*
 
-class FunctionParametersMacro : Macro() {
+class FunctionParametersMacro : KotlinMacro() {
     override fun getName() = "functionParameters"
     override fun getPresentableName() = "functionParameters()"
 
@@ -46,7 +46,4 @@ class FunctionParametersMacro : Macro() {
         }
         return null
     }
-
-    override fun isAcceptableInContext(context: TemplateContextType?) = context is JavaCodeContextType
-
 }
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinClassNameMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinClassNameMacro.kt
index 7b33100f6ec..7c121120397 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinClassNameMacro.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinClassNameMacro.kt
@@ -13,15 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 package org.jetbrains.kotlin.idea.liveTemplates.macro
 
-import com.intellij.codeInsight.template.*
-import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
+import com.intellij.codeInsight.template.Expression
+import com.intellij.codeInsight.template.ExpressionContext
+import com.intellij.codeInsight.template.Result
+import com.intellij.codeInsight.template.TextResult
 import org.jetbrains.kotlin.psi.KtClassOrObject
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
 
-class KotlinClassNameMacro : Macro() {
+class KotlinClassNameMacro : KotlinMacro() {
     override fun getName() = "kotlinClassName"
     override fun getPresentableName() = "kotlinClassName()"
 
@@ -29,6 +31,4 @@ class KotlinClassNameMacro : Macro() {
         val element = context.psiElementAtStartOffset?.parentsWithSelf?.firstOrNull { it is KtClassOrObject && it.name != null } ?: return null
         return TextResult((element as KtClassOrObject).name!!)
     }
-
-    override fun isAcceptableInContext(context: TemplateContextType?): Boolean = context is KotlinTemplateContextType
 }
\ No newline at end of file
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinFunctionNameMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinFunctionNameMacro.kt
index ee654c4ac71..c79536f554c 100644
--- a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinFunctionNameMacro.kt
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinFunctionNameMacro.kt
@@ -16,12 +16,14 @@
  
 package org.jetbrains.kotlin.idea.liveTemplates.macro
 
-import com.intellij.codeInsight.template.*
-import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
+import com.intellij.codeInsight.template.Expression
+import com.intellij.codeInsight.template.ExpressionContext
+import com.intellij.codeInsight.template.Result
+import com.intellij.codeInsight.template.TextResult
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
 
-class KotlinFunctionNameMacro : Macro() {
+class KotlinFunctionNameMacro : KotlinMacro() {
     override fun getName() = "kotlinFunctionName"
     override fun getPresentableName() = "kotlinFunctionName()"
 
@@ -30,7 +32,4 @@ class KotlinFunctionNameMacro : Macro() {
         val name = element?.name ?: return null
         return TextResult(name)
     }
-
-    override fun isAcceptableInContext(context: TemplateContextType?) = context is KotlinTemplateContextType
-
 }
\ No newline at end of file
diff --git a/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinMacro.kt b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinMacro.kt
new file mode 100644
index 00000000000..77859b5dddc
--- /dev/null
+++ b/idea/idea-live-templates/src/org/jetbrains/kotlin/idea/liveTemplates/macro/KotlinMacro.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2017 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.liveTemplates.macro
+
+import com.intellij.codeInsight.template.Macro
+import com.intellij.codeInsight.template.TemplateContextType
+import org.jetbrains.kotlin.idea.liveTemplates.KotlinTemplateContextType
+
+abstract class KotlinMacro : Macro() {
+    override fun isAcceptableInContext(context: TemplateContextType?): Boolean {
+        return context is KotlinTemplateContextType
+    }
+}
diff --git a/idea/idea.iml b/idea/idea.iml
index a37f028d36c..2512b76b225 100644
--- a/idea/idea.iml
+++ b/idea/idea.iml
@@ -47,7 +47,7 @@
     <orderEntry type="module" module-name="js.serializer" />
     <orderEntry type="module" module-name="daemon-client" />
     <orderEntry type="module" module-name="idea-repl" scope="TEST" />
-    <orderEntry type="module" module-name="idea-live-templates" exported="" scope="RUNTIME" />
+    <orderEntry type="module" module-name="idea-live-templates" exported="" />
     <orderEntry type="module" module-name="tests-common" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="lint-idea" scope="PROVIDED" />
diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
index f8966524724..084e08619a8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/SuggestVariableNameMacro.kt
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.idea.liveTemplates.macro
 
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder
-import com.intellij.codeInsight.template.*
+import com.intellij.codeInsight.template.Expression
+import com.intellij.codeInsight.template.ExpressionContext
+import com.intellij.codeInsight.template.Result
+import com.intellij.codeInsight.template.TextResult
 import com.intellij.psi.PsiDocumentManager
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.idea.caches.resolve.analyze
@@ -34,7 +37,7 @@ import org.jetbrains.kotlin.psi.KtFile
 import org.jetbrains.kotlin.psi.KtForExpression
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
 
-class SuggestVariableNameMacro : Macro() {
+class SuggestVariableNameMacro : KotlinMacro() {
     override fun getName() = "kotlinSuggestVariableName"
     override fun getPresentableName() = "kotlinSuggestVariableName()"