diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java
index ebb21749584..c2f6b067c87 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAllShortFunctionNameIndex.java
@@ -28,12 +28,14 @@ import java.util.Collection;
 public class JetAllShortFunctionNameIndex extends StringStubIndexExtension<JetNamedFunction> {
     private static final StubIndexKey<String, JetNamedFunction> KEY = KotlinIndexUtil.createIndexKey(JetAllShortFunctionNameIndex.class);
 
-    private static final JetShortClassNameIndex ourInstance = new JetShortClassNameIndex();
+    private static final JetAllShortFunctionNameIndex ourInstance = new JetAllShortFunctionNameIndex();
 
-    public static JetShortClassNameIndex getInstance() {
+    public static JetAllShortFunctionNameIndex getInstance() {
         return ourInstance;
     }
 
+    private JetAllShortFunctionNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetNamedFunction> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java
index 6cb18b78fbe..802f806473d 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetAnnotationsIndex.java
@@ -34,6 +34,8 @@ public class JetAnnotationsIndex extends StringStubIndexExtension<JetAnnotationE
         return ourInstance;
     }
 
+    private JetAnnotationsIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetAnnotationEntry> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetExtensionFunctionNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetExtensionFunctionNameIndex.java
index 082df10c2f6..d0700223285 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetExtensionFunctionNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetExtensionFunctionNameIndex.java
@@ -30,6 +30,8 @@ public class JetExtensionFunctionNameIndex extends StringStubIndexExtension<JetN
         return instance;
     }
 
+    private JetExtensionFunctionNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetNamedFunction> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java
index 770c20920f1..565eac88260 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetFullClassNameIndex.java
@@ -34,6 +34,8 @@ public class JetFullClassNameIndex extends StringStubIndexExtension<JetClassOrOb
         return ourInstance;
     }
 
+    private JetFullClassNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetClassOrObject> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetPackageDeclarationIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetPackageDeclarationIndex.java
index d219fcba0b6..13f889bda4d 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetPackageDeclarationIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetPackageDeclarationIndex.java
@@ -34,6 +34,8 @@ public class JetPackageDeclarationIndex extends StringStubIndexExtension<JetFile
         return ourInstance;
     }
 
+    private JetPackageDeclarationIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetFile> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java
index 6af4928459f..77decd42a0b 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortClassNameIndex.java
@@ -34,6 +34,8 @@ public class JetShortClassNameIndex extends StringStubIndexExtension<JetClassOrO
         return ourInstance;
     }
 
+    private JetShortClassNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetClassOrObject> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java
index da87ef68754..73279f80b75 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortFunctionNameIndex.java
@@ -34,6 +34,8 @@ public class JetShortFunctionNameIndex extends StringStubIndexExtension<JetNamed
         return ourInstance;
     }
 
+    private JetShortFunctionNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetNamedFunction> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java
index 011e218e765..844e01c3ba6 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetShortPropertiesNameIndex.java
@@ -34,6 +34,8 @@ public class JetShortPropertiesNameIndex extends StringStubIndexExtension<JetPro
         return ourInstance;
     }
 
+    private JetShortPropertiesNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetProperty> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java
index fc49f7d8a5d..bea7f934e85 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetSuperClassIndex.java
@@ -34,6 +34,8 @@ public class JetSuperClassIndex extends StringStubIndexExtension<JetClassOrObjec
         return ourInstance;
     }
 
+    private JetSuperClassIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetClassOrObject> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java
index a7ee07d988c..7b484fe3935 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelFunctionsFqnNameIndex.java
@@ -37,6 +37,8 @@ public class JetTopLevelFunctionsFqnNameIndex extends StringStubIndexExtension<J
         return INSTANCE;
     }
 
+    private JetTopLevelFunctionsFqnNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetNamedFunction> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java
index f2fc5f04c89..3af84bd91bd 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelPropertiesFqnNameIndex.java
@@ -34,6 +34,8 @@ public class JetTopLevelPropertiesFqnNameIndex extends StringStubIndexExtension<
         return INSTANCE;
     }
 
+    private JetTopLevelPropertiesFqnNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetProperty> getKey() {
diff --git a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
index 1760a5ced5b..5d9e1d4775e 100644
--- a/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
+++ b/idea/src/org/jetbrains/jet/plugin/stubindex/JetTopLevelShortObjectNameIndex.java
@@ -34,6 +34,8 @@ public class JetTopLevelShortObjectNameIndex extends StringStubIndexExtension<Je
         return ourInstance;
     }
 
+    private JetTopLevelShortObjectNameIndex() {}
+
     @NotNull
     @Override
     public StubIndexKey<String, JetObjectDeclaration> getKey() {