diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
index 0b976f2d1c26..2900abfc4ba7 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java
@@ -770,7 +770,7 @@ public class AnnotationsHighlightUtil {
     @NotNull
     @Override
     public String getText() {
-      return CodeInsightBundle.message("remove");
+      return CodeInsightBundle.message("intention.text.remove.annotation");
     }
 
     @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/MakeAnnotationExternal.java b/java/java-impl/src/com/intellij/codeInsight/MakeAnnotationExternal.java
index 2b24091b413a..5530299d2613 100644
--- a/java/java-impl/src/com/intellij/codeInsight/MakeAnnotationExternal.java
+++ b/java/java-impl/src/com/intellij/codeInsight/MakeAnnotationExternal.java
@@ -37,7 +37,7 @@ public class MakeAnnotationExternal extends BaseIntentionAction {
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("annotate.externally");
+    return CodeInsightBundle.message("intention.text.annotate.externally");
   }
 
   @Override
@@ -51,7 +51,7 @@ public class MakeAnnotationExternal extends BaseIntentionAction {
         VirtualFile virtualFile = PsiUtilCore.getVirtualFile(modifierListOwner);
         if (JavaCodeStyleSettings.getInstance(file).USE_EXTERNAL_ANNOTATIONS ||
             virtualFile != null && ExternalAnnotationsManager.getInstance(project).hasAnnotationRootsForFile(virtualFile)) {
-          setText(CodeInsightBundle.message("annotate.externally"));
+          setText(CodeInsightBundle.message("intention.text.annotate.externally"));
           return true;
         }
       }
diff --git a/java/java-impl/src/com/intellij/codeInsight/MakeExternalAnnotationExplicit.java b/java/java-impl/src/com/intellij/codeInsight/MakeExternalAnnotationExplicit.java
index 28032d6c4184..549ea5138be8 100644
--- a/java/java-impl/src/com/intellij/codeInsight/MakeExternalAnnotationExplicit.java
+++ b/java/java-impl/src/com/intellij/codeInsight/MakeExternalAnnotationExplicit.java
@@ -45,7 +45,7 @@ public class MakeExternalAnnotationExplicit extends BaseIntentionAction {
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("make.external.annotations.explicit");
+    return CodeInsightBundle.message("intention.family.make.external.annotations.explicit");
   }
 
   @Override
@@ -62,7 +62,7 @@ public class MakeExternalAnnotationExplicit extends BaseIntentionAction {
           final String name = nameRef != null ? nameRef.getReferenceName() : annotation.getQualifiedName();
           return "@" + name + annotation.getParameterList().getText();
         }, " ");
