diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java
index ea70ac17804..beda81c39a4 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java
@@ -109,6 +109,7 @@ public final class FqName extends FqNameBase {
         return fqName.shortName();
     }
 
+    @Override
     @NotNull
     public Name shortNameOrSpecial() {
         return fqName.shortNameOrSpecial();
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java
index 572f67d04b7..d9270106b1b 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java
@@ -52,6 +52,9 @@ public abstract class FqNameBase {
         return toFqNameUnsafe().equals(that);
     }
 
+    @NotNull
+    public abstract Name shortNameOrSpecial();
+
     @NotNull
     public abstract List<Name> pathSegments();
 }
diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
index f6d8c1358f5..2825825aa18 100644
--- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
+++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java
@@ -153,6 +153,7 @@ public final class FqNameUnsafe extends FqNameBase {
         return shortName;
     }
 
+    @Override
     @NotNull
     public Name shortNameOrSpecial() {
         if (isRoot()) {