diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaNameValuePairType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaNameValuePairType.java
index dd35bea8b5a2..1ddf7489335d 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaNameValuePairType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaNameValuePairType.java
@@ -30,6 +30,7 @@ import com.intellij.psi.stubs.IndexSink;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.stubs.StubInputStream;
 import com.intellij.psi.stubs.StubOutputStream;
+import com.intellij.util.io.StringRef;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -79,7 +80,7 @@ public class JavaNameValuePairType extends JavaStubElementType<PsiNameValuePairS
 
   @Override
   public void serialize(@NotNull PsiNameValuePairStub stub, @NotNull StubOutputStream dataStream) throws IOException {
-    dataStream.writeUTFFast(stub.getName());
+    dataStream.writeName(stub.getName());
 
     String value = stub.getValue();
     boolean hasValue = value != null;
@@ -92,7 +93,7 @@ public class JavaNameValuePairType extends JavaStubElementType<PsiNameValuePairS
   @NotNull
   @Override
   public PsiNameValuePairStub deserialize(@NotNull StubInputStream dataStream, StubElement parentStub) throws IOException {
-    String name = dataStream.readUTFFast();
+    String name = StringRef.toString(dataStream.readName());
     boolean hasValue = dataStream.readBoolean();
     return new PsiNameValuePairStubImpl(parentStub, name, hasValue ? dataStream.readUTFFast() : null);
   }
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
index 05db00ecee09..0763ed2103ed 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/JavaFileElementType.java
@@ -38,7 +38,7 @@ import java.io.IOException;
  * @author max
  */
 public class JavaFileElementType extends ILightStubFileElementType<PsiJavaFileStub> {
-  public static final int STUB_VERSION = 35;
+  public static final int STUB_VERSION = 36;
 
   public JavaFileElementType() {
     super("java.FILE", JavaLanguage.INSTANCE);