-        setText(CodeInsightBundle.message("insert.0", annos));
+        setText(CodeInsightBundle.message("intention.text.insert.0.annotation", annos));
         return true;
       }
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/MakeInferredAnnotationExplicit.java b/java/java-impl/src/com/intellij/codeInsight/MakeInferredAnnotationExplicit.java
index f6139b720138..d4f36c62f944 100644
--- a/java/java-impl/src/com/intellij/codeInsight/MakeInferredAnnotationExplicit.java
+++ b/java/java-impl/src/com/intellij/codeInsight/MakeInferredAnnotationExplicit.java
@@ -47,7 +47,7 @@ public class MakeInferredAnnotationExplicit extends BaseIntentionAction {
   @Nls
   @Override
   public @NotNull String getFamilyName() {
-    return CodeInsightBundle.message("make.inferred.annotations.explicit");
+    return CodeInsightBundle.message("intention.family.make.inferred.annotations.explicit");
   }
 
   @Override
@@ -67,7 +67,7 @@ public class MakeInferredAnnotationExplicit extends BaseIntentionAction {
                                    .map(MakeInferredAnnotationExplicit::getAnnotationPresentation)
                                    .joining(" ");
       if (!annotations.isEmpty()) {
-        setText(CodeInsightBundle.message("insert.0", annotations));
+        setText(CodeInsightBundle.message("intention.text.insert.0.annotation", annotations));
         return true;
       }
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/NonCodeAnnotationsLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/NonCodeAnnotationsLineMarkerProvider.java
index 2ff77f280a87..d7e106ab4807 100644
--- a/java/java-impl/src/com/intellij/codeInsight/NonCodeAnnotationsLineMarkerProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/NonCodeAnnotationsLineMarkerProvider.java
@@ -186,7 +186,7 @@ public abstract class NonCodeAnnotationsLineMarkerProvider extends LineMarkerPro
       for (PsiParameter parameter: method.getParameterList().getParameters()) {
         MakeInferredAnnotationExplicit intention = new MakeInferredAnnotationExplicit();
         if (intention.isAvailable(project, file, parameter)) {
-          actions.add(new AnAction(CodeInsightBundle.message("0.on.parameter.1", intention.getText(), parameter.getName())) {
+          actions.add(new AnAction(CodeInsightBundle.message("action.text.0.on.parameter.1", intention.getText(), parameter.getName())) {
             @Override
             public void actionPerformed(@NotNull AnActionEvent e) {
               PsiDocumentManager.getInstance(project).commitAllDocuments();
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
index 6b5077aeb1be..6c4eb8efe26c 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/MarkerType.java
@@ -251,7 +251,7 @@ public class MarkerType {
   private static void navigateToOverriddenMethod(MouseEvent e, @NotNull final PsiMethod method) {
     if (DumbService.isDumb(method.getProject())) {
       DumbService.getInstance(method.getProject()).showDumbModeNotification(
-        CodeInsightBundle.message("navigation.to.overriding.classes"));
+        CodeInsightBundle.message("notification.navigation.to.overriding.classes"));
       return;
     }
 
@@ -330,7 +330,7 @@ public class MarkerType {
                                                PsiElementListCellRenderer<NavigatablePsiElement> renderer) {
     if (DumbService.isDumb(aClass.getProject())) {
       DumbService.getInstance(aClass.getProject()).showDumbModeNotification(
-        CodeInsightBundle.message("navigation.to.overriding.methods"));
+        CodeInsightBundle.message("notification.navigation.to.overriding.methods"));
       return;
     }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
index 0f872b7b4b96..0dd84a07e907 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
@@ -82,7 +82,7 @@ public class RecursiveCallLineMarkerProvider extends LineMarkerProviderDescripto
   @NotNull
   @Override
   public String getName() {
-    return CodeInsightBundle.message("recursive.call");
+    return CodeInsightBundle.message("line.marker.recursive.call");
   }
 
   @Nullable
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceImplementationClassFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceImplementationClassFix.java
index a3cf25a27054..a615dad0c1db 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceImplementationClassFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateServiceImplementationClassFix.java
@@ -169,9 +169,9 @@ public class CreateServiceImplementationClassFix extends CreateServiceClassFixBa
       super(project);
       setTitle(QuickFixBundle.message("create.service.implementation"));
 
-      mySubclassButton.setText(CodeInsightBundle.message("subclass.of.0", superClassName));
+      mySubclassButton.setText(CodeInsightBundle.message("radio.button.subclass.of.0", superClassName));
       mySubclassButton.setSelected(true);
-      myProviderButton.setText(CodeInsightBundle.message("with.provider.method"));
+      myProviderButton.setText(CodeInsightBundle.message("radio.button.with.provider.method"));
 
       ButtonGroup group = new ButtonGroup();
       group.add(mySubclassButton);
@@ -197,7 +197,7 @@ public class CreateServiceImplementationClassFix extends CreateServiceClassFixBa
     @Override
     protected JComponent createNorthPanel() {
       PanelGridBuilder builder = UI.PanelFactory.grid();
-      builder.add(UI.PanelFactory.panel(mySubclassButton).withLabel(CodeInsightBundle.message("implementation")))
+      builder.add(UI.PanelFactory.panel(mySubclassButton).withLabel(CodeInsightBundle.message("label.implementation")))
              .add(UI.PanelFactory.panel(myProviderButton));
       if (myRootDirCombo.getModel().getSize() > 1) {
         builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("label.source.root") + ":"));
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
index 266eb56693aa..8aa844b3df09 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
@@ -85,7 +85,7 @@ public class MoveClassToModuleFix implements IntentionAction {
   @Override
   @NotNull
   public String getFamilyName() {
-    return CodeInsightBundle.message("move.it");
+    return CodeInsightBundle.message("intention.family.move.it");
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java
index da89aaf5fc12..c048bc9463f4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableAccessFromInnerClassJava10Fix.java
@@ -48,7 +48,7 @@ public class VariableAccessFromInnerClassJava10Fix extends BaseIntentionAction {
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("variable.access.from.inner.class");
+    return CodeInsightBundle.message("intention.family.variable.access.from.inner.class");
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
index 3aaf0fa293e2..f1f7ca70e1d2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/JavaTypedHandler.java
@@ -138,7 +138,7 @@ public class JavaTypedHandler extends TypedHandlerDelegate {
       if (CodeInsightSettings.getInstance().AUTOINSERT_PAIR_BRACKET && isRparenth(leaf) &&
           (st instanceof PsiWhileStatement || st instanceof PsiIfStatement) && shouldInsertStatementBody(st, doc, prev)) {
         CommandProcessor.getInstance().executeCommand(project, () -> new JavaSmartEnterProcessor().process(project, editor, file),
-                                                      CodeInsightBundle.message("insert.block.statement"), null);
+                                                      CodeInsightBundle.message("command.name.insert.block.statement"), null);
         return Result.STOP;
       }
 
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
index 4ecafcd66984..7cc8a96d178f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/JavaOverrideImplementMemberChooser.java
@@ -229,7 +229,8 @@ public class JavaOverrideImplementMemberChooser extends MemberChooser<PsiMethodM
 
   private class MyMergeAction extends ToggleAction {
     private MyMergeAction() {
-      super(CodeInsightBundle.message("show.methods.to.implement"), CodeInsightBundle.message("show.methods.to.implement"), AllIcons.General.Show_to_implement);
+      super(CodeInsightBundle.message("action.text.show.methods.to.implement"), CodeInsightBundle.message(
+        "action.text.show.methods.to.implement"), AllIcons.General.Show_to_implement);
       registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_I, InputEvent.ALT_MASK)), myTree);
       registerCustomShortcutSet(getActiveKeymapShortcuts("OverrideMethods"), myTree);
     }
diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/JavaTypeProvider.java b/java/java-impl/src/com/intellij/codeInsight/hint/JavaTypeProvider.java
index 0cdcff574a0d..4dfa8725cfd5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/hint/JavaTypeProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/hint/JavaTypeProvider.java
@@ -55,7 +55,7 @@ public class JavaTypeProvider extends ExpressionTypeProvider<PsiExpression> {
   @NotNull
   @Override
   public String getErrorHint() {
-    return CodeInsightBundle.message("no.expression.found");
+    return CodeInsightBundle.message("error.hint.no.expression.found");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddJavadocIntention.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddJavadocIntention.java
index 617680c332ed..96a764c69e74 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddJavadocIntention.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddJavadocIntention.java
@@ -50,7 +50,7 @@ public class AddJavadocIntention extends BaseElementAtCaretIntentionAction imple
   @Override
   public String getFamilyName() {
     //noinspection DialogTitleCapitalization
-    return CodeInsightBundle.message("add.javadoc");
+    return CodeInsightBundle.message("intention.family.add.javadoc");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java
index a11cbc7f559b..6ae1ef440498 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BindFieldsFromParametersAction.java
@@ -209,7 +209,7 @@ public class BindFieldsFromParametersAction extends BaseIntentionAction implemen
                                            ParameterClassMember @NotNull [] members) {
     final MemberChooser<ParameterClassMember> chooser = new MemberChooser<>(members, false, true, project);
     chooser.selectElements(getInitialSelection(method, members));
-    chooser.setTitle(CodeInsightBundle.message("choose.0.parameters", method.isConstructor() ? "Constructor" : "Method"));
+    chooser.setTitle(CodeInsightBundle.message("dialog.title.choose.0.parameters", method.isConstructor() ? "Constructor" : "Method"));
     chooser.show();
     return chooser;
   }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java
index a00cff80a566..101b6b56af02 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CollapseAnnotationsFix.java
@@ -27,7 +27,7 @@ public class CollapseAnnotationsFix extends LocalQuickFixAndIntentionActionOnPsi
   @NotNull
   @Override
   public String getText() {
-    return CodeInsightBundle.message("collapse.repeating.annotations");
+    return CodeInsightBundle.message("intention.text.collapse.repeating.annotations");
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
index 259872898f6a..5eb03ca16cc6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ConvertAbsolutePathToRelativeIntentionAction.java
@@ -63,7 +63,7 @@ public class ConvertAbsolutePathToRelativeIntentionAction extends BaseIntentionA
   @NotNull
   public String getFamilyName() {
     return CodeInsightBundle
-      .message("convert.0.path.to.1", isConvertToRelative() ? "absolute" : "relative", isConvertToRelative() ? "relative" : "absolute");
+      .message("intention.family.convert.0.path.to.1", isConvertToRelative() ? "absolute" : "relative", isConvertToRelative() ? "relative" : "absolute");
   }
 
   @Override
@@ -79,6 +79,6 @@ public class ConvertAbsolutePathToRelativeIntentionAction extends BaseIntentionA
   @NotNull
   @Override
   public String getText() {
-    return CodeInsightBundle.message("convert.path.to.0", isConvertToRelative() ? "relative" : "absolute");
+    return CodeInsightBundle.message("intention.text.convert.path.to.0", isConvertToRelative() ? "relative" : "absolute");
   }
 }
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java
index 123ea33b7553..9c8d9eefa412 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CopyAbstractMethodImplementationAction.java
@@ -28,7 +28,7 @@ public class CopyAbstractMethodImplementationAction extends ImplementAbstractMet
   @Override
   @NotNull
   public String getFamilyName() {
-    return CodeInsightBundle.message("copy.abstract.method.implementation");
+    return CodeInsightBundle.message("intention.family.copy.abstract.method.implementation");
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassInPackageInModuleFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassInPackageInModuleFix.java
index 15afc78e051b..c9456063d820 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassInPackageInModuleFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateClassInPackageInModuleFix.java
@@ -59,14 +59,14 @@ public class CreateClassInPackageInModuleFix implements IntentionAction {
   @NotNull
   @Override
   public String getText() {
-    return CodeInsightBundle.message("create.a.class.in.0", myPackageName);
+    return CodeInsightBundle.message("intention.text.create.a.class.in.0", myPackageName);
   }
 
   @Nls
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("create.a.class.in.package");
+    return CodeInsightBundle.message("intention.family.create.a.class.in.package");
   }
 
   @Override
@@ -142,7 +142,7 @@ public class CreateClassInPackageInModuleFix implements IntentionAction {
     CreateClassInPackageDialog(@Nullable Project project, PsiDirectory @NotNull [] rootDirs) {
       super(project);
       myProject = project;
-      setTitle(CodeInsightBundle.message("create.class.in.package"));
+      setTitle(CodeInsightBundle.message("dialog.title.create.class.in.package"));
 
       myRootDirCombo.setRenderer(new CreateServiceClassFixBase.PsiDirectoryListCellRenderer());
       myRootDirCombo.setModel(new DefaultComboBoxModel<>(rootDirs));
@@ -176,7 +176,7 @@ public class CreateClassInPackageInModuleFix implements IntentionAction {
       PanelGridBuilder builder = UI.PanelFactory.grid();
       builder.add(UI.PanelFactory.panel(myNameTextField)
                     .withLabel(CommonBundle.message("label.name") + ":")
-                    .withComment(CodeInsightBundle.message("the.class.will.be.created.in.the.package.0", myPackageName)));
+                    .withComment(CodeInsightBundle.message("comment.the.class.will.be.created.in.the.package.0", myPackageName)));
       if (myRootDirCombo.getModel().getSize() > 1) {
         builder.add(UI.PanelFactory.panel(myRootDirCombo).withLabel(CommonBundle.message("label.source.root") + ":"));
       }
@@ -194,7 +194,7 @@ public class CreateClassInPackageInModuleFix implements IntentionAction {
       if (PsiNameHelper.getInstance(myProject).isIdentifier(name, level)) {
         return null;
       }
-      return new ValidationInfo(CodeInsightBundle.message("this.is.not.a.valid.java.class.name"), myNameTextField);
+      return new ValidationInfo(CodeInsightBundle.message("error.text.this.is.not.a.valid.java.class.name"), myNameTextField);
     }
 
     @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
index 292d13b4bc6a..99b19e3ba4b5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExpandStaticImportAction.java
@@ -40,7 +40,7 @@ public class ExpandStaticImportAction extends BaseElementAtCaretIntentionAction
   @Override
   @NotNull
   public String getFamilyName() {
-    return CodeInsightBundle.message("expand.static.import");
+    return CodeInsightBundle.message("intention.family.expand.static.import");
   }
 
   @Override
@@ -55,7 +55,7 @@ public class ExpandStaticImportAction extends BaseElementAtCaretIntentionAction
     if (resolveScope instanceof PsiImportStaticStatement) {
       final PsiClass targetClass = ((PsiImportStaticStatement)resolveScope).resolveTargetClass();
       if (targetClass == null) return false;
-      setText(CodeInsightBundle.message("replace.static.import.with.qualified.access.to.0", targetClass.getName()));
+      setText(CodeInsightBundle.message("intention.text.replace.static.import.with.qualified.access.to.0", targetClass.getName()));
       return true;
     }
     return false;
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java
index a64cbebec2ec..e5bbfdfc4f22 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/ExtractSetFromComparisonChainAction.java
@@ -130,7 +130,8 @@ public class ExtractSetFromComparisonChainAction extends PsiElementBaseIntention
                    Messages.showYesNoDialog(project,
                                             CodeInsightBundle.message("intention.extract.set.from.comparison.chain.duplicates",
                                                                       ApplicationNamesInfo.getInstance().getProductName(),
-                                                                      copies.size()), CodeInsightBundle.message("process.duplicates"),
+                                                                      copies.size()), CodeInsightBundle.message(
+                       "dialog.title.process.duplicates"),
                                             Messages.getQuestionIcon());
       if (answer == Messages.YES) {
         WriteAction.run(() -> {
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SameErasureButDifferentMethodsFix.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SameErasureButDifferentMethodsFix.java
index 228a8530fac5..5d17c7425f55 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SameErasureButDifferentMethodsFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SameErasureButDifferentMethodsFix.java
@@ -86,14 +86,14 @@ public class SameErasureButDifferentMethodsFix extends LocalQuickFixAndIntention
   public String getText() {
     PsiMethod method = methodPtr.getElement();
     if (method == null || !method.isValid()) return getFamilyName();
-    return CodeInsightBundle.message("fix.method.0.parameters.with.bounded.wildcards", method.getName());
+    return CodeInsightBundle.message("intention.text.fix.method.0.parameters.with.bounded.wildcards", method.getName());
   }
 
   @Nls
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("fix.bounded.wildcards");
+    return CodeInsightBundle.message("intention.family.fix.bounded.wildcards");
   }
 
   @Override
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
index 2a3f8f4edd91..90f827440921 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SortContentAction.java
@@ -50,7 +50,7 @@ public class SortContentAction extends PsiElementBaseIntentionAction {
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("sort.content");
+    return CodeInsightBundle.message("intention.family.sort.content");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java
index 343ef66b709c..4b8265d7dcc4 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/SwapIfStatementsIntentionAction.java
@@ -70,7 +70,7 @@ public class SwapIfStatementsIntentionAction extends PsiElementBaseIntentionActi
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("swap.if.statements");
+    return CodeInsightBundle.message("intention.family.swap.if.statements");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopArgumentsAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopArgumentsAction.java
index 2349de9831a4..2f80c3d604b2 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopArgumentsAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopArgumentsAction.java
@@ -42,7 +42,7 @@ public class JavaChopArgumentsAction extends AbstractJavaChopListAction<PsiExpre
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("put.arguments.on.separate.lines");
+    return CodeInsightBundle.message("intention.family.put.arguments.on.separate.lines");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopParametersAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopParametersAction.java
index 475b435b6e44..78dbb2e1f406 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopParametersAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaChopParametersAction.java
@@ -41,7 +41,7 @@ public class JavaChopParametersAction extends AbstractJavaChopListAction<PsiPara
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("put.parameters.on.separate.lines");
+    return CodeInsightBundle.message("intention.family.put.parameters.on.separate.lines");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinArgumentsAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinArgumentsAction.java
index 30ed86b2048a..7555ab3852d6 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinArgumentsAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinArgumentsAction.java
@@ -41,7 +41,7 @@ public class JavaJoinArgumentsAction extends AbstractJavaJoinListAction<PsiExpre
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("put.arguments.on.one.line");
+    return CodeInsightBundle.message("intention.family.put.arguments.on.one.line");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinParametersAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinParametersAction.java
index 77d9d8c464d7..8f695b33f913 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinParametersAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/lists/JavaJoinParametersAction.java
@@ -42,7 +42,7 @@ public class JavaJoinParametersAction extends AbstractJavaJoinListAction<PsiPara
   @NotNull
   @Override
   public String getFamilyName() {
-    return CodeInsightBundle.message("put.parameters.on.one.line");
+    return CodeInsightBundle.message("intention.family.put.parameters.on.one.line");
   }
 
   @NotNull
diff --git a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
index 90b138790232..17420e08a849 100644
--- a/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/template/postfix/templates/editable/JavaPostfixTemplateEditor.java
@@ -113,8 +113,8 @@ public class JavaPostfixTemplateEditor extends PostfixTemplateEditorBase<JavaPos
     private final Project myProject;
 
     protected ChooseClassAction(@Nullable Project project) {
-      super((project != null && !project.isDefault() ? CodeInsightBundle.message("choose.class.in.0", project.getName())
-                                                     : CodeInsightBundle.message("enter.class.name")));
+      super((project != null && !project.isDefault() ? CodeInsightBundle.message("action.text.choose.class.in.0", project.getName())
+                                                     : CodeInsightBundle.message("action.text.enter.class.name")));
       myProject = project;
     }
 
@@ -129,8 +129,8 @@ public class JavaPostfixTemplateEditor extends PostfixTemplateEditorBase<JavaPos
     private String getFqn() {
       String title = "Choose Class";
       if (myProject == null || myProject.isDefault()) {
-        return Messages.showInputDialog(myPanel, CodeInsightBundle.message("enter.fully.qualified.class.name"),
-                                        CodeInsightBundle.message("choose.class"), null);
+        return Messages.showInputDialog(myPanel, CodeInsightBundle.message("label.enter.fully.qualified.class.name"),
+                                        CodeInsightBundle.message("dialog.title.choose.class"), null);
       }
       TreeClassChooser chooser = TreeClassChooserFactory.getInstance(myProject).createAllProjectScopeChooser(title);
       chooser.showDialog();
diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java
index 046f804d859c..c3e789c66e96 100644
--- a/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java
+++ b/java/java-tests/testSrc/com/intellij/java/codeInsight/ExternalAnnotationsTest.java
@@ -95,7 +95,7 @@ public class ExternalAnnotationsTest extends UsefulTestCase {
   public void testFromSrcToExternal() {
     myFixture.configureByFiles("src/fromSrc/Foo.java", "content/anno/fromSrc/annotations.xml");
 
-    IntentionAction action = myFixture.findSingleIntention(CodeInsightBundle.message("annotate.externally"));
+    IntentionAction action = myFixture.findSingleIntention(CodeInsightBundle.message("intention.text.annotate.externally"));
     assertNotNull(action);
 
     myFixture.launchAction(action);
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 5f49d6335f0d..8f1d3e3e452b 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -680,53 +680,53 @@ action.presentation.DocumentationComponent.text=Edit Source
 action.presentation.LookupUi.text=action.presentation.LookupUi.text
 action.presentation.QuickFixPreviewPanelFactory.text=Fix partially
 action.presentation.QuickFixPreviewPanelFactory.text.suppress=Suppress
-remove=Remove
-process.duplicates=Process Duplicates
-swap.if.statements=Swap 'if' statements
-replace.static.import.with.qualified.access.to.0=Replace static import with qualified access to {0}
-expand.static.import=Expand static import
-0.on.parameter.1={0} on parameter ''{1}''
-recursive.call=Recursive call
-fix.bounded.wildcards=Fix bounded wildcards
-fix.method.0.parameters.with.bounded.wildcards=Fix method ''{0}'' parameters with bounded wildcards
-variable.access.from.inner.class=Variable accessFromInnerClass
-put.arguments.on.separate.lines=Put arguments on separate lines
-annotate.externally=Annotate Externally
-put.parameters.on.one.line=Put parameters on one line
+intention.text.remove.annotation=Remove
+dialog.title.process.duplicates=Process Duplicates
+intention.family.swap.if.statements=Swap 'if' statements
+intention.text.replace.static.import.with.qualified.access.to.0=Replace static import with qualified access to {0}
+intention.family.expand.static.import=Expand static import
+action.text.0.on.parameter.1={0} on parameter ''{1}''
+line.marker.recursive.call=Recursive call
+intention.family.fix.bounded.wildcards=Fix bounded wildcards
+intention.text.fix.method.0.parameters.with.bounded.wildcards=Fix method ''{0}'' parameters with bounded wildcards
+intention.family.variable.access.from.inner.class=Variable accessFromInnerClass
+intention.family.put.arguments.on.separate.lines=Put arguments on separate lines
+intention.text.annotate.externally=Annotate Externally
+intention.family.put.parameters.on.one.line=Put parameters on one line
 please.report.a.bug=Please report a bug
-put.parameters.on.separate.lines=Put parameters on separate lines
-choose.class=Choose Class
-enter.fully.qualified.class.name=Enter fully qualified class name
-enter.class.name=enter class name...
-choose.class.in.0=choose class in {0}...
-insert.block.statement=Insert block statement
-this.is.not.a.valid.java.class.name=This is not a valid Java class name
-the.class.will.be.created.in.the.package.0=The class will be created in the package ''{0}''
-create.class.in.package=Create Class in Package
-create.a.class.in.package=Create a class in package
-create.a.class.in.0=Create a class in ''{0}''
-insert.0=Insert ''{0}''
-make.inferred.annotations.explicit=Make Inferred Annotations Explicit
-put.arguments.on.one.line=Put arguments on one line
-make.external.annotations.explicit=Make External Annotations Explicit
-show.methods.to.implement=Show methods to implement
+intention.family.put.parameters.on.separate.lines=Put parameters on separate lines
+dialog.title.choose.class=Choose Class
+label.enter.fully.qualified.class.name=Enter fully qualified class name
+action.text.enter.class.name=enter class name...
+action.text.choose.class.in.0=choose class in {0}...
+command.name.insert.block.statement=Insert block statement
+error.text.this.is.not.a.valid.java.class.name=This is not a valid Java class name
+comment.the.class.will.be.created.in.the.package.0=The class will be created in the package ''{0}''
+dialog.title.create.class.in.package=Create Class in Package
+intention.family.create.a.class.in.package=Create a class in package
+intention.text.create.a.class.in.0=Create a class in ''{0}''
+intention.text.insert.0.annotation=Insert ''{0}''
+intention.family.make.inferred.annotations.explicit=Make Inferred Annotations Explicit
+intention.family.put.arguments.on.one.line=Put arguments on one line
+intention.family.make.external.annotations.explicit=Make External Annotations Explicit
+action.text.show.methods.to.implement=Show methods to implement
 convert.compareto.expression.to.equals.call.may.change.semantics=Convert 'compareTo()' expression to 'equals()' call (may change semantics)
 convert.compareto.expression.to.equals.call=Convert 'compareTo()' expression to 'equals()' call
 java.line.markers=Java line markers
-add.javadoc=Add Javadoc
-copy.abstract.method.implementation=Copy abstract method implementation
-implementation=Implementation:
-with.provider.method=With 'provider()' method
-subclass.of.0=Subclass of ''{0}''
-no.expression.found=No expression found
-navigation.to.overriding.methods=Navigation to overriding methods is not possible during index update
-navigation.to.overriding.classes=Navigation to overriding classes is not possible during index update
-sort.content=Sort content
-collapse.repeating.annotations=Collapse repeating annotations
-convert.path.to.0=Convert path to {0}
-convert.0.path.to.1=Convert {0} path to {1}
-move.it=move it
-choose.0.parameters=Choose {0} Parameters
+intention.family.add.javadoc=Add Javadoc
+intention.family.copy.abstract.method.implementation=Copy abstract method implementation
+label.implementation=Implementation:
+radio.button.with.provider.method=With 'provider()' method
+radio.button.subclass.of.0=Subclass of ''{0}''
+error.hint.no.expression.found=No expression found
+notification.navigation.to.overriding.methods=Navigation to overriding methods is not possible during index update
+notification.navigation.to.overriding.classes=Navigation to overriding classes is not possible during index update
+intention.family.sort.content=Sort content
+intention.text.collapse.repeating.annotations=Collapse repeating annotations
+intention.text.convert.path.to.0=Convert path to {0}
+intention.family.convert.0.path.to.1=Convert {0} path to {1}
+intention.family.move.it=Move it
+dialog.title.choose.0.parameters=Choose {0} Parameters
 generate.hashcode.template.title=HashCode Template:
 generate.equals.template.title=Equals Template:
 postfix.template.language.level.title=Minimum language level: