diff --git a/RegExpSupport/resources/META-INF/RegExpPlugin.xml b/RegExpSupport/resources/META-INF/RegExpPlugin.xml
index dc012b8e9110..088a9db9bd3e 100644
--- a/RegExpSupport/resources/META-INF/RegExpPlugin.xml
+++ b/RegExpSupport/resources/META-INF/RegExpPlugin.xml
@@ -3,6 +3,8 @@
   -->
 
 <idea-plugin>
+  <resource-bundle>messages.RegExpBundle</resource-bundle>
+
   <extensionPoints>
     <extensionPoint name="regExpLanguageHost" beanClass="com.intellij.openapi.util.ClassExtensionPoint" dynamic="true">
       <with attribute="implementationClass" implements="org.intellij.lang.regexp.RegExpLanguageHost"/>
@@ -39,40 +41,40 @@
       <category>RegExp</category>
     </intentionAction>
 
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpRepeatedSpace" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.consecutive.spaces"
+    <localInspection language="RegExp" shortName="RegExpRepeatedSpace" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.consecutive.spaces"
                      implementationClass="org.intellij.lang.regexp.inspection.RepeatedSpaceInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpSingleCharAlternation" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.single.character.alternation"
+    <localInspection language="RegExp" shortName="RegExpSingleCharAlternation" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.single.character.alternation"
                      implementationClass="org.intellij.lang.regexp.inspection.SingleCharAlternationInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpOctalEscape" enabledByDefault="true" level="INFORMATION"
-                     bundle="messages.RegExpBundle" key="inspection.name.octal.escape"
+    <localInspection language="RegExp" shortName="RegExpOctalEscape" enabledByDefault="true" level="INFORMATION"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.octal.escape"
                      implementationClass="org.intellij.lang.regexp.inspection.OctalEscapeInspection"/>
     <!--<localInspection groupName="RegExp" language="RegExp" shortName="ReDoS" displayName="Exponential backtracking" enabledByDefault="true"
                      level="WARNING" implementationClass="org.intellij.lang.regexp.inspection.ReDoSInspection"/>-->
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpDuplicateAlternationBranch" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.duplicate.branch.in.alternation"
+    <localInspection language="RegExp" shortName="RegExpDuplicateAlternationBranch" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.duplicate.branch.in.alternation"
                      implementationClass="org.intellij.lang.regexp.inspection.DuplicateAlternationBranchInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpEscapedMetaCharacter" enabledByDefault="true" level="INFORMATION"
-                     bundle="messages.RegExpBundle" key="inspection.name.escaped.meta.character"
+    <localInspection language="RegExp" shortName="RegExpEscapedMetaCharacter" enabledByDefault="true" level="INFORMATION"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.escaped.meta.character"
                      implementationClass="org.intellij.lang.regexp.inspection.EscapedMetaCharacterInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpEmptyAlternationBranch" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.empty.branch.in.alternation"
+    <localInspection language="RegExp" shortName="RegExpEmptyAlternationBranch" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.empty.branch.in.alternation"
                      implementationClass="org.intellij.lang.regexp.inspection.EmptyAlternationBranchInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpAnonymousGroup" enabledByDefault="false" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.warning.anonymous.capturing.group"
+    <localInspection language="RegExp" shortName="RegExpAnonymousGroup" enabledByDefault="false" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.anonymous.group.or.numeric.back.reference"
                      implementationClass="org.intellij.lang.regexp.inspection.AnonymousGroupInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpRedundantEscape" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.redundant.character.escape"
+    <localInspection language="RegExp" shortName="RegExpRedundantEscape" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.redundant.character.escape"
                      implementationClass="org.intellij.lang.regexp.inspection.RedundantEscapeInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpUnexpectedAnchor" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.begin.or.end.anchor.in.unexpected.position"
+    <localInspection language="RegExp" shortName="RegExpUnexpectedAnchor" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.begin.or.end.anchor.in.unexpected.position"
                      implementationClass="org.intellij.lang.regexp.inspection.UnexpectedAnchorInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpDuplicateCharacterInClass" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.duplicate.character.in.class"
+    <localInspection language="RegExp" shortName="RegExpDuplicateCharacterInClass" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.duplicate.character.in.class"
                      implementationClass="org.intellij.lang.regexp.inspection.DuplicateCharacterInClassInspection"/>
-    <localInspection groupName="RegExp" language="RegExp" shortName="RegExpRedundantNestedCharacterClass" enabledByDefault="true" level="WARNING"
-                     bundle="messages.RegExpBundle" key="inspection.name.redundant.nested.character.class"
+    <localInspection language="RegExp" shortName="RegExpRedundantNestedCharacterClass" enabledByDefault="true" level="WARNING"
+                     groupKey="inspection.group.name.regexp" key="inspection.name.redundant.nested.character.class"
                      implementationClass="org.intellij.lang.regexp.inspection.RedundantNestedCharacterClassInspection"/>
 
   </extensions>
diff --git a/RegExpSupport/resources/messages/RegExpBundle.properties b/RegExpSupport/resources/messages/RegExpBundle.properties
index b67a83a93f92..fe1832e2a1de 100644
--- a/RegExpSupport/resources/messages/RegExpBundle.properties
+++ b/RegExpSupport/resources/messages/RegExpBundle.properties
@@ -60,6 +60,7 @@ error.unknown.property.value=Unknown property value
 error.unresolved.back.reference=Unresolved back reference
 error.unresolved.named.group.reference=Unresolved named group reference
 file.type.description.regular.expression=Regular expression
+inspection.group.name.regexp=RegExp
 inspection.name.anonymous.group.or.numeric.back.reference=Anonymous capturing group or numeric back reference
 inspection.name.begin.or.end.anchor.in.unexpected.position=Begin or end anchor in unexpected position
 inspection.name.consecutive.spaces=Consecutive spaces