diff --git a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
index 9407abf3a967..52e1f4edf4cf 100644
--- a/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
+++ b/platform/platform-api/src/com/intellij/openapi/options/Configurable.java
@@ -7,6 +7,7 @@ import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.nls.NlsContexts;
 import org.jetbrains.annotations.*;
 
 import javax.swing.*;
@@ -132,7 +133,7 @@ public interface Configurable extends UnnamedConfigurable {
    *
    * @return the visible name of the configurable component
    */
-  @Nls(capitalization = Nls.Capitalization.Title)
+  @Nls @NlsContexts.Configurable
   @Contract(pure = true)
   String getDisplayName();
 
diff --git a/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java b/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
index e2a77013fb39..aab6878491b8 100644
--- a/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
+++ b/platform/platform-api/src/com/intellij/util/nls/NlsContexts.java
@@ -123,4 +123,10 @@ public class NlsContexts {
   @Target(ElementType.TYPE_USE)
   public @interface CommandName {
   }
+
+  @NlsContext(prefix = "configurable.name")
+  @Nls(capitalization = Nls.Capitalization.Title)
+  @Target(ElementType.TYPE_USE)
+  public @interface Configurable {
+  }
 }
\ No newline at end of file