diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1068_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1068_java.html
index c41a8898274..ba7affc60f8 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1068_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1068_java.html
@@ -1,5 +1,7 @@
 <p>If a <code>private</code> field is declared but not used in the program, it can be considered dead code and should therefore be removed. This will
 improve maintainability because developers will not wonder what the variable is used for.</p>
+<p>Note that this rule does not take reflection into account, which means that issues will be raised on <code>private</code> fields that are only
+accessed using the reflection API.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 public class MyClass {
@@ -30,7 +32,7 @@ <h2>Exceptions</h2>
   private static final long serialVersionUID = 42L;
 }
 </pre>
-<p>Moreover, this rule doesn't raise any issue on annotated fields.</p>
+<p>Moreover, this rule doesn't raise any issue on annotated fields. </p>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.securecoding.cert.org/confluence/x/SIIyAQ">CERT, MSC12-CPP.</a> - Detect and remove code that has no effect </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1116_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1116_java.json
index 5207878eaf9..193ee668699 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1116_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1116_java.json
@@ -1,13 +1,12 @@
 {
   "title": "Empty statements should be removed",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "2min"
   },
   "tags": [
-    "bug",
     "misra",
     "cert",
     "unused"
@@ -15,5 +14,5 @@
   "standards": [
     "CERT"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Critical"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1120_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1120_java.json
index 12135f97b25..09b567d22df 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1120_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1120_java.json
@@ -7,7 +7,7 @@
     "constantCost": "1min"
   },
   "tags": [
-    "convention"
+    "style"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.html
index 94ac2cf11c6..91bb5d593cc 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.html
@@ -13,11 +13,19 @@ <h2>Compliant Solution</h2>
 }
 </pre>
 <h2>Exceptions</h2>
-<p>Generic exceptions in the signatures of overriding methods are ignored.</p>
+<p>Generic exceptions in the signatures of overriding methods are ignored, because overriding method has to follow signature of the throw declaration
+in the superclass. The issue will be raised on superclass declaration of the method (or won't be raised at all if superclass is not part of the
+analysis).</p>
 <pre>
 @Override
 public void myMethod() throws Exception {...}
 </pre>
+<p>Generic exceptions are also ignored in the signatures of methods that make calls to methods that throw generic exceptions.</p>
+<pre>
+public void myOtherMethod throws Exception {
+  doTheThing();  // this method throws Exception
+}
+</pre>
 <h2>See</h2>
 <ul>
   <li> <a href="http://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.json
index 9f28205012e..b5c183c2df7 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S112_java.json
@@ -1,6 +1,6 @@
 {
   "title": "Generic exceptions should never be thrown",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -9,7 +9,6 @@
   "tags": [
     "cwe",
     "error-handling",
-    "bug",
     "cert"
   ],
   "standards": [
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1144_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1144_java.html
index 046442c0afb..2518ed99a97 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1144_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1144_java.html
@@ -1,5 +1,7 @@
 <p><code>private</code> methods that are never executed are dead code: unnecessary, inoperative code that should be removed. Cleaning out dead code
 decreases the size of the maintained codebase, making it easier to understand the program and preventing bugs from being introduced.</p>
+<p>Note that this rule does not take reflection into account, which means that issues will be raised on <code>private</code> methods that are only
+accessed using the reflection API.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 public class Foo implements Serializable
@@ -30,7 +32,7 @@ <h2>Compliant Solution</h2>
 }
 </pre>
 <h2>Exceptions</h2>
-<p>This rule doesn't raise any issue on annotated methods.</p>
+<p>This rule doesn't raise any issue on annotated methods. </p>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.securecoding.cert.org/confluence/x/OYIyAQ">CERT, MSC07-CPP.</a> - Detect and remove dead code </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1147_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1147_java.json
index ac8e0550eb4..6c4799f56b4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1147_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1147_java.json
@@ -1,6 +1,6 @@
 {
   "title": "Exit methods should not be called",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -8,7 +8,6 @@
   },
   "tags": [
     "cwe",
-    "bug",
     "cert",
     "suspicious"
   ],
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1149_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1149_java.json
index 72d6a2eaea1..0c41e419149 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1149_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1149_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Synchronized classes Vector, Hashtable, Stack and StringBuffer should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1155_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1155_java.json
index 3154b37fbf7..80918715655 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1155_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1155_java.json
@@ -7,7 +7,6 @@
     "constantCost": "2min"
   },
   "tags": [
-    "bug",
     "clumsy"
   ],
   "defaultSeverity": "Minor"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1186_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1186_java.html
index f938586ae56..c91a3c76b72 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1186_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1186_java.html
@@ -3,8 +3,6 @@
   <li> It is an unintentional omission, and should be fixed to prevent an unexpected behavior in production. </li>
   <li> It is not yet, or never will be, supported. In this case an <code>UnsupportedOperationException</code> should be thrown. </li>
   <li> The method is an intentionally-blank override. In this case a nested comment should explain the reason for the blank override. </li>
-  <li> There is a desire to provide a public, no-args constructor. In this case, it can simply be omitted from the code; a default constructor will
-  automatically be generated. </li>
 </ul>
 <h2>Noncompliant Code Example</h2>
 <pre>
@@ -27,10 +25,10 @@ <h2>Compliant Solution</h2>
 }
 </pre>
 <h2>Exceptions</h2>
