diff --git a/java/java-impl/resources/intellij.java.impl.xml b/java/java-impl/resources/intellij.java.impl.xml
index 096557b99fc5..3fcfccdf6073 100644
--- a/java/java-impl/resources/intellij.java.impl.xml
+++ b/java/java-impl/resources/intellij.java.impl.xml
@@ -106,7 +106,7 @@
       serviceImplementation="com.intellij.refactoring.introduceField.JavaIntroduceFieldService"/>
 
     <registryKey defaultValue="false" description="Enable postfix mod completion" key="postfix.template.mod.completion.enabled"/>
-    <advancedSetting id="java.show.new.file.in.irrelevant.java.source.roots" default="false"
+    <advancedSetting id="java.suggest.creating.java.sources.in.irrelevant.source.roots" default="false"
                      groupKey="advanced.settings.group.java" bundle="messages.JavaBundle"/>
     <applicationSettings service="com.intellij.codeInsight.hints.AnnotationInlaySettings"/>
     <projectSettings service="com.intellij.javadoc.JavadocGenerationManager"/>
diff --git a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
index 7c7f8b9233e5..a78bf06a3b8d 100644
--- a/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
+++ b/java/java-impl/src/com/intellij/ide/actions/CreateClassAction.java
@@ -68,7 +68,7 @@ public class CreateClassAction extends JavaCreateTemplateInPackageAction<PsiClas
   }
 
   public static boolean isJavaFileActionSuppressed(@NotNull DataContext dataContext) {
-    if (AdvancedSettings.getBoolean("java.show.new.file.in.irrelevant.java.source.roots")) return false;
+    if (AdvancedSettings.getBoolean("java.suggest.creating.java.sources.in.irrelevant.source.roots")) return false;
 
     List<JavaClassActionSuppressor> suppressors = JavaClassActionSuppressor.EP_NAME.getExtensionList();
     return ContainerUtil.exists(suppressors,
diff --git a/java/openapi/resources/messages/JavaBundle.properties b/java/openapi/resources/messages/JavaBundle.properties
index b418f0ceda09..1c57c869d63e 100644
--- a/java/openapi/resources/messages/JavaBundle.properties
+++ b/java/openapi/resources/messages/JavaBundle.properties
@@ -2003,7 +2003,7 @@ command.completion.generate.no.args.constructor.text=No-Args Constructor
 command.completion.generate.all.args.constructor.text=All-Args Constructor
 
 advanced.setting.java.show.irrelevant.templates.in.source.roots=Show irrelevant New File templates in Java source roots
-advanced.setting.java.show.new.file.in.irrelevant.java.source.roots=Show New File in irrelevant Java source roots
+advanced.setting.java.suggest.creating.java.sources.in.irrelevant.source.roots=Suggest creating Java sources in irrelevant source roots
 java.test.use.wall.time=Use Wall Time
 java.test.overall.time=Overall time: {0}
 java.test.sum.time=Sum time: {0}