#ref may be 'static' #loc
string.buffer.must.have.initial.capacity.problem.descriptor=#ref without initial capacity #loc
string.buffer.replaceable.by.string.builder.problem.descriptor=StringBuffer #ref may be declared as ''StringBuilder'' #loc
-string.buffer.replaceable.by.string.problem.descriptor=Constant {0} #ref may be declared as ''String'' #loc
+string.buffer.replaceable.by.string.problem.descriptor={0} #ref can be replaced with ''String'' #loc
string.replaceable.by.string.buffer.problem.descriptor=Non-constant String #ref should probably be declared as ''StringBuilder'' #loc
collections.must.have.initial.capacity.problem.descriptor=#ref without initial capacity #loc
string.concatenation.in.loops.problem.descriptor=String concatenation #ref in loop #loc
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
similarity index 99%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java
rename to plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
index a77d0cc4161c..9d56ab1b5c69 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.siyeh.ig.performance;
+package com.siyeh.ig.style;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.openapi.project.Project;
diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VariableIsModifiedVisitor.java
similarity index 98%
rename from plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java
rename to plugins/InspectionGadgets/src/com/siyeh/ig/style/VariableIsModifiedVisitor.java
index fcccb5a96a46..748ce1bc5966 100644
--- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/VariableIsModifiedVisitor.java
+++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/VariableIsModifiedVisitor.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.siyeh.ig.performance;
+package com.siyeh.ig.style;
import com.intellij.psi.*;
import org.jetbrains.annotations.NonNls;
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html b/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html
index 2273ce2f01f6..832b4e495ec3 100644
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html
+++ b/plugins/InspectionGadgets/src/inspectionDescriptions/StringBufferReplaceableByString.html
@@ -1,8 +1,8 @@
-This inspection reports any variables declared as java.lang.StringBuffer
-and java.lang.StringBuilder which are
-effectively constant, and may thus be declared more efficiently declared as java.lang.String.
+This inspection reports any variables declared as or uses of java.lang.StringBuffer and java.lang.StringBuilder
+which are effectively constant. These may be replaced with java.lang.String expressions which results in simpler and possibly
+more efficient code.
Powered by InspectionGadgets
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/StringBufferReplaceableByStringInspection.java
deleted file mode 100644
index 085519f5c4ab..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/StringBufferReplaceableByStringInspection.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.siyeh.igtest.performance;
-
-public class StringBufferReplaceableByStringInspection {
- public void foo()
- {
- final StringBuffer buffer = new StringBuffer();
- System.out.println(buffer.toString());
- }
-
- public void foo2()
- {
- final StringBuffer buffer = new StringBuffer("foo").append("bar");
- System.out.println(buffer.toString());
- }
-}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java
deleted file mode 100644
index 7f0eb5b6fbfa..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.siyeh.igtest.performance.constant_string_buffer_may_be_string;
-
-public class StringBufferReplaceableByString {
-
- StringBuilder foo() {
- StringBuilder builder = new StringBuilder("asdfasdfasdf");
- StringBuffer buffer = new StringBuffer("test");
- StringBuilder result = new StringBuilder("return");
- return result;
- }
-}
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml
deleted file mode 100644
index 79e526123f19..000000000000
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-