-<p>An abstract class may have empty methods, in order to provide default implementations for child classes.</p>
+<p>Default (no-argument) constructors are ignored when there are other constructors in the class, as are empty methods in abstract classes.</p>
 <pre>
 public abstract class Animal {
-  void speak() {
+  void speak() {  // default implementation ignored
   }
 }
 </pre>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.html
index a2cf028c38a..70f9308d243 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.html
@@ -1,10 +1,7 @@
-<p>While it is technically correct to assign to parameters from within method bodies, it is typically done in error, with the intent to assign a
-parameter value to a field of the same name, (and <code>this</code> was forgotten). </p>
-<p>If it is done on purpose, a better course would be to use temporary variables to store intermediate results. Allowing parameters to be assigned to
-also reduces code readability because developers won't be able to tell whether the original parameter or some temporary variable is being accessed
-without going through the whole method. Moreover, some developers might also expect assignments of method parameters to be visible to callers, which
-is not the case, and this lack of visibility could confuse them. Instead, all parameters, caught exceptions, and foreach parameters should be treated
-as <code>final</code>.</p>
+<p>While it is technically correct to assign to parameters from within method bodies, it reduces code readability because developers won't be able to
+tell whether the original parameter or some temporary variable is being accessed without going through the whole method. Moreover, some developers
+might also expect assignments of method parameters to be visible to callers, which is not the case, and this lack of visibility could confuse them.
+Instead, all parameters, caught exceptions, and foreach parameters should be treated as <code>final</code>.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 class MyClass {
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.json
index e542ad03e5b..5915b7b7591 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1226_java.json
@@ -1,13 +1,12 @@
 {
   "title": "Method parameters, caught exceptions and foreach variables should not be reassigned",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "bug",
     "misra",
     "pitfall"
   ],
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1264_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1264_java.html
index 366b415a596..5417c90ff82 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1264_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1264_java.html
@@ -1,5 +1,5 @@
-<p>When only the condition expression is defined in a <code>for</code> loop, but the init and increment expressions are missing, a <code>while</code>
-loop should be used instead to increase readability. </p>
+<p>When only the condition expression is defined in a <code>for</code> loop, and the initialization and increment expressions are missing, a
+<code>while</code> loop should be used instead to increase readability. </p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 for (;condition;) { /*...*/ }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S135_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S135_java.json
index 0826aba0d9b..f8f12af6eba 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S135_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S135_java.json
@@ -10,5 +10,5 @@
   "tags": [
     "brain-overload"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1541_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1541_java.html
index df16c3f04a0..acab16da505 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1541_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1541_java.html
@@ -1,3 +1,6 @@
 <p>The cyclomatic complexity of methods should not exceed a defined threshold.</p>
 <p>Complex code can perform poorly and will in any case be difficult to understand and therefore to maintain.</p>
+<h2>Exceptions</h2>
+<p>While having a large number of fields in a class may indicate that it should be split, this rule nonetheless ignores high complexity in
+<code>equals</code> and <code>hashCode</code> methods.</p>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1640_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1640_java.json
index ed7b517de8b..83da825592b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1640_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1640_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Maps with keys that are enum values should be replaced with EnumMap",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1641_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1641_java.json
index 98179967d8e..3bcdae706a3 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1641_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1641_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Sets with elements that are enum values should be replaced with EnumSet",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1643_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1643_java.json
index 99ddd147f26..a9684395b4f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1643_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1643_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Strings should not be concatenated using '+' in a loop",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "10min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1656_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1656_java.json
index 3ef0b61d7ba..c1d5fd9a252 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1656_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1656_java.json
@@ -7,7 +7,6 @@
     "constantCost": "3min"
   },
   "tags": [
-    "bug",
     "cert"
   ],
   "defaultSeverity": "Major"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.html
deleted file mode 100644
index 7fff724bc32..00000000000
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<p>Protected methods that are never used by any of the classes in the same project are suspected to be dead code. Dead code is unnecessary,
-inoperative code that should be removed. Removing dead code makes maintenance easier by decreasing the size of the maintained code base, thereby
-making it easier to understand the program and preventing the introduction of bugs.</p>
-<p>Unused protected methods are not considered dead code in the following cases:</p>
-<ul>
-  <li> Protected methods which override a parent class method. </li>
-  <li> Protected methods of an abstract class. </li>
-</ul>
-
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.json
deleted file mode 100644
index 1f89c1ce085..00000000000
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1815_java.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "title": "Unused protected methods should be removed",
-  "type": "CODE_SMELL",
-  "status": "ready",
-  "remediation": {
-    "func": "Constant\/Issue",
-    "constantCost": "10min"
-  },
-  "tags": [
-    "unused"
-  ],
-  "defaultSeverity": "Minor"
-}
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.html
index 6975cafbba7..c9c52743b6b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.html
@@ -41,8 +41,28 @@
       <li> <code>PrintWriter(OutputStream out, boolean autoFlush)</code> </li>
       <li> <code>PrintWriter(String fileName)</code> </li>
     </ul> </li>
-  <li> <code>IOUtils</code> methods which accept an encoding argument when that argument is null, and overloads of those methods that omit the
-  encoding argument </li>
+  <li> methods from Apache commons-io library which accept an encoding argument when that argument is null, and overloads of those methods that omit
+  the encoding argument
+    <ul>
+      <li> <code>IOUtils.copy(InputStream, Writer)</code> </li>
+      <li> <code>IOUtils.copy(Reader, OutputStream)</code> </li>
+      <li> <code>IOUtils.readLines(InputStream)</code> </li>
+      <li> <code>IOUtils.toByteArray(Reader)</code> </li>
+      <li> <code>IOUtils.toByteArray(String)</code> </li>
+      <li> <code>IOUtils.toCharArray(InputStream)</code> </li>
+      <li> <code>IOUtils.toInputStream(TypeCriteria.subtypeOf(CharSequence))</code> </li>
+      <li> <code>IOUtils.toString(byte[])</code> </li>
+      <li> <code>IOUtils.toString(URI)</code> </li>
+      <li> <code>IOUtils.toString(URL)</code> </li>
+      <li> <code>IOUtils.write(char[], OutputStream)</code> </li>
+      <li> <code>IOUtils.write(CharSequence, OutputStream)</code> </li>
+      <li> <code>IOUtils.writeLines(Collection, String, OutputStream)</code> </li>
+      <li> <code>FileUtils.readFileToString(File)</code> </li>
+      <li> <code>FileUtils.readLines(File)</code> </li>
+      <li> <code>FileUtils.write(File, CharSequence)</code> </li>
+      <li> <code>FileUtils.write(File, CharSequence, boolean)</code> </li>
+      <li> <code>FileUtils.writeStringToFile(File, String)</code> </li>
+    </ul> </li>
 </ul>
 <h2>See</h2>
 <ul>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.json
index 29339d05b44..a962b2189c4 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S1943_java.json
@@ -1,15 +1,15 @@
 {
   "title": "Classes and methods that rely on the default system encoding should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "15min"
   },
   "tags": [
-    "bug",
     "unpredictable",
-    "cert"
+    "cert",
+    "i18n"
   ],
   "standards": [
     "CERT"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2070_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2070_java.html
index a4a544f20af..e7720cb421b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2070_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2070_java.html
@@ -1,9 +1,18 @@
 <p>The MD5 algorithm and its successor, SHA-1, are no longer considered secure, because it is too easy to create hash collisions with them. That is,
 it takes too little computational effort to come up with a different input that produces the same MD5 or SHA-1 hash, and using the new, same-hash
 value gives an attacker the same access as if he had the originally-hashed value. This applies as well to the other Message-Digest algorithms: MD2,
-MD4, MD6.</p>
-<p>This rule tracks usage of the <code>java.security.MessageDigest</code>, and <code>org.apache.commons.codec.digest.DigestUtils</code> classes to
-instantiate MD or SHA-1 algorithms, and of Guava's <code>com.google.common.hash.Hashing sha1</code> and <code>md5</code> methods. </p>
+MD4, MD6, RIPEMD160.</p>
+<p>The following APIs are tracked for use of obsolete crypto algorithms:</p>
+<p> * <code>java.security.AlgorithmParameters</code> (JDK)</p>
+<p> * <code>java.security.AlgorithmParameterGenerator</code> (JDK)</p>
+<p> * <code>java.security.MessageDigest</code> (JDK)</p>
+<p> * <code>java.security.KeyFactory</code> (JDK)</p>
+<p> * <code>java.security.KeyPairGenerator</code> (JDK)</p>
+<p> * <code>java.security.Signature</code> (JDK)</p>
+<p> * <code>javax.crypto.Mac</code> (JDK)</p>
+<p> * <code>javax.crypto.KeyGenerator</code> (JDK)</p>
+<p> * <code>org.apache.commons.codec.digest.DigestUtils</code> (Apache Commons Codec)</p>
+<p> * <code>com.google.common.hash.Hashing</code> (Guava)</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 MessageDigest md = MessageDigest.getInstance("SHA1");  // Noncompliant
@@ -12,10 +21,6 @@ <h2>Compliant Solution</h2>
 <pre>
 MessageDigest md = MessageDigest.getInstance("SHA-256");
 </pre>
-<p>or</p>
-<pre>
-Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
-</pre>
 <h2>See</h2>
 <ul>
   <li> <a href="http://cwe.mitre.org/data/definitions/328">MITRE, CWE-328</a> - Reversible One-Way Hash </li>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2077_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2077_java.html
index ecc47959d45..119e10e69c1 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2077_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2077_java.html
@@ -1,7 +1,38 @@
 <p>Applications that execute SQL commands should neutralize any externally-provided values used in those commands. Failure to do so could allow an
 attacker to include input that changes the query so that unintended commands are executed, or sensitive data is exposed.</p>
-<p>This rule checks that method parameters are not used directly in non-Hibernate SQL statements, and that parameter binding, rather than
-concatenation is used in Hibernate statements.</p>
+<p>This rule checks a variety of methods from different frameworks which are susceptible to SQL injection if not used properly. Frameworks which are
+covered are Java JDBC, JPA, JDO, Hibernate and Spring. The following specific method signatures are tested. </p>
+<ul>
+  <li> <code>org.hibernate.Session.createQuery</code> </li>
+  <li> <code>org.hibernate.Session.createSQLQuery</code> </li>
+  <li> <code>java.sql.Statement.executeQuery</code> </li>
+  <li> <code>java.sql.Statement.execute</code> </li>
+  <li> <code>java.sql.Statement.executeUpdate</code> </li>
+  <li> <code>java.sql.Statement.executeLargeUpdate</code> </li>
+  <li> <code>java.sql.Statement.addBatch</code> </li>
+  <li> <code>java.sql.Connection.prepareStatement</code> </li>
+  <li> <code>java.sql.Connection.prepareCall</code> </li>
+  <li> <code>java.sql.Connection.nativeSQL</code> </li>
+  <li> <code>javax.persistence.EntityManager.createNativeQuery</code> </li>
+  <li> <code>javax.persistence.EntityManager.createQuery</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.batchUpdate</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.execute</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.query</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForList</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForMap</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForObject</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForRowSet</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForInt</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.queryForLong</code> </li>
+  <li> <code>org.springframework.jdbc.core.JdbcOperations.update</code> </li>
+  <li> <code>org.springframework.jdbc.core.PreparedStatementCreatorFactory.&lt;init&gt;</code> </li>
+  <li> <code>org.springframework.jdbc.core.PreparedStatementCreatorFactory.newPreparedStatementCreator</code> </li>
+  <li> <code>javax.jdo.PersistenceManager.newQuery</code> </li>
+  <li> <code>javax.jdo.Query.setFilter</code> </li>
+  <li> <code>javax.jdo.Query.setGrouping</code> </li>
+</ul>
+<p>If a method is defined in an interface, implementations are also tested. For example this is the case for
+<code>org.springframework.jdbc.core.JdbcOperations</code> , which is usually used as <code>org.springframework.jdbc.core.JdbcTemplate</code>). </p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 public User getUser(Connection con, String user) throws SQLException {
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2112_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2112_java.json
index 36abf8b1a38..b9758a2af0d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2112_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2112_java.json
@@ -1,14 +1,13 @@
 {
   "title": "\"URL.hashCode\" and \"URL.equals\" should be avoided",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2129_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2129_java.json
index 772339f93a3..c8b581ace12 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2129_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2129_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Constructors should not be used to instantiate \"String\" and primitive-wrapper classes",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.html
index 9e3741cc054..faf4e4fcd81 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.html
@@ -4,7 +4,7 @@ <h2>Noncompliant Code Example</h2>
 <pre>
 String myNum = "12.2";
 
-float f = new Float(myNum).floatValue();  // Noncompliant; creates &amp; discards a Float
+float f = (new Float(myNum)).floatValue();  // Noncompliant; creates &amp; discards a Float
 </pre>
 <h2>Compliant Solution</h2>
 <pre>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.json
index 9757c1047f3..50d90a2625b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2130_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Parsing should be used to convert \"Strings\" to primitives",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.html
index 82cc32bab9f..8daff16cc0d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.html
@@ -5,7 +5,7 @@
 <h2>Noncompliant Code Example</h2>
 <pre>
 int myInt = 4;
-String myIntString = new Integer(myInt).toString(); // Noncompliant; creates &amp; discards an Integer object
+String myIntString = (new Integer(myInt)).toString(); // Noncompliant; creates &amp; discards an Integer object
 myIntString = Integer.valueOf(myInt).toString(); // Noncompliant
 myIntString = 4 + "";  // Noncompliant
 </pre>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.json
index 87e898ab5df..669a5d3ff60 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2131_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Primitives should not be boxed just for \"String\" conversion",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2133_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2133_java.json
index da5f2f692fa..366bf8136ff 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2133_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2133_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Objects should not be created only to \"getClass\"",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2178_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2178_java.json
index 797f17a9391..c182c3b5f8d 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2178_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2178_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Short-circuit logic should be used in boolean contexts",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "bug",
     "cert"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Blocker"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2184_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2184_java.json
index 178fbbfa735..33a65a56582 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2184_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2184_java.json
@@ -8,6 +8,7 @@
   },
   "tags": [
     "cwe",
+    "overflow",
     "bug",
     "sans-top25-risky",
     "misra",
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2232_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2232_java.json
index 95c1e169b7a..16e50f9fdf6 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2232_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2232_java.json
@@ -1,6 +1,6 @@
 {
   "title": "\"ResultSet.isLast()\" should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -8,7 +8,6 @@
   },
   "tags": [
     "performance",
-    "bug",
     "pitfall",
     "sql"
   ],
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2276_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2276_java.html
index 183ff670f66..c209fdb57ef 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2276_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2276_java.html
@@ -1,4 +1,4 @@
-<p>If <code>Thread.sleep(...)</code> is called when the current thread holds a lock, it could lead to performance, and scalability issues, or even
+<p>If <code>Thread.sleep(...)</code> is called when the current thread holds a lock, it could lead to performance and scalability issues, or even
 worse to deadlocks because the execution of the thread holding the lock is frozen. It's better to call <code>wait(...)</code> on the monitor object to
 temporarily release the lock and allow other threads to run.</p>
 <h2>Noncompliant Code Example</h2>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2278_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2278_java.html
index 1d188499bc8..4a37c4d9d27 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2278_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2278_java.html
@@ -4,6 +4,7 @@
   provides the security that is needed to protect federal government information.</p>
   <p>Federal agencies are encouraged to use the Advanced Encryption Standard, a faster and stronger algorithm approved as FIPS 197 in 2001.</p>
 </blockquote>
+<p>For similar reasons, RC2 should also be avoided.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
 Cipher c = Cipher.getInstance("DESede/ECB/PKCS5Padding");
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.html
index f1b9ee72fdc..33ed771e89c 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.html
@@ -1,7 +1,7 @@
 <p>Use of <code>File.deleteOnExit()</code> is not recommended for the following reasons:</p>
 <ul>
   <li> The deletion occurs only in the case of a normal JVM shutdown but not when the JVM crashes or is killed. </li>
-  <li> For each file handler, the memory associated to the handler is released only at the end of the process. </li>
+  <li> For each file handler, the memory associated with the handler is released only at the end of the process. </li>
 </ul>
 <h2>Noncompliant Code Example</h2>
 <pre>
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.json
index 3598b00a4a5..102009a137f 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2308_java.json
@@ -1,14 +1,13 @@
 {
   "title": "\"deleteOnExit\" should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "30min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2629_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2629_java.json
index b4870a2a200..cf4821aa12b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2629_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2629_java.json
@@ -1,14 +1,13 @@
 {
   "title": "\"Preconditions\" and logging arguments should not require evaluation",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2694_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2694_java.json
index ef892ead603..99e9a1f73af 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2694_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2694_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Inner classes which do not reference their owning classes should be \"static\"",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "15min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2718_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2718_java.json
index 349efb41618..b8c4ee83234 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2718_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2718_java.json
@@ -1,6 +1,6 @@
 {
   "title": "\"DateUtils.truncate\" from Apache Commons Lang library should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -8,7 +8,6 @@
   },
   "tags": [
     "performance",
-    "bug",
     "java8"
   ],
   "defaultSeverity": "Major"
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2864_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2864_java.json
index 64d50211dd8..4b720f31a30 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2864_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S2864_java.json
@@ -1,14 +1,13 @@
 {
   "title": "\"entrySet()\" should be iterated when both the key and value are needed",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3027_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3027_java.json
index 5c2e4003616..26abf0cce35 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3027_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3027_java.json
@@ -1,6 +1,6 @@
 {
   "title": "String function use should be optimized for single characters",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -8,8 +8,7 @@
   },
   "tags": [
     "performance",
-    "bug",
     "clumsy"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3047_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3047_java.json
index ab38aaddcc7..b9c2aed6d89 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3047_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3047_java.json
@@ -1,14 +1,13 @@
 {
   "title": "Multiple loops over the same set should be combined",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
   "defaultSeverity": "Minor"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.html b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.html
index 760126e6a0d..ea9b76e3b71 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.html
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.html
@@ -14,6 +14,4 @@ <h2>See</h2>
   <li> <a href="https://www.securecoding.cert.org/confluence/x/vwG7AQ">CERT, EXP06-J.</a> - Expressions used in assertions must not produce side
   effects </li>
 </ul>
-<h2>Deprecated</h2>
-<p>This rule is deprecated, and will eventually be removed.</p>
 
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.json
index c3a84dfbdb4..ef677b034ce 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3346_java.json
@@ -1,13 +1,16 @@
 {
-  "title": "\"assert\" should only be used with boolean variables",
+  "title": "Expressions used in \"assert\" should not produce side effects",
   "type": "BUG",
-  "status": "deprecated",
+  "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    
+    "cert"
+  ],
+  "standards": [
+    "CERT"
   ],
   "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3631_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3631_java.json
index 466c44e4e95..16d9ac0721b 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3631_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3631_java.json
@@ -1,14 +1,13 @@
 {
   "title": "\"Arrays.stream\" should be used for primitive arrays",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "tags": [
-    "performance",
-    "bug"
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Major"
 }
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3725_java.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3725_java.json
index 1e0d2bd57c4..ced9c86faaf 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3725_java.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/S3725_java.json
@@ -1,6 +1,6 @@
 {
   "title": "Java 8's \"Files.exists\" should not be used",
-  "type": "BUG",
+  "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
diff --git a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/Sonar_way_profile.json b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/Sonar_way_profile.json
index 6614e4a6bc9..c8361e5c43e 100644
--- a/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/Sonar_way_profile.json
+++ b/java-checks/src/main/resources/org/sonar/l10n/java/rules/squid/Sonar_way_profile.json
@@ -49,7 +49,6 @@
     "S1141",
     "S1143",
     "S1144",
-    "S1147",
     "S1148",
     "S1149",
     "S1150",
@@ -224,6 +223,7 @@
     "S2445",
     "S2446",
     "S2447",
+    "S2583",
     "S2629",
     "S2637",
     "S2638",
@@ -260,6 +260,7 @@
     "S3066",
     "S3067",
     "S3281",
+    "S3346",
     "S3355",
     "S3358",
     "S3398",