diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml
index 68743eecf9f3..00138dd317e7 100644
--- a/java/java-analysis-impl/intellij.java.analysis.impl.iml
+++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml
@@ -7,6 +7,7 @@
     </content>
     <content url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/InspectionGadgetsAnalysis">
       <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/InspectionGadgetsAnalysis/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/../../plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
similarity index 100%
rename from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
rename to plugins/InspectionGadgets/InspectionGadgetsAnalysis/resources/messages/InspectionGadgetsBundle.properties
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java
index 6634619cac56..d9d190800058 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java
@@ -7,7 +7,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.PropertyKey;
 
 public class InspectionGadgetsBundle extends DynamicBundle {
-  @NonNls public static final String BUNDLE = "com.siyeh.InspectionGadgetsBundle";
+  @NonNls public static final String BUNDLE = "messages.InspectionGadgetsBundle";
   private static final InspectionGadgetsBundle INSTANCE = new InspectionGadgetsBundle();
 
   private InspectionGadgetsBundle() { super(BUNDLE); }
diff --git a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
index b4c9c700bd5f..8c5d672bd0d6 100644
--- a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
@@ -20,785 +20,785 @@
     <inspectionElementsMerger implementation="com.siyeh.ig.jdk.ForwardCompatibilityInspectionMerger"/>
 
     <!--group.names.abstraction.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="BooleanParameter" bundle="com.siyeh.InspectionGadgetsBundle" key="boolean.parameter.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BooleanParameter" bundle="messages.InspectionGadgetsBundle" key="boolean.parameter.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.BooleanParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CastToConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle" key="cast.to.concrete.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CastToConcreteClass" bundle="messages.InspectionGadgetsBundle" key="cast.to.concrete.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.CastToConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassReferencesSubclass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassReferencesSubclass" bundle="messages.InspectionGadgetsBundle"
                      key="class.references.subclass.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.ClassReferencesSubclassInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CollectionDeclaredAsConcreteClass" shortName="DeclareCollectionAsInterface"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="collection.declared.by.class.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="collection.declared.by.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.DeclareCollectionAsInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FeatureEnvy" bundle="com.siyeh.InspectionGadgetsBundle" key="feature.envy.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FeatureEnvy" bundle="messages.InspectionGadgetsBundle" key="feature.envy.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.FeatureEnvyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstanceVariableOfConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstanceVariableOfConcreteClass" bundle="messages.InspectionGadgetsBundle"
                      key="instance.variable.of.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.InstanceVariableOfConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ChainOfInstanceofChecks" shortName="InstanceofChain" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ChainOfInstanceofChecks" shortName="InstanceofChain" bundle="messages.InspectionGadgetsBundle"
                      key="chain.of.instanceof.checks.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.InstanceofChainInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InstanceofConcreteClass" alternativeId="InstanceofInterfaces"
-                     shortName="InstanceofInterfaces" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="InstanceofInterfaces" bundle="messages.InspectionGadgetsBundle"
                      key="instanceof.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.InstanceofInterfacesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofThis" bundle="com.siyeh.InspectionGadgetsBundle" key="instanceof.check.for.this.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofThis" bundle="messages.InspectionGadgetsBundle" key="instanceof.check.for.this.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.InstanceofThisInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceMethodClashesWithObject" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceMethodClashesWithObject" bundle="messages.InspectionGadgetsBundle"
                      key="interface.clashes.with.object.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.InterfaceMethodClashesWithObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LocalVariableOfConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LocalVariableOfConcreteClass" bundle="messages.InspectionGadgetsBundle"
                      key="local.variable.of.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.LocalVariableOfConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MagicNumber" bundle="com.siyeh.InspectionGadgetsBundle" key="magic.number.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MagicNumber" bundle="messages.InspectionGadgetsBundle" key="magic.number.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.MagicNumberInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodOnlyUsedFromInnerClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodOnlyUsedFromInnerClass" bundle="messages.InspectionGadgetsBundle"
                      key="method.only.used.from.inner.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.MethodOnlyUsedFromInnerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodReturnOfConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodReturnOfConcreteClass" bundle="messages.InspectionGadgetsBundle"
                      key="method.return.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.MethodReturnOfConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OptionalUsedAsFieldOrParameterType" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OptionalUsedAsFieldOrParameterType" bundle="messages.InspectionGadgetsBundle"
                      key="optional.used.as.field.or.parameter.type.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.OptionalUsedAsFieldOrParameterTypeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverlyStrongTypeCast" bundle="com.siyeh.InspectionGadgetsBundle" key="overly.strong.type.cast.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverlyStrongTypeCast" bundle="messages.InspectionGadgetsBundle" key="overly.strong.type.cast.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.OverlyStrongTypeCastInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodParameterOfConcreteClass" shortName="ParameterOfConcreteClass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="concrete.class.method.parameter.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="concrete.class.method.parameter.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.ParameterOfConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicMethodNotExposedInInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicMethodNotExposedInInterface" bundle="messages.InspectionGadgetsBundle"
                      key="public.method.not.in.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.PublicMethodNotExposedInInterfaceInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="StaticMethodOnlyUsedInOneClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="StaticMethodOnlyUsedInOneClass" bundle="messages.InspectionGadgetsBundle"
                       key="static.method.only.used.in.one.class.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.abstraction.StaticMethodOnlyUsedInOneClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticVariableOfConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticVariableOfConcreteClass" bundle="messages.InspectionGadgetsBundle"
                      key="static.variable.of.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.abstraction.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.abstraction.StaticVariableOfConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TypeMayBeWeakened" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TypeMayBeWeakened" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.type.may.be.weakened.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.abstraction.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.abstraction.TypeMayBeWeakenedInspection"/>
 
     <!--group.names.assignment.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToCatchBlockParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToCatchBlockParameter" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.catch.block.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToCatchBlockParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToForLoopParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToForLoopParameter" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.for.loop.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToForLoopParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToLambdaParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToLambdaParameter" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.lambda.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToLambdaParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToMethodParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToMethodParameter" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.method.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToMethodParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToNull" bundle="com.siyeh.InspectionGadgetsBundle" key="assignment.to.null.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToNull" bundle="messages.InspectionGadgetsBundle" key="assignment.to.null.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.assignment.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.assignment.AssignmentToNullInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToStaticFieldFromInstanceMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToStaticFieldFromInstanceMethod" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.static.field.from.instance.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToStaticFieldFromInstanceMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToSuperclassField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentToSuperclassField" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.to.superclass.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentToSuperclassFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentUsedAsCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssignmentUsedAsCondition" bundle="messages.InspectionGadgetsBundle"
                      key="assignment.used.as.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.assignment.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.assignment.AssignmentUsedAsConditionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ValueOfIncrementOrDecrementUsed" shortName="IncrementDecrementUsedAsExpression"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="increment.decrement.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="increment.decrement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.assignment.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.assignment.IncrementDecrementUsedAsExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedAssignment" bundle="com.siyeh.InspectionGadgetsBundle" key="nested.assignment.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedAssignment" bundle="messages.InspectionGadgetsBundle" key="nested.assignment.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.assignment.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.assignment.NestedAssignmentInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="AssignmentReplaceableWithOperatorAssignment" shortName="ReplaceAssignmentWithOperatorAssignment"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="assignment.replaceable.with.operator.assignment.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="assignment.replaceable.with.operator.assignment.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.assignment.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.assignment.ReplaceAssignmentWithOperatorAssignmentInspection"/>
 
     <!--group.names.bitwise.operation.issues-->
-    <localInspection groupPath="Java" language="JAVA" suppressId="IncompatibleBitwiseMaskOperation" shortName="IncompatibleMask" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="IncompatibleBitwiseMaskOperation" shortName="IncompatibleMask" bundle="messages.InspectionGadgetsBundle"
                      key="incompatible.mask.operation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.bitwise.operation.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bitwise.IncompatibleMaskInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PointlessBitwiseExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PointlessBitwiseExpression" bundle="messages.InspectionGadgetsBundle"
                      key="pointless.bitwise.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.bitwise.operation.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bitwise.PointlessBitwiseExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ShiftOutOfRange" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ShiftOutOfRange" bundle="messages.InspectionGadgetsBundle"
                      key="shift.operation.by.inappropriate.constant.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.bitwise.operation.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bitwise.ShiftOutOfRangeInspection"/>
 
     <!--group.names.probable.bugs-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="array.comparison.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayEquality" bundle="messages.InspectionGadgetsBundle" key="array.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ArrayEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayEquals" bundle="com.siyeh.InspectionGadgetsBundle" key="equals.called.on.array.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayEquals" bundle="messages.InspectionGadgetsBundle" key="equals.called.on.array.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ArrayEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayHashCode" bundle="com.siyeh.InspectionGadgetsBundle" key="array.hash.code.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayHashCode" bundle="messages.InspectionGadgetsBundle" key="array.hash.code.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ArrayHashCodeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayObjectsEquals" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayObjectsEquals" bundle="messages.InspectionGadgetsBundle"
                      key="array.objects.equals.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.bugs.ArrayObjectsEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertWithSideEffects" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertWithSideEffects" bundle="messages.InspectionGadgetsBundle"
                      key="assert.with.side.effects.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.AssertWithSideEffectsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantAssertCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantAssertCondition" bundle="messages.InspectionGadgetsBundle"
                      key="constant.assert.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ConstantAssertConditionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CastConflictsWithInstanceof" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CastConflictsWithInstanceof" bundle="messages.InspectionGadgetsBundle"
                      key="cast.conflicts.with.instanceof.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.CastConflictsWithInstanceofInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CastToIncompatibleInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CastToIncompatibleInterface" bundle="messages.InspectionGadgetsBundle"
                      key="casting.to.incompatible.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.CastToIncompatibleInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassNewInstance" bundle="com.siyeh.InspectionGadgetsBundle" key="class.new.instance.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassNewInstance" bundle="messages.InspectionGadgetsBundle" key="class.new.instance.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ClassNewInstanceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CollectionAddedToSelf" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CollectionAddedToSelf" bundle="messages.InspectionGadgetsBundle"
                      key="collection.added.to.self.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.CollectionAddedToSelfInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparableImplementedButEqualsNotOverridden" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparableImplementedButEqualsNotOverridden" bundle="messages.InspectionGadgetsBundle"
                      key="comparable.implemented.but.equals.not.overridden.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ComparableImplementedButEqualsNotOverriddenInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorMethodParameterNotUsed" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorMethodParameterNotUsed" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.comparator.compare.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousComparatorCompareInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CompareToUsesNonFinalVariable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CompareToUsesNonFinalVariable" bundle="messages.InspectionGadgetsBundle"
                      key="non.final.field.compareto.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.CompareToUsesNonFinalVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CopyConstructorMissesField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CopyConstructorMissesField" bundle="messages.InspectionGadgetsBundle"
                      key="copy.constructor.misses.field.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.bugs.CopyConstructorMissesFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CovariantEquals" bundle="com.siyeh.InspectionGadgetsBundle" key="covariant.equals.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CovariantEquals" bundle="messages.InspectionGadgetsBundle" key="covariant.equals.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.CovariantEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="EmptyClassInitializer" shortName="EmptyInitializer" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="EmptyClassInitializer" shortName="EmptyInitializer" bundle="messages.InspectionGadgetsBundle"
                      key="empty.class.initializer.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.declaration.redundancy" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EmptyInitializerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="StatementWithEmptyBody" shortName="EmptyStatementBody" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="StatementWithEmptyBody" shortName="EmptyStatementBody" bundle="messages.InspectionGadgetsBundle"
                      key="statement.with.empty.body.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EmptyStatementBodyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsBetweenInconvertibleTypes" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsBetweenInconvertibleTypes" bundle="messages.InspectionGadgetsBundle"
                      key="equals.between.inconvertible.types.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EqualsBetweenInconvertibleTypesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsOnSuspiciousObject" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsOnSuspiciousObject" bundle="messages.InspectionGadgetsBundle"
                      key="equals.called.on.suspicious.object.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EqualsOnSuspiciousObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsWithItself" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsWithItself" bundle="messages.InspectionGadgetsBundle"
                      key="equals.with.itself.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EqualsWithItselfInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonFinalFieldReferenceInEquals" shortName="EqualsUsesNonFinalVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.final.field.in.equals.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.final.field.in.equals.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EqualsUsesNonFinalVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsWhichDoesntCheckParameterClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsWhichDoesntCheckParameterClass" bundle="messages.InspectionGadgetsBundle"
                      key="equals.doesnt.check.class.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.EqualsWhichDoesntCheckParameterClassInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonFinalFieldReferencedInHashCode" shortName="HashCodeUsesNonFinalVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.final.field.in.hashcode.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.final.field.in.hashcode.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.HashCodeUsesNonFinalVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ResultOfMethodCallIgnored" shortName="IgnoreResultOfCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ResultOfMethodCallIgnored" shortName="IgnoreResultOfCall" bundle="messages.InspectionGadgetsBundle"
                      key="result.of.method.call.ignored.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.IgnoreResultOfCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitArrayToString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitArrayToString" bundle="messages.InspectionGadgetsBundle"
                      key="implicit.array.to.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ImplicitArrayToStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InfiniteRecursion" bundle="com.siyeh.InspectionGadgetsBundle" key="infinite.recursion.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="InfiniteRecursion" bundle="messages.InspectionGadgetsBundle" key="infinite.recursion.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.InfiniteRecursionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InnerClassReferencedViaSubclass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InnerClassReferencedViaSubclass" bundle="messages.InspectionGadgetsBundle"
                      key="inner.class.referenced.via.subclass.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.bugs.InnerClassReferencedViaSubclassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofIncompatibleInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofIncompatibleInterface" bundle="messages.InspectionGadgetsBundle"
                      key="instanceof.with.incompatible.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.InstanceofIncompatibleInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstantiationOfUtilityClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstantiationOfUtilityClass" bundle="messages.InspectionGadgetsBundle"
                      key="instantiation.utility.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.InstantiationOfUtilityClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IteratorHasNextCallsIteratorNext" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IteratorHasNextCallsIteratorNext" bundle="messages.InspectionGadgetsBundle"
                      key="iterator.hasnext.which.calls.next.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.IteratorHasNextCallsIteratorNextInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="IteratorNextCanNotThrowNoSuchElementException" shortName="IteratorNextDoesNotThrowNoSuchElementException"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="iterator.next.does.not.throw.nosuchelementexception.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="iterator.next.does.not.throw.nosuchelementexception.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.IteratorNextDoesNotThrowNoSuchElementExceptionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MalformedFormatString" bundle="com.siyeh.InspectionGadgetsBundle" key="malformed.format.string.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MalformedFormatString" bundle="messages.InspectionGadgetsBundle" key="malformed.format.string.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MalformedFormatStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MalformedXPath" bundle="com.siyeh.InspectionGadgetsBundle" key="malformed.xpath.expression.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MalformedXPath" bundle="messages.InspectionGadgetsBundle" key="malformed.xpath.expression.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MalformedXPathInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MathRandomCastToInt" bundle="com.siyeh.InspectionGadgetsBundle" key="math.random.cast.to.int.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MathRandomCastToInt" bundle="messages.InspectionGadgetsBundle" key="math.random.cast.to.int.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MathRandomCastToIntInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MismatchedReadAndWriteOfArray" shortName="MismatchedArrayReadWrite"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="mismatched.read.write.array.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="mismatched.read.write.array.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MismatchedArrayReadWriteInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MismatchedQueryAndUpdateOfCollection" shortName="MismatchedCollectionQueryUpdate"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="mismatched.update.collection.display.name" runForWholeFile="true"
+                     bundle="messages.InspectionGadgetsBundle" key="mismatched.update.collection.display.name" runForWholeFile="true"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MismatchedCollectionQueryUpdateInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MismatchedQueryAndUpdateOfStringBuilder" shortName="MismatchedStringBuilderQueryUpdate"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="mismatched.string.builder.query.update.display.name" runForWholeFile="true"
+                     bundle="messages.InspectionGadgetsBundle" key="mismatched.string.builder.query.update.display.name" runForWholeFile="true"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MismatchedStringBuilderQueryUpdateInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MisspelledEquals" bundle="com.siyeh.InspectionGadgetsBundle" key="misspelled.equals.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MisspelledEquals" bundle="messages.InspectionGadgetsBundle" key="misspelled.equals.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MisspelledEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NewStringBufferWithCharArgument" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NewStringBufferWithCharArgument" bundle="messages.InspectionGadgetsBundle"
                      key="new.string.buffer.with.char.argument.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.NewStringBufferWithCharArgumentInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonShortCircuitBooleanExpression" shortName="NonShortCircuitBoolean"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.short.circuit.boolean.expression.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.short.circuit.boolean.expression.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.NonShortCircuitBooleanInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ConfusingArgumentToVarargsMethod" alternativeId="NullArgumentToVariableArgMethod"
-                     shortName="NullArgumentToVariableArgMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="NullArgumentToVariableArgMethod" bundle="messages.InspectionGadgetsBundle"
                      key="null.argument.to.var.arg.method.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.bugs.NullArgumentToVariableArgMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NumberEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="number.comparison.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NumberEquality" bundle="messages.InspectionGadgetsBundle" key="number.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.NumberEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NewObjectEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.new.object.equality.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NewObjectEquality" bundle="messages.InspectionGadgetsBundle" key="inspection.new.object.equality.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.NewObjectEqualityInspection"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.bugs.ObjectEqualityInspectionMerger"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ObjectEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="object.comparison.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ObjectEquality" bundle="messages.InspectionGadgetsBundle" key="object.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.bugs.ObjectEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ObjectToString" bundle="com.siyeh.InspectionGadgetsBundle" key="default.tostring.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ObjectToString" bundle="messages.InspectionGadgetsBundle" key="default.tostring.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ObjectToStringInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="PrimitiveArrayArgumentToVarargsMethod" alternativeId="PrimitiveArrayArgumentToVariableArgMethod"
-                     shortName="PrimitiveArrayArgumentToVariableArgMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="PrimitiveArrayArgumentToVariableArgMethod" bundle="messages.InspectionGadgetsBundle"
                      key="primitive.array.argument.to.var.arg.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.PrimitiveArrayArgumentToVariableArgMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ReflectionForUnavailableAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ReflectionForUnavailableAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="reflection.for.unavailable.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ReflectionForUnavailableAnnotationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SuspiciousRegexArgument" alternativeId="ReplaceAllDot"
-                     shortName="ReplaceAllDot" bundle="com.siyeh.InspectionGadgetsBundle" key="replace.all.dot.display.name"
+                     shortName="ReplaceAllDot" bundle="messages.InspectionGadgetsBundle" key="replace.all.dot.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ReplaceAllDotInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ResultOfObjectAllocationIgnored" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ResultOfObjectAllocationIgnored" bundle="messages.InspectionGadgetsBundle"
                      key="result.of.object.allocation.ignored.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ResultOfObjectAllocationIgnoredInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfIndexZeroInJDBCResultSet" shortName="ResultSetIndexZero" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfIndexZeroInJDBCResultSet" shortName="ResultSetIndexZero" bundle="messages.InspectionGadgetsBundle"
                      key="use.0index.in.jdbc.resultset.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ResultSetIndexZeroInspection"/>
-    <localInspection groupPath="Java,Probable bugs" language="JAVA" suppressId="ReturnOfNull" shortName="ReturnNull" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Probable bugs" language="JAVA" suppressId="ReturnOfNull" shortName="ReturnNull" bundle="messages.InspectionGadgetsBundle"
                      key="return.of.null.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.nullability.problems"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.bugs.ReturnNullInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StaticMethodReferencedViaSubclass" shortName="StaticCallOnSubclass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="static.method.via.subclass.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="static.method.via.subclass.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StaticCallOnSubclassInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInFormatCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInFormatCall" bundle="messages.InspectionGadgetsBundle"
                      key="string.concatenation.in.format.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StringConcatenationInFormatCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInMessageFormatCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInMessageFormatCall" bundle="messages.InspectionGadgetsBundle"
                      key="string.concatenation.in.message.format.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StringConcatenationInMessageFormatCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationMissingWhitespace" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationMissingWhitespace" bundle="messages.InspectionGadgetsBundle"
                      key="string.concatenation.missing.whitespace.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StringConcatenationMissingWhitespaceInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StaticFieldReferencedViaSubclass" shortName="StaticFieldReferenceOnSubclass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="static.field.via.subclass.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="static.field.via.subclass.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="string.comparison.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringEquality" bundle="messages.InspectionGadgetsBundle" key="string.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.StringEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringEqualsCharSequence" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringEqualsCharSequence" bundle="messages.InspectionGadgetsBundle"
                      key="string.equals.char.sequence.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.bugs.StringEqualsCharSequenceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SubtractionInCompareTo" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SubtractionInCompareTo" bundle="messages.InspectionGadgetsBundle"
                      key="subtraction.in.compareto.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SubtractionInCompareToInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousArrayCast" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousArrayCast" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.array.cast.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousArrayCastInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MismatchedStringCase" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MismatchedStringCase" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.case.mismatch.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.MismatchedStringCaseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousIndentAfterControlStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousIndentAfterControlStatement" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.indent.after.control.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousIndentAfterControlStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousIntegerDivAssignment" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousIntegerDivAssignment" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.integer.div.assignment.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousIntegerDivAssignmentInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousSystemArraycopy" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousSystemArraycopy" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.system.arraycopy.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousSystemArraycopyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousToArrayCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousToArrayCall" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.to.array.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousToArrayCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TextLabelInSwitchStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TextLabelInSwitchStatement" bundle="messages.InspectionGadgetsBundle"
                      key="text.label.in.switch.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.TextLabelInSwitchStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ThrowableNotThrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ThrowableNotThrown" bundle="messages.InspectionGadgetsBundle"
                      key="throwable.not.thrown.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.ThrowableNotThrownInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfPropertiesAsHashtable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfPropertiesAsHashtable" bundle="messages.InspectionGadgetsBundle"
                      key="properties.object.as.hashtable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.UseOfPropertiesAsHashtableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="VariableNotUsedInsideIf" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="VariableNotUsedInsideIf" bundle="messages.InspectionGadgetsBundle"
                      key="variable.not.used.inside.if.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.probable.bugs" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.bugs.VariableNotUsedInsideIfInspection"/>
 
     <!--group.names.class.structure-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousInnerClass" bundle="com.siyeh.InspectionGadgetsBundle" key="anonymous.inner.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousInnerClass" bundle="messages.InspectionGadgetsBundle" key="anonymous.inner.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.AnonymousInnerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="NonStaticInitializer" shortName="ClassInitializer" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="NonStaticInitializer" shortName="ClassInitializer" bundle="messages.InspectionGadgetsBundle"
                      key="class.initializer.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classlayout.ClassInitializerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassMayBeInterface" bundle="com.siyeh.InspectionGadgetsBundle" key="class.may.be.interface.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassMayBeInterface" bundle="messages.InspectionGadgetsBundle" key="class.may.be.interface.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.classlayout.ClassMayBeInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassNameDiffersFromFileName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassNameDiffersFromFileName" bundle="messages.InspectionGadgetsBundle"
                      key="class.name.differs.from.file.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ClassNameDiffersFromFileNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithOnlyPrivateConstructors" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithOnlyPrivateConstructors" bundle="messages.InspectionGadgetsBundle"
                      key="class.with.only.private.constructors.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ClassWithOnlyPrivateConstructorsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantDeclaredInAbstractClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantDeclaredInAbstractClass" bundle="messages.InspectionGadgetsBundle"
                      key="constant.declared.in.abstract.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ConstantDeclaredInAbstractClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantDeclaredInInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantDeclaredInInterface" bundle="messages.InspectionGadgetsBundle"
                      key="constant.declared.in.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ConstantDeclaredInInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EmptyClass" bundle="com.siyeh.InspectionGadgetsBundle" key="empty.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="EmptyClass" bundle="messages.InspectionGadgetsBundle" key="empty.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.EmptyClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalClass" bundle="com.siyeh.InspectionGadgetsBundle" key="final.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalClass" bundle="messages.InspectionGadgetsBundle" key="final.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.FinalClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalMethodInFinalClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalMethodInFinalClass" bundle="messages.InspectionGadgetsBundle"
                      key="final.method.in.final.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.FinalMethodInFinalClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalMethod" bundle="com.siyeh.InspectionGadgetsBundle" key="final.method.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalMethod" bundle="messages.InspectionGadgetsBundle" key="final.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.FinalMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalPrivateMethod" bundle="com.siyeh.InspectionGadgetsBundle" key="final.private.method.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalPrivateMethod" bundle="messages.InspectionGadgetsBundle" key="final.private.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.FinalPrivateMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalStaticMethod" bundle="com.siyeh.InspectionGadgetsBundle" key="final.static.method.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalStaticMethod" bundle="messages.InspectionGadgetsBundle" key="final.static.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.FinalStaticMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="InnerClassOfInterface" shortName="InnerClassOnInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="InnerClassOfInterface" shortName="InnerClassOnInterface" bundle="messages.InspectionGadgetsBundle"
                      key="inner.class.on.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.InnerClassOnInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LimitedScopeInnerClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LimitedScopeInnerClass" bundle="messages.InspectionGadgetsBundle"
                      key="limited.scope.inner.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.LimitedScopeInnerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ListenerMayUseAdapter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ListenerMayUseAdapter" bundle="messages.InspectionGadgetsBundle"
                      key="listener.may.use.adapter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ListenerMayUseAdapterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MarkerInterface" bundle="com.siyeh.InspectionGadgetsBundle" key="marker.interface.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MarkerInterface" bundle="messages.InspectionGadgetsBundle" key="marker.interface.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.MarkerInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MultipleTopLevelClassesInFile" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MultipleTopLevelClassesInFile" bundle="messages.InspectionGadgetsBundle"
                      key="multiple.top.level.classes.in.file.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.MultipleTopLevelClassesInFileInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldInEnum" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldInEnum" bundle="messages.InspectionGadgetsBundle"
                      key="non.final.field.in.enum.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.NonFinalFieldInEnumInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalUtilityClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalUtilityClass" bundle="messages.InspectionGadgetsBundle"
                      key="non.final.utility.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.NonFinalUtilityClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NoopMethodInAbstractClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NoopMethodInAbstractClass" bundle="messages.InspectionGadgetsBundle"
                      key="noop.method.in.abstract.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.NoopMethodInAbstractClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedMemberInFinalClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedMemberInFinalClass" bundle="messages.InspectionGadgetsBundle"
                      key="protected.member.in.final.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.ProtectedMemberInFinalClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="public.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.PublicConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicConstructorInNonPublicClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicConstructorInNonPublicClass" bundle="messages.InspectionGadgetsBundle"
                      key="public.constructor.in.non.public.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.PublicConstructorInNonPublicClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="Singleton" bundle="com.siyeh.InspectionGadgetsBundle" key="singleton.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="Singleton" bundle="messages.InspectionGadgetsBundle" key="singleton.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false" runForWholeFile="true"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.SingletonInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticNonFinalField" bundle="com.siyeh.InspectionGadgetsBundle" key="static.non.final.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticNonFinalField" bundle="messages.InspectionGadgetsBundle" key="static.non.final.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.StaticNonFinalFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClass" bundle="com.siyeh.InspectionGadgetsBundle" key="utility.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClass" bundle="messages.InspectionGadgetsBundle" key="utility.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.structure" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.classlayout.UtilityClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassCanBeEnum" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassCanBeEnum" bundle="messages.InspectionGadgetsBundle"
                      key="utility.class.can.be.enum.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.UtilityClassCanBeEnumInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassWithPublicConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassWithPublicConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="utility.class.with.public.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.UtilityClassWithPublicConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassWithoutPrivateConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UtilityClassWithoutPrivateConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="utility.class.without.private.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.UtilityClassWithoutPrivateConstructorInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="MethodReturnAlwaysConstant" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="MethodReturnAlwaysConstant" bundle="messages.InspectionGadgetsBundle"
                       key="method.return.always.constant.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.classlayout.MethodReturnAlwaysConstantInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceMayBeAnnotatedFunctional" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceMayBeAnnotatedFunctional" bundle="messages.InspectionGadgetsBundle"
                      key="interface.may.be.annotated.functional.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.structure" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classlayout.InterfaceMayBeAnnotatedFunctionalInspection"/>
 
     <!--group.names.class.metrics-->
     <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexAnonymousInnerClass" shortName="AnonymousClassComplexity"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="overly.complex.anonymous.inner.class.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="overly.complex.anonymous.inner.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classmetrics.AnonymousClassComplexityInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="AnonymousInnerClassWithTooManyMethods" shortName="AnonymousClassMethodCount"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="anonymous.inner.class.with.too.many.methods.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="anonymous.inner.class.with.too.many.methods.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classmetrics.AnonymousClassMethodCountInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexClass" shortName="ClassComplexity" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexClass" shortName="ClassComplexity" bundle="messages.InspectionGadgetsBundle"
                      key="overly.complex.class.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.ClassComplexityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyCoupledClass" shortName="ClassCoupling" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyCoupledClass" shortName="ClassCoupling" bundle="messages.InspectionGadgetsBundle"
                      key="overly.coupled.class.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.ClassCouplingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassTooDeepInInheritanceTree" shortName="ClassInheritanceDepth" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassTooDeepInInheritanceTree" shortName="ClassInheritanceDepth" bundle="messages.InspectionGadgetsBundle"
                      key="class.too.deep.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classmetrics.ClassInheritanceDepthInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="InnerClassTooDeeplyNested" shortName="ClassNestingDepth" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="InnerClassTooDeeplyNested" shortName="ClassNestingDepth" bundle="messages.InspectionGadgetsBundle"
                      key="inner.class.too.deeply.nested.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.class.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.classmetrics.ClassNestingDepthInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyConstructors" shortName="ConstructorCount" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyConstructors" shortName="ConstructorCount" bundle="messages.InspectionGadgetsBundle"
                      key="too.many.constructors.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.ConstructorCountInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyFields" shortName="FieldCount" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyFields" shortName="FieldCount" bundle="messages.InspectionGadgetsBundle"
                      key="too.many.fields.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.FieldCountInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyMethods" shortName="MethodCount" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassWithTooManyMethods" shortName="MethodCount" bundle="messages.InspectionGadgetsBundle"
                      key="too.many.methods.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.class.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.classmetrics.MethodCountInspection"/>
 
     <!--group.names.cloning.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="CloneCallsConstructors" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CloneCallsConstructors" bundle="messages.InspectionGadgetsBundle"
                      key="clone.instantiates.objects.with.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.CloneCallsConstructorsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CloneDoesntDeclareCloneNotSupportedException" shortName="CloneDeclaresCloneNotSupported"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="clone.doesnt.declare.clonenotsupportedexception.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="clone.doesnt.declare.clonenotsupportedexception.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.cloning.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.CloneDeclaresCloneNotSupportedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CloneInNonCloneableClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CloneInNonCloneableClass" bundle="messages.InspectionGadgetsBundle"
                      key="clone.method.in.non.cloneable.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.CloneInNonCloneableClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CloneableClassWithoutClone" shortName="CloneableImplementsClone" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CloneableClassWithoutClone" shortName="CloneableImplementsClone" bundle="messages.InspectionGadgetsBundle"
                      key="cloneable.class.without.clone.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.CloneableImplementsCloneInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CloneReturnsClassType" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CloneReturnsClassType" bundle="messages.InspectionGadgetsBundle"
                      key="clone.returns.class.type.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.CloneReturnsClassTypeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonPublicClone" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonPublicClone" bundle="messages.InspectionGadgetsBundle"
                      key="non.public.clone.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.NonPublicCloneInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfClone" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfClone" bundle="messages.InspectionGadgetsBundle"
                      key="use.of.clone.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.cloning.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.cloneable.UseOfCloneInspection"/>
 
     <!--group.names.control.flow.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="BooleanExpressionMayBeConditional" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="BooleanExpressionMayBeConditional" bundle="messages.InspectionGadgetsBundle"
                      key="boolean.expression.may.be.conditional.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.BooleanExpressionMayBeConditionalInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BreakStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="break.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BreakStatement" bundle="messages.InspectionGadgetsBundle" key="break.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.BreakStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BreakStatementWithLabel" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="BreakStatementWithLabel" bundle="messages.InspectionGadgetsBundle"
                      key="break.statement.with.label.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.BreakStatementWithLabelInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalExpression" bundle="com.siyeh.InspectionGadgetsBundle" key="conditional.expression.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalExpression" bundle="messages.InspectionGadgetsBundle" key="conditional.expression.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.controlflow.ConditionalExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalExpressionWithIdenticalBranches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalExpressionWithIdenticalBranches" bundle="messages.InspectionGadgetsBundle"
                      key="conditional.expression.with.identical.branches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.ConditionalExpressionWithIdenticalBranchesInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalCanBePushedInsideExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConditionalCanBePushedInsideExpression" bundle="messages.InspectionGadgetsBundle"
                      key="conditional.can.be.pushed.inside.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.controlflow.ConditionalCanBePushedInsideExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ConfusingElseBranch" shortName="ConfusingElse" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ConfusingElseBranch" shortName="ConfusingElse" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.else.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues"
                      enabledByDefault="true" level="INFORMATION" implementationClass="com.siyeh.ig.controlflow.ConfusingElseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantConditionalExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantConditionalExpression" bundle="messages.InspectionGadgetsBundle"
                      key="constant.conditional.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.ConstantConditionalExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ContinueStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="continue.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ContinueStatement" bundle="messages.InspectionGadgetsBundle" key="continue.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.ContinueStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ContinueStatementWithLabel" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ContinueStatementWithLabel" bundle="messages.InspectionGadgetsBundle"
                      key="continue.statement.with.label.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.ContinueStatementWithLabelInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DefaultNotLastCaseInSwitch" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DefaultNotLastCaseInSwitch" bundle="messages.InspectionGadgetsBundle"
                      key="default.not.last.case.in.switch.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.DefaultNotLastCaseInSwitchInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DoubleNegation" bundle="com.siyeh.InspectionGadgetsBundle" key="double.negation.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="DoubleNegation" bundle="messages.InspectionGadgetsBundle" key="double.negation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.DoubleNegationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DuplicateBooleanBranch" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DuplicateBooleanBranch" bundle="messages.InspectionGadgetsBundle"
                      key="duplicate.boolean.branch.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.DuplicateBooleanBranchInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DuplicateCondition" bundle="com.siyeh.InspectionGadgetsBundle" key="duplicate.condition.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="DuplicateCondition" bundle="messages.InspectionGadgetsBundle" key="duplicate.condition.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.DuplicateConditionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EnumSwitchStatementWhichMissesCases" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EnumSwitchStatementWhichMissesCases" bundle="messages.InspectionGadgetsBundle"
                      key="enum.switch.statement.which.misses.cases.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.controlflow.EnumSwitchStatementWhichMissesCasesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="fallthrough" shortName="FallthruInSwitchStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="fallthrough" shortName="FallthruInSwitchStatement" bundle="messages.InspectionGadgetsBundle"
                      key="fallthru.in.switch.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.FallthruInSwitchStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ForLoopReplaceableByWhile" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ForLoopReplaceableByWhile" bundle="messages.InspectionGadgetsBundle"
                      key="for.loop.replaceable.by.while.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.ForLoopReplaceableByWhileInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ForLoopWithMissingComponent" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ForLoopWithMissingComponent" bundle="messages.InspectionGadgetsBundle"
                      key="for.loop.with.missing.component.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.ForLoopWithMissingComponentInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementWithIdenticalBranches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementWithIdenticalBranches" bundle="messages.InspectionGadgetsBundle"
                      key="if.statement.with.identical.branches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WEAK WARNING"
                      implementationClass="com.siyeh.ig.controlflow.IfStatementWithIdenticalBranchesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementWithTooManyBranches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementWithTooManyBranches" bundle="messages.InspectionGadgetsBundle"
                      key="if.statement.with.too.many.branches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.IfStatementWithTooManyBranchesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InfiniteLoopStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="infinite.loop.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="InfiniteLoopStatement" bundle="messages.InspectionGadgetsBundle" key="infinite.loop.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.InfiniteLoopStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LabeledStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="labeled.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="LabeledStatement" bundle="messages.InspectionGadgetsBundle" key="labeled.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.LabeledStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LoopConditionNotUpdatedInsideLoop" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LoopConditionNotUpdatedInsideLoop" bundle="messages.InspectionGadgetsBundle"
                      key="loop.condition.not.updated.inside.loop.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.LoopConditionNotUpdatedInsideLoopInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="LoopStatementThatDoesntLoop" shortName="LoopStatementsThatDontLoop"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="loop.statements.that.dont.loop.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="loop.statements.that.dont.loop.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.LoopStatementsThatDontLoopInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LoopWithImplicitTerminationCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LoopWithImplicitTerminationCondition" bundle="messages.InspectionGadgetsBundle"
                      key="loop.with.implicit.termination.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.LoopWithImplicitTerminationConditionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ConditionalExpressionWithNegatedCondition" shortName="NegatedConditional"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="negated.conditional.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="negated.conditional.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.NegatedConditionalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NegatedConditionalExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NegatedConditionalExpression" bundle="messages.InspectionGadgetsBundle"
                      key="negated.conditional.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.NegatedConditionalExpressionInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NegatedEqualityExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NegatedEqualityExpression" bundle="messages.InspectionGadgetsBundle"
                      key="negated.equality.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.NegatedEqualityExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="IfStatementWithNegatedCondition" shortName="NegatedIfElse" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="IfStatementWithNegatedCondition" shortName="NegatedIfElse" bundle="messages.InspectionGadgetsBundle"
                      key="negated.if.else.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.controlflow.NegatedIfElseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedConditionalExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedConditionalExpression" bundle="messages.InspectionGadgetsBundle"
                      key="nested.conditional.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.NestedConditionalExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedSwitchStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="nested.switch.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedSwitchStatement" bundle="messages.InspectionGadgetsBundle" key="nested.switch.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.NestedSwitchStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverlyComplexBooleanExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverlyComplexBooleanExpression" bundle="messages.InspectionGadgetsBundle"
                      key="overly.complex.boolean.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.OverlyComplexBooleanExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PointlessBooleanExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PointlessBooleanExpression" bundle="messages.InspectionGadgetsBundle"
                      key="pointless.boolean.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.PointlessBooleanExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PointlessIndexOfComparison" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PointlessIndexOfComparison" bundle="messages.InspectionGadgetsBundle"
                      key="pointless.indexof.comparison.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.PointlessIndexOfComparisonInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PointlessNullCheck" bundle="com.siyeh.InspectionGadgetsBundle" key="pointless.nullcheck.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="PointlessNullCheck" bundle="messages.InspectionGadgetsBundle" key="pointless.nullcheck.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.PointlessNullCheckInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableBooleanExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableBooleanExpression" bundle="messages.InspectionGadgetsBundle"
                      key="simplifiable.boolean.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SimplifiableBooleanExpressionInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableConditionalExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableConditionalExpression" bundle="messages.InspectionGadgetsBundle"
                      key="simplifiable.conditional.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SimplifiableConditionalExpressionInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementDensity" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementDensity" bundle="messages.InspectionGadgetsBundle"
                      key="switch.statement.density.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SwitchStatementDensityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="switch.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatement" bundle="messages.InspectionGadgetsBundle" key="switch.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.SwitchStatementInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="LocalVariableUsedAndDeclaredInDifferentSwitchBranches" shortName="SwitchStatementWithConfusingDeclaration"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="switch.statement.with.confusing.declaration.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="switch.statement.with.confusing.declaration.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.SwitchStatementWithConfusingDeclarationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementWithTooFewBranches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementWithTooFewBranches" bundle="messages.InspectionGadgetsBundle"
                      key="switch.statement.with.too.few.branches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SwitchStatementWithTooFewBranchesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementWithTooManyBranches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SwitchStatementWithTooManyBranches" bundle="messages.InspectionGadgetsBundle"
                      key="switch.statement.with.too.many.branches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SwitchStatementWithTooManyBranchesInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SwitchStatementWithoutDefaultBranch" shortName="SwitchStatementsWithoutDefault"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="switch.statements.without.default.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="switch.statements.without.default.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.controlflow.SwitchStatementsWithoutDefaultInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantIfStatement" shortName="TrivialIf" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantIfStatement" shortName="TrivialIf" bundle="messages.InspectionGadgetsBundle"
                      key="trivial.if.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.controlflow.TrivialIfInspection" cleanupTool="true"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="RedundantConditionalExpression" shortName="UnnecessaryConditionalExpression"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.conditional.expression.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="unnecessary.conditional.expression.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.control.flow.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.UnnecessaryConditionalExpressionInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertionCanBeIf" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertionCanBeIf" bundle="messages.InspectionGadgetsBundle"
                      key="assertion.can.be.if.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.asserttoif.AssertionCanBeIfInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IfCanBeAssertion" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IfCanBeAssertion" bundle="messages.InspectionGadgetsBundle"
                      key="if.can.be.assertion.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.control.flow.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.asserttoif.IfCanBeAssertionInspection"/>
 
     <!--group.names.data.flow.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="BooleanVariableAlwaysNegated" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="BooleanVariableAlwaysNegated" bundle="messages.InspectionGadgetsBundle"
                      key="boolean.variable.always.inverted.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.data.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.dataflow.BooleanVariableAlwaysNegatedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantValueVariableUse" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantValueVariableUse" bundle="messages.InspectionGadgetsBundle"
                      key="constant.value.variable.use.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.data.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.dataflow.ConstantValueVariableUseInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LawOfDemeter" bundle="com.siyeh.InspectionGadgetsBundle" key="law.of.demeter.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="LawOfDemeter" bundle="messages.InspectionGadgetsBundle" key="law.of.demeter.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.data.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.dataflow.LawOfDemeterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NegativelyNamedBooleanVariable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NegativelyNamedBooleanVariable" bundle="messages.InspectionGadgetsBundle"
                      key="negatively.named.boolean.variable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.data.flow.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.dataflow.NegativelyNamedBooleanVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ReuseOfLocalVariable" bundle="com.siyeh.InspectionGadgetsBundle" key="reuse.of.local.variable.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ReuseOfLocalVariable" bundle="messages.InspectionGadgetsBundle" key="reuse.of.local.variable.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.data.flow.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.dataflow.ReuseOfLocalVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TooBroadScope" bundle="com.siyeh.InspectionGadgetsBundle" key="too.broad.scope.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="TooBroadScope" bundle="messages.InspectionGadgetsBundle" key="too.broad.scope.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.data.flow.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.dataflow.TooBroadScopeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLocalVariable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLocalVariable" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.local.variable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.data.flow.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.dataflow.UnnecessaryLocalVariableInspection"/>
@@ -808,31 +808,31 @@
                       implementationClass="com.intellij.codeInspection.booleanIsAlwaysInverted.BooleanMethodIsAlwaysInvertedInspection"/>
 
     <!--group.names.dependency.issues-->
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyDependencies" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyDependencies" bundle="messages.InspectionGadgetsBundle"
                       key="class.with.too.many.dependencies.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.ClassWithTooManyDependenciesInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyDependents" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyDependents" bundle="messages.InspectionGadgetsBundle"
                       key="class.with.too.many.dependents.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.ClassWithTooManyDependentsInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyTransitiveDependencies" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyTransitiveDependencies" bundle="messages.InspectionGadgetsBundle"
                       key="class.with.too.many.transitive.dependencies.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.ClassWithTooManyTransitiveDependenciesInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyTransitiveDependents" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassWithTooManyTransitiveDependents" bundle="messages.InspectionGadgetsBundle"
                       key="class.with.too.many.transitive.dependents.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.ClassWithTooManyTransitiveDependentsInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="CyclicClassDependency" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="CyclicClassDependency" bundle="messages.InspectionGadgetsBundle"
                       key="cyclic.class.dependency.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.CyclicClassDependencyInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="CyclicPackageDependency" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="CyclicPackageDependency" bundle="messages.InspectionGadgetsBundle"
                       key="cyclic.package.dependency.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.dependency.CyclicPackageDependencyInspection"/>
-    <localInspection groupPath="Java" language="UAST" shortName="SuspiciousPackagePrivateAccess" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="UAST" shortName="SuspiciousPackagePrivateAccess" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.package.private.access.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.dependency.issues" enabledByDefault="false" level="WARNING" isInternal="true"
                      implementationClass="com.siyeh.ig.dependency.SuspiciousPackagePrivateAccessInspection"/>
@@ -841,787 +841,787 @@
     <!--group.names.encapsulation.issues-->
     <inspectionElementsMerger implementation="com.siyeh.ig.encapsulation.AssignmentOrReturnOfFieldWithMutableTypeInspectionMerger"/>
     <localInspection groupPath="Java" language="JAVA" shortName="AssignmentOrReturnOfFieldWithMutableType"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="assignment.or.return.of.field.with.mutable.type.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="assignment.or.return.of.field.with.mutable.type.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.AssignmentOrReturnOfFieldWithMutableTypeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PackageVisibleField" bundle="com.siyeh.InspectionGadgetsBundle" key="package.visible.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="PackageVisibleField" bundle="messages.InspectionGadgetsBundle" key="package.visible.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.PackageVisibleFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PackageVisibleInnerClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PackageVisibleInnerClass" bundle="messages.InspectionGadgetsBundle"
                      key="package.visible.inner.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.encapsulation.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.encapsulation.PackageVisibleInnerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedField" bundle="com.siyeh.InspectionGadgetsBundle" key="protected.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedField" bundle="messages.InspectionGadgetsBundle" key="protected.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.ProtectedFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedInnerClass" bundle="com.siyeh.InspectionGadgetsBundle" key="protected.inner.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ProtectedInnerClass" bundle="messages.InspectionGadgetsBundle" key="protected.inner.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.ProtectedInnerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicField" bundle="com.siyeh.InspectionGadgetsBundle" key="public.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicField" bundle="messages.InspectionGadgetsBundle" key="public.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.encapsulation.PublicFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicInnerClass" bundle="com.siyeh.InspectionGadgetsBundle" key="public.inner.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicInnerClass" bundle="messages.InspectionGadgetsBundle" key="public.inner.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.PublicInnerClassInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="AccessingNonPublicFieldOfAnotherObject" shortName="UseOfAnotherObjectsPrivateField"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="accessing.non.public.field.of.another.object.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="accessing.non.public.field.of.another.object.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.encapsulation.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.encapsulation.UseOfAnotherObjectsPrivateFieldInspection"/>
 
     <!--group.names.error.handling-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ExtendsThrowable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ExtendsThrowable" bundle="messages.InspectionGadgetsBundle"
                      key="extends.throwable.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.errorhandling.ExtendsThrowableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionCaught" shortName="BadExceptionCaught" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionCaught" shortName="BadExceptionCaught" bundle="messages.InspectionGadgetsBundle"
                      key="bad.exception.caught.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.BadExceptionCaughtInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionDeclared" shortName="BadExceptionDeclared" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionDeclared" shortName="BadExceptionDeclared" bundle="messages.InspectionGadgetsBundle"
                      key="bad.exception.declared.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.BadExceptionDeclaredInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionThrown" shortName="BadExceptionThrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ProhibitedExceptionThrown" shortName="BadExceptionThrown" bundle="messages.InspectionGadgetsBundle"
                      key="bad.exception.thrown.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.BadExceptionThrownInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CaughtExceptionImmediatelyRethrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CaughtExceptionImmediatelyRethrown" bundle="messages.InspectionGadgetsBundle"
                      key="caught.exception.immediately.rethrown.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.CaughtExceptionImmediatelyRethrownInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CheckedExceptionClass" bundle="com.siyeh.InspectionGadgetsBundle" key="checked.exception.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CheckedExceptionClass" bundle="messages.InspectionGadgetsBundle" key="checked.exception.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.CheckedExceptionClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ContinueOrBreakFromFinallyBlock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ContinueOrBreakFromFinallyBlock" bundle="messages.InspectionGadgetsBundle"
                      key="continue.or.break.from.finally.block.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ContinueOrBreakFromFinallyBlockInspection"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.errorhandling.CatchMayIgnoreExceptionMerger"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CatchMayIgnoreException" bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.catch.ignores.exception.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CatchMayIgnoreException" bundle="messages.InspectionGadgetsBundle" key="inspection.catch.ignores.exception.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.CatchMayIgnoreExceptionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EmptyFinallyBlock" bundle="com.siyeh.InspectionGadgetsBundle" key="empty.finally.block.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="EmptyFinallyBlock" bundle="messages.InspectionGadgetsBundle" key="empty.finally.block.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.EmptyFinallyBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EmptyTryBlock" bundle="com.siyeh.InspectionGadgetsBundle" key="empty.try.block.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="EmptyTryBlock" bundle="messages.InspectionGadgetsBundle" key="empty.try.block.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.EmptyTryBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ErrorNotRethrown" shortName="ErrorRethrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ErrorNotRethrown" shortName="ErrorRethrown" bundle="messages.InspectionGadgetsBundle"
                      key="error.rethrown.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.errorhandling.ErrorRethrownInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ThrowInsideCatchBlockWhichIgnoresCaughtException" shortName="ExceptionFromCatchWhichDoesntWrap"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="exception.from.catch.which.doesnt.wrap.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="exception.from.catch.which.doesnt.wrap.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ExceptionFromCatchWhichDoesntWrapInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="finally" shortName="FinallyBlockCannotCompleteNormally" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="finally" shortName="FinallyBlockCannotCompleteNormally" bundle="messages.InspectionGadgetsBundle"
                      key="finally.block.cannot.complete.normally.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.FinallyBlockCannotCompleteNormallyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofCatchParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstanceofCatchParameter" bundle="messages.InspectionGadgetsBundle"
                      key="instanceof.catch.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.InstanceofCatchParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedTryStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="nested.try.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedTryStatement" bundle="messages.InspectionGadgetsBundle" key="nested.try.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.NestedTryStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldOfException" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalFieldOfException" bundle="messages.InspectionGadgetsBundle"
                      key="non.final.field.of.exception.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.NonFinalFieldOfExceptionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ReturnInsideFinallyBlock" shortName="ReturnFromFinallyBlock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ReturnInsideFinallyBlock" shortName="ReturnFromFinallyBlock" bundle="messages.InspectionGadgetsBundle"
                      key="return.from.finally.block.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ReturnFromFinallyBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ThreadDeathNotRethrown" shortName="ThreadDeathRethrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ThreadDeathNotRethrown" shortName="ThreadDeathRethrown" bundle="messages.InspectionGadgetsBundle"
                      key="thread.death.rethrown.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ThreadDeathRethrownInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ThrowCaughtLocally" bundle="com.siyeh.InspectionGadgetsBundle" key="throw.caught.locally.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ThrowCaughtLocally" bundle="messages.InspectionGadgetsBundle" key="throw.caught.locally.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ThrowCaughtLocallyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ThrowFromFinallyBlock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ThrowFromFinallyBlock" bundle="messages.InspectionGadgetsBundle"
                      key="throw.from.finally.block.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ThrowFromFinallyBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NullThrown" bundle="com.siyeh.InspectionGadgetsBundle" key="null.thrown.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NullThrown" bundle="messages.InspectionGadgetsBundle" key="null.thrown.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.NullThrownInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyBroadCatchBlock" shortName="TooBroadCatch" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyBroadCatchBlock" shortName="TooBroadCatch" bundle="messages.InspectionGadgetsBundle"
                      key="too.broad.catch.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.errorhandling.TooBroadCatchInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyBroadThrowsClause" shortName="TooBroadThrows" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyBroadThrowsClause" shortName="TooBroadThrows" bundle="messages.InspectionGadgetsBundle"
                      key="overly.broad.throws.clause.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.TooBroadThrowsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UncheckedExceptionClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UncheckedExceptionClass" bundle="messages.InspectionGadgetsBundle"
                      key="unchecked.exception.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.UncheckedExceptionClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInitCause" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInitCause" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.initcause.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.error.handling" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.UnnecessaryInitCauseInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NewExceptionWithoutArguments" bundle="com.siyeh.InspectionGadgetsBundle" key="new.exception.without.arguments.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NewExceptionWithoutArguments" bundle="messages.InspectionGadgetsBundle" key="new.exception.without.arguments.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.NewExceptionWithoutArgumentsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ThrowsRuntimeException" bundle="com.siyeh.InspectionGadgetsBundle" key="throws.runtime.exception.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ThrowsRuntimeException" bundle="messages.InspectionGadgetsBundle" key="throws.runtime.exception.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.error.handling" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.errorhandling.ThrowsRuntimeExceptionInspection"/>
 
     <!--group.names.finalization.issues-->
-    <localInspection groupPath="Java" language="JAVA" suppressId="FinalizeDeclaration" shortName="Finalize" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="FinalizeDeclaration" shortName="Finalize" bundle="messages.InspectionGadgetsBundle"
                      key="finalize.declaration.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.finalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.finalization.FinalizeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FinalizeNotProtected" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FinalizeNotProtected" bundle="messages.InspectionGadgetsBundle"
                      key="finalize.not.declared.protected.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.finalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.finalization.FinalizeNotProtectedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="FinalizeCalledExplicitly" shortName="NoExplicitFinalizeCalls" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="FinalizeCalledExplicitly" shortName="NoExplicitFinalizeCalls" bundle="messages.InspectionGadgetsBundle"
                      key="finalize.called.explicitly.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.finalization.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.finalization.NoExplicitFinalizeCallsInspection"/>
 
     <!--group.names.imports-->
-    <localInspection groupPath="Java" language="JAVA" shortName="JavaLangImport" bundle="com.siyeh.InspectionGadgetsBundle" key="java.lang.import.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="JavaLangImport" bundle="messages.InspectionGadgetsBundle" key="java.lang.import.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.imports.JavaLangImportInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OnDemandImport" bundle="com.siyeh.InspectionGadgetsBundle" key="import.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="OnDemandImport" bundle="messages.InspectionGadgetsBundle" key="import.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.imports.OnDemandImportInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SamePackageImport" bundle="com.siyeh.InspectionGadgetsBundle" key="import.from.same.package.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="SamePackageImport" bundle="messages.InspectionGadgetsBundle" key="import.from.same.package.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.imports.SamePackageImportInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SingleClassImport" bundle="com.siyeh.InspectionGadgetsBundle" key="single.class.import.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="SingleClassImport" bundle="messages.InspectionGadgetsBundle" key="single.class.import.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.imports.SingleClassImportInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticImport" bundle="com.siyeh.InspectionGadgetsBundle" key="static.import.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticImport" bundle="messages.InspectionGadgetsBundle" key="static.import.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.imports" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.imports.StaticImportInspection"/>
     <!--group.names.inheritance.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassExtendsConcreteClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassExtendsConcreteClass" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.class.extends.concrete.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractClassExtendsConcreteClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassNeverImplemented" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassNeverImplemented" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.class.never.implemented.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractClassNeverImplementedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassWithoutAbstractMethods" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractClassWithoutAbstractMethods" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.class.without.abstract.methods.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractClassWithoutAbstractMethodsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodOverridesAbstractMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodOverridesAbstractMethod" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.method.overrides.abstract.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractMethodOverridesAbstractMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodOverridesConcreteMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodOverridesConcreteMethod" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.method.overrides.concrete.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractMethodOverridesConcreteMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodWithMissingImplementations" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodWithMissingImplementations" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.method.with.missing.implementations.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.AbstractMethodWithMissingImplementationsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyAnnotation" shortName="ExtendsAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyAnnotation" shortName="ExtendsAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="extends.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.ExtendsAnnotationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ClassExtendsConcreteCollection" shortName="ExtendsConcreteCollection"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="extends.concrete.collection.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="extends.concrete.collection.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.inheritance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.inheritance.ExtendsConcreteCollectionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ExtendsUtilityClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ExtendsUtilityClass" bundle="messages.InspectionGadgetsBundle"
                      key="class.extends.utility.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.ExtendsUtilityClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceNeverImplemented" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InterfaceNeverImplemented" bundle="messages.InspectionGadgetsBundle"
                      key="interface.never.implemented.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.InterfaceNeverImplementedInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ConstructorNotProtectedInAbstractClass" shortName="NonProtectedConstructorInAbstractClass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.protected.constructor.in.abstract.class.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.protected.constructor.in.abstract.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.inheritance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.inheritance.NonProtectedConstructorInAbstractClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ParameterTypePreventsOverriding" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ParameterTypePreventsOverriding" bundle="messages.InspectionGadgetsBundle"
                      key="parameter.type.prevents.overriding.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.ParameterTypePreventsOverridingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ProblematicVarargsMethodOverride" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ProblematicVarargsMethodOverride" bundle="messages.InspectionGadgetsBundle"
                      key="problematic.varargs.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.ProblematicVarargsMethodOverrideInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantMethodOverride" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantMethodOverride" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.method.override.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.RedundantMethodOverrideInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="MethodDoesntCallSuperMethod" shortName="RefusedBequest" bundle="com.siyeh.InspectionGadgetsBundle" key="refused.bequest.display.name"
+    <localInspection groupPath="Java" language="JAVA" suppressId="MethodDoesntCallSuperMethod" shortName="RefusedBequest" bundle="messages.InspectionGadgetsBundle" key="refused.bequest.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.inheritance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.inheritance.RefusedBequestInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticInheritance" bundle="com.siyeh.InspectionGadgetsBundle" key="static.inheritance.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticInheritance" bundle="messages.InspectionGadgetsBundle" key="static.inheritance.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.inheritance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.inheritance.StaticInheritanceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TypeParameterExtendsFinalClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TypeParameterExtendsFinalClass" bundle="messages.InspectionGadgetsBundle"
                      key="type.parameter.extends.final.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.inheritance.TypeParameterExtendsFinalClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="override" shortName="MissingOverrideAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="override" shortName="MissingOverrideAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="missing.override.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.inheritance.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.inheritance.MissingOverrideAnnotationInspection" cleanupTool="true"/>
 
     <!--group.names.initialization.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodCallInConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbstractMethodCallInConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.method.call.in.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.initialization.AbstractMethodCallInConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DoubleBraceInitialization" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DoubleBraceInitialization" bundle="messages.InspectionGadgetsBundle"
                      key="double.brace.initialization.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.initialization.DoubleBraceInitializationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InstanceVariableMayNotBeInitialized" shortName="InstanceVariableInitialization"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="instance.variable.may.not.be.initialized.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="instance.variable.may.not.be.initialized.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.initialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.InstanceVariableInitializationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InstanceVariableUsedBeforeInitialized" shortName="InstanceVariableUninitializedUse"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="instance.variable.used.before.initialized.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="instance.variable.used.before.initialized.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.initialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.InstanceVariableUninitializedUseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalStaticVariableUsedInClassInitialization" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalStaticVariableUsedInClassInitialization" bundle="messages.InspectionGadgetsBundle"
                      key="non.final.static.variable.initialization.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.initialization.NonFinalStaticVariableUsedInClassInitializationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonThreadSafeLazyInitialization" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonThreadSafeLazyInitialization" bundle="messages.InspectionGadgetsBundle"
                      key="non.thread.safe.lazy.initialization.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.initialization.NonThreadSafeLazyInitializationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverridableMethodCallDuringObjectConstruction" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverridableMethodCallDuringObjectConstruction" bundle="messages.InspectionGadgetsBundle"
                      key="overridable.method.call.in.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.initialization.OverridableMethodCallDuringObjectConstructionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverriddenMethodCallDuringObjectConstruction" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverriddenMethodCallDuringObjectConstruction" bundle="messages.InspectionGadgetsBundle"
                      key="overridden.method.call.in.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.initialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.initialization.OverriddenMethodCallDuringObjectConstructionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StaticVariableMayNotBeInitialized" shortName="StaticVariableInitialization"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="static.variable.may.not.be.initialized.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="static.variable.may.not.be.initialized.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.initialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.StaticVariableInitializationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StaticVariableUsedBeforeInitialization" shortName="StaticVariableUninitializedUse"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="static.variable.used.before.initialization.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="static.variable.used.before.initialization.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.initialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.StaticVariableUninitializedUseInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ThisEscapedInObjectConstruction" shortName="ThisEscapedInConstructor"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="this.reference.escaped.in.construction.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="this.reference.escaped.in.construction.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.initialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.initialization.ThisEscapedInConstructorInspection"/>
 
     <!--group.names.internationalization.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="CallToSuspiciousStringMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CallToSuspiciousStringMethod" bundle="messages.InspectionGadgetsBundle"
                      key="call.to.suspicious.string.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.CallToSuspiciousStringMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CharacterComparison" bundle="com.siyeh.InspectionGadgetsBundle" key="character.comparison.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CharacterComparison" bundle="messages.InspectionGadgetsBundle" key="character.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.CharacterComparisonInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToDateToString" shortName="DateToString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToDateToString" shortName="DateToString" bundle="messages.InspectionGadgetsBundle"
                      key="call.to.date.tostring.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.DateToStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MagicCharacter" bundle="com.siyeh.InspectionGadgetsBundle" key="magic.character.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MagicCharacter" bundle="messages.InspectionGadgetsBundle" key="magic.character.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.MagicCharacterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToNumericToString" shortName="NumericToString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToNumericToString" shortName="NumericToString" bundle="messages.InspectionGadgetsBundle"
                      key="call.to.numeric.tostring.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.NumericToStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimpleDateFormatWithoutLocale" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimpleDateFormatWithoutLocale" bundle="messages.InspectionGadgetsBundle"
                      key="instantiating.simpledateformat.without.locale.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.SimpleDateFormatWithoutLocaleInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenation" bundle="com.siyeh.InspectionGadgetsBundle" key="string.concatenation.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenation" bundle="messages.InspectionGadgetsBundle" key="string.concatenation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.StringConcatenationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StringToUpperCaseOrToLowerCaseWithoutLocale" shortName="StringToUpperWithoutLocale"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="string.touppercase.tolowercase.without.locale.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="string.touppercase.tolowercase.without.locale.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.internationalization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.internationalization.StringToUpperWithoutLocaleInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfStringTokenizer" shortName="StringTokenizer" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfStringTokenizer" shortName="StringTokenizer" bundle="messages.InspectionGadgetsBundle"
                      key="use.stringtokenizer.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.StringTokenizerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToTimeToString" shortName="TimeToString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToTimeToString" shortName="TimeToString" bundle="messages.InspectionGadgetsBundle"
                      key="time.tostring.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.TimeToStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AbsoluteAlignmentInUserInterface" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AbsoluteAlignmentInUserInterface" bundle="messages.InspectionGadgetsBundle"
                      key="absolute.alignment.in.user.interface.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.AbsoluteAlignmentInUserInterfaceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryUnicodeEscape" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryUnicodeEscape" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.unicode.escape.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.UnnecessaryUnicodeEscapeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitDefaultCharsetUsage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitDefaultCharsetUsage" bundle="messages.InspectionGadgetsBundle"
                      key="implicit.default.charset.usage.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.internationalization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.internationalization.ImplicitDefaultCharsetUsageInspection"/>
 
     <!--group.names.j2me.issues-->
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="AbstractClassWithOnlyOneDirectInheritor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="AbstractClassWithOnlyOneDirectInheritor" bundle="messages.InspectionGadgetsBundle"
                      key="abstract.class.with.only.one.direct.inheritor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.AbstractClassWithOnlyOneDirectInheritorInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="ArrayLengthInLoopCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="ArrayLengthInLoopCondition" bundle="messages.InspectionGadgetsBundle"
                      key="array.length.in.loop.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.ArrayLengthInLoopConditionInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="CheckForOutOfMemoryOnLargeArrayAllocation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="CheckForOutOfMemoryOnLargeArrayAllocation" bundle="messages.InspectionGadgetsBundle"
                      key="large.array.allocation.no.outofmemoryerror.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.CheckForOutOfMemoryOnLargeArrayAllocationInspection"/>
     <localInspection groupPath="Java,Performance" language="JAVA" suppressId="ConnectionOpenedButNotSafelyClosed" shortName="ConnectionResource"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="connection.opened.not.safely.closed.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="connection.opened.not.safely.closed.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.ConnectionResourceInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="InterfaceWithOnlyOneDirectInheritor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="InterfaceWithOnlyOneDirectInheritor" bundle="messages.InspectionGadgetsBundle"
                      key="interface.one.inheritor.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.j2me.issues"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.InterfaceWithOnlyOneDirectInheritorInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="MethodCallInLoopCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="MethodCallInLoopCondition" bundle="messages.InspectionGadgetsBundle"
                      key="method.call.in.loop.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.MethodCallInLoopConditionInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="MultiplyOrDivideByPowerOfTwo" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="MultiplyOrDivideByPowerOfTwo" bundle="messages.InspectionGadgetsBundle"
                      key="multiply.or.divide.by.power.of.two.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.MultiplyOrDivideByPowerOfTwoInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="OverlyLargePrimitiveArrayInitializer" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="OverlyLargePrimitiveArrayInitializer" bundle="messages.InspectionGadgetsBundle"
                      key="large.initializer.primitive.type.array.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.OverlyLargePrimitiveArrayInitializerInspection"/>
     <localInspection groupPath="Java,Performance" language="JAVA" suppressId="SyntheticAccessorCall" alternativeId="PrivateMemberAccessBetweenOuterAndInnerClass"
-                     shortName="PrivateMemberAccessBetweenOuterAndInnerClass" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="PrivateMemberAccessBetweenOuterAndInnerClass" bundle="messages.InspectionGadgetsBundle"
                      key="private.member.access.between.outer.and.inner.classes.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.PrivateMemberAccessBetweenOuterAndInnerClassInspection"/>
     <localInspection groupPath="Java,Performance" language="JAVA" suppressId="RecordStoreOpenedButNotSafelyClosed" shortName="RecordStoreResource"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="recordstore.opened.not.safely.closed.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="recordstore.opened.not.safely.closed.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.RecordStoreResourceInspection"/>
-    <localInspection groupPath="Java,Performance" language="JAVA" shortName="SingleCharacterStartsWith" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Performance" language="JAVA" shortName="SingleCharacterStartsWith" bundle="messages.InspectionGadgetsBundle"
                      key="single.character.startswith.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.j2me.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.j2me.SingleCharacterStartsWithInspection"/>
 
     <!--group.names.javabeans.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="class.without.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javabeans.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javabeans.ClassWithoutConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutNoArgConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutNoArgConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="class.without.no.arg.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javabeans.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javabeans.ClassWithoutNoArgConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldHasSetterButNoGetter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldHasSetterButNoGetter" bundle="messages.InspectionGadgetsBundle"
                      key="field.has.setter.but.no.getter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javabeans.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javabeans.FieldHasSetterButNoGetterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PropertyValueSetToItself" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PropertyValueSetToItself" bundle="messages.InspectionGadgetsBundle"
                      key="property.value.set.to.itself.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javabeans.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javabeans.PropertyValueSetToItselfInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousGetterSetter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousGetterSetter" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.getter.setter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javabeans.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javabeans.SuspiciousGetterSetterInspection"/>
 
     <!--group.names.javadoc.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="DanglingJavadoc" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DanglingJavadoc" bundle="messages.InspectionGadgetsBundle"
                      key="dangling.javadoc.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.DanglingJavadocInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="HtmlTagCanBeJavadocTag" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="HtmlTagCanBeJavadocTag" bundle="messages.InspectionGadgetsBundle"
                      key="html.tag.can.be.javadoc.tag.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.HtmlTagCanBeJavadocTagInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MissingDeprecatedAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MissingDeprecatedAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="missing.deprecated.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING" runForWholeFile="true"
                      implementationClass="com.siyeh.ig.javadoc.MissingDeprecatedAnnotationInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="MissingPackageInfo" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="MissingPackageInfo" bundle="messages.InspectionGadgetsBundle"
                       key="missing.package.info.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.javadoc.MissingPackageInfoInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PackageInfoWithoutPackage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PackageInfoWithoutPackage" bundle="messages.InspectionGadgetsBundle"
                      key="package.info.java.without.package.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.PackageInfoWithoutPackageInspection"/>
-    <localInspection groupPath="Java" language="HTML" shortName="PackageDotHtmlMayBePackageInfo" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="HTML" shortName="PackageDotHtmlMayBePackageInfo" bundle="messages.InspectionGadgetsBundle"
                      key="package.dot.html.may.be.package.info.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.PackageDotHtmlMayBePackageInfoInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryJavaDocLink" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryJavaDocLink" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.javadoc.link.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.UnnecessaryJavaDocLinkInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInheritDoc" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.inherit.doc.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInheritDoc" bundle="messages.InspectionGadgetsBundle" key="unnecessary.inherit.doc.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.javadoc.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.javadoc.UnnecessaryInheritDocInspection"/>
 
     <!--group.names.language.level.specific.issues.and.migration.aids-->
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="CollectionsFieldAccessReplaceableByMethodCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="CollectionsFieldAccessReplaceableByMethodCall" bundle="messages.InspectionGadgetsBundle"
                      key="collections.field.access.replaceable.by.method.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.CollectionsFieldAccessReplaceableByMethodCallInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="BigDecimalLegacyMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="BigDecimalLegacyMethod" bundle="messages.InspectionGadgetsBundle"
                      key="bigdecimal.legacy.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.BigDecimalLegacyMethodInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="EqualsReplaceableByObjectsCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="EqualsReplaceableByObjectsCall" bundle="messages.InspectionGadgetsBundle"
                      key="equals.replaceable.by.objects.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids7" enabledByDefault="true" level="WEAK WARNING"
                      implementationClass="com.siyeh.ig.migration.EqualsReplaceableByObjectsCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EnumerationCanBeIteration" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EnumerationCanBeIteration" bundle="messages.InspectionGadgetsBundle"
                      key="enumeration.can.be.iteration.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.EnumerationCanBeIterationInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="ForLoopReplaceableByForEach" shortName="ForCanBeForeach" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="ForLoopReplaceableByForEach" shortName="ForCanBeForeach" bundle="messages.InspectionGadgetsBundle"
                      key="for.can.be.foreach.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.ForCanBeForeachInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IfCanBeSwitch" bundle="com.siyeh.InspectionGadgetsBundle" key="if.can.be.switch.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="IfCanBeSwitch" bundle="messages.InspectionGadgetsBundle" key="if.can.be.switch.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.migration.IfCanBeSwitchInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="IndexOfReplaceableByContains" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="IndexOfReplaceableByContains" bundle="messages.InspectionGadgetsBundle"
                      key="string.indexof.replaceable.by.contains.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.IndexOfReplaceableByContainsInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="MethodCanBeVariableArityMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="MethodCanBeVariableArityMethod" bundle="messages.InspectionGadgetsBundle"
                      key="method.can.be.variable.arity.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.migration.MethodCanBeVariableArityMethodInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="rawtypes" alternativeId="RawUseOfParameterized" shortName="RawUseOfParameterizedType" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="rawtypes" alternativeId="RawUseOfParameterized" shortName="RawUseOfParameterizedType" bundle="messages.InspectionGadgetsBundle"
                      key="raw.use.of.parameterized.type.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.RawUseOfParameterizedTypeInspection"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="StringBufferMayBeStringBuilder" shortName="StringBufferReplaceableByStringBuilder"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="string.buffer.replaceable.by.string.builder.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="string.buffer.replaceable.by.string.builder.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids5"
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.StringBufferReplaceableByStringBuilderInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="TryFinallyCanBeTryWithResources" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="TryFinallyCanBeTryWithResources" bundle="messages.InspectionGadgetsBundle"
                      key="try.finally.can.be.try.with.resources.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids7" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.TryFinallyCanBeTryWithResourcesInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="TryWithIdenticalCatches" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="TryWithIdenticalCatches" bundle="messages.InspectionGadgetsBundle"
                      key="try.with.identical.catches.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids7" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.TryWithIdenticalCatchesInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="UnnecessaryBoxing" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.boxing.display.name"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="UnnecessaryBoxing" bundle="messages.InspectionGadgetsBundle" key="unnecessary.boxing.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids5"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.migration.UnnecessaryBoxingInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="UnnecessaryUnboxing" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.unboxing.display.name"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="UnnecessaryUnboxing" bundle="messages.InspectionGadgetsBundle" key="unnecessary.unboxing.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids5"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.migration.UnnecessaryUnboxingInspection"/>
-    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="WhileLoopReplaceableByForEach" shortName="WhileCanBeForeach" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java,Java language level migration aids" language="JAVA" suppressId="WhileLoopReplaceableByForEach" shortName="WhileCanBeForeach" bundle="messages.InspectionGadgetsBundle"
                      key="while.can.be.foreach.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.language.level.specific.issues.and.migration.aids5" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.migration.WhileCanBeForeachInspection"/>
 
     <!--group.names.java.language.level.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AnnotationClass" bundle="com.siyeh.InspectionGadgetsBundle" key="annotation.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AnnotationClass" bundle="messages.InspectionGadgetsBundle" key="annotation.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.AnnotationClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="Annotation" bundle="com.siyeh.InspectionGadgetsBundle" key="annotation.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="Annotation" bundle="messages.InspectionGadgetsBundle" key="annotation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.AnnotationInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ForwardCompatibility" bundle="messages.InspectionsBundle" key="inspection.forward.compatibility.name"
                      groupKey="group.names.java.language.level.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.jdk.ForwardCompatibilityInspection" />
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="assert.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertStatement" bundle="messages.InspectionGadgetsBundle" key="assert.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.AssertStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" alternativeId="boxing" shortName="AutoBoxing" bundle="com.siyeh.InspectionGadgetsBundle" key="auto.boxing.display.name"
+    <localInspection groupPath="Java" language="JAVA" alternativeId="boxing" shortName="AutoBoxing" bundle="messages.InspectionGadgetsBundle" key="auto.boxing.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.AutoBoxingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AutoUnboxing" bundle="com.siyeh.InspectionGadgetsBundle" key="auto.unboxing.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AutoUnboxing" bundle="messages.InspectionGadgetsBundle" key="auto.unboxing.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.AutoUnboxingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EnumClass" bundle="com.siyeh.InspectionGadgetsBundle" key="enumerated.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="EnumClass" bundle="messages.InspectionGadgetsBundle" key="enumerated.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.EnumClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ForeachStatement" bundle="com.siyeh.InspectionGadgetsBundle" key="extended.for.statement.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ForeachStatement" bundle="messages.InspectionGadgetsBundle" key="extended.for.statement.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.java.language.level.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.jdk.ForeachStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="VariableArgumentMethod" shortName="VarargParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="VariableArgumentMethod" shortName="VarargParameter" bundle="messages.InspectionGadgetsBundle"
                      key="variable.argument.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.java.language.level.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.jdk.VarargParameterInspection"/>
 
     <!--group.names.junit.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsBetweenInconvertibleTypes" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsBetweenInconvertibleTypes" bundle="messages.InspectionGadgetsBundle"
                      key="assertequals.between.inconvertible.types.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.AssertEqualsBetweenInconvertibleTypesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsMayBeAssertSame" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsMayBeAssertSame" bundle="messages.InspectionGadgetsBundle"
                      key="assertequals.may.be.assertsame.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.AssertEqualsMayBeAssertSameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsCalledOnArray" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertEqualsCalledOnArray" bundle="messages.InspectionGadgetsBundle"
                      key="assertequals.called.on.arrays.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.AssertEqualsCalledOnArrayInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnitRule" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnitRule" bundle="messages.InspectionGadgetsBundle"
                      key="junit.rule.display.name" implementationClass="com.siyeh.ig.junit.JUnitRuleInspection"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnitDatapoint" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnitDatapoint" bundle="messages.InspectionGadgetsBundle"
                      key="junit.datapoint.display.name" implementationClass="com.siyeh.ig.junit.JUnitDatapointInspection"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MessageMissingOnJUnitAssertion" shortName="AssertsWithoutMessages"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="asserts.without.messages.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="asserts.without.messages.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnitAssertsWithoutMessagesInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="BeforeOrAfterWithIncorrectSignature" shortName="BeforeClassOrAfterClassIsPublicStaticVoidNoArg"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="before.class.or.after.class.is.public.static.void.no.arg.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="before.class.or.after.class.is.public.static.void.no.arg.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="BeforeOrAfterWithIncorrectSignature" shortName="BeforeOrAfterIsPublicVoidNoArg"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="before.or.after.is.public.void.no.arg.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="before.or.after.is.public.void.no.arg.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.BeforeOrAfterIsPublicVoidNoArgInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ExpectedExceptionNeverThrown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ExpectedExceptionNeverThrown" bundle="messages.InspectionGadgetsBundle"
                      key="expected.exception.never.thrown.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.ExpectedExceptionNeverThrownInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ParameterizedParametersStaticCollection" displayName="@RunWith(Parameterized.class) without data provider"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.ParameterizedParametersStaticCollectionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantJUnitAssertArgument" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantJUnitAssertArgument" bundle="messages.InspectionGadgetsBundle"
                      key="constant.junit.assert.argument.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.ConstantJUnitAssertArgumentInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IgnoredJUnitTest" bundle="com.siyeh.InspectionGadgetsBundle" key="ignored.junit.test.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="IgnoredJUnitTest" bundle="messages.InspectionGadgetsBundle" key="ignored.junit.test.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.IgnoredJUnitTestInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit3StyleTestMethodInJUnit4Class" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit3StyleTestMethodInJUnit4Class" bundle="messages.InspectionGadgetsBundle"
                      key="junit3.style.test.method.in.junit4.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnit3StyleTestMethodInJUnit4ClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit4AnnotatedMethodInJUnit3TestCase" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit4AnnotatedMethodInJUnit3TestCase" bundle="messages.InspectionGadgetsBundle"
                      key="junit4.test.method.in.class.extending.junit3.testcase.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnit4AnnotatedMethodInJUnit3TestCaseInspection"/>
-    <localInspection groupPath="Java" language="JAVA"  shortName="MalformedSetUpTearDown" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA"  shortName="MalformedSetUpTearDown" bundle="messages.InspectionGadgetsBundle"
                      key="malformed.set.up.tear.down.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.MalformedSetUpTearDownInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MisorderedAssertEqualsArguments" alternativeId="MisorderedAssertEqualsArguments" shortName="MisorderedAssertEqualsParameters"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="misordered.assert.equals.arguments.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="misordered.assert.equals.arguments.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.MisorderedAssertEqualsParametersInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MultipleExceptionsDeclaredOnTestMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MultipleExceptionsDeclaredOnTestMethod" bundle="messages.InspectionGadgetsBundle"
                      key="multiple.exceptions.declared.on.test.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.MultipleExceptionsDeclaredOnTestMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestCaseWithNonTrivialConstructors" shortName="TestCaseWithConstructor"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="test.case.with.constructor.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="test.case.with.constructor.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestCaseWithConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableJUnitAssertion" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableJUnitAssertion" bundle="messages.InspectionGadgetsBundle"
                      key="simplifiable.junit.assertion.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.SimplifiableJUnitAssertionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="SuiteNotDeclaredStatic" shortName="StaticSuite" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="SuiteNotDeclaredStatic" shortName="StaticSuite" bundle="messages.InspectionGadgetsBundle"
                      key="static.suite.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.junit.StaticSuiteInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuperTearDownInFinally" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuperTearDownInFinally" bundle="messages.InspectionGadgetsBundle"
                      key="super.tear.down.in.finally.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.junit.SuperTearDownInFinallyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestCaseInProductSource" shortName="TestCaseInProductCode" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestCaseInProductSource" shortName="TestCaseInProductCode" bundle="messages.InspectionGadgetsBundle"
                      key="test.case.in.product.code.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestCaseInProductCodeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestCaseWithNoTests" shortName="TestCaseWithNoTestMethods" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestCaseWithNoTests" shortName="TestCaseWithNoTestMethods" bundle="messages.InspectionGadgetsBundle"
                      key="test.case.with.no.test.methods.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestCaseWithNoTestMethodsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestMethodInProductSource" shortName="TestMethodInProductCode"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="test.method.in.product.code.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="test.method.in.product.code.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestMethodInProductCodeInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="TestMethodWithIncorrectSignature" shortName="TestMethodIsPublicVoidNoArg"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="test.method.is.public.void.no.arg.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="test.method.is.public.void.no.arg.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestMethodIsPublicVoidNoArgInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="JUnitTestMethodWithNoAssertions" shortName="TestMethodWithoutAssertion"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="test.method.without.assertion.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="test.method.without.assertion.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.TestMethodWithoutAssertionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="UnconstructableJUnitTestCase" shortName="UnconstructableTestCase"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="unconstructable.test.case.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="unconstructable.test.case.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.UnconstructableTestCaseInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfObsoleteAssert" bundle="com.siyeh.InspectionGadgetsBundle" key="usage.of.obsolete.assert.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfObsoleteAssert" bundle="messages.InspectionGadgetsBundle" key="usage.of.obsolete.assert.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.UseOfObsoleteAssertInspection"/>
 
     <!--group.names.logging.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithMultipleLoggers" bundle="com.siyeh.InspectionGadgetsBundle" key="multiple.loggers.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithMultipleLoggers" bundle="messages.InspectionGadgetsBundle" key="multiple.loggers.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.ClassWithMultipleLoggersInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutLogger" bundle="com.siyeh.InspectionGadgetsBundle" key="no.logger.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassWithoutLogger" bundle="messages.InspectionGadgetsBundle" key="no.logger.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.ClassWithoutLoggerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LoggingConditionDisagreesWithLogStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LoggingConditionDisagreesWithLogStatement" bundle="messages.InspectionGadgetsBundle"
                      key="logging.condition.disagrees.with.log.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.LoggingConditionDisagreesWithLogStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LoggerInitializedWithForeignClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LoggerInitializedWithForeignClass" bundle="messages.InspectionGadgetsBundle"
                      key="logger.initialized.with.foreign.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.LoggerInitializedWithForeignClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LogStatementGuardedByLogCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LogStatementGuardedByLogCondition" bundle="messages.InspectionGadgetsBundle"
                      key="log.statement.guarded.by.log.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.LogStatementGuardedByLogConditionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="NonConstantLogger" shortName="NonStaticFinalLogger" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="NonConstantLogger" shortName="NonStaticFinalLogger" bundle="messages.InspectionGadgetsBundle"
                      key="non.constant.logger.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.logging.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.logging.NonStaticFinalLoggerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PlaceholderCountMatchesArgumentCount" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PlaceholderCountMatchesArgumentCount" bundle="messages.InspectionGadgetsBundle"
                      key="placeholder.count.matches.argument.count.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.PlaceholderCountMatchesArgumentCountInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicMethodWithoutLogging" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicMethodWithoutLogging" bundle="messages.InspectionGadgetsBundle"
                      key="public.method.without.logging.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.PublicMethodWithoutLoggingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationArgumentToLogCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationArgumentToLogCall" bundle="messages.InspectionGadgetsBundle"
                      key="string.concatenation.argument.to.log.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.logging.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.logging.StringConcatenationArgumentToLogCallInspection"/>
 
     <!--group.names.code.maturity.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="SuppressionAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuppressionAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.suppression.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.SuppressionAnnotationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfSystemOutOrSystemErr" shortName="SystemOutErr" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfSystemOutOrSystemErr" shortName="SystemOutErr" bundle="messages.InspectionGadgetsBundle"
                      key="use.system.out.err.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.SystemOutErrInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToPrintStackTrace" shortName="ThrowablePrintStackTrace" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToPrintStackTrace" shortName="ThrowablePrintStackTrace" bundle="messages.InspectionGadgetsBundle"
                      key="printstacktrace.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.ThrowablePrintStackTraceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadDumpStack" shortName="ThreadDumpStack" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadDumpStack" shortName="ThreadDumpStack" bundle="messages.InspectionGadgetsBundle"
                      key="dumpstack.call.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.maturity.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.maturity.ThreadDumpStackInspection"/>
-    <localInspection groupPath="Java" language="JAVA"  shortName="ThrowablePrintedToSystemOut" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA"  shortName="ThrowablePrintedToSystemOut" bundle="messages.InspectionGadgetsBundle"
                      key="throwable.printed.to.system.out.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.ThrowablePrintedToSystemOutInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfObsoleteCollectionType" shortName="ObsoleteCollection" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UseOfObsoleteCollectionType" shortName="ObsoleteCollection" bundle="messages.InspectionGadgetsBundle"
                      key="use.obsolete.collection.type.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.ObsoleteCollectionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfObsoleteDateTimeApi" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfObsoleteDateTimeApi" bundle="messages.InspectionGadgetsBundle"
                      key="use.of.obsolete.date.time.api.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.maturity.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.maturity.UseOfObsoleteDateTimeApiInspection"/>
 
     <!--group.names.memory.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousInnerClassMayBeStatic" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousInnerClassMayBeStatic" bundle="messages.InspectionGadgetsBundle"
                      key="anonymous.inner.may.be.named.static.inner.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.memory.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.AnonymousInnerClassMayBeStaticInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InnerClassMayBeStatic" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InnerClassMayBeStatic" bundle="messages.InspectionGadgetsBundle"
                      key="inner.class.may.be.static.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.memory.issues" enabledByDefault="true" level="WARNING" runForWholeFile="true"
                      implementationClass="com.siyeh.ig.memory.InnerClassMayBeStaticInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ReturnOfInnerClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ReturnOfInnerClass" bundle="messages.InspectionGadgetsBundle"
                      key="return.of.inner.class.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues"
                      implementationClass="com.siyeh.ig.memory.ReturnOfInnerClassInspection" enabledByDefault="false" level="WARNING"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StaticCollection" bundle="com.siyeh.InspectionGadgetsBundle" key="static.collection.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StaticCollection" bundle="messages.InspectionGadgetsBundle" key="static.collection.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.StaticCollectionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferField" bundle="com.siyeh.InspectionGadgetsBundle" key="stringbuffer.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferField" bundle="messages.InspectionGadgetsBundle" key="stringbuffer.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.StringBufferFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemGC" shortName="SystemGC" bundle="com.siyeh.InspectionGadgetsBundle" key="gc.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemGC" shortName="SystemGC" bundle="messages.InspectionGadgetsBundle" key="gc.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.SystemGCInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ZeroLengthArrayAllocation" shortName="ZeroLengthArrayInitialization"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="array.allocation.zero.length.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="array.allocation.zero.length.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.ZeroLengthArrayInitializationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ConstantForZeroLengthArrayAllocation" shortName="UnnecessaryEmptyArrayUsage"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="constant.for.zero.length.array.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="constant.for.zero.length.array.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.memory.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.memory.UnnecessaryEmptyArrayUsageInspection"/>
 
     <!--group.names.method.metrics-->
     <localInspection groupPath="Java" language="JAVA" suppressId="ConstructorWithTooManyParameters" shortName="ParametersPerConstructor"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="parameters.per.constructor.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="parameters.per.constructor.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.ParametersPerConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexMethod" shortName="CyclomaticComplexity" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyComplexMethod" shortName="CyclomaticComplexity" bundle="messages.InspectionGadgetsBundle"
                      key="cyclomatic.complexity.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.CyclomaticComplexityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyCoupledMethod" shortName="MethodCoupling" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyCoupledMethod" shortName="MethodCoupling" bundle="messages.InspectionGadgetsBundle"
                      key="method.coupling.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.methodmetrics.MethodCouplingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodWithMultipleLoops" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodWithMultipleLoops" bundle="messages.InspectionGadgetsBundle"
                      key="method.with.multiple.loops.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.MethodWithMultipleLoopsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodWithMultipleReturnPoints" shortName="MultipleReturnPointsPerMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="multiple.return.points.per.method.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="multiple.return.points.per.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.MultipleReturnPointsPerMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyNestedMethod" shortName="NestingDepth" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyNestedMethod" shortName="NestingDepth" bundle="messages.InspectionGadgetsBundle"
                      key="nesting.depth.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.methodmetrics.NestingDepthInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyLongMethod" shortName="NonCommentSourceStatements" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OverlyLongMethod" shortName="NonCommentSourceStatements" bundle="messages.InspectionGadgetsBundle"
                      key="non.comment.source.statements.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.NonCommentSourceStatementsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverlyLongLambda" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverlyLongLambda" bundle="messages.InspectionGadgetsBundle"
                      key="overly.long.lambda.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.methodmetrics.OverlyLongLambdaInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="MethodWithTooManyParameters" shortName="ParametersPerMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="MethodWithTooManyParameters" shortName="ParametersPerMethod" bundle="messages.InspectionGadgetsBundle"
                      key="parameters.per.method.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics"
                      enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.ParametersPerMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodWithMoreThanThreeNegations" shortName="ThreeNegationsPerMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="three.negations.per.method.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="three.negations.per.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.ThreeNegationsPerMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodWithTooExceptionsDeclared" shortName="ThrownExceptionsPerMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="thrown.exceptions.per.method.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="thrown.exceptions.per.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.method.metrics" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.methodmetrics.ThrownExceptionsPerMethodInspection"/>
 
     <!--group.names.modularization.issues-->
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassIndependentOfModule" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassIndependentOfModule" bundle="messages.InspectionGadgetsBundle"
                       key="class.independent.of.module.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.modularization.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.modularization.ClassIndependentOfModuleInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassOnlyUsedInOneModule" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassOnlyUsedInOneModule" bundle="messages.InspectionGadgetsBundle"
                       key="class.only.used.in.one.module.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.modularization.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.modularization.ClassOnlyUsedInOneModuleInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ModuleWithTooManyClasses" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ModuleWithTooManyClasses" bundle="messages.InspectionGadgetsBundle"
                       key="module.with.too.many.classes.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.modularization.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.modularization.ModuleWithTooManyClassesInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ModuleWithTooFewClasses" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ModuleWithTooFewClasses" bundle="messages.InspectionGadgetsBundle"
                       key="module.with.too.few.classes.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.modularization.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.modularization.ModuleWithTooFewClassesInspection"/>
 
     <!--group.names.naming.conventions-->
-    <localInspection groupPath="Java" language="JAVA" shortName="NewClassNamingConvention" bundle="com.siyeh.InspectionGadgetsBundle" key="class.naming.convention.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NewClassNamingConvention" bundle="messages.InspectionGadgetsBundle" key="class.naming.convention.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.NewClassNamingConventionInspection"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.naming.ClassNamingConventionMerger"/>
@@ -1635,7 +1635,7 @@
     <naming.convention.class implementation="com.siyeh.ig.naming.AbstractClassNamingConvention" id="AbstractClassNamingConvention" order="after InterfaceNamingConvention"/>
     <naming.convention.class implementation="com.siyeh.ig.naming.ClassNamingConvention" id="ClassNamingConvention" order="last"/>
 
-    <localInspection groupPath="Java" language="JAVA" shortName="NewMethodNamingConvention" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NewMethodNamingConvention" bundle="messages.InspectionGadgetsBundle"
                      key="new.method.naming.convention.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.NewMethodNamingConventionInspection"/>
@@ -1646,23 +1646,23 @@
     <naming.convention.method implementation="com.siyeh.ig.junit.JUnit4MethodNamingConvention" id="JUnit4MethodNamingConvention" order="before NativeMethodNamingConvention"/>
     <naming.convention.method implementation="com.siyeh.ig.junit.JUnit3MethodNamingConvention" id="JUnit3MethodNamingConvention" order="before JUnit4MethodNamingConvention"/>
 
-    <localInspection groupPath="Java" language="JAVA" shortName="BooleanMethodNameMustStartWithQuestion" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="BooleanMethodNameMustStartWithQuestion" bundle="messages.InspectionGadgetsBundle"
                      key="boolean.method.name.must.start.with.question.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.BooleanMethodNameMustStartWithQuestionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassNamePrefixedWithPackageName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassNamePrefixedWithPackageName" bundle="messages.InspectionGadgetsBundle"
                      key="class.name.prefixed.with.package.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.ClassNamePrefixedWithPackageNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassNameSameAsAncestorName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassNameSameAsAncestorName" bundle="messages.InspectionGadgetsBundle"
                      key="class.name.same.as.ancestor.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.ClassNameSameAsAncestorNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConfusingMainMethod" bundle="com.siyeh.InspectionGadgetsBundle" key="confusing.main.method.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConfusingMainMethod" bundle="messages.InspectionGadgetsBundle" key="confusing.main.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.ConfusingMainMethodInspection"/>
 
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldNamingConvention" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldNamingConvention" bundle="messages.InspectionGadgetsBundle"
                      key="field.naming.convention.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.FieldNamingConventionInspection"/>
@@ -1673,587 +1673,587 @@
     <naming.convention.field implementation="com.siyeh.ig.naming.StaticVariableNamingConvention" id="StaticVariableNamingConvention" order="after ConstantWithMutableFieldTypeNamingConvention"/>
     <naming.convention.field implementation="com.siyeh.ig.naming.InstanceVariableNamingConvention" id="InstanceVariableNamingConvention" order="after StaticVariableNamingConvention"/>
 
-    <localInspection groupPath="Java" language="JAVA" shortName="DollarSignInName" bundle="com.siyeh.InspectionGadgetsBundle" key="dollar.sign.in.name.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="DollarSignInName" bundle="messages.InspectionGadgetsBundle" key="dollar.sign.in.name.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.DollarSignInNameInspection"/>
 
     <localInspection groupPath="Java" language="JAVA" suppressId="ExceptionClassNameDoesntEndWithException" shortName="ExceptionNameDoesntEndWithException"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="exception.name.doesnt.end.with.exception.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="exception.name.doesnt.end.with.exception.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.ExceptionNameDoesntEndWithExceptionInspection"/>
 
     <localInspection groupPath="Java" language="JAVA" shortName="LambdaParameterNamingConvention"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="lambda.parameter.naming.convention.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="lambda.parameter.naming.convention.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.LambdaParameterNamingConventionInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="LambdaUnfriendlyMethodOverload"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="lambda.unfriendly.method.overload.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="lambda.unfriendly.method.overload.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.LambdaUnfriendlyMethodOverloadInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LocalVariableNamingConvention" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LocalVariableNamingConvention" bundle="messages.InspectionGadgetsBundle"
                      key="local.variable.naming.convention.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.LocalVariableNamingConventionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodNameSameAsClassName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodNameSameAsClassName" bundle="messages.InspectionGadgetsBundle"
                      key="method.name.same.as.class.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.MethodNameSameAsClassNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodNameSameAsParentName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodNameSameAsParentName" bundle="messages.InspectionGadgetsBundle"
                      key="method.name.same.as.parent.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.MethodNameSameAsParentNameInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodNamesDifferingOnlyByCase" shortName="MisspelledMethodName"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="method.names.differ.only.by.case.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="method.names.differ.only.by.case.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.MisspelledMethodNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonBooleanMethodNameMayNotStartWithQuestion" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonBooleanMethodNameMayNotStartWithQuestion" bundle="messages.InspectionGadgetsBundle"
                      key="non.boolean.method.name.must.not.start.with.question.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.NonBooleanMethodNameMayNotStartWithQuestionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonExceptionNameEndsWithException" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonExceptionNameEndsWithException" bundle="messages.InspectionGadgetsBundle"
                      key="non.exception.name.ends.with.exception.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.NonExceptionNameEndsWithExceptionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverloadedMethodsWithSameNumberOfParameters" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverloadedMethodsWithSameNumberOfParameters" bundle="messages.InspectionGadgetsBundle"
                      key="overloaded.methods.with.same.number.parameters.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.OverloadedMethodsWithSameNumberOfParametersInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverloadedVarargsMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverloadedVarargsMethod" bundle="messages.InspectionGadgetsBundle"
                      key="overloaded.vararg.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.OverloadedVarargsMethodInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="PackageNamingConvention" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="PackageNamingConvention" bundle="messages.InspectionGadgetsBundle"
                       key="package.naming.convention.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.naming.PackageNamingConventionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ParameterNameDiffersFromOverriddenParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ParameterNameDiffersFromOverriddenParameter" bundle="messages.InspectionGadgetsBundle"
                      key="parameter.name.differs.from.overridden.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.naming.conventions" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.naming.ParameterNameDiffersFromOverriddenParameterInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodParameterNamingConvention" shortName="ParameterNamingConvention"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="parameter.naming.convention.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="parameter.naming.convention.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.ParameterNamingConventionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="QuestionableName" bundle="com.siyeh.InspectionGadgetsBundle" key="questionable.name.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="QuestionableName" bundle="messages.InspectionGadgetsBundle" key="questionable.name.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.QuestionableNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StandardVariableNames" bundle="com.siyeh.InspectionGadgetsBundle" key="standard.variable.names.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="StandardVariableNames" bundle="messages.InspectionGadgetsBundle" key="standard.variable.names.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.StandardVariableNamesInspection"/>
    
     <localInspection groupPath="Java" language="JAVA" suppressId="NonConstantFieldWithUpperCaseName" shortName="UpperCaseFieldNameNotConstant"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="upper.case.field.name.not.constant.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="upper.case.field.name.not.constant.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.naming.conventions" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.naming.UpperCaseFieldNameNotConstantInspection"/>
 
     <!--group.names.numeric.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="BadOddness" bundle="com.siyeh.InspectionGadgetsBundle" key="bad.oddness.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BadOddness" bundle="messages.InspectionGadgetsBundle" key="bad.oddness.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.BadOddnessInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BigDecimalEquals" bundle="com.siyeh.InspectionGadgetsBundle" key="big.decimal.equals.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BigDecimalEquals" bundle="messages.InspectionGadgetsBundle" key="big.decimal.equals.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.BigDecimalEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BigDecimalMethodWithoutRoundingCalled" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="BigDecimalMethodWithoutRoundingCalled" bundle="messages.InspectionGadgetsBundle"
                      key="big.decimal.method.without.rounding.called.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.BigDecimalMethodWithoutRoundingCalledInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CachedNumberConstructorCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CachedNumberConstructorCall" bundle="messages.InspectionGadgetsBundle"
                      key="cached.number.constructor.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.CachedNumberConstructorCallInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NumericCastThatLosesPrecision" shortName="CastThatLosesPrecision"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="cast.that.loses.precision.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="cast.that.loses.precision.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.CastThatLosesPrecisionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CharUsedInArithmeticContext" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CharUsedInArithmeticContext" bundle="messages.InspectionGadgetsBundle"
                      key="char.used.in.arithmetic.context.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.CharUsedInArithmeticContextInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparisonOfShortAndChar" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparisonOfShortAndChar" bundle="messages.InspectionGadgetsBundle"
                      key="comparison.of.short.and.char.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.ComparisonOfShortAndCharInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparisonToNaN" bundle="com.siyeh.InspectionGadgetsBundle" key="comparison.to.nan.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparisonToNaN" bundle="messages.InspectionGadgetsBundle" key="comparison.to.nan.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.ComparisonToNaNInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConfusingFloatingPointLiteral" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConfusingFloatingPointLiteral" bundle="messages.InspectionGadgetsBundle"
                      key="confusing.floating.point.literal.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.ConfusingFloatingPointLiteralInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ConstantMathCall" bundle="com.siyeh.InspectionGadgetsBundle" key="constant.math.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ConstantMathCall" bundle="messages.InspectionGadgetsBundle" key="constant.math.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.ConstantMathCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="divzero" shortName="DivideByZero" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="divzero" shortName="DivideByZero" bundle="messages.InspectionGadgetsBundle"
                      key="divide.by.zero.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.numeric.DivideByZeroInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DoubleLiteralMayBeFloatLiteral" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DoubleLiteralMayBeFloatLiteral" bundle="messages.InspectionGadgetsBundle"
                      key="double.literal.may.be.float.literal.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.DoubleLiteralMayBeFloatLiteralInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FloatingPointEquality" bundle="com.siyeh.InspectionGadgetsBundle" key="floating.point.equality.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FloatingPointEquality" bundle="messages.InspectionGadgetsBundle" key="floating.point.equality.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.FloatingPointEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitNumericConversion" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitNumericConversion" bundle="messages.InspectionGadgetsBundle"
                      key="implicit.numeric.conversion.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.ImplicitNumericConversionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IntegerDivisionInFloatingPointContext" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IntegerDivisionInFloatingPointContext" bundle="messages.InspectionGadgetsBundle"
                      key="integer.division.in.floating.point.context.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.IntegerDivisionInFloatingPointContextInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IntegerMultiplicationImplicitCastToLong" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IntegerMultiplicationImplicitCastToLong" bundle="messages.InspectionGadgetsBundle"
                      key="integer.multiplication.implicit.cast.to.long.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.IntegerMultiplicationImplicitCastToLongInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IntLiteralMayBeLongLiteral" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IntLiteralMayBeLongLiteral" bundle="messages.InspectionGadgetsBundle"
                      key="int.literal.may.be.long.literal.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.IntLiteralMayBeLongLiteralInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="LongLiteralEndingWithLowercaseL" shortName="LongLiteralsEndingWithLowercaseL"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="long.literals.ending.with.lowercase.l.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="long.literals.ending.with.lowercase.l.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.LongLiteralsEndingWithLowercaseLInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonReproducibleMathCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonReproducibleMathCall" bundle="messages.InspectionGadgetsBundle"
                      key="non.reproducible.math.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.NonReproducibleMathCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="OctalInteger" shortName="OctalLiteral" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="OctalInteger" shortName="OctalLiteral" bundle="messages.InspectionGadgetsBundle"
                      key="octal.literal.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.numeric.OctalLiteralInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="OctalAndDecimalIntegersInSameArray" shortName="OctalAndDecimalIntegersMixed"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="octal.and.decimal.integers.in.same.array.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="octal.and.decimal.integers.in.same.array.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.OctalAndDecimalIntegersMixedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OverlyComplexArithmeticExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OverlyComplexArithmeticExpression" bundle="messages.InspectionGadgetsBundle"
                      key="overly.complex.arithmetic.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.OverlyComplexArithmeticExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PointlessArithmeticExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PointlessArithmeticExpression" bundle="messages.InspectionGadgetsBundle"
                      key="pointless.arithmetic.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.PointlessArithmeticExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousLiteralUnderscore" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousLiteralUnderscore" bundle="messages.InspectionGadgetsBundle"
                      key="suspicious.literal.underscore.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.SuspiciousLiteralUnderscoreInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnaryPlus" bundle="com.siyeh.InspectionGadgetsBundle" key="unary.plus.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnaryPlus" bundle="messages.InspectionGadgetsBundle" key="unary.plus.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.UnaryPlusInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryExplicitNumericCast" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryExplicitNumericCast" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.explicit.numeric.cast.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.UnnecessaryExplicitNumericCastInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryUnaryMinus" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.unary.minus.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryUnaryMinus" bundle="messages.InspectionGadgetsBundle" key="unnecessary.unary.minus.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.numeric.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.UnnecessaryUnaryMinusInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnpredictableBigDecimalConstructorCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnpredictableBigDecimalConstructorCall" bundle="messages.InspectionGadgetsBundle"
                      key="unpredictable.big.decimal.constructor.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.numeric.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.numeric.UnpredictableBigDecimalConstructorCallInspection"/>
 
     <!--group.names.packaging.issues-->
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassOnlyUsedInOnePackage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassOnlyUsedInOnePackage" bundle="messages.InspectionGadgetsBundle"
                       key="class.only.used.in.one.package.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.packaging.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.packaging.ClassOnlyUsedInOnePackageInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ClassUnconnectedToPackage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ClassUnconnectedToPackage" bundle="messages.InspectionGadgetsBundle"
                       key="class.unconnected.to.package.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.packaging.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.packaging.ClassUnconnectedToPackageInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="DisjointPackage" bundle="com.siyeh.InspectionGadgetsBundle" key="disjoint.package.display.name"
+    <globalInspection groupPath="Java" language="JAVA" shortName="DisjointPackage" bundle="messages.InspectionGadgetsBundle" key="disjoint.package.display.name"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.packaging.issues" enabledByDefault="false"
                       level="WARNING" implementationClass="com.siyeh.ig.packaging.DisjointPackageInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="EmptyDirectory" bundle="com.siyeh.InspectionGadgetsBundle" key="empty.directory.display.name"
+    <globalInspection groupPath="Java" language="JAVA" shortName="EmptyDirectory" bundle="messages.InspectionGadgetsBundle" key="empty.directory.display.name"
                       groupBundle="messages.InspectionsBundle" groupKey="group.names.packaging.issues" enabledByDefault="false"
                       level="WARNING" implementationClass="com.siyeh.ig.packaging.EmptyDirectoryInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="ExceptionPackage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="ExceptionPackage" bundle="messages.InspectionGadgetsBundle"
                       key="exception.package.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.packaging.issues"
                       enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.packaging.ExceptionPackageInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="PackageInMultipleModules" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="PackageInMultipleModules" bundle="messages.InspectionGadgetsBundle"
                       key="package.in.multiple.modules.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.packaging.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.packaging.PackageInMultipleModulesInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="PackageWithTooManyClasses" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="PackageWithTooManyClasses" bundle="messages.InspectionGadgetsBundle"
                       key="package.with.too.many.classes.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.packaging.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.packaging.PackageWithTooManyClassesInspection"/>
-    <globalInspection groupPath="Java" language="JAVA" shortName="PackageWithTooFewClasses" bundle="com.siyeh.InspectionGadgetsBundle"
+    <globalInspection groupPath="Java" language="JAVA" shortName="PackageWithTooFewClasses" bundle="messages.InspectionGadgetsBundle"
                       key="package.with.too.few.classes.display.name" groupBundle="messages.InspectionsBundle"
                       groupKey="group.names.packaging.issues" enabledByDefault="false" level="WARNING"
                       implementationClass="com.siyeh.ig.packaging.PackageWithTooFewClassesInspection"/>
 
     <!--group.names.performance.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ArraysAsListWithZeroOrOneArgument" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArraysAsListWithZeroOrOneArgument" bundle="messages.InspectionGadgetsBundle"
                      key="arrays.as.list.with.zero.or.one.argument.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ArraysAsListWithZeroOrOneArgumentInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="BooleanConstructorCall" shortName="BooleanConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="BooleanConstructorCall" shortName="BooleanConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="boolean.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.BooleanConstructorInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToSimpleGetterFromWithinClass" shortName="CallToSimpleGetterInClass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="call.to.simple.getter.in.class.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="call.to.simple.getter.in.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.CallToSimpleGetterInClassInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToSimpleSetterFromWithinClass" shortName="CallToSimpleSetterInClass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="call.to.simple.setter.in.class.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="call.to.simple.setter.in.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.CallToSimpleSetterInClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CollectionContainsUrl" bundle="com.siyeh.InspectionGadgetsBundle" key="collection.contains.url.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CollectionContainsUrl" bundle="messages.InspectionGadgetsBundle" key="collection.contains.url.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.CollectionContainsUrlInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CollectionWithoutInitialCapacity" shortName="CollectionsMustHaveInitialCapacity"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="collections.must.have.initial.capacity.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="collections.must.have.initial.capacity.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.CollectionsMustHaveInitialCapacityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DynamicRegexReplaceableByCompiledPattern" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DynamicRegexReplaceableByCompiledPattern" bundle="messages.InspectionGadgetsBundle"
                      key="dynamic.regex.replaceable.by.compiled.pattern.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.DynamicRegexReplaceableByCompiledPatternInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsHashCodeCalledOnUrl" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsHashCodeCalledOnUrl" bundle="messages.InspectionGadgetsBundle"
                      key="equals.hashcode.called.on.url.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.EqualsHashCodeCalledOnUrlInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldMayBeStatic" bundle="com.siyeh.InspectionGadgetsBundle" key="field.may.be.static.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldMayBeStatic" bundle="messages.InspectionGadgetsBundle" key="field.may.be.static.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.FieldMayBeStaticInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="InstantiatingObjectToGetClassObject" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="InstantiatingObjectToGetClassObject" bundle="messages.InspectionGadgetsBundle"
                      key="instantiating.object.to.get.class.object.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.InstantiatingObjectToGetClassObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="KeySetIterationMayUseEntrySet" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="KeySetIterationMayUseEntrySet" bundle="messages.InspectionGadgetsBundle"
                      key="key.set.iteration.may.use.entry.set.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.KeySetIterationMayUseEntrySetInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SingleCharacterStringConcatenation" shortName="LengthOneStringInIndexOf"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="length.one.string.in.indexof.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="length.one.string.in.indexof.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.LengthOneStringInIndexOfInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SingleCharacterStringConcatenation" shortName="LengthOneStringsInConcatenation"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="length.one.strings.in.concatenation.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="length.one.strings.in.concatenation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.performance.LengthOneStringsInConcatenationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ManualArrayToCollectionCopy" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ManualArrayToCollectionCopy" bundle="messages.InspectionGadgetsBundle"
                      key="manual.array.to.collection.copy.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ManualArrayToCollectionCopyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ManualArrayCopy" bundle="com.siyeh.InspectionGadgetsBundle" key="manual.array.copy.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ManualArrayCopy" bundle="messages.InspectionGadgetsBundle" key="manual.array.copy.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.ManualArrayCopyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MapReplaceableByEnumMap" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MapReplaceableByEnumMap" bundle="messages.InspectionGadgetsBundle"
                      key="map.replaceable.by.enum.map.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.MapReplaceableByEnumMapInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodMayBeStatic" bundle="com.siyeh.InspectionGadgetsBundle" key="method.may.be.static.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodMayBeStatic" bundle="messages.InspectionGadgetsBundle" key="method.may.be.static.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.MethodMayBeStaticInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassInitializerMayBeStatic" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassInitializerMayBeStatic" bundle="messages.InspectionGadgetsBundle"
                      key="class.initializer.may.be.static.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ClassInitializerMayBeStaticInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ObjectAllocationInLoop" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ObjectAllocationInLoop" bundle="messages.InspectionGadgetsBundle"
                      key="object.allocation.in.loop.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ObjectAllocationInLoopInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ObjectEqualsCanBeEquality" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ObjectEqualsCanBeEquality" bundle="messages.InspectionGadgetsBundle"
                      key="object.equals.can.be.equality.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.performance.ObjectEqualsCanBeEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ObjectInstantiationInEqualsHashCode" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ObjectInstantiationInEqualsHashCode" bundle="messages.InspectionGadgetsBundle"
                      key="object.instantiation.inside.equals.or.hashcode.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ObjectInstantiationInEqualsHashCodeInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="UsingRandomNextDoubleForRandomInteger" shortName="RandomDoubleForRandomInteger"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="random.double.for.random.integer.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="random.double.for.random.integer.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.RandomDoubleForRandomIntegerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantStringFormatCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantStringFormatCall" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.string.format.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.RedundantStringFormatCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SetReplaceableByEnumSet" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SetReplaceableByEnumSet" bundle="messages.InspectionGadgetsBundle"
                      key="set.replaceable.by.enum.set.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.SetReplaceableByEnumSetInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StringBufferWithoutInitialCapacity" shortName="StringBufferMustHaveInitialCapacity"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="string.buffer.must.have.initial.capacity.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="string.buffer.must.have.initial.capacity.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.StringBufferMustHaveInitialCapacityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferToStringInConcatenation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferToStringInConcatenation" bundle="messages.InspectionGadgetsBundle"
                      key="string.buffer.to.string.in.concatenation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.StringBufferToStringInConcatenationInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StringConcatenationInLoop" alternativeId="StringContatenationInLoop" shortName="StringConcatenationInLoops"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="string.concatenation.in.loops.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="string.concatenation.in.loops.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.StringConcatenationInLoopsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInsideStringBufferAppend" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringConcatenationInsideStringBufferAppend" bundle="messages.InspectionGadgetsBundle"
                      key="string.concatenation.inside.string.buffer.append.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.StringConcatenationInsideStringBufferAppendInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringEqualsEmptyString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringEqualsEmptyString" bundle="messages.InspectionGadgetsBundle"
                      key="string.equals.empty.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.StringEqualsEmptyStringInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonConstantStringShouldBeStringBuffer" shortName="StringReplaceableByStringBuffer"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="string.replaceable.by.string.buffer.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="string.replaceable.by.string.buffer.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.StringReplaceableByStringBufferInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TailRecursion" bundle="com.siyeh.InspectionGadgetsBundle" key="tail.recursion.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="TailRecursion" bundle="messages.InspectionGadgetsBundle" key="tail.recursion.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="INFORMATION" implementationClass="com.siyeh.ig.performance.TailRecursionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ToArrayCallWithZeroLengthArrayArgument" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ToArrayCallWithZeroLengthArrayArgument" bundle="messages.InspectionGadgetsBundle"
                      key="to.array.call.style.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.ToArrayCallWithZeroLengthArrayArgumentInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ConcatenationWithEmptyString" shortName="TrivialStringConcatenation"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="trivial.string.concatenation.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="trivial.string.concatenation.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.TrivialStringConcatenationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryTemporaryOnConversionToString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryTemporaryOnConversionToString" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.temporary.on.conversion.to.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.UnnecessaryTemporaryOnConversionToStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryTemporaryOnConversionFromString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryTemporaryOnConversionFromString" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.temporary.on.conversion.from.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.performance.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.performance.UnnecessaryTemporaryOnConversionFromStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BoxingBoxedValue" bundle="com.siyeh.InspectionGadgetsBundle" key="boxing.boxed.value.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BoxingBoxedValue" bundle="messages.InspectionGadgetsBundle" key="boxing.boxed.value.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.BoxingBoxedValueInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ListRemoveInLoop" bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.list.remove.in.loop.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ListRemoveInLoop" bundle="messages.InspectionGadgetsBundle" key="inspection.list.remove.in.loop.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.ListRemoveInLoopInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementMissingBreakInLoop" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="IfStatementMissingBreakInLoop" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.if.statement.missing.break.in.loop.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.performance.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.performance.IfStatementMissingBreakInLoopInspection"/>
 
     <!--group.names.portability.issues-->
-    <localInspection groupPath="Java" language="JAVA" suppressId="HardcodedFileSeparator" shortName="HardcodedFileSeparators" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="HardcodedFileSeparator" shortName="HardcodedFileSeparators" bundle="messages.InspectionGadgetsBundle"
                      key="hardcoded.file.separator.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.portability.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.portability.HardcodedFileSeparatorsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="HardcodedLineSeparator" shortName="HardcodedLineSeparators" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="HardcodedLineSeparator" shortName="HardcodedLineSeparators" bundle="messages.InspectionGadgetsBundle"
                      key="hardcoded.line.separator.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.portability.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.portability.HardcodedLineSeparatorsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="NativeMethod" shortName="NativeMethods" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="NativeMethod" shortName="NativeMethods" bundle="messages.InspectionGadgetsBundle"
                      key="native.method.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.portability.NativeMethodsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToRuntimeExec" shortName="RuntimeExec" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToRuntimeExec" shortName="RuntimeExec" bundle="messages.InspectionGadgetsBundle"
                      key="runtime.exec.call.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.portability.RuntimeExecInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemExit" shortName="SystemExit" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemExit" shortName="SystemExit" bundle="messages.InspectionGadgetsBundle"
                      key="system.exit.call.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.portability.SystemExitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemGetenv" shortName="SystemGetenv" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemGetenv" shortName="SystemGetenv" bundle="messages.InspectionGadgetsBundle"
                      key="system.getenv.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.portability.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.portability.SystemGetenvInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfAWTPeerClass" bundle="com.siyeh.InspectionGadgetsBundle" key="use.of.awt.peer.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfAWTPeerClass" bundle="messages.InspectionGadgetsBundle" key="use.of.awt.peer.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.portability.UseOfAWTPeerClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfJDBCDriverClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfJDBCDriverClass" bundle="messages.InspectionGadgetsBundle"
                      key="use.of.concrete.jdbc.driver.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.portability.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.portability.UseOfJDBCDriverClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfProcessBuilder" bundle="com.siyeh.InspectionGadgetsBundle" key="use.processbuilder.class.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfProcessBuilder" bundle="messages.InspectionGadgetsBundle" key="use.processbuilder.class.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.portability.UseOfProcessBuilderInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UseOfSunClasses" bundle="com.siyeh.InspectionGadgetsBundle" key="use.sun.classes.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UseOfSunClasses" bundle="messages.InspectionGadgetsBundle" key="use.sun.classes.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.portability.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.portability.UseOfSunClassesInspection"/>
 
     <!--group.names.declaration.redundancy-->
-    <localInspection groupPath="Java" language="JAVA" shortName="UnusedLabel" bundle="com.siyeh.InspectionGadgetsBundle" key="unused.label.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnusedLabel" bundle="messages.InspectionGadgetsBundle" key="unused.label.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.declaration.redundancy" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.redundancy.UnusedLabelInspection"/>
 
     <!--group.names.resource.management.issues-->
-    <localInspection groupPath="Java" language="JAVA" suppressId="resource" shortName="AutoCloseableResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="resource" shortName="AutoCloseableResource" bundle="messages.InspectionGadgetsBundle"
                      key="auto.closeable.resource.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.AutoCloseableResourceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ChannelOpenedButNotSafelyClosed" shortName="ChannelResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ChannelOpenedButNotSafelyClosed" shortName="ChannelResource" bundle="messages.InspectionGadgetsBundle"
                      key="channel.opened.not.closed.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.ChannelResourceInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToDriverManagerGetConnection" shortName="DriverManagerGetConnection"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="drivermanager.call.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="drivermanager.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.resource.management.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.resources.DriverManagerGetConnectionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="HibernateResourceOpenedButNotSafelyClosed" shortName="HibernateResource"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="hibernate.resource.opened.not.closed.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="hibernate.resource.opened.not.closed.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.resource.management.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.resources.HibernateResourceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="IOResourceOpenedButNotSafelyClosed" shortName="IOResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="IOResourceOpenedButNotSafelyClosed" shortName="IOResource" bundle="messages.InspectionGadgetsBundle"
                      key="i.o.resource.opened.not.closed.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.IOResourceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="JDBCResourceOpenedButNotSafelyClosed" shortName="JDBCResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="JDBCResourceOpenedButNotSafelyClosed" shortName="JDBCResource" bundle="messages.InspectionGadgetsBundle"
                      key="jdbc.resource.opened.not.closed.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.JDBCResourceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="JNDIResourceOpenedButNotSafelyClosed" shortName="JNDIResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="JNDIResourceOpenedButNotSafelyClosed" shortName="JNDIResource" bundle="messages.InspectionGadgetsBundle"
                      key="jndi.resource.opened.not.closed.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.JNDIResourceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="SocketOpenedButNotSafelyClosed" shortName="SocketResource" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="SocketOpenedButNotSafelyClosed" shortName="SocketResource" bundle="messages.InspectionGadgetsBundle"
                      key="socket.opened.not.closed.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.resource.management.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.resources.SocketResourceInspection"/>
 
     <!--group.names.security.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ClassLoaderInstantiation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ClassLoaderInstantiation" bundle="messages.InspectionGadgetsBundle"
                      key="class.loader.instantiation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.ClassLoaderInstantiationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CloneableClassInSecureContext" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CloneableClassInSecureContext" bundle="messages.InspectionGadgetsBundle"
                      key="cloneable.class.in.secure.context.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.CloneableClassInSecureContextInspection"/>
     <!--suppress PluginXmlCapitalization -->
-    <localInspection groupPath="Java" language="JAVA" shortName="CustomClassloader" bundle="com.siyeh.InspectionGadgetsBundle" key="custom.classloader.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CustomClassloader" bundle="messages.InspectionGadgetsBundle" key="custom.classloader.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.CustomClassloaderInspection"/>
     <!--suppress PluginXmlCapitalization -->
-    <localInspection groupPath="Java" language="JAVA" shortName="CustomSecurityManager" bundle="com.siyeh.InspectionGadgetsBundle" key="custom.security.manager.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="CustomSecurityManager" bundle="messages.InspectionGadgetsBundle" key="custom.security.manager.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.CustomSecurityManagerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DesignForExtension" bundle="com.siyeh.InspectionGadgetsBundle" key="design.for.extension.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="DesignForExtension" bundle="messages.InspectionGadgetsBundle" key="design.for.extension.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.DesignForExtensionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JDBCExecuteWithNonConstantString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JDBCExecuteWithNonConstantString" bundle="messages.InspectionGadgetsBundle"
                      key="jdbc.execute.with.non.constant.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.JDBCExecuteWithNonConstantStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JDBCPrepareStatementWithNonConstantString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JDBCPrepareStatementWithNonConstantString" bundle="messages.InspectionGadgetsBundle"
                      key="jdbc.prepare.statement.with.non.constant.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.JDBCPrepareStatementWithNonConstantStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LoadLibraryWithNonConstantString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LoadLibraryWithNonConstantString" bundle="messages.InspectionGadgetsBundle"
                      key="load.library.with.non.constant.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.LoadLibraryWithNonConstantStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalClone" bundle="com.siyeh.InspectionGadgetsBundle" key="non.final.clone.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonFinalClone" bundle="messages.InspectionGadgetsBundle" key="non.final.clone.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.NonFinalCloneInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonStaticInnerClassInSecureContext" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonStaticInnerClassInSecureContext" bundle="messages.InspectionGadgetsBundle"
                      key="non.static.inner.class.in.secure.context.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.NonStaticInnerClassInSecureContextInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicStaticArrayField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicStaticArrayField" bundle="messages.InspectionGadgetsBundle"
                      key="public.static.array.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.PublicStaticArrayFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="PublicStaticCollectionField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="PublicStaticCollectionField" bundle="messages.InspectionGadgetsBundle"
                      key="public.static.collection.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.PublicStaticCollectionFieldInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToRuntimeExecWithNonConstantString" shortName="RuntimeExecWithNonConstantString"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="runtime.exec.with.non.constant.string.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="runtime.exec.with.non.constant.string.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.RuntimeExecWithNonConstantStringInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SerializableDeserializableClassInSecureContext" alternativeId="serial"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serializable.class.in.secure.context.display.name" groupBundle="messages.InspectionsBundle"
+                     bundle="messages.InspectionGadgetsBundle" key="serializable.class.in.secure.context.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.SerializableDeserializableClassInSecureContextInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemSetSecurityManager" shortName="SystemSetSecurityManager"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="system.set.security.manager.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="system.set.security.manager.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.security.SystemSetSecurityManagerInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="AccessOfSystemProperties" shortName="SystemProperties" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="AccessOfSystemProperties" shortName="SystemProperties" bundle="messages.InspectionGadgetsBundle"
                      key="system.properties.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.security.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.security.SystemPropertiesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnsecureRandomNumberGeneration" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnsecureRandomNumberGeneration" bundle="messages.InspectionGadgetsBundle"
                      key="unsecure.random.number.generation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.security.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.security.UnsecureRandomNumberGenerationInspection"/>
 
     <!--group.names.serialization.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorNotSerializable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ComparatorNotSerializable" bundle="messages.InspectionGadgetsBundle"
                      key="comparator.not.serializable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.ComparatorNotSerializableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ExternalizableWithoutPublicNoArgConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ExternalizableWithoutPublicNoArgConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="externalizable.without.public.no.arg.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.ExternalizableWithoutPublicNoArgConstructorInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ExternalizableClassWithSerializationMethods" shortName="ExternalizableWithSerializationMethods"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="externalizable.with.serialization.methods.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="externalizable.with.serialization.methods.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.ExternalizableWithSerializationMethodsInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="NonSerializableFieldInSerializableClass" alternativeId="serial"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.serializable.field.in.serializable.class.display.name" groupBundle="messages.InspectionsBundle"
+                     bundle="messages.InspectionGadgetsBundle" key="non.serializable.field.in.serializable.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.NonSerializableFieldInSerializableClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonSerializableObjectBoundToHttpSession" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonSerializableObjectBoundToHttpSession" bundle="messages.InspectionGadgetsBundle"
                      key="non.serializable.object.bound.to.http.session.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.NonSerializableObjectBoundToHttpSessionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonSerializableObjectPassedToObjectStream" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonSerializableObjectPassedToObjectStream" bundle="messages.InspectionGadgetsBundle"
                      key="non.serializable.object.passed.to.object.stream.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.NonSerializableObjectPassedToObjectStreamInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonSerializableClassWithSerialVersionUID" shortName="NonSerializableWithSerialVersionUIDField"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.serializable.with.serialversionuid.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.serializable.with.serialversionuid.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.NonSerializableWithSerialVersionUIDFieldInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonSerializableClassWithSerializationMethods" shortName="NonSerializableWithSerializationMethods"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="non.serializable.class.with.readwriteobject.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="non.serializable.class.with.readwriteobject.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.NonSerializableWithSerializationMethodsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonPrivateSerializationMethod" shortName="ReadObjectAndWriteObjectPrivate"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="readwriteobject.private.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="readwriteobject.private.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.ReadObjectAndWriteObjectPrivateInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InstanceVariableMayNotBeInitializedByReadObject" shortName="ReadObjectInitialization"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="readobject.initialization.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="readobject.initialization.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.ReadObjectInitializationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ReadResolveAndWriteReplaceProtected" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ReadResolveAndWriteReplaceProtected" bundle="messages.InspectionGadgetsBundle"
                      key="readresolve.writereplace.protected.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.ReadResolveAndWriteReplaceProtectedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SerialPersistentFieldsWithWrongSignature" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SerialPersistentFieldsWithWrongSignature" bundle="messages.InspectionGadgetsBundle"
                      key="serialpersistentfields.with.wrong.signature.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerialPersistentFieldsWithWrongSignatureInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SerialVersionUIDWithWrongSignature" shortName="SerialVersionUIDNotStaticFinal"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serialversionuid.private.static.final.long.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="serialversionuid.private.static.final.long.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.SerialVersionUIDNotStaticFinalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="serial" shortName="SerializableHasSerialVersionUIDField" alternativeId="serial" 
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serializable.class.without.serialversionuid.display.name" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="serial" shortName="SerializableHasSerialVersionUIDField" alternativeId="serial"
+                     bundle="messages.InspectionGadgetsBundle" key="serializable.class.without.serialversionuid.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerializableHasSerialVersionUIDFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SerializableHasSerializationMethods" alternativeId="serial" 
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serializable.has.serialization.methods.display.name" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SerializableHasSerializationMethods" alternativeId="serial"
+                     bundle="messages.InspectionGadgetsBundle" key="serializable.has.serialization.methods.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerializableHasSerializationMethodsInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SerializableNonStaticInnerClassWithoutSerialVersionUID" alternativeId="serial"
-                     shortName="SerializableInnerClassHasSerialVersionUIDField" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="SerializableInnerClassHasSerialVersionUIDField" bundle="messages.InspectionGadgetsBundle"
                      key="serializable.inner.class.has.serial.version.uid.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerializableInnerClassHasSerialVersionUIDFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SerializableInnerClassWithNonSerializableOuterClass" alternativeId="serial" 
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serializable.inner.class.with.non.serializable.outer.class.display.name" groupBundle="messages.InspectionsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SerializableInnerClassWithNonSerializableOuterClass" alternativeId="serial"
+                     bundle="messages.InspectionGadgetsBundle" key="serializable.inner.class.with.non.serializable.outer.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerializableInnerClassWithNonSerializableOuterClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SerializableStoresNonSerializable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SerializableStoresNonSerializable" bundle="messages.InspectionGadgetsBundle"
                      key="serializable.stores.non.serializable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.SerializableStoresNonSerializableInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="SerializableClassWithUnconstructableAncestor" shortName="SerializableWithUnconstructableAncestor"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="serializable.with.unconstructable.ancestor.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="serializable.with.unconstructable.ancestor.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.serialization.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.serialization.SerializableWithUnconstructableAncestorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TransientFieldInNonSerializableClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TransientFieldInNonSerializableClass" bundle="messages.InspectionGadgetsBundle"
                      key="transient.field.in.non.serializable.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.TransientFieldInNonSerializableClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TransientFieldNotInitialized" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TransientFieldNotInitialized" bundle="messages.InspectionGadgetsBundle"
                      key="transient.field.not.initialized.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.serialization.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.serialization.TransientFieldNotInitializedInspection"/>
@@ -2261,435 +2261,435 @@
     <!--group.names.code.style.issues-->
     <inspectionElementsMerger implementation="com.siyeh.ig.style.MultipleVariablesInDeclarationInspectionMerger"/>
     <inspectionElementsMerger implementation="com.siyeh.ig.style.ConstantOnWrongSideOfComparisonInspectionMerger"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AssertMessageNotString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AssertMessageNotString" bundle="messages.InspectionGadgetsBundle"
                      key="assert.message.not.string.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.style.AssertMessageNotStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BoundedWildcard" bundle="com.siyeh.InspectionGadgetsBundle" key="bounded.wildcard.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BoundedWildcard" bundle="messages.InspectionGadgetsBundle" key="bounded.wildcard.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.style.BoundedWildcardInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CallToStringConcatCanBeReplacedByOperator" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CallToStringConcatCanBeReplacedByOperator" bundle="messages.InspectionGadgetsBundle"
                      key="call.to.string.concat.can.be.replaced.by.operator.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.CallToStringConcatCanBeReplacedByOperatorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CStyleArrayDeclaration" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CStyleArrayDeclaration" bundle="messages.InspectionGadgetsBundle"
                      key="c.style.array.declaration.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.style.CStyleArrayDeclarationInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ChainedEqualityComparisons" shortName="ChainedEquality" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ChainedEqualityComparisons" shortName="ChainedEquality" bundle="messages.InspectionGadgetsBundle"
                      key="chained.equality.comparisons.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.ChainedEqualityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ChainedMethodCall" bundle="com.siyeh.InspectionGadgetsBundle" key="chained.method.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ChainedMethodCall" bundle="messages.InspectionGadgetsBundle" key="chained.method.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.style.ChainedMethodCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ConfusingOctalEscapeSequence" shortName="ConfusingOctalEscape" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ConfusingOctalEscapeSequence" shortName="ConfusingOctalEscape" bundle="messages.InspectionGadgetsBundle"
                      key="confusing.octal.escape.sequence.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.ConfusingOctalEscapeInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ConstantOnWrongSideOfComparison"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="constant.on.side.of.comparison.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="constant.on.side.of.comparison.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.style.ConstantOnWrongSideOfComparisonInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ControlFlowStatementWithoutBraces" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ControlFlowStatementWithoutBraces" bundle="messages.InspectionGadgetsBundle"
                      key="control.flow.statement.without.braces.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.ControlFlowStatementWithoutBracesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SingleStatementInBlock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SingleStatementInBlock" bundle="messages.InspectionGadgetsBundle"
                      key="single.statement.in.block.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.SingleStatementInBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EqualsCalledOnEnumConstant" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EqualsCalledOnEnumConstant" bundle="messages.InspectionGadgetsBundle"
                      key="equals.called.on.enum.constant.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.EqualsCalledOnEnumConstantInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyExtendsObject" shortName="ExtendsObject" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyExtendsObject" shortName="ExtendsObject" bundle="messages.InspectionGadgetsBundle"
                      key="extends.object.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.style.ExtendsObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldMayBeFinal" bundle="com.siyeh.InspectionGadgetsBundle" key="field.may.be.final.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldMayBeFinal" bundle="messages.InspectionGadgetsBundle" key="field.may.be.final.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="true" runForWholeFile="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.FieldMayBeFinalInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitCallToSuper" bundle="com.siyeh.InspectionGadgetsBundle" key="implicit.call.to.super.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="ImplicitCallToSuper" bundle="messages.InspectionGadgetsBundle" key="implicit.call.to.super.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false" runForWholeFile="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.ImplicitCallToSuperInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ListIndexOfReplaceableByContains" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ListIndexOfReplaceableByContains" bundle="messages.InspectionGadgetsBundle"
                      key="list.indexof.replaceable.by.contains.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.style.ListIndexOfReplaceableByContainsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LiteralAsArgToStringEquals" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LiteralAsArgToStringEquals" bundle="messages.InspectionGadgetsBundle"
                      key="literal.as.arg.to.string.equals.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.LiteralAsArgToStringEqualsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MissortedModifiers" bundle="com.siyeh.InspectionGadgetsBundle" key="missorted.modifiers.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="MissortedModifiers" bundle="messages.InspectionGadgetsBundle" key="missorted.modifiers.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false" cleanupTool="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.MissortedModifiersInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="MultipleVariablesInDeclaration" shortName="MultipleVariablesInDeclaration" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="MultipleVariablesInDeclaration" shortName="MultipleVariablesInDeclaration" bundle="messages.InspectionGadgetsBundle"
                      key="multiple.declaration.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.MultipleVariablesInDeclarationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryConstantArrayCreationExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryConstantArrayCreationExpression" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.constant.array.creation.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryConstantArrayCreationExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedMethodCall" bundle="com.siyeh.InspectionGadgetsBundle" key="nested.method.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedMethodCall" bundle="messages.InspectionGadgetsBundle" key="nested.method.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.style.NestedMethodCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="OptionalContainsCollection" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="OptionalContainsCollection" bundle="messages.InspectionGadgetsBundle"
                      key="optional.contains.collection.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.OptionalContainsCollectionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantFieldInitialization" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantFieldInitialization" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.field.initialization.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.RedundantFieldInitializationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantInterfaceDeclaration" shortName="RedundantImplements" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantInterfaceDeclaration" shortName="RedundantImplements" bundle="messages.InspectionGadgetsBundle"
                      key="redundant.implements.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.RedundantImplementsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ReturnOfThis" shortName="ReturnThis" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ReturnOfThis" shortName="ReturnThis" bundle="messages.InspectionGadgetsBundle"
                      key="return.this.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.style.ReturnThisInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="simplifiable.annotation.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.SimplifiableAnnotationInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableEqualsExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableEqualsExpression" bundle="messages.InspectionGadgetsBundle"
                      key="simplifiable.equals.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.SimplifiableEqualsExpressionInspection" cleanupTool="true"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="TypeParameterExplicitlyExtendsObject" shortName="TypeParameterExtendsObject"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="type.parameter.extends.object.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="type.parameter.extends.object.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.TypeParameterExtendsObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedInnerClassAccess" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedInnerClassAccess" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessarily.qualified.inner.class.access.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessarilyQualifiedInnerClassAccessInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedStaticUsage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedStaticUsage" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessarily.qualified.static.usage.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessarilyQualifiedStaticUsageInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryCodeBlock" shortName="UnnecessaryBlockStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryCodeBlock" shortName="UnnecessaryBlockStatement" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.code.block.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryBlockStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryCallToStringValueOf" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryCallToStringValueOf" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.conversion.to.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryCallToStringValueOfInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryToStringCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryToStringCall" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.tostring.call.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryToStringCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantNoArgConstructor" shortName="UnnecessaryConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="RedundantNoArgConstructor" shortName="UnnecessaryConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.UnnecessaryConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryEnumModifier" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryEnumModifier" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.enum.modifier.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryEnumModifierInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryFinalOnLocalVariableOrParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryFinalOnLocalVariableOrParameter" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.final.on.local.variable.or.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryFinalOnLocalVariableOrParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryFullyQualifiedName" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryFullyQualifiedName" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.fully.qualified.name.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryFullyQualifiedNameInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInterfaceModifier" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryInterfaceModifier" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.interface.modifier.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryInterfaceModifierInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryParentheses" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryParentheses" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.parentheses.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryParenthesesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedStaticallyImportedElement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarilyQualifiedStaticallyImportedElement" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessarily.qualified.statically.imported.element.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessarilyQualifiedStaticallyImportedElementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryQualifierForThis" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryQualifierForThis" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.qualifier.for.this.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessaryQualifierForThisInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarySemicolon" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.semicolon.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarySemicolon" bundle="messages.InspectionGadgetsBundle" key="unnecessary.semicolon.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="true" cleanupTool="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.UnnecessarySemicolonInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryCallToSuper" shortName="UnnecessarySuperConstructor" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryCallToSuper" shortName="UnnecessarySuperConstructor" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.super.constructor.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessarySuperConstructorInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarySuperQualifier" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessarySuperQualifier" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.super.qualifier.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING" cleanupTool="true"
                      implementationClass="com.siyeh.ig.style.UnnecessarySuperQualifierInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryThis" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.this.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryThis" bundle="messages.InspectionGadgetsBundle" key="unnecessary.this.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues" enabledByDefault="false" cleanupTool="true"
                      level="WARNING" implementationClass="com.siyeh.ig.style.UnnecessaryThisInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedFieldAccess" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedFieldAccess" bundle="messages.InspectionGadgetsBundle"
                      key="unqualified.field.access.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.UnqualifiedFieldAccessInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedMethodAccess" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedMethodAccess" bundle="messages.InspectionGadgetsBundle"
                      key="unqualified.method.access.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.UnqualifiedMethodAccessInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedInnerClassAccess" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedInnerClassAccess" bundle="messages.InspectionGadgetsBundle"
                      key="unqualified.inner.class.access.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.UnqualifiedInnerClassAccessInspection" cleanupTool="true"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedStaticUsage" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnqualifiedStaticUsage" bundle="messages.InspectionGadgetsBundle"
                      key="unqualified.static.usage.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.UnqualifiedStaticUsageInspection" cleanupTool="true"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="UnclearExpression" alternativeId="UnclearBinaryExpression"
-                     shortName="UnclearBinaryExpression" bundle="com.siyeh.InspectionGadgetsBundle"
+                     shortName="UnclearBinaryExpression" bundle="messages.InspectionGadgetsBundle"
                      key="unclear.binary.expression.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.UnclearBinaryExpressionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SizeReplaceableByIsEmpty" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SizeReplaceableByIsEmpty" bundle="messages.InspectionGadgetsBundle"
                      key="size.replaceable.by.isempty.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.style.SizeReplaceableByIsEmptyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LambdaBodyCanBeCodeBlock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LambdaBodyCanBeCodeBlock" bundle="messages.InspectionGadgetsBundle"
                      key="lambda.body.can.be.code.block.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.LambdaBodyCanBeCodeBlockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LambdaParameterTypeCanBeSpecified" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LambdaParameterTypeCanBeSpecified" bundle="messages.InspectionGadgetsBundle"
                      key="lambda.parameter.type.can.be.specified.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.LambdaParameterTypeCanBeSpecifiedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DiamondCanBeReplacedWithExplicitTypeArguments" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="DiamondCanBeReplacedWithExplicitTypeArguments" bundle="messages.InspectionGadgetsBundle"
                      key="diamond.can.be.replaced.with.explicit.type.arguments.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.DiamondCanBeReplacedWithExplicitTypeArgumentsInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="LambdaCanBeReplacedWithAnonymous" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="LambdaCanBeReplacedWithAnonymous" bundle="messages.InspectionGadgetsBundle"
                      key="lambda.can.be.replaced.with.anonymous.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.LambdaCanBeReplacedWithAnonymousInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodRefCanBeReplacedWithLambda" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodRefCanBeReplacedWithLambda" bundle="messages.InspectionGadgetsBundle"
                      key="method.ref.can.be.replaced.with.lambda.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.MethodRefCanBeReplacedWithLambdaInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TryStatementWithMultipleResources" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TryStatementWithMultipleResources" bundle="messages.InspectionGadgetsBundle"
                      key="try.statement.with.multiple.resources.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.exceptions.TryStatementWithMultipleResourcesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MultiCatchCanBeSplit" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MultiCatchCanBeSplit" bundle="messages.InspectionGadgetsBundle"
                      key="multi.catch.can.be.split.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.exceptions.MultiCatchCanBeSplitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SingleElementAnnotation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SingleElementAnnotation" bundle="messages.InspectionGadgetsBundle"
                      key="single.element.annotation.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.annotation.SingleElementAnnotationInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="MetaAnnotationWithoutRuntimeRetention"
-                     bundle="com.siyeh.InspectionGadgetsBundle"
+                     bundle="messages.InspectionGadgetsBundle"
                      key="meta.annotation.without.runtime.retention" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.reflective.access.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.annotation.MetaAnnotationWithoutRuntimeRetentionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayCreationWithoutNewKeyword" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayCreationWithoutNewKeyword" bundle="messages.InspectionGadgetsBundle"
                      key="array.creation.without.new.keyword.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.ArrayCreationWithoutNewKeywordInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableIfStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SimplifiableIfStatement" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.simplifiable.if.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.SimplifiableIfStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ArrayCanBeReplacedWithEnumValues" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ArrayCanBeReplacedWithEnumValues" bundle="messages.InspectionGadgetsBundle"
                      key="array.can.be.replaced.with.enum.values" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.code.style.issues" enabledByDefault="true" level="INFORMATION"
                      implementationClass="com.siyeh.ig.style.ArrayCanBeReplacedWithEnumValuesInspection"/>
 
     <!--group.names.threading.issues-->
     <localInspection groupPath="Java" language="JAVA" suppressId="AccessToNonThreadSafeStaticField" shortName="AccessToNonThreadSafeStaticFieldFromInstance"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="access.to.non.thread.safe.static.field.from.instance.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="access.to.non.thread.safe.static.field.from.instance.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.AccessToNonThreadSafeStaticFieldFromInstanceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AccessToStaticFieldLockedOnInstance" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AccessToStaticFieldLockedOnInstance" bundle="messages.InspectionGadgetsBundle"
                      key="access.to.static.field.locked.on.instance.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.AccessToStaticFieldLockedOnInstanceInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AwaitNotInLoop" bundle="com.siyeh.InspectionGadgetsBundle" key="await.not.in.loop.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AwaitNotInLoop" bundle="messages.InspectionGadgetsBundle" key="await.not.in.loop.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.AwaitNotInLoopInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AtomicFieldUpdaterIssues" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AtomicFieldUpdaterIssues" bundle="messages.InspectionGadgetsBundle"
                      key="atomic.field.updater.issues.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.AtomicFieldUpdaterIssuesInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AtomicFieldUpdaterNotStaticFinal" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AtomicFieldUpdaterNotStaticFinal" bundle="messages.InspectionGadgetsBundle"
                      key="atomic.field.updater.not.static.final.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.AtomicFieldUpdaterNotStaticFinalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AwaitWithoutCorrespondingSignal" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AwaitWithoutCorrespondingSignal" bundle="messages.InspectionGadgetsBundle"
                      key="await.without.corresponding.signal.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.AwaitWithoutCorrespondingSignalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="BusyWait" bundle="com.siyeh.InspectionGadgetsBundle" key="busy.wait.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="BusyWait" bundle="messages.InspectionGadgetsBundle" key="busy.wait.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.BusyWaitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="CallToNativeMethodWhileLocked" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="CallToNativeMethodWhileLocked" bundle="messages.InspectionGadgetsBundle"
                      key="call.to.native.method.while.locked.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.CallToNativeMethodWhileLockedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSignalInsteadOfSignalAll" shortName="ConditionSignal" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToSignalInsteadOfSignalAll" shortName="ConditionSignal" bundle="messages.InspectionGadgetsBundle"
                      key="condition.signal.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.ConditionSignalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="DoubleCheckedLocking" bundle="com.siyeh.InspectionGadgetsBundle" key="double.checked.locking.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="DoubleCheckedLocking" bundle="messages.InspectionGadgetsBundle" key="double.checked.locking.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.DoubleCheckedLockingInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="EmptySynchronizedStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="EmptySynchronizedStatement" bundle="messages.InspectionGadgetsBundle"
                      key="empty.synchronized.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.EmptySynchronizedStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyExtendsThread" shortName="ExtendsThread" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassExplicitlyExtendsThread" shortName="ExtendsThread" bundle="messages.InspectionGadgetsBundle"
                      key="extends.thread.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.ExtendsThreadInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="FieldAccessedSynchronizedAndUnsynchronized" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="FieldAccessedSynchronizedAndUnsynchronized" bundle="messages.InspectionGadgetsBundle"
                      key="field.accessed.synchronized.and.unsynchronized.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING" runForWholeFile="true"
                      implementationClass="com.siyeh.ig.threading.FieldAccessedSynchronizedAndUnsynchronizedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="MethodMayBeSynchronized" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="MethodMayBeSynchronized" bundle="messages.InspectionGadgetsBundle"
                      key="method.may.be.synchronized.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING" runForWholeFile="true"
                      implementationClass="com.siyeh.ig.threading.MethodMayBeSynchronizedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NakedNotify" bundle="com.siyeh.InspectionGadgetsBundle" key="naked.notify.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="NakedNotify" bundle="messages.InspectionGadgetsBundle" key="naked.notify.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.NakedNotifyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NestedSynchronizedStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NestedSynchronizedStatement" bundle="messages.InspectionGadgetsBundle"
                      key="nested.synchronized.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.NestedSynchronizedStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonAtomicOperationOnVolatileField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonAtomicOperationOnVolatileField" bundle="messages.InspectionGadgetsBundle"
                      key="non.atomic.operation.on.volatile.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.NonAtomicOperationOnVolatileFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NonSynchronizedMethodOverridesSynchronizedMethod" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NonSynchronizedMethodOverridesSynchronizedMethod" bundle="messages.InspectionGadgetsBundle"
                      key="non.synchronized.method.overrides.synchronized.method.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.NonSynchronizedMethodOverridesSynchronizedMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NotifyCalledOnCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NotifyCalledOnCondition" bundle="messages.InspectionGadgetsBundle"
                      key="notify.called.on.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.NotifyCalledOnConditionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="NotifyWithoutCorrespondingWait" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="NotifyWithoutCorrespondingWait" bundle="messages.InspectionGadgetsBundle"
                      key="notify.without.corresponding.wait.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.NotifyWithoutCorrespondingWaitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToNotifyInsteadOfNotifyAll" shortName="ObjectNotify" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToNotifyInsteadOfNotifyAll" shortName="ObjectNotify" bundle="messages.InspectionGadgetsBundle"
                      key="object.notify.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.ObjectNotifyInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="NonPrivateFieldAccessedInSynchronizedContext" shortName="PublicFieldAccessedInSynchronizedContext"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="public.field.accessed.in.synchronized.context.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="public.field.accessed.in.synchronized.context.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.PublicFieldAccessedInSynchronizedContextInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="LockAcquiredButNotSafelyReleased" shortName="SafeLock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="LockAcquiredButNotSafelyReleased" shortName="SafeLock" bundle="messages.InspectionGadgetsBundle"
                      key="safe.lock.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.SafeLockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="SharedThreadLocalRandom" shortName="SharedThreadLocalRandom" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="SharedThreadLocalRandom" shortName="SharedThreadLocalRandom" bundle="messages.InspectionGadgetsBundle"
                      key="shared.thread.local.random.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.SharedThreadLocalRandomInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SignalWithoutCorrespondingAwait" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SignalWithoutCorrespondingAwait" bundle="messages.InspectionGadgetsBundle"
                      key="signal.without.corresponding.await.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SignalWithoutCorrespondingAwaitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SleepWhileHoldingLock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SleepWhileHoldingLock" bundle="messages.InspectionGadgetsBundle"
                      key="sleep.while.holding.lock.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SleepWhileHoldingLockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnGetClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnGetClass" bundle="messages.InspectionGadgetsBundle"
                      key="synchronization.on.get.class.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SynchronizationOnGetClassInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnLocalVariableOrMethodParameter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnLocalVariableOrMethodParameter" bundle="messages.InspectionGadgetsBundle"
                      key="synchronization.on.local.variable.or.method.parameter.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SynchronizationOnLocalVariableOrMethodParameterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnStaticField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizationOnStaticField" bundle="messages.InspectionGadgetsBundle"
                      key="synchronization.on.static.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SynchronizationOnStaticFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="SynchroniziationOnLockObject" shortName="SynchronizeOnLock" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="SynchroniziationOnLockObject" shortName="SynchronizeOnLock" bundle="messages.InspectionGadgetsBundle"
                      key="synchronize.on.lock.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.SynchronizeOnLockInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizeOnNonFinalField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizeOnNonFinalField" bundle="messages.InspectionGadgetsBundle"
                      key="synchronize.on.non.final.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SynchronizeOnNonFinalFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizedOnLiteralObject" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizedOnLiteralObject" bundle="messages.InspectionGadgetsBundle"
                      key="synchronized.on.literal.object.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.SynchronizedOnLiteralObjectInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizeOnThis" bundle="com.siyeh.InspectionGadgetsBundle" key="synchronize.on.this.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizeOnThis" bundle="messages.InspectionGadgetsBundle" key="synchronize.on.this.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.SynchronizeOnThisInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizedMethod" bundle="com.siyeh.InspectionGadgetsBundle" key="synchronized.method.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="SynchronizedMethod" bundle="messages.InspectionGadgetsBundle" key="synchronized.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.SynchronizedMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToSystemRunFinalizersOnExit" shortName="SystemRunFinalizersOnExit"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="system.run.finalizers.on.exit.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="system.run.finalizers.on.exit.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.SystemRunFinalizersOnExitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="ThreadLocalNotStaticFinal" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="ThreadLocalNotStaticFinal" bundle="messages.InspectionGadgetsBundle"
                      key="thread.local.not.static.final.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.ThreadLocalNotStaticFinalInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadSetPriority" shortName="ThreadPriority" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadSetPriority" shortName="ThreadPriority" bundle="messages.InspectionGadgetsBundle"
                      key="thread.priority.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadPriorityInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadRun" shortName="ThreadRun" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadRun" shortName="ThreadRun" bundle="messages.InspectionGadgetsBundle"
                      key="thread.run.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="true" level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadRunInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadStartDuringObjectConstruction" shortName="ThreadStartInConstruction"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="thread.start.in.construction.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="thread.start.in.construction.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadStartInConstructionInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadStopSuspendOrResumeManager" shortName="ThreadStopSuspendResume"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="thread.stop.suspend.resume.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="thread.stop.suspend.resume.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadStopSuspendResumeInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InstantiatingAThreadWithDefaultRunMethod" shortName="ThreadWithDefaultRunMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="thread.with.default.run.method.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="thread.with.default.run.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadWithDefaultRunMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadYield" shortName="ThreadYield" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="CallToThreadYield" shortName="ThreadYield" bundle="messages.InspectionGadgetsBundle"
                      key="thread.yield.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues"
                      enabledByDefault="false" level="WARNING" implementationClass="com.siyeh.ig.threading.ThreadYieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnconditionalWait" bundle="com.siyeh.InspectionGadgetsBundle" key="unconditional.wait.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnconditionalWait" bundle="messages.InspectionGadgetsBundle" key="unconditional.wait.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.UnconditionalWaitInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="VolatileArrayField" bundle="com.siyeh.InspectionGadgetsBundle" key="volatile.array.field.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="VolatileArrayField" bundle="messages.InspectionGadgetsBundle" key="volatile.array.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.VolatileArrayFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WaitCalledOnCondition" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="WaitCalledOnCondition" bundle="messages.InspectionGadgetsBundle"
                      key="wait.called.on.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WaitCalledOnConditionInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WaitNotInLoop" bundle="com.siyeh.InspectionGadgetsBundle" key="wait.not.in.loop.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="WaitNotInLoop" bundle="messages.InspectionGadgetsBundle" key="wait.not.in.loop.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.WaitNotInLoopInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="WaitNotifyWhileNotSynced" shortName="WaitNotifyNotInSynchronizedContext"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="wait.notify.not.in.synchronized.context.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="wait.notify.not.in.synchronized.context.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WaitNotifyNotInSynchronizedContextInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WaitOrAwaitWithoutTimeout" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="WaitOrAwaitWithoutTimeout" bundle="messages.InspectionGadgetsBundle"
                      key="wait.or.await.without.timeout.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WaitOrAwaitWithoutTimeoutInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WaitWhileHoldingTwoLocks" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="WaitWhileHoldingTwoLocks" bundle="messages.InspectionGadgetsBundle"
                      key="wait.while.holding.two.locks.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WaitWhileHoldingTwoLocksInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WaitWithoutCorrespondingNotify" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="WaitWithoutCorrespondingNotify" bundle="messages.InspectionGadgetsBundle"
                      key="wait.without.corresponding.notify.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WaitWithoutCorrespondingNotifyInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="WhileLoopSpinsOnField" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="WhileLoopSpinsOnField" bundle="messages.InspectionGadgetsBundle"
                      key="while.loop.spins.on.field.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.threading.WhileLoopSpinsOnFieldInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="StaticInitializerReferencesSubClass" shortName="StaticInitializerReferencesSubClass"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="static.initializer.references.subclass.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="static.initializer.references.subclass.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.StaticInitializerReferencesSubClassInspection"/>
 
@@ -2697,127 +2697,127 @@
     <localInspection groupPath="Java" language="JAVA" shortName="RedundantCompareCall"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
                      enabledByDefault="true" level="WARNING"
-                     key="inspection.redundant.compare.call.display.name" bundle="com.siyeh.InspectionGadgetsBundle"
+                     key="inspection.redundant.compare.call.display.name" bundle="messages.InspectionGadgetsBundle"
                      implementationClass="com.intellij.codeInspection.RedundantCompareCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantClassCall" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantClassCall" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.redundant.class.call.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
                      enabledByDefault="true" level="WARNING" cleanupTool="true" implementationClass="com.siyeh.ig.redundancy.RedundantClassCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="RedundantCollectionOperation" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="RedundantCollectionOperation" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.redundant.collection.operation.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
                      enabledByDefault="true" level="WARNING" cleanupTool="true" implementationClass="com.siyeh.ig.redundancy.RedundantCollectionOperationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryStringEscape" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryStringEscape" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.string.escape.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
                      enabledByDefault="true" level="WARNING" cleanupTool="true" implementationClass="com.siyeh.ig.redundancy.UnnecessaryStringEscapeInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringOperationCanBeSimplified" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringOperationCanBeSimplified" bundle="messages.InspectionGadgetsBundle"
                      key="inspection.redundant.string.operation.display.name" groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs"
                      enabledByDefault="true" level="WARNING" cleanupTool="true" implementationClass="com.siyeh.ig.redundancy.RedundantStringOperationInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferReplaceableByString" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="StringBufferReplaceableByString" bundle="messages.InspectionGadgetsBundle"
                      key="string.buffer.replaceable.by.string.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.style.StringBufferReplaceableByStringInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryBreak" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.break.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryBreak" bundle="messages.InspectionGadgetsBundle" key="unnecessary.break.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.UnnecessaryBreakInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryContinue" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.continue.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryContinue" bundle="messages.InspectionGadgetsBundle" key="unnecessary.continue.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.UnnecessaryContinueInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryDefault" bundle="com.siyeh.InspectionGadgetsBundle" key="unnecessary.default.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryDefault" bundle="messages.InspectionGadgetsBundle" key="unnecessary.default.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true"
                      level="WARNING" implementationClass="com.siyeh.ig.controlflow.UnnecessaryDefaultInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLabelOnBreakStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLabelOnBreakStatement" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.label.on.break.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.UnnecessaryLabelOnBreakStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLabelOnContinueStatement" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="UnnecessaryLabelOnContinueStatement" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.label.on.continue.statement.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.UnnecessaryLabelOnContinueStatementInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryReturnStatement" shortName="UnnecessaryReturn" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="UnnecessaryReturnStatement" shortName="UnnecessaryReturn" bundle="messages.InspectionGadgetsBundle"
                      key="unnecessary.return.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.verbose.or.redundant.code.constructs" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.controlflow.UnnecessaryReturnInspection"/>
 
     <!--group.names.visibility.issues-->
-    <localInspection groupPath="Java" language="JAVA" shortName="AmbiguousMethodCall" bundle="com.siyeh.InspectionGadgetsBundle" key="ambiguous.method.call.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AmbiguousMethodCall" bundle="messages.InspectionGadgetsBundle" key="ambiguous.method.call.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.AmbiguousMethodCallInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AmbiguousFieldAccess" bundle="com.siyeh.InspectionGadgetsBundle" key="ambiguous.field.access.display.name"
+    <localInspection groupPath="Java" language="JAVA" shortName="AmbiguousFieldAccess" bundle="messages.InspectionGadgetsBundle" key="ambiguous.field.access.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.AmbiguousFieldAccessInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousClassVariableHidesContainingMethodVariable" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="AnonymousClassVariableHidesContainingMethodVariable" bundle="messages.InspectionGadgetsBundle"
                      key="anonymous.class.variable.hides.containing.method.variable.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.visibility.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.visibility.AnonymousClassVariableHidesContainingMethodVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" suppressId="ClassEscapesDefinedScope" shortName="ClassEscapesItsScope" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" suppressId="ClassEscapesDefinedScope" shortName="ClassEscapesItsScope" bundle="messages.InspectionGadgetsBundle"
                      key="class.escapes.defined.scope.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.visibility.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.visibility.ClassEscapesItsScopeInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="FieldNameHidesFieldInSuperclass" shortName="FieldHidesSuperclassField"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="field.name.hides.in.superclass.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="field.name.hides.in.superclass.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.FieldHidesSuperclassFieldInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="InnerClassFieldHidesOuterClassField" shortName="InnerClassVariableHidesOuterClassVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="inner.class.field.hides.outer.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="inner.class.field.hides.outer.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.InnerClassVariableHidesOuterClassVariableInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="LocalVariableHidesMemberVariable" shortName="LocalVariableHidingMemberVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="local.variable.hides.member.variable.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="local.variable.hides.member.variable.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.LocalVariableHidingMemberVariableInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodOverloadsMethodOfSuperclass" shortName="MethodOverloadsParentMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="method.overloads.display.name" groupBundle="messages.InspectionsBundle"
+                     bundle="messages.InspectionGadgetsBundle" key="method.overloads.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.visibility.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.visibility.MethodOverloadsParentMethodInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodOverridesInaccessibleMethodOfSuper" shortName="MethodOverridesInaccessibleMethodOfSuper"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="method.overrides.inaccessible.method.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="method.overrides.inaccessible.method.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.MethodOverridesInaccessibleMethodOfSuperInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="MethodOverridesStaticMethodOfSuperclass" shortName="MethodOverridesStaticMethod"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="method.overrides.static.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="method.overrides.static.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.MethodOverridesStaticMethodInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="TypeParameterHidesVisibleType" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="TypeParameterHidesVisibleType" bundle="messages.InspectionGadgetsBundle"
                      key="type.parameter.hides.visible.type.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.visibility.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.visibility.TypeParameterHidesVisibleTypeInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="ParameterHidesMemberVariable" shortName="ParameterHidingMemberVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="parameter.hides.member.variable.display.name" alternativeId="hiding"
+                     bundle="messages.InspectionGadgetsBundle" key="parameter.hides.member.variable.display.name" alternativeId="hiding"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.ParameterHidingMemberVariableInspection"/>
     <localInspection groupPath="Java" language="JAVA" suppressId="LambdaParameterHidesMemberVariable" shortName="LambdaParameterHidingMemberVariable"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="lambda.parameter.hides.member.variable.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="lambda.parameter.hides.member.variable.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.visibility.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.visibility.LambdaParameterHidingMemberVariableInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5AssertionsConverter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5AssertionsConverter" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.assertions.converter.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnit5AssertionsConverterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5Converter" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5Converter" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.converter.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="false" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnit5ConverterInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5Platform" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5Platform" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.platform.runner.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.siyeh.ig.junit.JUnit5PlatformInspection"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="RedundantExplicitVariableType" enabledByDefault="true" level="INFORMATION"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="redundant.explicit.var.type.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="redundant.explicit.var.type.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids10"
                      implementationClass="com.intellij.codeInspection.RedundantExplicitVariableTypeInspection"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="PatternVariableCanBeUsed" enabledByDefault="true" level="WARNING"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.pattern.variable.can.be.used.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="inspection.pattern.variable.can.be.used.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids14"
                      implementationClass="com.intellij.codeInspection.PatternVariableCanBeUsedInspection"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="VariableTypeCanBeExplicit" enabledByDefault="true" level="INFORMATION"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="variable.type.can.be.explicit.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="variable.type.can.be.explicit.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.language.level.specific.issues.and.migration.aids10"
                      implementationClass="com.intellij.codeInspection.VariableTypeCanBeExplicitInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="SuspiciousDateFormat" enabledByDefault="true" level="WARNING"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.suspicious.date.format.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="inspection.suspicious.date.format.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.probable.bugs"
                      implementationClass="com.siyeh.ig.bugs.SuspiciousDateFormatInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="ConstantExpression" enabledByDefault="true" level="INFORMATION"
-                     bundle="com.siyeh.InspectionGadgetsBundle" key="inspection.constant.expression.display.name"
+                     bundle="messages.InspectionGadgetsBundle" key="inspection.constant.expression.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.code.style.issues"
                      implementationClass="com.siyeh.ig.style.ConstantExpressionInspection"/>
     <codeInsight.unresolvedReferenceQuickFixProvider implementation="com.intellij.codeInsight.daemon.impl.analysis.LocalVariableTypeInferenceUnresolvedFixProvider"/>
diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index 1e7f38c3d03d..1b252fdd5c90 100644
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -82,16 +82,16 @@
     <predefinedMigrationMapProvider implementation="com.intellij.execution.junit2.refactoring.JUnit5Migration"/>
     <psi.referenceContributor implementation="com.intellij.execution.junit.codeInsight.references.JUnitReferenceContributor"/>
 
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5MalformedParameterized" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5MalformedParameterized" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.valid.parameterized.configuration.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.execution.junit.codeInsight.JUnit5MalformedParameterizedInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5MalformedRepeated" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JAVA" shortName="JUnit5MalformedRepeated" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.malformed.repeated.test.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.execution.junit.codeInsight.JUnit5MalformedRepeatedTestInspection"/>
 
-    <localInspection groupPath="Java" language="JVM" shortName="JUnit5MalformedNestedClass" bundle="com.siyeh.InspectionGadgetsBundle"
+    <localInspection groupPath="Java" language="JVM" shortName="JUnit5MalformedNestedClass" bundle="messages.InspectionGadgetsBundle"
                      key="junit5.nested.test.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.junit.issues" enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.execution.junit.codeInsight.JUnit5MalformedNestedClassInspection"/>
diff --git a/plugins/testng/resources/META-INF/plugin.xml b/plugins/testng/resources/META-INF/plugin.xml
index b391f81c4cdd..8cf97e10e916 100644
--- a/plugins/testng/resources/META-INF/plugin.xml
+++ b/plugins/testng/resources/META-INF/plugin.xml
@@ -75,7 +75,7 @@
       <runConfigurationProducer
           implementation="com.theoryinpractice.testng.configuration.testDiscovery.TestNGTestDiscoveryConfigurationProducer"/>
       <localInspection implementationClass="com.theoryinpractice.testng.inspection.SimplifiedTestNGAssertionInspection"
-                       groupPath="Java" language="JAVA" shortName="SimplifiedTestNGAssertion" bundle="com.siyeh.InspectionGadgetsBundle"
+                       groupPath="Java" language="JAVA" shortName="SimplifiedTestNGAssertion" bundle="messages.InspectionGadgetsBundle"
                        key="simplifiable.testng.assertion.display.name" groupName="TestNG"
                        enabledByDefault="true" level="WARNING"/>
       <localInspection groupPath="Java" language="JAVA" shortName="ConstantTestNGAssertArgument" displayName="Constant TestNG assert argument"
diff --git a/xml/tests/testData/xml/PluginXml.xml b/xml/tests/testData/xml/PluginXml.xml
index f5864045d6d3..b7c6e87c28eb 100644
--- a/xml/tests/testData/xml/PluginXml.xml
+++ b/xml/tests/testData/xml/PluginXml.xml
@@ -8,7 +8,7 @@
     <version>1.0</version>
     <idea-version min="4.0" max="6.0" since-build="2200"/>
 
-    <resource-bundle>com.siyeh.InspectionGadgetsBundle</resource-bundle>
+    <resource-bundle>messages.InspectionGadgetsBundle</resource-bundle>
 
     <extensions defaultExtensionNs="com.intellij" xmlns="<error>com.intellij</error>">
       <errorHandler implementation="com.intellij.diagnostic.ITNReporter"/>