diff --git a/idea/resources/liveTemplates/Kotlin.xml b/idea/resources/liveTemplates/Kotlin.xml
index 7342df2f1cb..7c32105fbf5 100644
--- a/idea/resources/liveTemplates/Kotlin.xml
+++ b/idea/resources/liveTemplates/Kotlin.xml
@@ -169,4 +169,26 @@
             <option name="KOTLIN_NAMESPACE" value="true"/>
         </context>
     </template>
+
+
+    <!-- Synonyms -->
+
+    <!-- Synonym for main -->
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" key="livetemplate.description.main"
+              name="psvm" toReformat="true" toShortenFQNames="true"
+              value="fun main(args : Array&lt;String&gt;) {&#10;  $END$&#10;}">
+        <context>
+            <option name="KOTLIN_NAMESPACE" value="true" />
+        </context>
+    </template>
+
+    <!-- Synonym for anonymous -->
+    <template resource-bundle="org.jetbrains.jet.plugin.JetBundle" 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>
+            <option name="KOTLIN_STATEMENT" value="true"/>
+            <option name="KOTLIN_EXPRESSION" value="true"/>
+        </context>
+    </template>
 </templateSet>
diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
index e7388dcc7d1..142409c349e 100644
--- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
+++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetLiveTemplateCompletionContributor.java
@@ -73,8 +73,6 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
             for (final TemplateImpl possible : templates) {
                 result.addElement(new LiveTemplateLookupElement(possible, false));
             }
-            
-            addSynonym(templates, result, "anonymous", "object");
         }
     }
 
@@ -97,22 +95,4 @@ public class JetLiveTemplateCompletionContributor extends CompletionContributor
             return element instanceof LiveTemplateLookupElement && ((LiveTemplateLookupElement) element).sudden;
         }
     }
-
-
-    /* custom code start */
-    private static void addSynonym(List<TemplateImpl> templates, @NotNull CompletionResultSet result, @NotNull String standardName, @NotNull final String synonym) {
-        for (TemplateImpl t : templates) {
-            if (standardName.equals(t.getKey())) {
-                result.addElement(new LiveTemplateLookupElement(t, false) {
-                    @NotNull
-                    @Override
-                    public String getLookupString() {
-                        return synonym;
-                    }
-                });
-                return;
-            }
-        }
-
-    }
 }