diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrFileStub.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrFileStub.java
index 4d482477da42..abe676008c09 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrFileStub.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/GrFileStub.java
@@ -15,7 +15,6 @@
  */
 package org.jetbrains.plugins.groovy.lang.psi.stubs;
 
-import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.stubs.PsiFileStubImpl;
 import com.intellij.psi.tree.IStubFileElementType;
 import com.intellij.util.ArrayUtil;
@@ -34,7 +33,7 @@ public class GrFileStub extends PsiFileStubImpl<GroovyFile> {
 
   public GrFileStub(GroovyFile file) {
     super(file);
-    myName = StringRef.fromString(StringUtil.trimEnd(file.getName(), ".groovy"));
+    myName = StringRef.fromString(file.getViewProvider().getVirtualFile().getNameWithoutExtension());
     isScript = file.isScript();
     final GrPackageDefinition definition = file.getPackageDefinition();
     if (definition != null) {
diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
index 8ccfe21915f8..1942f869f58f 100644
--- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
+++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/stubs/elements/GrStubFileElementType.java
@@ -58,7 +58,7 @@ public class GrStubFileElementType extends IStubFileElementType<GrFileStub> {
 
   @Override
   public int getStubVersion() {
-    return super.getStubVersion() + 21;
+    return super.getStubVersion() + 22;
   }
 
   @Override
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileTypeLoader.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileTypeLoader.java
index 734cae7b3470..16cb6a7b1142 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileTypeLoader.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyFileTypeLoader.java
@@ -32,8 +32,7 @@ public class GroovyFileTypeLoader extends FileTypeFactory{
   public static Set<String> getCustomGroovyScriptExtensions() {
     final LinkedHashSet<String> strings = new LinkedHashSet<String>();
     strings.add("gdsl");
-    strings.add("gpp");
-    strings.add("grunit");
+    strings.add("gy");
     for (GroovyScriptTypeDetector ep : GroovyScriptTypeDetector.EP_NAME.getExtensions()) {
       Collections.addAll(strings, ep.getExtensions());
     }