From c3ca19546047af0d7133aa1b785a5cd92c7a0198 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Fri, 9 Aug 2024 18:47:13 +0200
Subject: [PATCH 01/19] Rule specifications normalization in progress

---
 .../src/main/rules/EC1/EC1.json               |  10 +-
 .../src/main/rules/EC1/java/EC1.asciidoc      |  31 ++-
 .../src/main/rules/EC10/EC10.json             |  13 +-
 .../src/main/rules/EC10/python/EC10.asciidoc  |  13 +-
 .../src/main/rules/EC11/EC11.json             |  14 +-
 .../main/rules/EC11/javascript/EC11.asciidoc  |   9 +-
 .../src/main/rules/EC12/EC12.json             |  16 +-
 .../main/rules/EC12/javascript/EC12.asciidoc  |  11 +-
 .../src/main/rules/EC13/EC13.json             |   4 +-
 .../main/rules/EC13/javascript/EC13.asciidoc  |   9 +-
 .../src/main/rules/EC2/EC2.json               |  10 +-
 .../src/main/rules/EC2/java/EC2.asciidoc      |  50 ++--
 .../src/main/rules/EC2/php/EC2.asciidoc       |  62 +++--
 .../src/main/rules/EC2/python/EC2.asciidoc    |  62 +++--
 .../src/main/rules/EC203/EC203.json           |  10 +-
 .../main/rules/EC203/python/EC203.asciidoc    |  48 ++--
 .../src/main/rules/EC22/EC22.json             |  12 +-
 .../src/main/rules/EC22/php/EC22.asciidoc     |  15 +-
 .../src/main/rules/EC24/EC24.json             |   2 +-
 .../src/main/rules/EC24/java/EC24.asciidoc    |   4 +-
 .../main/rules/EC24/javascript/EC24.asciidoc  |   7 +-
 .../src/main/rules/EC25/EC25.json             |   4 +-
 .../main/rules/EC25/javascript/EC25.asciidoc  |  11 +-
 .../src/main/rules/EC26/EC26.json             |   4 +-
 .../main/rules/EC26/javascript/EC26.asciidoc  |   8 +-
 .../src/main/rules/EC27/EC27.json             |  10 +-
 .../src/main/rules/EC27/java/EC27.asciidoc    |  15 +-
 .../src/main/rules/EC28/EC28.json             |  10 +-
 .../src/main/rules/EC28/java/EC28.asciidoc    |  20 +-
 .../src/main/rules/EC29/EC29.json             |   4 +-
 .../main/rules/EC29/javascript/EC29.asciidoc  |   9 +-
 .../src/main/rules/EC3/EC3.json               |  10 +-
 .../src/main/rules/EC3/java/EC3.asciidoc      |  17 +-
 .../src/main/rules/EC3/php/EC3.asciidoc       |  27 +-
 .../src/main/rules/EC30/EC30.json             |   4 +-
 .../main/rules/EC30/javascript/EC30.asciidoc  |  10 +-
 .../src/main/rules/EC31/EC31.json             |   4 +-
 .../main/rules/EC31/javascript/EC31.asciidoc  |  18 +-
 .../src/main/rules/EC32/EC32.json             |  10 +-
 .../src/main/rules/EC32/java/EC32.asciidoc    |  13 +-
 .../src/main/rules/EC34/EC34.json             |  10 +-
 .../src/main/rules/EC34/php/EC34.asciidoc     |  18 +-
 .../src/main/rules/EC34/python/EC34.asciidoc  |  14 +-
 .../src/main/rules/EC35/EC35.json             |  10 +-
 .../src/main/rules/EC35/php/EC35.asciidoc     |  21 +-
 .../src/main/rules/EC35/python/EC35.asciidoc  |  15 +-
 .../src/main/rules/EC36/EC36.json             |   5 +-
 .../src/main/rules/EC36/html/EC36.asciidoc    |  18 +-
 .../src/main/rules/EC4/EC4.json               |  10 +-
 .../src/main/rules/EC4/php/EC4.asciidoc       |  28 ++-
 .../src/main/rules/EC4/python/EC4.asciidoc    |  31 ++-
 .../src/main/rules/EC404/EC404.json           |  10 +-
 .../main/rules/EC404/python/EC404.asciidoc    |  16 +-
 .../src/main/rules/EC5/EC5.json               |  10 +-
 .../src/main/rules/EC5/java/EC5.asciidoc      |  15 +-
 .../src/main/rules/EC500/EC500.json           |  12 +-
 .../src/main/rules/EC500/java/EC500.asciidoc  |  13 +-
 .../src/main/rules/EC501/EC501.json           |  14 +-
 .../src/main/rules/EC501/java/EC501.asciidoc  |  14 +-
 .../src/main/rules/EC502/EC502.json           |  16 +-
 .../src/main/rules/EC502/java/EC502.asciidoc  |  16 +-
 .../src/main/rules/EC503/EC503.json           |  14 +-
 .../src/main/rules/EC503/java/EC503.asciidoc  |  14 +-
 .../src/main/rules/EC504/EC504.json           |  14 +-
 .../src/main/rules/EC504/java/EC504.asciidoc  |  13 +-
 .../src/main/rules/EC505/EC505.json           |  12 +-
 .../src/main/rules/EC505/java/EC505.asciidoc  |  23 +-
 .../src/main/rules/EC505/swift/EC505.asciidoc |  16 +-
 .../src/main/rules/EC505/xml/EC505.asciidoc   |  14 +-
 .../src/main/rules/EC506/EC506.json           |  13 +-
 .../src/main/rules/EC506/java/EC506.asciidoc  |  12 +-
 .../src/main/rules/EC507/EC507.json           |  14 +-
 .../src/main/rules/EC507/java/EC507.asciidoc  |  13 +-
 .../src/main/rules/EC507/xml/EC507.asciidoc   |  16 +-
 .../src/main/rules/EC508/EC508.json           |  13 +-
 .../src/main/rules/EC508/java/EC508.asciidoc  |  16 +-
 .../src/main/rules/EC509/EC509.json           |  14 +-
 .../src/main/rules/EC509/java/EC509.asciidoc  |  15 +-
 .../src/main/rules/EC509/swift/EC509.asciidoc |  15 +-
 .../src/main/rules/EC510/EC510.json           |  14 +-
 .../src/main/rules/EC510/java/EC510.asciidoc  |  16 +-
 .../src/main/rules/EC511/EC511.json           |  14 +-
 .../src/main/rules/EC511/java/EC511.asciidoc  |  17 +-
 .../src/main/rules/EC512/EC512.json           |   6 +-
 .../src/main/rules/EC512/java/EC512.asciidoc  |  16 +-
 .../src/main/rules/EC513/EC513.json           |  14 +-
 .../src/main/rules/EC513/java/EC513.asciidoc  |  13 +-
 .../src/main/rules/EC513/swift/EC513.asciidoc |  13 +-
 .../src/main/rules/EC514/EC514.json           |  14 +-
 .../src/main/rules/EC514/java/EC514.asciidoc  |  13 +-
 .../src/main/rules/EC514/swift/EC514.asciidoc |  13 +-
 .../src/main/rules/EC515/EC515.json           |  14 +-
 .../src/main/rules/EC515/java/EC515.asciidoc  |  14 +-
 .../src/main/rules/EC515/swift/EC515.asciidoc |  15 +-
 .../src/main/rules/EC516/EC516.json           |  14 +-
 .../src/main/rules/EC516/java/EC516.asciidoc  |  18 +-
 .../src/main/rules/EC517/EC517.json           |  14 +-
 .../src/main/rules/EC517/java/EC517.asciidoc  |  13 +-
 .../src/main/rules/EC518/EC518.json           |  14 +-
 .../src/main/rules/EC518/java/EC518.asciidoc  |  15 +-
 .../src/main/rules/EC519/EC519.json           |  12 +-
 .../src/main/rules/EC519/java/EC519.asciidoc  |  23 +-
 .../src/main/rules/EC519/swift/EC519.asciidoc |  24 +-
 .../src/main/rules/EC519/xml/EC519.asciidoc   |  23 +-
 .../src/main/rules/EC520/EC520.json           |  14 +-
 .../src/main/rules/EC520/java/EC520.asciidoc  |  25 +-
 .../src/main/rules/EC520/swift/EC520.asciidoc |  19 +-
 .../src/main/rules/EC520/xml/EC520.asciidoc   |  19 +-
 .../src/main/rules/EC521/EC521.json           |  15 +-
 .../src/main/rules/EC521/java/EC521.asciidoc  |  14 +-
 .../src/main/rules/EC522/EC522.json           |  10 +-
 .../src/main/rules/EC522/java/EC522.asciidoc  |  18 +-
 .../src/main/rules/EC522/java/EC522.json      |   7 +-
 .../rules/EC522/javascript/EC522.asciidoc     |  13 +-
 .../main/rules/EC522/javascript/EC522.json    |   6 +-
 .../src/main/rules/EC522/swift/EC522.asciidoc |  16 +-
 .../src/main/rules/EC522/swift/EC522.json     |   8 +-
 .../src/main/rules/EC523/EC523.json           |   8 +-
 .../src/main/rules/EC523/java/EC523.asciidoc  |  15 +-
 .../src/main/rules/EC523/java/EC523.json      |   2 -
 .../rules/EC523/javascript/EC523.asciidoc     |  13 +-
 .../main/rules/EC523/javascript/EC523.json    |   7 +-
 .../src/main/rules/EC524/EC524.json           |  15 +-
 .../src/main/rules/EC524/java/EC524.asciidoc  |  13 +-
 .../src/main/rules/EC524/swift/EC524.asciidoc |  18 +-
 .../src/main/rules/EC525/EC525.json           |  15 +-
 .../src/main/rules/EC525/java/EC525.asciidoc  |  13 +-
 .../src/main/rules/EC526/EC526.json           |  14 +-
 .../src/main/rules/EC526/java/EC526.asciidoc  |  14 +-
 .../src/main/rules/EC527/EC527.json           |  15 +-
 .../src/main/rules/EC527/java/EC527.asciidoc  |  16 +-
 .../src/main/rules/EC528/EC528.json           |  12 +-
 .../src/main/rules/EC528/java/EC528.asciidoc  |  15 +-
 .../src/main/rules/EC529/EC529.json           |  13 +-
 .../src/main/rules/EC529/java/EC529.asciidoc  |  13 +-
 .../src/main/rules/EC530/EC530.json           |  10 +-
 .../src/main/rules/EC530/java/EC530.asciidoc  |  14 +-
 .../src/main/rules/EC530/java/EC530.json      |   2 -
 .../rules/EC530/javascript/EC530.asciidoc     |   6 +-
 .../main/rules/EC530/javascript/EC530.json    |   2 -
 .../src/main/rules/EC530/swift/EC530.asciidoc |  21 +-
 .../src/main/rules/EC530/swift/EC530.json     |   5 +-
 .../src/main/rules/EC531/EC531.json           |  16 +-
 .../src/main/rules/EC531/java/EC531.asciidoc  |  17 +-
 .../src/main/rules/EC532/EC532.json           |  17 +-
 .../src/main/rules/EC532/java/EC532.asciidoc  |  21 +-
 .../src/main/rules/EC533/EC533.json           |  12 +-
 .../src/main/rules/EC533/swift/EC533.asciidoc |  20 +-
 .../src/main/rules/EC534/EC534.json           |  15 +-
 .../src/main/rules/EC534/swift/EC534.asciidoc |  21 +-
 .../src/main/rules/EC540/EC540.json           |  12 +-
 .../src/main/rules/EC540/xml/EC540.asciidoc   |  12 +-
 .../src/main/rules/EC543/EC543.json           |  12 +-
 .../src/main/rules/EC543/xml/EC543.asciidoc   |  21 +-
 .../src/main/rules/EC544/EC544.json           |  14 +-
 .../src/main/rules/EC544/xml/EC544.asciidoc   |  18 +-
 .../src/main/rules/EC547/EC547.json           |  15 +-
 .../src/main/rules/EC547/xml/EC547.asciidoc   |  18 +-
 .../src/main/rules/EC548/EC548.json           |  16 +-
 .../src/main/rules/EC548/xml/EC548.asciidoc   |  15 +-
 .../src/main/rules/EC602/EC602.json           |  13 +-
 .../src/main/rules/EC603/EC603.json           |  15 +-
 .../src/main/rules/EC603/swift/EC603.asciidoc |  14 +-
 .../src/main/rules/EC66/EC66.json             |  10 +-
 .../src/main/rules/EC66/php/EC66.asciidoc     |  22 +-
 .../src/main/rules/EC67/EC67.json             |  10 +-
 .../src/main/rules/EC67/java/EC67.asciidoc    |  19 +-
 .../src/main/rules/EC67/php/EC67.asciidoc     |  22 +-
 .../src/main/rules/EC69/EC69.json             |  10 +-
 .../src/main/rules/EC69/csharp/EC69.asciidoc  |  15 +-
 .../src/main/rules/EC69/java/EC69.asciidoc    |  13 +-
 .../src/main/rules/EC69/php/EC69.asciidoc     |  23 +-
 .../src/main/rules/EC69/python/EC69.asciidoc  |  12 +-
 .../src/main/rules/EC7/EC7.json               |  10 +-
 .../src/main/rules/EC7/python/EC7.asciidoc    |  21 +-
 .../src/main/rules/EC72/EC72.json             |  10 +-
 .../src/main/rules/EC72/csharp/EC72.asciidoc  |  15 +-
 .../src/main/rules/EC72/java/EC72.asciidoc    |  13 +-
 .../src/main/rules/EC72/php/EC72.asciidoc     |  34 ++-
 .../src/main/rules/EC72/python/EC72.asciidoc  |  15 +-
 .../src/main/rules/EC74/EC74.json             |  10 +-
 .../src/main/rules/EC74/java/EC74.asciidoc    |  14 +-
 .../src/main/rules/EC74/php/EC74.asciidoc     |  22 +-
 .../src/main/rules/EC74/python/EC74.asciidoc  |  13 +-
 .../src/main/rules/EC75/EC75.json             |  10 +-
 .../src/main/rules/EC75/csharp/EC75.asciidoc  |  15 +-
 .../src/main/rules/EC76/EC76.json             |  11 +-
 .../src/main/rules/EC76/java/EC76.asciidoc    |  20 +-
 .../src/main/rules/EC77/EC77.json             |  10 +-
 .../src/main/rules/EC77/java/EC77.asciidoc    |  20 +-
 .../src/main/rules/EC78/EC78.json             |  10 +-
 .../src/main/rules/EC78/java/EC78.asciidoc    |  14 +-
 .../src/main/rules/EC79/EC79.json             |  10 +-
 .../src/main/rules/EC79/java/EC79.asciidoc    |  13 +-
 .../src/main/rules/EC81/EC81.json             |  10 +-
 .../src/main/rules/EC81/csharp/EC81.asciidoc  |  17 +-
 .../src/main/rules/EC82/EC82.json             |  11 +-
 .../src/main/rules/EC82/csharp/EC82.asciidoc  |  19 +-
 .../src/main/rules/EC83/EC83.json             |  10 +-
 .../src/main/rules/EC83/csharp/EC83.asciidoc  |  19 +-
 .../src/main/rules/EC84/EC84.json             |  10 +-
 .../src/main/rules/EC84/csharp/EC84.asciidoc  |  19 +-
 .../src/main/rules/EC85/EC85.json             |   8 +-
 .../src/main/rules/EC85/csharp/EC85.asciidoc  |  36 +--
 .../src/main/rules/EC86/EC86.json             |   9 +-
 .../src/main/rules/EC86/csharp/EC86.asciidoc  |  18 +-
 .../src/main/rules/EC87/EC87.json             |  10 +-
 .../src/main/rules/EC87/csharp/EC87.asciidoc  |  23 +-
 .../src/main/rules/EC88/EC88.json             |  10 +-
 .../src/main/rules/EC88/csharp/EC88.asciidoc  |  20 +-
 .../src/main/rules/EC89/EC89.json             |  10 +-
 .../src/main/rules/EC89/python/EC89.asciidoc  |  15 +-
 .../src/main/rules/EC9/EC9.json               |   4 +-
 .../main/rules/EC9/javascript/EC9.asciidoc    |  14 +-
 .../src/main/rules/EC91/EC91.json             |  10 +-
 .../src/main/rules/EC91/csharp/EC91.asciidoc  |  18 +-
 .../src/main/rules/EC92/EC92.json             |  10 +-
 .../src/main/rules/EC92/csharp/EC92.asciidoc  |  17 +-
 .../src/main/rules/EC93/EC93.json             |  10 +-
 .../src/main/rules/EC93/csharp/EC93.asciidoc  |  19 +-
 .../src/main/rules/EC94/EC94.json             |  10 +-
 .../src/main/rules/EC94/java/EC94.asciidoc    |  13 +-
 .../main/rules/etsdiff-methodology.asciidoc   |   2 +-
 .../fr/greencodeinitiative/RulesTest.java     | 233 ++++++++++++++++++
 pom.xml                                       |  48 ++++
 225 files changed, 2719 insertions(+), 811 deletions(-)
 create mode 100644 ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java

diff --git a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
index 826bb1dda..257f041c0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
+++ b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid Spring repository call in loop or stream operations",
+  "title": "Spring repository should not be called in loop or stream operations",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc b/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
index 524e8d0c2..457dad28a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
@@ -1,9 +1,17 @@
+:!sectids:
+
+== Why is this an issue?
+
 The use of Spring repository in a loop induces unnecessary calculations by the CPU and therefore superfluous energy consumption.
 Also, the use of Spring repository in a stream operation like "peek, forEach, forEachOrdered, map" induces unnecessary multiple access to the database instead of single batch call.
 
-## Noncompliant Code Example
+== How to fix it
 
-```java
+=== Noncompliant Code Example
+
+[source,java]
+----
+// Noncompliant
 private final List<Integer> ids = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 
 List<Employee> employees = new ArrayList<>();
@@ -14,9 +22,11 @@ for (Integer id: ids) {
         employees.add(employee.get());
     }
 }
-```
+----
 
-```java
+[source,java]
+----
+// Noncompliant
 List<Employee> employees = new ArrayList<>();
 Stream stream = Stream.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 stream.forEach(id -> {
@@ -25,16 +35,21 @@ stream.forEach(id -> {
         employees.add(employee.get());
     }
 });
-```
+----
 
-## Compliant Solution
+== Compliant solution
 
-```java
+[source,java]
+----
 private final List<Integer> ids = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 List<Employee> employees = employeeRepository.findAllById(ids);
-```
+----
 
 ```java
 private final List<Integer> ids = Stream.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10).toList();
 List<Employee> employees = employeeRepository.findAllById(ids);
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
index ec7fbffd9..f6377762a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
+++ b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using unoptimized vector images",
+  "title": "Unoptimized vector images should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,7 +8,14 @@
   },
   "tags": [
     "eco-design",
-    "ecocode"
+    "ecocode",
+    "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc b/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
index cf2483171..876fdb4c6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 SVG images generated by common drawing softwares contains unnecessary data: calc layer, metadata, namespaces and comments.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
@@ -30,10 +35,14 @@ SVG images generated by common drawing softwares contains unnecessary data: calc
 </svg>
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```xml
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 297" width="210mm" height="297mm">
     <circle cx="104.02724" cy="152.19028" r="73.177132" style="fill:#ff00ff;stroke-width:0.264583"/>
 </svg>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_036_fr.md[CNumR best practices (3rd edition) BP_036]
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
index b03cb64dd..6efe68c92 100644
--- a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
+++ b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
@@ -1,12 +1,6 @@
 {
-  "title": "Disallow multiple access of same DOM element.",
+  "title": "DOM manipulation should be limited",
   "type": "CODE_SMELL",
-  "code": {
-    "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
-    },
-    "attribute": "EFFICIENT"
-  },
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -18,6 +12,12 @@
     "performance"
   ],
   "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  },
   "compatibleLanguages": [
     "JAVASCRIPT",
     "TYPESCRIPT"
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc b/ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc
index 94ef0077d..e3c87ceb3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC11/javascript/EC11.asciidoc
@@ -10,14 +10,19 @@ Assigning the DOM object to a variable not only improves performance but also en
 It makes the code more concise and self-explanatory.
 Developers reading the code can understand that the variable holds a reference to a specific DOM element, and its subsequent use is likely for multiple operations.
 
+== How to fix it
+=== Noncompliant code example
+
 Here's an example in JavaScript to illustrate this rule:
 
 [source,js,data-diff-id="2",data-diff-type="noncompliant"]
 ----
 const width = document.getElementById('block').clientWidth;
-const height = document.getElementById('block').clientHeight; // Non-compliant
+const height = document.getElementById('block').clientHeight; // Noncompliant
 ----
 
+=== Compliant solution
+
 [source,js,data-diff-id="1",data-diff-type="noncompliant"]
 ----
 const blockElement = document.getElementById('block'); // Compliant
@@ -32,5 +37,5 @@ In the second example, the DOM element reference is cached in the `blockElement`
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_054_en.md[CNUMR best practices] - Reduce DOM access via JavaScript
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_054_en.md[CNumR best practices] - Reduce DOM access via JavaScript
 - https://developer.mozilla.org/en-US/docs/Learn/Performance/JavaScript#tips_for_writing_more_efficient_code[Mozilla Web Technology for Developers] - Tips for writing more efficient code
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
index 633a643d2..1998ae15b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
+++ b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
@@ -1,12 +1,6 @@
 {
-  "title": "Disallow multiple style changes at once.",
+  "title": "Multiple style changes should be batched",
   "type": "CODE_SMELL",
-  "code": {
-    "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
-    },
-    "attribute": "EFFICIENT"
-  },
   "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
@@ -18,8 +12,14 @@
     "performance"
   ],
   "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  },
   "compatibleLanguages": [
     "JAVASCRIPT",
     "TYPESCRIPT"
   ]
-}
+}
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc b/ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc
index b75571d8b..57cb75677 100644
--- a/ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC12/javascript/EC12.asciidoc
@@ -10,17 +10,22 @@ Making multiple CSS changes in a single batch can trigger multiple reflows and r
 Reflows and repaints are resource-intensive operations that can lead to performance issues.
 Applying changes individually minimizes the number of reflows and repaints, improving overall page performance.
 
+== How to fix it
+=== Noncompliant code example
+
 Here's an example in JavaScript and CSS to illustrate this rule:
 
 [source,html,data-diff-id="3",data-diff-type="noncompliant"]
 ----
 <script>
   element.style.height = "800px";
-  element.style.width = "600px"; // Non-compliant
-  element.style.color = "red"; // Non-compliant
+  element.style.width = "600px"; // Noncompliant
+  element.style.color = "red"; // Noncompliant
 </script>
 ----
 
+=== Compliant solution
+
 [source,html,data-diff-id="10",data-diff-type="compliant"]
 ----
 <style>
@@ -42,4 +47,4 @@ In the first example, multiple CSS properties are set in a single batch, while i
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_045_en.md[CNUMR best practices] - Modify several CSS properties at once
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_045_en.md[CNumR best practices] - Modify several CSS properties at once
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
index 82cb8f0c7..6093a90c6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
+++ b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
@@ -1,9 +1,9 @@
 {
-  "title": "Prefer API collections with pagination.",
+  "title": "API collections should be preferred with pagination",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc b/ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc
index 27115898d..e28dc5385 100644
--- a/ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC13/javascript/EC13.asciidoc
@@ -11,15 +11,20 @@ Pagination ensures that only the relevant data is transferred, conserving bandwi
 
 This rule is built for the https://nestjs.com[NestJS framework] but can work with a controller `@Controller()` and a decorated method `@Get()`.
 
+== How to fix it
+=== Noncompliant code example
+
 [source,typescript,data-diff-id="4",data-diff-type="noncompliant"]
 ----
 @Controller()
 class Test {
   @Get()
-  public find(): Promise<string[]> {} // Non-compliant
+  public find(): Promise<string[]> {} // Noncompliant
 }
 ----
 
+=== Compliant solution
+
 [source,typescript,data-diff-id="10",data-diff-type="compliant"]
 ----
 interface Pagination {
@@ -39,7 +44,7 @@ class Test {
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_076_en.md[CNUMR best practices] - Avoid transferring large amounts of data for processing tasks
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_076_en.md[CNumR best practices] - Avoid transferring large amounts of data for processing tasks
 - https://github.com/ppetzold/nestjs-paginate[nestjs-paginate] - Pagination and filtering helper method using Nest.js framework
 
 === Articles & blog posts
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
index d48945c08..44c8af003 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
+++ b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid multiple if-else statement",
+  "title": "Variables should not be used in multiple if...else statements",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
index df00a5933..202257712 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
@@ -1,22 +1,26 @@
-If we are using too many conditional IF, ELSEIF or ELSE statements it will impact performance.
-We can think of using a switch statement instead of multiple if-else if possible, or refactor code
-to reduce number of IF, ELSEIF and ELSE statements. Sometimes called "complexity cyclomatic".
-Switch statement has a performance advantage over if – else.
-
-## Functional rules
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at the same level - WARNINGs :
-- IF and ELSEIF statements use explicitly variable names !
-- ELSE statements use implicity variable names !
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at differents hierarchical levels
-- we can assume that if one variable is used three times or more, we should :
-- use a SWITCH statement instead
-- or refactor the code if possible
-
-## Non-compliant Code Example
-
-NON compliant, because `nb` is used 4 times :
-- 2 explicit times in IF statements
-- 2 implicit times in ELSE statements
+:!sectids:
+
+One variable should be used at most twice in `if...else if...else` statements:
+
+- variable is used explicitly in `if` and `else if` statements
+- variable is used implicitly in `else` statements
+
+== Why is this an issue?
+
+Performance is impacted by many conditional `if`, `else if` or `else` statements, which is sometimes called "complexity cyclomatic".
+
+Switch statement has a performance advantage over `if...else`.
+
+== How to fix it
+
+A switch statement can be used instead of multiple `if...else` if possible, or code can be refactored to reduce number of `if...else if...else` statements.
+
+=== Noncompliant code example
+
+Code is noncompliant, because `nb` is used 4 times:
+
+- 3 times explicitly in `if` statements
+- 1 time implicitly in `else` statement
 
 ```java
 int index = 1;
@@ -34,9 +38,9 @@ if (nb == 0) {
 return nb;
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
-SWITCH statement solution + refactor solution
+With a `switch`:
 
 ```java
 int index = 1;
@@ -53,3 +57,7 @@ switch (nb) {
 }
 return nb;
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
index eae2c2817..a8c1b2f8c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
@@ -1,24 +1,27 @@
-If we are using too many conditional IF, ELSEIF or ELSE statements it will impact performance.
-We can think of using a switch statement instead of multiple if-else if possible, or refactor code
-to reduce number of IF, ELSEIF and ELSE statements. Sometimes called "complexity cyclomatic".
-Switch statement has a performance advantage over if – else.
-
-## Functional rules
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at the same level - WARNINGs :
-- IF and ELSEIF statements use explicitly variable names !
-- ELSE statements use implicity variable names !
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at differents hierarchical levels
-- we can assume that if one variable is used three times or more, we should :
-- use a SWITCH statement instead
-- or refactor the code if possible
-
-## Non-compliant Code Example
-
-NON compliant, because `$nb` is used 4 times :
-- 2 explicit times in IF statements
-- 2 implicit times in ELSE statements
-
-```php
+:!sectids:
+
+One variable should be used at most twice in `if...elseif...else` statements:
+
+- variable is used explicitly in `if` and `else if` statements
+- variable is used implicitly in `else` statements
+
+== Why is this an issue?
+
+Performance is impacted by many conditional `if`, `elseif` or `else` statements, which is sometimes called "complexity cyclomatic".
+
+Switch statement has a performance advantage over `if...else`.
+
+== How to fix it
+
+=== Noncompliant code example
+
+Code is noncompliant, because `$nb` is used 4 times :
+
+- 3 times explicitly in `if` and `elseif` statements
+- 1 time implicitly in `else` statement
+
+[source,php]
+----
 $index = 1;
 $nb = 2;
 ...
@@ -32,13 +35,16 @@ if ($nb == 0) {
     $nb = -1;
 }
 return $nb;
-```
+----
 
-## Compliant Code Example
+=== Compliant solution
 
-SWITCH statement solution + refactor solution
+A switch statement can be used instead of multiple `if...else` if possible, or code can be refactored to reduce number of `if...elseif...else` statements.
 
-```php
+With a `switch` statement:
+
+[source,php]
+----
 $index = 1;
 $nb = 2;
 ...
@@ -52,4 +58,8 @@ switch ($nb) {
         $nb = -1;
 }
 return $nb;
-```
+----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
index e2688d834..e2217745d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
@@ -1,24 +1,27 @@
-If we are using too many conditional IF, ELSEIF or ELSE statements it will impact performance.
-We can think of using a switch statement instead of multiple if-else if possible, or refactor code
-to reduce number of IF, ELSEIF and ELSE statements. Sometimes called "complexity cyclomatic".
-MATCH-CASE statement has a performance advantage over if – else.
-
-## Functional rules
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at the same level - WARNINGs :
-- IF and ELSEIF statements use explicitly variable names !
-- ELSE statements use implicity variable names !
-- one variable must be used maximum twice in IF / ELSEIF / ELSE statements at differents hierarchical levels
-- we can assume that if one variable is used three times or more, we should :
-- use a MATCH-CASE statement instead
-- or refactor the code if possible
-
-## Non-compliant Code Example
-
-Non-compliant, because `nb` is used 4 times :
-- 2 explicit times in IF statements
-- 2 implicit times in ELSE statements
-
-```python
+:!sectids:
+
+One variable should be used at most twice in `if...elif...else` statements:
+
+- variable is used explicitly in `if` and `elif` statements
+- variable is used implicitly in `else` statements
+
+== Why is this an issue?
+
+Performance is impacted by many conditional `if`, `elif` or `else` statements, which is sometimes called "complexity cyclomatic".
+
+Switch statement has a performance advantage over `if...else`.
+
+== How to fix it
+
+=== Noncompliant code example
+
+Code is noncompliant, because `nb` is used 4 times:
+
+- 3 times explicitly in `if` and `elif` statements
+- 1 time implicitly in `else` statement
+
+[source,python]
+----
 index = 1
 nb = 2
 ...
@@ -31,13 +34,16 @@ elif nb == 2:
 else:
     nb = -1
 return nb
-```
+----
 
-## Compliant Code Example
+=== Compliant solution
 
-MATCH-CASE statement solution + refactor solution
+A switch statement can be used instead of multiple `if...else` if possible, or code can be refactored to reduce number of `if...elif...else` statements.
 
-```python
+With a `switch`:
+
+[source,python]
+----
 index = 1
 nb = 2
 ...
@@ -51,4 +57,8 @@ match nb:
     case _:
         nb = -1
 return nb
-```
+----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
index 3f46aefd8..f635e1683 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
+++ b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
@@ -1,5 +1,5 @@
 {
-  "title": "Detect unoptimized image format",
+  "title": "Image format should be optimized",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
index 85d38acb6..67f267e14 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 If possible, the utilisation of svg image format (or `<svg/>` html tag) is recommended over other image format.
 
 Because SVGs are generally smaller than other image format, they’re less taxing on your server despite needing to render on load.
@@ -15,21 +19,16 @@ Some advantages of using SVG:
 - SVGs can be embedded into the HTML which means they can be cached, edited directly using CSS and indexed for greater accessibility.
 - SVGs can be animated directly or by using CSS or JavaScript making it easy for web designers to add interactivity to a site.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
-```
+```python
+# Noncompliant
 img_jpg = "image.jpg"
 ```
 
-## Compliant Solution
-
-```
-img_svg = "image.svg"
-```
-
-## Noncompliant Code Example
-
-```
+```python
+# Noncompliant
 public void foo() {
     // ...
     image_format = testImage("image.jpg")
@@ -37,29 +36,30 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
-
-```
+```python
+# Noncompliant
 public void foo() {
     // ...
-    image_format = testImage("image.svg")
+    return '<html><img src="xx/xx/image.bmp"></html>'
     // ...
 }
 ```
 
-## Noncompliant Code Example
+=== Compliant solution
 
+```python
+img_svg = "image.svg"
 ```
+
+```python
 public void foo() {
     // ...
-    return '<html><img src="xx/xx/image.bmp"></html>'
+    image_format = testImage("image.svg")
     // ...
 }
 ```
 
-## Compliant Solution
-
-```
+```python
 public void foo() {
     // ...
     return '<html><img src="xx/xx/image.svg"></html>'
@@ -67,12 +67,14 @@ public void foo() {
 }
 ```
 
-Or
-
-```
+```python
  public void foo() {
     // ...
     return ('<html><svg width="100" height="100"><circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow"/></svg></html>')
     // ...
 }
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
index 9d3ed8c36..89a3dd333 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
+++ b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use of methods for basic operations",
+  "title": "Methods should not be used for basic operations",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
-}
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
+}
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc b/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
index c42338993..6840caf5d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
@@ -1,13 +1,22 @@
-Use of methods for basic operations
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+Using methods for basic operations consumes additional system resources. The interpreter must in effect and solve the objects and then the methods, just to carry out these simple operations of the language.
+
+== How to fix it
+=== Noncompliant code example
 
 ```php
 $min = min($a, $b);  // Noncompliant
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 $min = $a < $b ? $a : $b;
 ```
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_048 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
index 108041741..79a7ef546 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
+++ b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
@@ -3,7 +3,7 @@
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc b/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
index 51140247f..4dcd9dcf6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
@@ -1,5 +1,7 @@
 :!sectids:
 
+:!sectids:
+
 == Why is this an issue?
 
 SQL queries often involve processing large amounts of data, and fetching a large number of rows can consume significant CPU resources.
@@ -12,7 +14,7 @@ If you store data about customers, you certainly don’t need to retrieve inform
 
 [source,java,data-diff-id="1",data-diff-type="noncompliant"]
 ----
-String query = "SELECT * FROM customers"; // Non-compliant
+String query = "SELECT * FROM customers"; // Noncompliant
 ----
 
 It may therefore be a good idea to limit the results and use pagination, for example.
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc b/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
index 91088487d..7db05ba40 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
@@ -10,11 +10,16 @@ By restricting the result set size, you reduce the amount of data that needs to
 
 If you store data about customers, you certainly don’t need to retrieve information of all at once, because the larger the table will be, the more elements the query will return.
 
+== How to fix it
+=== Noncompliant code example
+
 [source,js,data-diff-id="1",data-diff-type="noncompliant"]
 ----
-const query = "SELECT * FROM customers"; // Non-compliant
+const query = "SELECT * FROM customers"; // Noncompliant
 ----
 
+== Compliant solution
+
 It may therefore be a good idea to limit the results and use pagination, for example.
 
 [source,js,data-diff-id="1",data-diff-type="compliant"]
diff --git a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
index d83e58852..78a83b2d9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
+++ b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
@@ -1,9 +1,9 @@
 {
-  "title": "Do not use an image with empty source attribute",
+  "title": "Image with empty source attribute should not be used",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "LOW"
+      "RELIABILITY": "LOW"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC25/javascript/EC25.asciidoc b/ecocode-rules-specifications/src/main/rules/EC25/javascript/EC25.asciidoc
index fc09083f3..0893e3886 100644
--- a/ecocode-rules-specifications/src/main/rules/EC25/javascript/EC25.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC25/javascript/EC25.asciidoc
@@ -9,18 +9,23 @@ Proper use of the src attribute is essential for web accessibility.
 Screen readers and other assistive technologies rely on valid image sources to provide meaningful information to users with disabilities.
 A missing src attribute can result in confusion and hinder accessibility.
 
+== How to fix it
+=== Noncompliant code example
+
 [source,typescriptjsx,data-diff-id="3",data-diff-type="noncompliant"]
 ----
 return (
   <>
-    <img src="" /> // Non-compliant
-    <img /> // Non-compliant
+    <img src="" /> // Noncompliant
+    <img /> // Noncompliant
   </>
 )
 ----
 
 The HTML specification requires the src attribute for the <img> element, and not including it may lead to non-compliance with standards.
 
+=== Compliant solution
+
 [source,typescriptjsx,data-diff-id="4",data-diff-type="compliant"]
 ----
 import myLogo from "./logo.svg"
@@ -32,7 +37,7 @@ return (
 )
 ----
 
-This rule is build for https://react.dev/[React] and JSX.
+This rule is built for https://react.dev/[React] and JSX.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
index b816b0208..18cb60eb5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
+++ b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
@@ -1,9 +1,9 @@
 {
-  "title": "Prefer shorthand CSS notations to reduce stylesheets size",
+  "title": "Shorthand CSS notations should be used to reduce stylesheets size",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "LOW"
+      "RELIABILITY": "LOW"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc b/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
index 92ca0cd8f..ae140fe27 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
@@ -7,6 +7,10 @@ By reducing the number of CSS properties, you help to reduce the weight of your
 
 For example, the `font` shorthand consolidates various font-related properties, and the `margin` shorthand streamlines the definition of margins around a box.
 
+== How to fix it
+
+=== Noncompliant code example
+
 [source,typescriptjsx,data-diff-id="1",data-diff-type="noncompliant"]
 ----
 <div style={{ marginTop: "1em", marginRight: 0, marginBottom: "2em", marginLeft: "0.5em" }}>
@@ -14,6 +18,8 @@ For example, the `font` shorthand consolidates various font-related properties,
 </div>
 ----
 
+=== Compliant solution
+
 [source,typescriptjsx,data-diff-id="1",data-diff-type="compliant"]
 ----
 <div style={{ margin: "1em 0 2em 0.5em" }}>
@@ -37,7 +43,7 @@ This optimization works for a number of properties https://developer.mozilla.org
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/fc5a1f865bafb196e4775cce8835393751d40ed8/chapters/BP_026_en.md[CNUMR best practices] - Use abbreviated CSS notations
+- https://github.com/cnumr/best-practices/blob/fc5a1f865bafb196e4775cce8835393751d40ed8/chapters/BP_026_en.md[CNumR best practices] - Use abbreviated CSS notations
 - https://developer.mozilla.org/en-US/docs/Web/CSS/Shorthand_properties[Mozilla Web Technology for Developers] - Shorthand properties
 
 === Articles & blog posts
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
index eaa045e90..ac25fff41 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
+++ b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use System.arraycopy to copy arrays",
+  "title": "System.arraycopy should be used to copy arrays",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc b/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
index 455e0a137..91ea4a3a3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
@@ -1,4 +1,6 @@
-Using `System.arraycopy` to copy arrays
+:!sectids:
+
+== Why is this an issue?
 
 Programs spend most of the time in loops. These can be resource consuming, especially when they integrate heavy processing (IO access). Moreover, the size of the data and processing inside the loops will not allow full use of hardware mechanisms such as the cache or compiler optimization mechanisms.
 
@@ -6,9 +8,10 @@ For example, an array copy is potentially a non-performance source if it is poor
 Loops must be optimized to reduce processing time and make full use of hardware and processor mechanisms and optimizations.
 In the case of table copying (table), use the native `System.arraycopy`.
 We can also use `copyOf` or `clone` that are slightly less efficient.
-The looping method will be outlawed.
+The looping method is less efficient.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 int len = array.length;
@@ -19,10 +22,14 @@ for (int i = 0; i < len; i++) {
 return copy;
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 int[] copy = new int[array.length];
 System.arraycopy(array, 0, copy, 0, array.length);
 return copy;
 ```
+
+== Resources
+
+- See https://stackoverflow.com/questions/18638743/is-it-better-to-use-system-arraycopy-than-a-for-loop-for-copying-arrays[StackOverflow #18638743]
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
index c85d2ee51..7181623c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
+++ b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
@@ -1,5 +1,5 @@
 {
-  "title": "Optimize read file exceptions",
+  "title": "Read file exceptions should be optimized",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc b/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
index 841ee9f8c..6d1ac0744 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
@@ -1,22 +1,28 @@
-Optimize read file exception
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+Throwing and handling exceptions is expensive and should not be used for normal program flows.
+
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 public void readPreferences(String filename) {
     //...
     InputStream in = null;
     try {
-    in = new FileInputStream(filename);
+        in = new FileInputStream(filename);
     } catch (FileNotFoundException e) {
-    logger.log(e);
+        logger.log(e);
     }
     in.read(...);
     //...
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void readPreferences(String filename) throws IllegalArgumentException, FileNotFoundException, IOException {
@@ -28,3 +34,7 @@ public void readPreferences(String filename) throws IllegalArgumentException, Fi
     //...
 }
 ```
+
+== Resources
+
+Reference/Validation for this rule is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
index e80a3ca89..01d96ed30 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
+++ b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
@@ -1,9 +1,9 @@
 {
-  "title": "Avoid usage of CSS animations",
+  "title": "CSS animations should be avoided",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc b/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
index 94bec925f..7a03fe5fe 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
@@ -8,11 +8,16 @@ They may consume significant browser resources, leading to slower page rendering
 On mobile devices, constant animations can contribute to increased power consumption, affecting the device's battery life.
 Limiting the usage of CSS animations helps in creating a more energy-efficient and mobile-friendly user experience.
 
+== How to fix it
+=== Noncompliant code example
+
 [source,typescriptjsx,data-diff-id="1",data-diff-type="noncompliant"]
 ----
-<div style={{ border: "1px solid black", transition: "border 2s ease" }}/> // Non-compliant
+<div style={{ border: "1px solid black", transition: "border 2s ease" }}/> // Noncompliant
 ----
 
+=== Compliant solution
+
 [source,typescriptjsx,data-diff-id="1",data-diff-type="compliant"]
 ----
 <div style={{ border: "1px solid black" }}/> // Compliant
@@ -26,7 +31,7 @@ You can also inform the navigator of upcoming changes with the `will-change` ins
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_039_en.md[CNUMR best practices] - Avoid JavaScript / CSS animations
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_039_en.md[CNumR best practices] - Avoid JavaScript / CSS animations
 
 === Articles & blog posts
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
index 33916b15e..7b37df14f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
+++ b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid getting the size of the collection in the loop",
+  "title": "Getting the size of the collection should be avoided inside a loop",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc b/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
index 49fcb223e..9822f9856 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
@@ -1,8 +1,15 @@
-When iterating over any collection, fetch the size of the collection in advance to avoid fetching it on each iteration, this saves CPU cycles, and therefore consumes less power. The example provided below illustrates what should be avoided.
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+When iterating over any collection, fetch the size of the collection in advance to avoid fetching it on each iteration, this saves CPU cycles, and therefore consumes less power.
+
+== How to fix it
+
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 List<String> objList = getData();
 
 for (int i = 0; i < objList.size(); i++) {  // Noncompliant
@@ -10,7 +17,7 @@ for (int i = 0; i < objList.size(); i++) {  // Noncompliant
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 List<String> objList = getData();
@@ -20,3 +27,7 @@ for (int i = 0; i < size; i++) {
     // execute code
 }
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/php/EC3.asciidoc b/ecocode-rules-specifications/src/main/rules/EC3/php/EC3.asciidoc
index 9c4d5bb81..2b03f2cab 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/php/EC3.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC3/php/EC3.asciidoc
@@ -1,10 +1,18 @@
+:!sectids:
+
+== Why is this an issue?
+
 When iterating over any collection, fetch the size of the collection in advance to avoid fetching it on each iteration, this saves CPU cycles, and therefore consumes less power.
 
-NB : note that we are using the `count()` method to get the size of an array but it would work the same with the `sizeof()` and `iterator_count()` methods.
+Note: the `count()` method is used to get the size of an array, but it would be the same with the `sizeof()` and `iterator_count()` methods.
+
+== How to fix it
 
-## Noncompliant Code Example
+=== Noncompliant code example
 
-```php
+[source,php]
+----
+// Noncompliant
 $array = array('orange', 'banana', 'apple', 'carrot', 'collard', 'pea');
 
 // FOR STATEMENTS / Right operand
@@ -44,11 +52,12 @@ do {
 	var_dump($array[$i]);
 	++$i;
 } while (count($array) > $i);
-```
+----
 
-## Compliant Solution
+=== Compliant solution
 
-```php
+[source,php]
+----
 $array = array('orange', 'banana', 'apple', 'carrot', 'collard', 'pea');
 // FOR STATEMENTS / Right operand
 $size = sizeof($array);
@@ -93,4 +102,8 @@ do {
 	var_dump($array[$i]);
 	++$i;
 } while ($size > $i);
-```
+----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
index aad962af3..060ab9982 100644
--- a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
+++ b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
@@ -1,9 +1,9 @@
 {
-  "title": "Provide a print stylesheet",
+  "title": "Print stylesheet should be provided",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "LOW"
+      "RELIABILITY": "LOW"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC30/javascript/EC30.asciidoc b/ecocode-rules-specifications/src/main/rules/EC30/javascript/EC30.asciidoc
index d3127ad7a..bc2f9fee8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC30/javascript/EC30.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC30/javascript/EC30.asciidoc
@@ -9,14 +9,20 @@ This includes adjusting font sizes, hiding unnecessary elements, and optimizing
 Limiting the number of printed pages helps in reducing paper and ink consumption.
 By optimizing the print layout, you can ensure that only essential content is printed, saving resources and contributing to environmental sustainability.
 
+== How to fix it
+
+=== Noncompliant code example
+
 [source,html,data-diff-id="3",data-diff-type="noncompliant"]
 ----
 <head>
   <title>Web Page</title>
-  <link rel="stylesheet" type="text/css" href="styles.css" /> <!-- Non-compliant -->
+  <link rel="stylesheet" type="text/css" href="styles.css" /> <!-- Noncompliant -->
 </head>
 ----
 
+=== Compliant solution
+
 In your HTML file, you can include a link to the print stylesheet inside the <head> section.
 Use the media attribute with a value of "print" to indicate that this stylesheet is specifically for print.
 
@@ -47,7 +53,7 @@ Adjust font sizes, hide unnecessary elements, or make any other modifications su
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_027_en.md[CNUMR best practices] - Provide a print CSS
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_027_en.md[CNumR best practices] - Provide a print CSS
 
 === Articles & blog posts
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
index 5e046d03e..70f360780 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
+++ b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
@@ -1,9 +1,9 @@
 {
-  "title": "Prefer lighter formats for image files",
+  "title": "Lighter formats should be used for image files",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "LOW"
+      "RELIABILITY": "LOW"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc b/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
index 1648173cf..fe5362e25 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
@@ -6,6 +6,17 @@ Using appropriate image formats and optimizing image sizes is essential for impr
 Larger image file sizes consume more bandwidth, increasing the data transfer required to load a web page.
 Some image formats are generally considered better for eco-friendly web design and should be used in most cases.
 
+== How to fix it
+
+=== Noncompliant code example
+
+[source,html,data-diff-id="1",data-diff-type="noncompliant"]
+----
+<img src="./assets/images/cat.jpg" alt="Unoptimized image of a cat"/> // Noncompliant
+----
+
+=== Compliant solution
+
 We recommend using the following formats:
 
 - *WebP*, developed by Google, is a modern image format that provides high compression efficiency without significant loss of quality.
@@ -13,11 +24,6 @@ We recommend using the following formats:
 - *SVG* (Scalable Vector Graphics) is a vector image format that is based on XML.
 Files are lightweight and can be scaled without loss of quality.
 
-[source,html,data-diff-id="1",data-diff-type="noncompliant"]
-----
-<img src="./assets/images/cat.jpg" alt="Unoptimized image of a cat"/> // Non-compliant
-----
-
 [source,html,data-diff-id="1",data-diff-type="compliant"]
 ----
 <img src="./assets/images/cat.webp" alt="Optimized image of a cat"/> // Compliant
@@ -34,7 +40,7 @@ To address this issue, you can supply multiple formats for the same image.
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_080_en.md[CNUMR best practices] - Optimize images
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_080_en.md[CNumR best practices] - Optimize images
 
 === Articles & blog posts
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
index 95e1d7b33..9f70aa74c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
+++ b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
@@ -1,5 +1,5 @@
 {
-  "title": "Initialize builder/buffer with the appropriate size",
+  "title": "String builders should be initialized with the appropriate size",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc b/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
index 00c2ac907..8883b328c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 If you know in advance how many characters would be appended, initialize builder/buffer with the appropriate size.
 They will thus never have to be resized.
 This saves CPU cycles and therefore consumes less energy.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 StringBuilder sb = new StringBuilder(); // Noncompliant
@@ -11,7 +16,7 @@ for (int i = 0; i < 100; i++) {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 StringBuilder sb = new StringBuilder(100);
@@ -19,3 +24,7 @@ for (int i = 0; i < 100; i++) {
     sb.append(...);
 }
 ```
+
+== Resources
+
+- https://docs.oracle.com/en%2Fjava%2Fjavase%2F22%2Fdocs%2Fapi%2F%2F/java.base/java/lang/StringBuilder.html#%3Cinit%3E(int)[StringBuilder javadoc]
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
index 00bc65320..1d8b43332 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
+++ b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using try-catch statement",
+  "title": "Try-catch statement should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc b/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
index 47b8d2e36..421053b2a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
@@ -1,8 +1,14 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Inside complex code parts (for exemple multiple loops, complex data constructions...), avoid using try...catch.
 
 When an exception is thrown, a variable (the exception itself) is created in a catch block and it's destruction consumes unnecessary CPU cycles and RAM. Prefer using logical tests in this cases.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
 try
@@ -16,7 +22,7 @@ catch(Exception $ex)
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 //try
@@ -31,15 +37,19 @@ if (!$picture) {
 }
 ```
 
+== Resources
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622382871_f19da08db4_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc b/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
index d214cf7a1..7e583a5d1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
@@ -1,20 +1,25 @@
+:!sectids:
+
+== Why is this an issue?
+
 Inside complex code parts (for example multiple loops, complex data constructions...), avoid using try...catch.
 
 When an exception is thrown, a variable (the exception itself) is created in a catch block, and it's destruction consumes unnecessary CPU cycles and RAM. Prefer using logical tests in this cases.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
 try:
     f = open(path)
     print(fh.read())
 except:
-    print('No such file '+path
+    print('No such file ' + path)
 finally:
     f.close()
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 if os.path.isfile(path):
@@ -23,3 +28,6 @@ if os.path.isfile(path):
   fh.close
 ```
 
+== Resources
+
+- See also rule EC35 which replaces EC34 for a particular use case (FileNotFoundException).
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
index 719ac25d2..8d505e769 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
+++ b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using try-catch statement with file open operation in try block",
+  "title": "Try-catch statement with file open operation should be avoided in try block",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc b/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
index 60f1e8c0b..80b91db97 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
@@ -1,9 +1,14 @@
+:!sectids:
+
+== Why is this an issue?
+
 Inside complex code parts (for exemple multiple loops, complex data constructions...), avoid using try...catch.
 For the moment, this rule only deals with "file open" use case in try...catch blocks.
 
 When an exception is thrown, a variable (the exception itself) is created in a catch block and it's destruction consumes unnecessary CPU cycles and RAM. Prefer using logical tests in this cases.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
 try
@@ -17,7 +22,7 @@ catch(Exception $ex)
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 //try
@@ -32,15 +37,23 @@ if (!$picture) {
 }
 ```
 
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_047 (no longer exists in edition 4)]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622382871_f19da08db4_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc b/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
index 08fc1f95f..ec260efc1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
@@ -1,21 +1,27 @@
+:!sectids:
+
+== Why is this an issue?
+
 Inside complex code parts (for example multiple loops, complex data constructions...), avoid using try...catch.
 For the moment, this rule only deals with "file open" use case in try...catch blocks.
 
 When an exception is thrown, a variable (the exception itself) is created in a catch block, and it's destruction consumes unnecessary CPU cycles and RAM. Prefer using logical tests in this cases.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
+# Noncompliant
 try:
     f = open(path)
     print(fh.read())
 except:
-    print('No such file '+path
+    print('No such file ' + path)
 finally:
     f.close()
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 if os.path.isfile(path):
@@ -24,3 +30,6 @@ if os.path.isfile(path):
   fh.close
 ```
 
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_047 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
index 1ea236995..726c09260 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
+++ b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
@@ -1,9 +1,9 @@
 {
-  "title": "Avoid autoplay for videos and audio content",
+  "title": "Autoplay should be avoided for video and audio content",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
   },
@@ -15,6 +15,7 @@
   "tags": [
     "ecocode",
     "eco-design",
+    "performance",
     "video",
     "audio"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc b/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
index 41059f3dc..438590a1f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
@@ -11,25 +11,33 @@ However, even without autoplay, segments of video or audio files might still dow
 This leads to unnecessary data usage, especially if users don't commence playback.
 To mitigate this, it's crucial to prevent browsers from preloading any content by configuring the appropriate settings.
 
-Video:
+== How to fix it in video
+
+=== Noncompliant code example
 
 [source,html,data-diff-id="1",data-diff-type="noncompliant"]
 ----
-<video src="videofile.webm" autoplay></video> // Non-compliant
+<video src="videofile.webm" autoplay></video> // Noncompliant
 ----
 
+=== Compliant solution
+
 [source,html,data-diff-id="1",data-diff-type="compliant"]
 ----
 <video src="videofile.webm" preload="none"></video> // Compliant
 ----
 
-Audio:
+== How to fix it in audio
+
+=== Noncompliant code example
 
 [source,html,data-diff-id="1",data-diff-type="noncompliant"]
 ----
-<audio controls src="audiofile.mp3" autoplay></audio> // Non-compliant
+<audio controls src="audiofile.mp3" autoplay></audio> // Noncompliant
 ----
 
+=== Compliant solution
+
 [source,html,data-diff-id="1",data-diff-type="compliant"]
 ----
 <audio controls src="audiofile.mp3" preload="none"></audio> // Compliant
@@ -39,7 +47,7 @@ Audio:
 
 === Documentation
 
-- https://github.com/cnumr/best-practices/blob/main/chapters/BP_4003_en.md[CNUMR best practices] - Avoid autoplay for videos and audio content
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_4003_en.md[CNumR best practices] - Avoid autoplay for videos and audio content
 
 === Articles & blog posts
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
index 0cf5108bd..299ed5af0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
+++ b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using global variables",
+  "title": "Global variables should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/php/EC4.asciidoc b/ecocode-rules-specifications/src/main/rules/EC4/php/EC4.asciidoc
index 94021a9e6..985897a51 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/php/EC4.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC4/php/EC4.asciidoc
@@ -1,10 +1,19 @@
+:!sectids:
+
+== Why is this an issue?
+
 Prefer local variables as parameters
 
-When calling a global variable, the interpretation engine must check that it exists in all the scopes, that it has a value, etc. Passing global variables as arguments gives them the status of local variables inside the function, thus saving computing time (CPU cycles).
+When calling a global variable, the interpretation engine must check that it exists in all the scopes, that it has a value, etc.
+Passing global variables as arguments gives them the status of local variables inside the function, thus saving computing time (CPU cycles).
+
+== How to fix it
 
-## Noncompliant Code Example
+=== Noncompliant code example
 
-```php
+[source,php]
+----
+// Noncompliant
 var aGlobal = new String('Hello');
 
 function globalLength(){
@@ -13,11 +22,12 @@ function globalLength(){
 }
 
 globalLength();
-```
+----
 
-## Compliant Solution
+=== Compliant solution
 
-```php
+[source,php]
+----
 var aGlobal = new String('Hello');
 
 function someVarLength(str){
@@ -26,4 +36,8 @@ function someVarLength(str){
 }
 
 somVarLength(aGlobal);
-```
+----
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_050 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/python/EC4.asciidoc b/ecocode-rules-specifications/src/main/rules/EC4/python/EC4.asciidoc
index b777840a9..722a68901 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/python/EC4.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC4/python/EC4.asciidoc
@@ -1,24 +1,37 @@
+:!sectids:
+
+== Why is this an issue?
+
 When function calls global variables, a lot a CPU cycles is consumed.
 
-## Noncompliant Code Example
+== How to fix it
+
+=== Noncompliant code example
 
-```python
+[source,python]
+----
+# Noncompliant
 global_var = 'foo'
 def print_global_var_details():
     print(len(global_var)) # Noncompliant
     print('Global var : ', global_var) # Noncompliant
     print('Global var : ' + global_var) # Noncompliant
 print_global_var_details()
-```
+----
 
-## Compliant Solution
+=== Compliant solution
 
-```python
-global_var = 'foo';
+[source,python]
+----
+global_var = 'foo'
 def print_var_details(local_var) {
-    print(len(local_var));
+    print(len(local_var))
     print('Var : ', local_var)
     print('Var : ' + local_var)
 }
-print_length(global_var);
-```
+print_length(global_var)
+----
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_050 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
index c04d919d3..ab4be1b08 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
+++ b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use generator comprehension instead of list comprehension in for loop declaration",
+  "title": "Generator comprehension should be used instead of list comprehension in for loop declaration",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
index 4a0738f9f..d37d6e208 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
@@ -1,20 +1,26 @@
-Use generator comprehension instead of list comprehension in for loop declaration.
+:!sectids:
 
-Python generators resemble lazy lists from other programming languages: when iterated over, they compute their values on the fly. They lack some list behaviors (indexing, len method, ...) but are memory-efficient, as they do not store each of their values in memory, unlike lists. Thus, when declared in a for-loop declaration, list comprehensions can be safely replaced with generator comprehensions.
+== Why is this an issue?
 
-For more details on list comprehensions vs generator comprehensions, see https://docs.python.org/3/howto/functional.html#generator-expressions-and-list-comprehensions[Python documentation].
+Python generators resemble lazy lists from other programming languages: when iterated over, they compute their values on the fly. They lack some list behaviors (indexing, len method, ...) but are memory-efficient, as they do not store each of their values in memory, unlike lists. Thus, when declared in a for-loop declaration, list comprehensions can be safely replaced with generator comprehensions.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
+# Noncompliant
 for var in [var2 for var2 in range(100)]:
     ...
 
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 for var in (var2 for var2 in range(100)):
     ...
 ```
+
+== Resources
+
+For more details on list comprehensions vs generator comprehensions, see https://docs.python.org/3/howto/functional.html#generator-expressions-and-list-comprehensions[Python documentation].
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
index 6629e0943..2ac3540eb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
+++ b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use PreparedStatement instead of Statement",
+  "title": "PreparedStatement should be used instead of Statement",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc b/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
index 229a3503d..e3e90d736 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
@@ -1,6 +1,11 @@
-Use `PreparedStatement` instead of `Statement`, because SQL will only commit the query once, whereas if you used only one statement, it would commit the query every time and thus induce unnecessary calculations by the CPU and therefore superfluous energy consumption.
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+Use `PreparedStatement` instead of `Statement`, because SQL will only commit the query once, whereas if only one statement is used, it would commit the query every time and thus induce unnecessary calculations by the CPU and therefore superfluous energy consumption.
+
+== How to fix it
+=== Noncompliant code example
 
 ```java
 public void select() {
@@ -9,7 +14,7 @@ public void select() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void select() {
@@ -20,3 +25,7 @@ public void select() {
     statement.executeQuery();
 }
 ```
+
+== Resources
+
+- https://www.baeldung.com/java-statement-preparedstatement[Difference Between Statement and PreparedStatement]
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
index 87aae031c..506324b84 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
+++ b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
@@ -8,11 +8,17 @@
   },
   "tags": [
     "batch",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc b/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
index 951822492..84de25491 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
@@ -1,10 +1,15 @@
+:!sectids:
+
+== Why is this an issue?
+
 With `SensorManager#registerListener(SensorEventListener, Sensor, int)` the events are delivered as soon as possible.
 
 Instead, `SensorManager#registerListener(SensorEventListener, Sensor, int, int maxReportLatencyUs)` allows events to stay temporarily in the hardware FIFO (queue) before being delivered. The events can be stored in the hardware FIFO up to `maxReportLatencyUs` microseconds.
 
 Once one of the events in the FIFO needs to be reported, all the events in the FIFO are reported sequentially. Setting `maxReportLatencyUs` to a positive value allows to reduce the number of interrupts the AP (Application Processor) receives, hence reducing power consumption, as the AP can switch to a lower power state while the sensor is capturing the data.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 SensorEventListener sensorEventListener;
@@ -14,7 +19,7 @@ Sensor sensor;
 sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 SensorEventListener sensorEventListener;
@@ -23,3 +28,7 @@ Sensor sensor;
 
 sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL, 200000);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
index 169e1f742..04a684088 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
+++ b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
@@ -1,5 +1,5 @@
 {
-  "title": "Batch: Job Coalesce",
+  "title": "Job Scheduler should be used instead of Alarm Manager",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "batch",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc b/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
index 84062dbab..c51e2dceb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
@@ -1,12 +1,18 @@
+:!sectids:
+
+== Why is this an issue?
+
 The Android 5.0 Lollipop (API 21) release introduces a job scheduler API via the Job Scheduler class.
 
 Compared to a custom Sync Adapter or the alarm manager, the Job Scheduler supports batch scheduling of jobs.
 
 The Android system can combine jobs so that battery consumption is reduced.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 void setAlarm(Context context) {
     AlarmManager alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
     Intent intent = new Intent(context, Alarm.class);
@@ -18,7 +24,7 @@ Alarm alarm = new Alarm();
 alarm.setAlarm(this);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 JobInfo info = new JobInfo.Builder(123, COMPONENT_NAME)
@@ -30,3 +36,7 @@ JobInfo info = new JobInfo.Builder(123, COMPONENT_NAME)
 JobScheduler scheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
 scheduler.schedule(info);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
index 786b0dc7a..8b0666cdc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
+++ b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
@@ -1,5 +1,5 @@
 {
-  "title": "Bottleneck: Internet In The Loop",
+  "title": "Internet connections should not be opened continuously ",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,12 +7,18 @@
     "constantCost": "3h"
   },
   "tags": [
-    "optimized-api",
-    "environment",
+    "bottleneck",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.2",
-  "defaultSeverity": "Critical"
+  "defaultSeverity": "Critical",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "HIGH"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc b/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
index c645aaf93..5dd5d8c31 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
@@ -1,11 +1,25 @@
+:!sectids:
+
+== Why is this an issue?
+
 Opening and closing internet connection continuously is extremely battery-inefficient since HTTP exchange is the most consuming operation of the network. This bug typically occurs when one obtain a new `HttpURLConnection` by calling `URL#openConnection()`  within a loop control structure (while, for, do-while, for-each).
 
 Also, this bad practice must be early prevented because it is the root of another evil that consists in polling data at regular intervals, instead of using push notifications to save a lot of battery power.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 for (int val : myArray) {
     URL.openConnection();
 }
 ```
+
+=== Compliant solution
+
+Do not open connections continuously.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
index 27bc96daa..66e05a144 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
+++ b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
@@ -1,5 +1,5 @@
 {
-  "title": "Bottleneck: Wifi Multicast Lock",
+  "title": "Wifi Multicast Lock should be released",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "bottleneck",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.6",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc b/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
index 674011019..32cbe735e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
@@ -1,16 +1,22 @@
+:!sectids:
+
+== Why is this an issue?
+
 Normally the Wi-Fi stack filters out packets not explicitly addressed to the device. Acquiring a Multicast Lock with `WifiManager.MulticastLock.acquire()` will cause the stack to receive packets addressed to multicast addresses.
 
 Processing these extra packets can cause a noticeable battery drain and must be disabled when not needed with to a call to `WifiManager.MulticastLock.release()`.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 WifiManager.MulticastLock lock = wifiManager.createMulticastLock("tag");
 lock.acquire();
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
@@ -18,3 +24,7 @@ WifiManager.MulticastLock lock = wifiManager.createMulticastLock("tag");
 lock.acquire();
 lock.release()
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
index ee1782089..bbf77b40b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
+++ b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
@@ -1,5 +1,5 @@
 {
-  "title": "Bottleneck: Uncompressed Data Transmission",
+  "title": "Data transmission should use compression",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "bottleneck",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc b/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
index 80f67b532..0f6ef621d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 Transmitting a file over a network infrastructure without compressing it consumes more energy than with compression. More precisely, energy efficiency is improved in case the data is compressed at least by 10%, transmitted and decompressed at the other network node. From the Android client side, it means making a post HTTP request using a `GZIPOutputStream` instead of the classical OutputStream, along with the `HttpURLConnection` object.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 Url url = new Url("https://www.ecocode.io/");
@@ -8,10 +13,14 @@ HttpsUrlConnection con = (HttpsURLConnection) url.openConnection();
 OutputStream stream = con.getOutputStream();
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 Url url = new Url("https://www.ecocode.io/");
 HttpsUrlConnection con = (HttpsURLConnection) url.openConnection();
 OutputStream stream = new GZIPOutputStream(con.getOutputStream());
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
index b7a63c78b..963e8ee83 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
+++ b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
@@ -8,12 +8,18 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.6",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
index 8cb61fe1e..a0b366424 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
@@ -1,9 +1,28 @@
+:!sectids:
+
+Bad practise includes:
+
+- using `FLAG_KEEP_SCREEN_ON` in activity
+- using the `android:keepScreenOn` attribute in application's layout XML file
+
+== Why is this an issue?
+
 To avoid draining the battery, an Android device that is left idle quickly falls asleep.
 
-Hence, keeping the screen on should be avoided, unless it is absolutely necessary. If so, developers typically use the `FLAG_KEEP_SCREEN_ON` in their activity. Another way to implement this is in their application's layout XML file, by using the `android:keepScreenOn` attribute.
+Hence, keeping the screen on should be avoided, unless it is absolutely necessary.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 getWindow().addFlags(FLAG_KEEP_SCREEN_ON);
 ```
+
+=== Compliant solution
+
+Do not use `FLAG_KEEP_SCREEN_ON` in activity or `android:keepScreenOn` in XML.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
index 17999dc22..288823382 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
@@ -1,11 +1,23 @@
+:!sectids:
+
+== Why is this an issue?
+
 To avoid draining the battery, an iOS device that is left idle quickly falls asleep.
 
-Hence, keeping the screen on should be avoided, unless it is absolutely necessary. If so, developers typically
+Hence, keeping the screen on should be avoided, unless it is absolutely necessary. Developers typically
 disable the idle timer with `UIApplication.shared.isIdleTimerDisabled = true`.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```swift
 UIApplication.shared.isIdleTimerDisabled = true
 ```
 
+=== Compliant solution
+
+Do not disable idle timer.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
index ddb1cf0c0..ca8981044 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
@@ -1,19 +1,23 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 To avoid draining the battery, an Android device that is left idle quickly falls asleep.
 
 Hence, keeping the screen on should be avoided, unless it is absolutely necessary. If so, developers typically use the `FLAG_KEEP_SCREEN_ON` in their activity. Another way to implement this is in their application's layout XML file, by using the `android:keepScreenOn` attribute.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:keepScreenOn="true"/>
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```xml
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -21,3 +25,7 @@ android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:keepScreenOn="false"/>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
index 02149cb73..09d540491 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
+++ b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
@@ -8,11 +8,18 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.6",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  },
+
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc b/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
index b047c41cc..065d75d7b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
@@ -1,9 +1,19 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 To avoid draining the battery, an Android device that is left idle quickly falls asleep.
 
 Hence, keeping the screen on should be avoided, unless it is absolutely necessary. If so, developers typically use the `FLAG_KEEP_SCREEN_ON` in their activity. Another way to implement this is in their application's layout XML file, by using the `android:keepScreenOn` attribute.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 getWindow().setFlags(FLAG_KEEP_SCREEN_ON, FLAG_KEEP_SCREEN_ON);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
index e8c97bac2..3aaa70f6b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
+++ b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Keep Cpu On",
+  "title": "Wake locks should not be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc b/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
index a1a8362d5..ba30469ae 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
@@ -1,10 +1,19 @@
+:!sectids:
+
+== Why is this an issue?
+
 To avoid draining the battery, an Android device that is left idle quickly falls asleep. Hence, keeping the CPU on should be avoided, unless it is absolutely necessary.
 
-If so, developers typically use a Power Manager system service feature called wake locks by invoking `PowerManager.WakeLock#newWakeLock(int levelAndFlags, String tag)`, along with the specific permission `WAKE_LOCK` in their manifest.
+The bad practise includes using a Power Manager system service feature called wake locks by invoking `PowerManager.WakeLock#newWakeLock(int levelAndFlags, String tag)`, along with the specific permission `WAKE_LOCK` in their manifest.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
 WakeLock manager = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TAG");
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc b/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
index b3b66f946..ad6afc65e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
@@ -1,17 +1,25 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 To avoid draining the battery, an Android device that is left idle quickly falls asleep.
 
 Hence, keeping the screen on should be avoided, unless it is absolutely necessary.
 
-If so, developers typically use a Power Manager system service feature called wake locks
+Bad practise includes using a Power Manager system service feature called wake locks
 by invoking `PowerManager.WakeLock#newWakeLock(int levelAndFlags, String tag)`,
-along with the specific permission `WAKE_LOCK` in their manifest.
+along with the specific permission `WAKE_LOCK` in the manifest.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <manifest>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 </manifest>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
index 10d100572..d864ca6c7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
+++ b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
@@ -8,11 +8,18 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  },
+
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc b/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
index 98bf682f7..bb9f7a03a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
@@ -1,17 +1,29 @@
+:!sectids:
+
+== Why is this an issue?
+
 A wake lock is a mechanism to indicate that your application needs to have the device stay on. The general principle is to obtain a wake lock, acquire it and finally release it.
 
 Hence, the challenge here is to release the lock as soon as possible to avoid running down the device's battery excessively. Missing call to `PowerManager#release()` is a built-in check of Android lint (_Wakelock_ check) but that does not prevent abuse of the lock over too long a period of time.
 
 This can be avoided by a call to `PowerManager#acquire(long timeout)` instead of `PowerManager#acquire()`, because the lock will be released for sure after the given timeout expires.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 PowerManager.acquire()
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 PowerManager.acquire(long timeout)
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
index dfe4b3eaf..9b0adf81e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
+++ b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Rigid Alarm",
+  "title": "Rigid alarms should not be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,12 +8,18 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc b/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
index a477697e7..17edf9536 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
@@ -1,10 +1,15 @@
+:!sectids:
+
+== Why is this an issue?
+
 Applications are strongly discouraged from using exact alarms unnecessarily as they reduce the OS's ability to minimize battery use (i.e. Doze Mode).
 
 For most apps prior to API 19, `setInexactRepeating()` is preferable over `setRepeating()`. When you use this method, Android synchronizes multiple inexact repeating alarms and fires them at the same time, thus reducing the battery drain.
 
 Similarly after API 19, `setExact()` and `setExactAndAllowWhileIdle()` can significantly impact the power use of the device when idle, so they should be used with care. High-frequency alarms are also bad for battery life but this is already checked by Android lint (ShortAlarm built-in check).
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
@@ -23,9 +28,15 @@ AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_S
 alarmManager.setExactAndAllowWhileIdle(type,triggerAtMilllis,operation);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setInexactRepeating(alarmType, triggerAtMillis, intervalMillis, operation);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc b/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
index 3663db78d..84b7ab577 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
@@ -1,14 +1,25 @@
+:!sectids:
+
+== Why is this an issue?
+
 Setting a tolerance for timers will allow them to fire later than the scheduled fire date. The system will use this flexibility to shift the execution of timers by small amounts of time, within their tolerances, increasing the ability to optimize power savings. Your app can set the `Timer#tolerance` property to specify a tolerance for a timer. Using this approach dramatically increases the amount of time that the processor spends idling while users detect no change in system responsiveness.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```swift
 let timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in }
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```swift
 let timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in }
 timer.tolerance = 0.5
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
index d09f88864..aeb65d39d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
+++ b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Continuous Rendering",
+  "title": " Continuous Rendering should not be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc b/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
index 9d12df018..ff2d8a959 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
@@ -1,15 +1,27 @@
+:!sectids:
+
+== Why is this an issue?
+
 For developers wishing to display OpenGL rendering, when choosing the rendering mode with `GLSurfaceView#setRenderMode(int renderMode)`, using `RENDERMODE_WHEN_DIRTY` instead of `RENDERMODE_CONTINUOUSLY` (by default) can improve battery life and overall system performance by allowing the GPU and CPU to idle when the view does not need to be updated.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 GLSurfaceView surfaceView = new GLSurfaceView(this);
 surfaceView.setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY)
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 GLSurfaceView surfaceView = new GLSurfaceView(this);
 surfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY)
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
index 14cccf094..f9232da6a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
+++ b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Keep Voice Awake",
+  "title": "Voice interactions should not be kept awake",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "idleness",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc b/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
index c911421da..61bdc2749 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
@@ -1,23 +1,36 @@
+:!sectids:
+
+== Why is this an issue?
+
 During a voice interaction session, `VoiceInteractionSession#setKeepAwake(boolean keepAwake)` allows to decide whether it will keep the device awake while it is running a voice activity.
 
 By default, the system holds a wake lock for it while in this state, so that it can work even if the screen is off. Setting this to `false` removes that wake lock, allowing the CPU to go to sleep and hence does not let this continue to drain the battery.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
 ```
 
 or
 
 ```java
+// Noncompliant
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
 voiceSession.setKeepAwake(true);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
 voiceSession.setKeepAwake(false);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
index 4f9481425..d4567510b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
+++ b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
@@ -1,5 +1,5 @@
 {
-  "title": "Leakage: Camera Leak",
+  "title": "Camera should be released",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,10 +8,10 @@
   },
   "tags": [
     "leakage",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.2",
   "defaultSeverity": "Critical"
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc b/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
index 782c35274..b186a56bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
@@ -1,20 +1,30 @@
+:!sectids:
+
+== Why is this an issue?
+
 Most Android-powered devices have built-in sensors that measure motion, orientation, and various environmental conditions.
     In addition to these are the image sensor (a.k.a. Camera) and the geo-positioning sensor (a.k.a. GPS).
 
 The common point of all these sensors is that they are expensive while in use. Their common bug is to let the sensor unnecessarily process data when the app enters an idle state, typically when paused or stopped.
 
-    Consequently, calls must be carefully pairwised: `Camera.open()/Camera.release()`.
+    Consequently, calls must be carefully paired: `Camera.open()/Camera.release()`.
     Failing to do so can drain the battery in just a few hours.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 Camera camera = Camera.open();
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 Camera camera = Camera.open();
 camera.release();
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
index 62ae8ab4d..7153387ef 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
+++ b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
@@ -1,5 +1,5 @@
 {
-  "title": "Leakage: Location Leak",
+  "title": "Location Sensor should not leak",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "leakage",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.2",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc b/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
index cdc8b59a1..ffc0ba3bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Most Android-powered devices have built-in sensors that measure motion, orientation, and various environmental conditions.
     In addition to these are the image sensor (a.k.a. Camera) and the geo-positioning sensor (a.k.a. GPS).
 
@@ -7,17 +11,22 @@ The common point of all these sensors is that they are expensive while in use. T
 
     Failing to do so can drain the battery in just a few hours.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000L, 1.0f, this);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000L, 1.0f, this);
 locationManager.removeUpdates(this);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc b/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
index efcb0b784..ff04c7c44 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Most iOS devices come equipped with a variety of sensors that measure motion, orientation, and various environmental conditions.
 In addition to these, the devices include advanced sensors such as the image sensor (commonly referred to as the Camera) and the geo-positioning sensor (commonly referred to as GPS).
 
@@ -6,7 +10,8 @@ The common point of all these sensors is that they are power-intensive while in
     Consequently, calls must be carefully paired: `CLLocationManager.startUpdatingLocation()` and `CLLocationManager.stopUpdatingLocation()`.
     Failing to do so can drain the battery in just a few hours.
 
-== Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 [source,swift]
 ----
@@ -30,7 +35,7 @@ class LocationTracker: NSObject, CLLocationManagerDelegate {
 }
 ----
 
-== Compliant Code Example
+=== Compliant solution
 
 [source,swift]
 ----
@@ -55,3 +60,7 @@ class LocationTracker: NSObject, CLLocationManagerDelegate {
     }
 }
 ----
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
index 7d3fbc451..71404fa48 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
+++ b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
@@ -1,5 +1,5 @@
 {
-  "title": "Leakage: SensorManager Leak",
+  "title": "Sensor Manager should not leak",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "leakage",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.2",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc b/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
index 2f06dd287..98b481a01 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Most Android-powered devices have built-in sensors that measure motion, orientation, and various environmental conditions.
     In addition to these are the image sensor (a.k.a. Camera) and the geo-positioning sensor (a.k.a. GPS).
 
@@ -6,7 +10,8 @@ The common point of all these sensors is that they are expensive while in use. T
     Consequently, calls must be carefully pairwised: `SensorManager#registerListener()/unregisterListener()`.
     Failing to do so can drain the battery in just a few hours.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
@@ -14,7 +19,7 @@ Sensor accelerometer = sManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 sManager.registerListener(this,accelerometer,SensorManager.SENSOR_DELAY_NORMAL);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
@@ -22,3 +27,7 @@ Sensor accelerometer = sManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 sManager.registerListener(this,accelerometer,SensorManager.SENSOR_DELAY_NORMAL);
 sManager.unregisterListener(this);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc b/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
index 37eb6dcb4..7cddb4a85 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Most iOS devices have built-in sensors that measure motion, orientation, and various environmental conditions. Additionally, they have image sensors (a.k.a. Camera) and geo-positioning sensors (a.k.a. GPS).
 
 The common point of all these sensors is that they consume significant power while in use. Their common issue is processing data unnecessarily when the app is in an idle state, typically when it enters the background or becomes inactive.
@@ -5,7 +9,8 @@ The common point of all these sensors is that they consume significant power whi
     Consequently, calls to start and stop sensor updates must be carefully managed for motion sensor: CMMotionManager#startAccelerometerUpdates()/CMMotionManager#stopAccelerometerUpdates().
     Failing to do so can drain the battery quickly.
 
-== Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 [source,swift]
 ----
@@ -22,7 +27,7 @@ func startMotionUpdates() {
 }
 ----
 
-== Compliant Code Example
+=== Compliant solution
 
 [source,swift]
 ----
@@ -44,3 +49,7 @@ func stopMotionUpdates() {
     }
 }
 ----
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
index 8fd81725b..759c6ad94 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
+++ b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
@@ -1,5 +1,5 @@
 {
-  "title": "Leakage: Media Leak (MediaRecorder)",
+  "title": "Media Recorder should be released",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "leakage",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc b/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
index 2053d051b..75c376d83 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
@@ -1,16 +1,26 @@
+:!sectids:
+
+== Why is this an issue?
+
 Creation of a Media Recorder object with `new MediaRecorder()` is used to record audio and video. Class own a `release()` method.
 
 In addition to unnecessary resources (such as memory and instances of codecs) being held, failure to call this method immediately if a media object is no longer needed may also lead to continuous battery consumption for mobile devices.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 MediaRecorder mr = new MediaRecorder();
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 MediaRecorder mr = new MediaRecorder();
 mr.release();
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc b/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
index 3770fdedd..317873912 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
@@ -1,12 +1,17 @@
+:!sectids:
+
+== Why is this an issue?
+
 Creation of an `AVAudioRecorder` object is used to record audio. These class has a method to stop recording and release resources.
 
 In addition to unnecessary resources (such as memory and instances of codecs) being held, failure to properly stop and release these object if it is no longer needed may also lead to continuous battery consumption for mobile devices.
 
-
-== Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 [source,swift]
 ----
+// Noncompliant
 import AVFoundation
 
 var audioRecorder: AVAudioRecorder?
@@ -28,7 +33,7 @@ func startRecording() {
 }
 ----
 
-== Compliant Solution
+== Compliant solution
 
 [source,swift]
 ----
@@ -59,3 +64,7 @@ func stopRecording() {
     }
 }
 ----
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
index b6ebfa5f2..6bda872b9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
+++ b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
@@ -1,5 +1,5 @@
 {
-  "title": "Leakage: Media Leak (MediaPlayer)",
+  "title": "Media Player should be released",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "leakage",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc b/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
index e59c5a2ed..b971f36f8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
@@ -1,16 +1,26 @@
-Creation of a Media Player object with `new MediaPlayer()` can be used to control playback of audio/video files and streams. Class own a`release()` method.
+:!sectids:
 
-In addition to unnecessary resources (such as memory and instances of codecs) being held, failure to call this method immediately if a media object is no longer needed may also lead to continuous battery consumption for mobile devices.
+== Why is this an issue?
 
-## Noncompliant Code Example
+Creation of a Media Player object with `new MediaPlayer()` can be used to control playback of audio/video files and streams. `release()` method should be used.
+
+Otherwise, in addition to unnecessary resources (such as memory and instances of codecs) being held, failure to call this method immediately if a media object is no longer needed may also lead to continuous battery consumption for mobile devices.
+
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 MediaPlayer mp = new MediaPlayer();
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 MediaPlayer mp = new MediaPlayer();
 mp.release();
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
index 7c263b9f8..60f0f93b6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
+++ b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
@@ -1,5 +1,5 @@
 {
-  "title": "Optimized API: Fused Location",
+  "title": "Fused Location should be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "optimized-api",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.6",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc b/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
index 03a404866..251564892 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
@@ -1,15 +1,24 @@
+:!sectids:
+
+== Why is this an issue?
+
 The fused location provider is one of the location APIs in Google Play services which combines signals from GPS, Wi-Fi, and cell networks, as well as accelerometer, gyroscope, magnetometer and other sensors. It is officially recommended to maximize battery life.
 
 Thus, developer has to set up Google Play Service in her gradle file with a dependency to `com.google.android.gms:play-services-location:x.y.z`, and then to import from `com.google.android.gms.location` instead of the `android.location` package of the SDK.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 import android.location.*;
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 import com.google.android.gms.location.*;
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
index 87d28f50a..11076a4c6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
+++ b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
@@ -1,5 +1,5 @@
 {
-  "title": "Optimized API: Bluetooth Low-Energy",
+  "title": "Bluetooth Low-Energy should be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "optimized-api",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.6",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc b/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
index 805dd1e46..7be3e3132 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
@@ -1,15 +1,26 @@
+:!sectids:
+
+== Why is this an issue?
+
 In contrast to classic Bluetooth, Bluetooth Low Energy (BLE) is designed to provide significantly lower power consumption. Its purpose is to save energy on both paired devices but very few developers are aware of this alternative API.
 
 From the Android client side, it means append `android.bluetooth.le.\*` imports to `android.bluetooth.*` imports in order to benefits from low-energy features.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 import android.bluetooth.*
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 import android.bluetooth.le.*
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
index 890ce700c..193a8b3c7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
+++ b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
@@ -1,5 +1,5 @@
 {
-  "title": "Power: Charge Awareness",
+  "title": "App should be aware of charge status",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,12 +8,18 @@
   },
   "tags": [
     "power",
-    "environment",
     "ecocode",
     "android",
     "eco-design",
+    "performance",
     "ios"
   ],
   "ecoScore": "1.0",
-  "defaultSeverity": "Info"
+  "defaultSeverity": "Info",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
index 1bdc27c6e..1e91bd227 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
@@ -1,8 +1,21 @@
-It's always good that an app has different behavior when device is connected/disconnected to a power station, or has different battery levels.
+:!sectids:
+
+== Why is this an issue?
+
+An app should have a different behavior when device is connected/disconnected to a power station, or has different battery levels.
 
 One can monitor the changes in charging state with a broadcast receiver registered on the actions `ACTION_POWER_CONNECTED` and `ACTION_POWER_DISCONNECTED`, or monitor significant changes in battery level with a broadcast receiver registered on the actions `BATTERY_LOW` and `BATTERY_OKAY`.
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code example
+
+```java
+// Noncompliant
+// No IntentFilter for power charge status
+```
+
+=== Compliant solution
 
 ```java
 new IntentFilter(Intent.ACTION_POWER_CONNECTED)
@@ -25,3 +38,9 @@ Or
 ```java
 new IntentFilter(Intent.ACTION_POWER_BATTERY_LOW)
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
index 906ee3872..b50534b73 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
@@ -1,8 +1,21 @@
-It's always good that an app has different behavior when device is connected/disconnected to a power station, or has different battery levels. Your app can query the `UIDevice#batteryLevel` and `UIDevice#batteryState` properties at any time to determine the level of charge and the state of the battery.
+:!sectids:
+
+== Why is this an issue?
+
+An app should have a different behavior when device is connected/disconnected to a power station, or has different battery levels. Your app can query the `UIDevice#batteryLevel` and `UIDevice#batteryState` properties at any time to determine the level of charge and the state of the battery.
 
 Your app can also register to receive notifications when the battery level or state changes, using `batteryLevelDidChangeNotification` and `batteryStateDidChangeNotification`.
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code sample
+
+```swift
+// Noncompliant
+// No handling of power charge status
+```
+
+=== Compliant solution
 
 ```swift
 let level = UIDevice.current.batteryLevel
@@ -25,3 +38,10 @@ or
 ```swift
 NotificationCenter.default.addObserver(forName: UIDevice.batteryStateDidChangeNotification, object: nil, queue: nil) { _ in }
 ```
+
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
index 9d1ebf6cb..e4f5b7229 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
@@ -1,8 +1,19 @@
-Score ecoCode: 5sur5
+:!sectids:
 
-It's always good that an app has different behavior when device is connected/disconnected to a power station, or has different battery levels. One can monitor the changes in charging state with a broadcast receiver registered on the actions `ACTION_POWER_CONNECTED` and `ACTION_POWER_DISCONNECTED`, or monitor significant changes in battery level with a broadcast receiver registered on the actions `BATTERY_LOW` and `BATTERY_OKAY`.
+== Why is this an issue?
 
-## Compliant Code Example
+An app should have a different behavior when device is connected/disconnected to a power station, or has different battery levels. One can monitor the changes in charging state with a broadcast receiver registered on the actions `ACTION_POWER_CONNECTED` and `ACTION_POWER_DISCONNECTED`, or monitor significant changes in battery level with a broadcast receiver registered on the actions `BATTERY_LOW` and `BATTERY_OKAY`.
+
+== How to fix it
+
+=== Noncompliant code example
+
+```xml
+// Noncompliant
+// No intent for power charge status
+```
+
+=== Compliant solution
 
 ```xml
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
@@ -41,3 +52,9 @@ or
     </intent-filter>
 </receiver>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
index 7c1c87033..04dbc2843 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
+++ b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
@@ -1,5 +1,5 @@
 {
-  "title": "Power: Save Mode Awareness",
+  "title": "Save Mode should be taken into account",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,12 +8,18 @@
   },
   "tags": [
     "power",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "1.0",
-  "defaultSeverity": "Info"
+  "defaultSeverity": "Info",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
index d4e3c166c..569de2b85 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
@@ -1,8 +1,27 @@
+:!sectids:
+
+== Why is this an issue?
+
 Taking into account when the device is entering or exiting the power save mode is higly desirable for the battery life.
 
 It implies the existence of a broadcast receiver registered on the action `ACTION_POWER_SAVE_MODE_CHANGED`, or programmaticaly with a call to `PowerManager#isPowerSaveMode().`
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code example
+
+```java
+IntentFilter filter3 = new IntentFilter(ACTION_BATTERY_CHANGED); // Noncompliant
+IntentFilter filter4 = new IntentFilter(PING_ALARM_ACTION);
+
+IntentFilter.create(ACTION_BATTERY_CHANGED, "");// Noncompliant 
+IntentFilter.create("foo", "application/blatz");
+
+filter3.addAction(ACTION_BATTERY_CHANGED);// Noncompliant
+filter4.addAction("android.provider.Telephony.SMS_RECEIVED");
+```
+
+=== Compliant solution
 
 ```java
 new IntentFilter(Intent.ACTION_POWER_SAVE_MODE_CHANGED)
@@ -25,3 +44,7 @@ Or
 ```java
 powerManager.isPowerSaveMode()
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
index ba002a0e1..8a80e0aba 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
@@ -1,10 +1,23 @@
+:!sectids:
+
+== Why is this an issue?
+
 Use device API to check if low power mode is enabled, and adapt resources usage accordingly.
 
 For example, you can reduce frequency of data update if low power mode is enabled.
 
 Your app can query the `ProcessInfo.processInfo.isLowPowerModeEnabled` property at any time to determine whether Low Power Mode is active. Your app can also register to receive notifications when the Low Power Mode state of a device changes, using `NSProcessInfoPowerStateDidChange`.
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code sample
+
+```swift
+// Noncompliant
+// No handling of power mode
+```
+
+=== Compliant solution
 
 ```swift
 let isLowPowerModeEnabled = ProcessInfo.processInfo.isLowPowerModeEnabled
@@ -21,3 +34,7 @@ or
 ```swift
 NotificationCenter.default.addObserver(forName: Notification.Name.NSProcessInfoPowerStateDidChange, object: nil, queue: nil) { _ in }
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
index a342353a4..067ef1fc3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
@@ -1,10 +1,21 @@
-Score ecoCode: 5sur5
+:!sectids:
+
+== Why is this an issue?
 
 Taking into account when the device is entering or exiting the power save mode is higly desirable for the battery life.
 
 It implies the existence of a broadcast receiver registered on the action `ACTION_POWER_SAVE_MODE_CHANGED`, or programmatically with a call to `PowerManager#isPowerSaveMode().`
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code sample
+
+```xml
+// Noncompliant
+// No BATTERY_CHANGED intent
+```
+
+=== Compliant solution
 
 ```xml
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
@@ -13,3 +24,7 @@ It implies the existence of a broadcast receiver registered on the action `ACTIO
     </intent-filter>
 </receiver>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
index 53ba19f31..fc98c5efa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
+++ b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Motion Sensor",
+  "title": "Motion sensor should be a magnetometer instead of a gyroscope",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,13 +7,18 @@
     "constantCost": "5min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc b/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
index 4d370f0a4..0553bbfb0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
@@ -1,15 +1,25 @@
+:!sectids:
+
+== Why is this an issue?
+
 The rotation vector sensor is the most frequently used sensor for motion detection and monitoring. When using `SensorManager#getDefaultSensor(int type)`, always prefer the constant `TYPE_GEOMAGNETIC_ROTATION_VECTOR` which is similar to `TYPE_ROTATION_VECTOR`, but using a magnetometer instead of using a gyroscope. This sensor uses lower power than the other rotation vectors, because it doesn't use the gyroscope. However, it is more noisy and will work best outdoors.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 sManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 sManager.getDefaultSensor(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
index 7835b7a63..e33e659f4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Brightness Override",
+  "title": "Brightness should not be forced",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,5 +7,11 @@
     "constantCost": "20min"
   },
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
index a7286af84..098b9b7aa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
@@ -1,11 +1,27 @@
+:!sectids:
+
+== Why is this an issue?
+
 Introduced in Android 9, the adaptive brightness feature raises or lower the brightness of the screen depending on the light in the current environment.
 
 For some reasons, developers may disable this feature programmatically, setting the field `WindowManager.LayoutParams#screenBrightness` with the constant `BRIGHTNESS_OVERRIDE_FULL`.
 
 This feature was introduced to improve battery life, be careful when deactivating it.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 getWindow().getAttributes().screenBrightness = BRIGHTNESS_OVERRIDE_FULL;
 ```
+
+=== Compliant solution
+
+Do not use `BRIGHTNESS_OVERRIDE_FULL`.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
index 639ebdd0d..1796c21cb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
@@ -1,9 +1,8 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
-    "ecocode",
     "android",
-    "eco-design"
+    "ecocode",
+    "eco-design",
+    "performance"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
index 94e8c6f5e..f93703cc6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
@@ -10,7 +10,8 @@ This feature was introduced to improve battery life, be careful when deactivatin
 
 Hence, keeping forcing the screen brightness on should be avoided, unless it is absolutely necessary. 
 
-== Example of non compliant code
+== How to fix it
+=== Noncompliant code example
 
 ```js
 // Example with expo-brightness (Expo framework library)
@@ -20,7 +21,7 @@ import * as Brightness from 'expo-brightness';
 
 export default function App() {
     useEffect(() => {
-        (async () => { Brightness.setSystemBrightnessAsyn(1); })(); // Brightness is forced here
+        (async () => { Brightness.setSystemBrightnessAsyn(1); })(); // Noncompliant: Brightness is forced here
     }, []);
     return (
         <View>
@@ -28,3 +29,11 @@ export default function App() {
         </View>
     );
 }
+
+=== Compliant solution
+
+Do not set the screen brightness.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
index e32eae117..c3c32f884 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
@@ -1,10 +1,10 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
+    "eco-design",
+    "performance",
     "react-native",
-    "eco-design"
+    "sobriety"
   ],
   "compatibleLanguages": [
     "JAVASCRIPT",
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
index 16cee2bbc..b35e4c483 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
@@ -1,10 +1,22 @@
+:!sectids:
+
+== Why is this an issue?
+
 To avoid draining the battery, an iOS device adapt its brightness to the environment .
 
-Hence, keeping forcing the screen brightness on should be avoided, unless it is absolutely necessary. If so, developers typically force the Brightness to 1 with `UIScreen.main.brightness = a float`.
+Hence, keeping forcing the screen brightness on should be avoided, unless it is absolutely necessary. Developers typically force the Brightness with `UIScreen.main.brightness = a float`.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```swift
 UIScreen.main.brightness = CGFloat(0.3)
 ```
 
+=== Compliant solution
+
+Do not set screen brightness.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
index bfcb65813..a256661cc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
@@ -1,9 +1,9 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
-    "ecocode",
     "ios",
-    "eco-design"
+    "ecocode",
+    "eco-design",
+    "performance",
+    "sobriety"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
index 3ae99eb68..f821491c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
@@ -7,5 +7,11 @@
     "constantCost": "10min"
   },
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
index 2fb54ab84..f600f4453 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 With a call to `LocationManager#requestLocationUpdates(String provider, long minTime, float minDistance, LocationListener listener)`, the location provider will only send your application an update when the location has changed by at least minDistance meters AND at least minTime milliseconds have passed. So `minTime` should be the primary tool to conserve battery life, and, to a lesser extent, `minDistance`.
 
 These two must imperatively be greater than 0.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
@@ -11,7 +16,7 @@ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     this);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
@@ -19,3 +24,9 @@ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     10.0f,   // refresh location at least each 10 meters
     this);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
index 639ebdd0d..fa51e410b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
@@ -1,7 +1,5 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
     "eco-design"
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
index a6e81bb76..5a7b8e33b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
@@ -11,11 +11,11 @@ usage.
 If the application or service does not critically require pinpoint accuracy, opting for a less accurate geolocation can
 help minimize the strain on the device's CPU.
 
-== Web
+== How to fix it in Web
 
 [source,js]
 ----
-var options = { enableHighAccuracy: true, timeout: 5000, maximumAge: 0 }; // Non-compliant
+var options = { enableHighAccuracy: true, timeout: 5000, maximumAge: 0 }; // Noncompliant
 navigator.geolocation.getCurrentPosition(
   (pos) => console.log(pos),
   (err) => console.warn(err),
@@ -41,7 +41,7 @@ navigator.geolocation.getCurrentPosition(
 );
 ----
 
-== React Native
+== How to fix it in React Native
 
 In this example, we ask the user to turn on high accuracy location mode which enables network provider that uses Google Play services to improve location accuracy and location-based services:
 
@@ -49,7 +49,7 @@ In this example, we ask the user to turn on high accuracy location mode which en
 ----
 import * as Location from 'expo-location';
 
-Location.enableNetworkProviderAsync(); // Non-compliant
+Location.enableNetworkProviderAsync(); // Noncompliant
 ----
 
 Prefer to ask the user to turn on lower-accuracy geolocation to conserve resources:
@@ -63,6 +63,11 @@ Location.requestPermissionsAsync(); // Compliant
 
 == Resources
 
+=== Best practises
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
 === Documentation
 
 - https://developer.mozilla.org/en-US/docs/Web/API/Geolocation/getCurrentPosition[getCurrentPosition() method] - Mozilla Web Technology for Developers
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
index e32eae117..f947e415d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
@@ -1,10 +1,9 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
-    "react-native",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "react-native"
   ],
   "compatibleLanguages": [
     "JAVASCRIPT",
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
index f0ef7d986..e644d5885 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
+++ b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Geolocation Criteria",
+  "title": "Geolocation should use lower accuracy",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,13 +7,18 @@
     "constantCost": "20min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc b/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
index 356629524..a7b1eef94 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 Location awareness is one of the most popular features used by apps.
 
 An important point is to try to get the best possible provider (`LocationManager#getBestProvider()`) based on an energy criteria thanks to `Criteria#setPowerRequirement(int level)`, using constant `POWER_LOW` instead of `POWER_HIGH` or `POWER_MEDIUM`.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
@@ -11,7 +16,7 @@ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     this);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 Criteria criteria = new Criteria();
@@ -21,3 +26,7 @@ locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria,
     1.0f,
     this);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices]
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc b/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
index 75a998f71..5068cdc43 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Location awareness is one of the most popular features used by apps.
 
 By default, standard location updates run with the best accuracy level, but unless your app really needs to know the user’s position within a few meters, this level of accuracy isn't needed.
@@ -6,10 +10,22 @@ Requesting higher accuracy than you need causes the system to power up additiona
 
 Also, setting the `CLLocationManager#activityType` property will let the system knows what type of location activity your app is performing and helps it determine the most appropriate time to perform location updates. Finally, if your app just needs a quick fix on the user’s location, it’s best to call the `CLLocationManager#requestLocation` method, that will deliver a single location update.
 
-## Compliant Code Example
+== How to fix it
+
+=== Noncompliant code example
+
+```swift
+// Noncompliant
+let manager = CLLocationManager()
+```
+
+=== Compliant solution
 
 ```swift
 let manager = CLLocationManager()
 manager.desiredAccuracy = 2
 ```
 
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
index 820a920f9..012ff950c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
+++ b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Bluetooth Low Energy (setAdvertiseMode)",
+  "title": "Bluetooth Low Energy should use Low Power advertise mode",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,12 +7,17 @@
     "constantCost": "10min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc b/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
index a1e2af352..a7a9f55c6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
@@ -1,17 +1,26 @@
+:!sectids:
+
+== Why is this an issue?
+
 With Bluetooth Low Energy technology, a Bluetooth Smart Ready device (the master) will establish a link with a Bluetooth Smart device (the slave). Most often, the slave is a GATT server and the master is a GATT client. GATT capable devices can be discovered using BLE scan process.
 
 The default and preferred advertising mode is `ADVERTISE_MODE_LOW_POWER` when calling `AdvertiseSettings.Builder#setAdvertiseMode(int advertiseMode).`
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 AdvertiseSettings.Builder builder = new AdvertiseSettings.Builder();
 builder.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 AdvertiseSettings.Builder builder = new AdvertiseSettings.Builder();
 builder.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_POWER);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices]
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
index 5257b74de..17c043eb3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
+++ b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Bluetooth Low Energy (requestConnectionPriority)",
+  "title": "Bluetooth Low Energy should use low power connection priority",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,11 +8,17 @@
   },
   "tags": [
     "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc b/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
index 36b25cef1..a50786b75 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
@@ -1,19 +1,27 @@
-With Bluetooth Low Energy technology (see BLE API smell), a Bluetooth Smart Ready device (the master) will establish a link with a Bluetooth Smart device (the slave).
+:!sectids:
+
+== Why is this an issue?
+
+With Bluetooth Low Energy technology, a Bluetooth Smart Ready device (the master) will establish a link with a Bluetooth Smart device (the slave).
 
 Most often, the slave is a GATT server and the master is a GATT client. GATT capable devices can be discovered using BLE scan process.
 
 Invoking `BluetoothGatt#requestConnectionPriority(int connectionPriority)` with the value `CONNECTION_PRIORITY_LOW_POWER`, is recommended to reduce power consumption.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 BluetoothGatt gatt = new BluetoothGatt();
 gatt.requestConnectionPriority(CONNECTION_PRIORITY_HIGH);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 BluetoothGatt gatt = new BluetoothGatt();
 gatt.requestConnectionPriority(CONNECTION_PRIORITY_LOW_POWER);
 ```
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
index 3a290b995..8c969250b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
+++ b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Geolocation (minDistance)",
+  "title": "Geolocation should use a minimum distance",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,12 +7,17 @@
     "constantCost": "10min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc b/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
index 2fb54ab84..694bb588a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
@@ -1,17 +1,23 @@
+:!sectids:
+
+== Why is this an issue?
+
 With a call to `LocationManager#requestLocationUpdates(String provider, long minTime, float minDistance, LocationListener listener)`, the location provider will only send your application an update when the location has changed by at least minDistance meters AND at least minTime milliseconds have passed. So `minTime` should be the primary tool to conserve battery life, and, to a lesser extent, `minDistance`.
 
 These two must imperatively be greater than 0.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     0,
     0,
     this);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
@@ -19,3 +25,9 @@ locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     10.0f,   // refresh location at least each 10 meters
     this);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
index 15b9d9905..515f583cd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
+++ b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
@@ -8,11 +8,17 @@
   },
   "tags": [
     "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc b/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
index 5698168e1..97b947256 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 Shaking of an Android device is possible in all circumstances with a call to `getSystemService(Context.VIBRATOR_SERVICE)` (API 26) or `getSystemService(Context.VIBRATOR.MANAGER.SERVICE)` (API 31).
     Behind this effect stands a specific miniature hardware component, motor or actuator, that consumes power.
     As a consequence, its usage must be discouraged, especially since its added value is not clear.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 API 26:
 ```java
@@ -15,3 +20,11 @@ API 31:
 VibratorManager vm = (VibratorManager) getSystemService(Context.VIBRATOR_MANAGER_SERVICE);
 vm.getDefaultVibrator().vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
 ```
+
+=== Compliant solution
+
+Do not use the vibrator.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
index 53a758843..cd48f0393 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
+++ b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
@@ -7,12 +7,17 @@
     "constantCost": "5min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc b/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
index 9dcff316a..537af7cdd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 Giving information to the end-user through notifications is an important aspect of a modern app.
 
 However, a notification does not necessarily need to be loud and vibrant to achieve its purpose. Default mode is enough. That is why when building a notification with `NotificationManager` there should be no extra calls to the methods `setSound()` nor `setVibrate()` (API26) nor `setVibrationPattern()` (API31) on the builder object.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 API 26:
 
@@ -28,3 +33,9 @@ notification.setSound(
     Notification.AUDIO_ATTRIBUTES_DEFAULT
 );
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
index 2bca358ec..73107a1ad 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Torch Free",
+  "title": "Torch should not be turned on",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,5 +7,11 @@
     "constantCost": "5min"
   },
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
index 9357810a6..3fc4fc285 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Turning on the torch mode programmatically with `CameraManager#setTorchMode(..., true)` must absolutely be avoided because the flashlight is one of the most energy-intensive component.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
  CameraManager camManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
@@ -12,3 +18,9 @@ try {
     e.printStackTrace();
 }
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
index 639ebdd0d..fa51e410b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
@@ -1,7 +1,5 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
     "eco-design"
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
index 830784d73..62e81b6c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
@@ -1,3 +1,5 @@
+:!sectids:
+
 == Why is this an issue?
 
 Turning on the torch mode programmatically with `react-native-torch` must absolutely be avoided because the flashlight is one of the most energy-intensive component.
@@ -6,7 +8,7 @@ Turning on the torch mode programmatically with `react-native-torch` must absolu
 
 [source,js,data-diff-id="2",data-diff-type="noncompliant"]
 ----
-import Torch from 'react-native-torch'; // Non-compliant
+import Torch from 'react-native-torch'; // Noncompliant
 ----
 
 [source,js,data-diff-id="2",data-diff-type="compliant"]
@@ -18,4 +20,4 @@ import axios from 'axios'; // Compliant
 
 === Documentation
 
-- [CNUMR best practices mobile](https://github.com/cnumr/best-practices-mobile) - Torch free
\ No newline at end of file
+- [CNumR best practices mobile](https://github.com/cnumr/best-practices-mobile) - Torch free
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
index e32eae117..fd663fcf5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
@@ -1,7 +1,5 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "react-native",
     "eco-design"
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
index 0cc3c0778..6d9f93163 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
@@ -1,7 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
 Turning on the torch mode programmatically using `AVCaptureDevice#torchMode` or `AVCaptureDevice#setTorchModeOn(level:)` 
 methods must absolutely be avoided because the flashlight is one of the most energy-intensive component.
 
-## Non-Compliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```swift
 guard let videoDevice = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back) else { return }
@@ -9,6 +14,16 @@ guard videoDevice.hasTorch else { return }
 
 videoDevice.lockForConfiguration()
 videoDevice.torchMode = .on // non-compliant
-videoDevice.setTorchModeOn(level: 1.0) // non-compliant
+videoDevice.setTorchModeOn(level: 1.0) // Noncompliant
 videoDevice.unlockForConfiguration()
-```
\ No newline at end of file
+```
+
+=== Compliant solution
+
+Do not set the torch programmaticaly.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
index bfcb65813..e29660370 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
@@ -1,9 +1,8 @@
 {
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "ios",
-    "eco-design"
+    "eco-design",
+    "sobriety"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
index 7d74efb32..7b365c386 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
+++ b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: High Frame Rate",
+  "title": "High frame rate should not be set",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,12 +7,18 @@
     "constantCost": "5min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "sobriety"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc b/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
index a12e6a75f..ce7e0dc75 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
@@ -1,13 +1,24 @@
-In Android 11 (API level 30) or higher, a call to `Surface#setFrameRate(float frameRate, int compatibility)` results in a change to the display refresh rate. However, a regular app displays 60 frames per second (60Hz). In order to optimize content refreshes and hence saving energy, this frequency should not be raised to 90Hz or 120Hz, despite this is now supported by many devices.
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+In Android 11 (API level 30) or higher, a call to `Surface#setFrameRate(float frameRate, int compatibility)` results in a change to the display refresh rate. However, a regular app displays 60 frames per second (60Hz). In order to optimize content refreshes and hence saving energy, this frequency should not be raised to 90Hz or 120Hz, even if this is now supported by many devices.
+
+== How to fix it
+=== Noncompliant code example
 
 ```java
 surface.setFrameRate(120f, FRAME_RATE_COMPATIBILITY_DEFAULT);
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 surface.setFrameRate(60f, FRAME_RATE_COMPATIBILITY_DEFAULT);
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
index c73038cf1..9433f8dfc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
+++ b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
@@ -1,18 +1,23 @@
 {
-  "title": "Privacy: Google Tracker",
+  "title": "Google Tracker should not be used",
   "type": "CODE_SMELL",
-  "status": "ready",
+  "status": "deprecated",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "tags": [
-    "privacy",
-    "social",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
index 8cec4d695..c37282843 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
@@ -1,15 +1,34 @@
+:!sectids:
+
+This check is deprecated since it is about privacy and not about eco-design.
+
+== Why is this an issue?
+
 Importing the `com.google.android.gms.analytics.Tracker` or `com.google.firebase.analytics.FirebaseAnalytics` classes means that the app sends hits to Google Analytics. It is not necessarily sensitive information, but it is a first step towards Google Ads and hence this practice should be discouraged at early stage.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 Import of Google Analytics :
 
 ```java
+// Noncompliant
 import com.google.android.gms.analytics.Tracker
 ```
 
 Import of Firebase Analytics :
 
 ```java
+// Noncompliant
 import com.google.firebase.analytics
 ```
+
+=== Compliant solution
+
+Do not use Google Analytics.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
index a1ec5d8f4..67509a448 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
+++ b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
@@ -8,11 +8,17 @@
   },
   "tags": [
     "ecocode",
-    "environment",
-    "sobriety",
     "eco-design",
+    "performance"
     "ios"
   ],
   "ecoScore": "0.4",
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  },
+
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc b/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
index fd19cdcfe..100e15566 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
@@ -1,9 +1,27 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Allowing the system to pause location updates, at times when the location data is unlikely to change, can improve battery life without sacrificing location data. This is the default behavior. For example, if the user stops for food while using a navigation app, the location manager might pause updates for a period of time. It is possible to disable this behavior, by setting the `CLLocationManager#pausesLocationUpdatesAutomatically` property to `false`, but applications are strongly discouraged of doing it.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```swift
+// Noncompliant
 let manager = CLLocationManager()
 manager.pausesLocationUpdatesAutomatically = false
 ```
 
+=== Compliant solution
+
+```swift
+let manager = CLLocationManager()
+```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
index 70bc40998..ceda606be 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
+++ b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
@@ -1,5 +1,5 @@
 {
-  "title": "Motion Sensor Update Rate",
+  "title": "Motion Sensor should have an updated rate",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,11 +7,16 @@
     "constantCost": "5min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc b/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
index 06310b54c..fdac3829f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
 Using the Core Motion API, your app can receive continuous motion updates in the form of accelerometer, gyroscope, and device motion (rotation, acceleration, and more) events. Yet you don't often need these updates as soon as they are generated. Before registering to receive these recurring motion updates, you can specify an interval that meets your app’s needs, using `CMMotionManager#accelerometerUpdateInterval`, `CMMotionManager#gyroUpdateInterval`, `CMMotionManager#deviceMotionUpdateInterval` and `CMMotionManager#magnetometerUpdateInterval` properties. The larger the interval, the fewer events are delivered to your app, improving battery life.
 
-## Compliant Code
+== How to fix it
+
+=== Noncompliant solution
 
 ```swift
 CMMotionManager.accelerometerUpdateInterval = 1000
@@ -8,3 +14,16 @@ CMMotionManager.gyroUpdateInterval = 1000
 CMMotionManager.deviceMotionUpdateInterval = 1000
 CMMotionManager.magnetometerUpdateInterval = 1000
 ```
+
+=== Compliant solution
+
+```swift
+CMMotionManager.accelerometerUpdateInterval = 1000
+CMMotionManager.gyroUpdateInterval = 1000
+CMMotionManager.deviceMotionUpdateInterval = 1000
+CMMotionManager.magnetometerUpdateInterval = 1000
+```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
index 96150d255..600f7166d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
+++ b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
@@ -8,10 +8,16 @@
   },
   "tags": [
     "batch",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc b/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
index 722d5d683..2e7d8542c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
@@ -1,4 +1,6 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 Services are long-living operations, as components of the apps. However, they can be started in isolation each time the device is next started, without the user's acknowledgement.
 
@@ -8,12 +10,18 @@ In addition, end-users know how to kill applications, but more rarely how to kil
 
 Thus, any developer should avoid having a call to `Context#startService()` from a Broadcast Receiver component that has specified an intent-filter for the `BOOT_COMPLETED` action in the manifest.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <receiver>
     <intent-filter>
         <action android:name= "android.intent.action.BOOT_COMPLETED"/>
     </intent-filter>
 </receiver>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
index 1b065547a..70310af9c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
+++ b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
@@ -8,11 +8,17 @@
   },
   "tags": [
     "power",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc b/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
index 5eec80ead..2f920be0f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
@@ -1,11 +1,24 @@
-Score ecoCode: 2sur5
+:!sectids:
 
-A negative effect on the device s battery is when an app is paired with a companion device (over Bluetooth, BLE, or Wi-Fi) and that it has been excluded from battery optimizations (run in the background) using the declaration `Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND`.
+== Why is this an issue?
 
-## Noncompliant Code Example
+There is a negative effect on the device battery when an app is paired with a companion device (over Bluetooth, BLE, or Wi-Fi) and that it has been excluded from battery optimizations (run in the background) using the declaration `Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND`.
+
+== How to fix it
+=== Noncompliant code example
 
 ```xml
 <manifest>
-   <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND">
+   <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"><!-- Noncompliant -->
 </manifest>
 ```
+
+=== Compliant solution
+
+Do not use `Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND`.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
index cbfbf69fb..fb6a39aab 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
+++ b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
@@ -1,5 +1,5 @@
 {
-  "title": "Power: Ignore Battery Optimizations",
+  "title": "Battery optimizations should not be ignored",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,10 +8,16 @@
   },
   "tags": [
     "power",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc b/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
index 3abdafaf2..65867657c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
@@ -1,13 +1,27 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 An app holding the permission `REQUEST_IGNORE_BATTERY_OPTIMIZATIONS` asks the user to allow it to ignore battery optimizations (that is, put them on the whitelist of apps).
 
 Most applications should not use this; there are many facilities provided by the platform for applications to operate correctly in the various power saving modes.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <manifest>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 </manifest>
 ```
+
+=== Compliant solution
+
+Do not use `REQUEST_IGNORE_BATTERY_OPTIMIZATIONS`.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
index 6ce23ddba..349ac8bd7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
+++ b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Dark UI (Bright Colors)",
+  "title": "Bright Colors should not be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,12 +7,17 @@
     "constantCost": "1h"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc b/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
index 4b8bcc02e..02fc1cb8a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
@@ -1,12 +1,16 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 Displaying dark colors is particularly beneficial for mobile devices with (AM)OLED screens.
 
 Consequently, custom resources like bright colors values and bitmap images with too high luminance should be avoided.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <TextView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -14,3 +18,13 @@ Consequently, custom resources like bright colors values and bitmap images with
     android:foregroundTint="#FFFFFF">
 </TextView>
 ```
+
+=== Compliant solution
+
+Use darker colors.
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
+
+
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
index 329f040d9..1fa28410a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
+++ b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Dark UI (Theme)",
+  "title": "Dark UI Theme should be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,11 +7,17 @@
     "constantCost": "1h"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "android",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "sobriety"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc b/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
index 5ea8017df..fbc18ed6e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
@@ -1,22 +1,27 @@
-Score ecoCode: 2sur5
+:!sectids:
+
+== Why is this an issue?
 
 Developers are allowed to apply native themes for their app, or derive new ones through inheritance. This decision has a significant impact on energy consumption since displaying dark colors is particularly beneficial for mobile devices with (AM)OLED screens.
 
 By default, Android will set Holo to the Dark theme (parent style `Theme.Holo`) and hence switching to the light theme (parent style `Theme.Holo.Light`) within the manifest or in xml themes should be avoided.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```xml
+<!-- Noncompliant -->
 <style name="Theme.MyTheme" parent="@android:style/Theme.Holo.Light"/>
 ```
 
 or
 
 ```xml
+<!-- Noncompliant -->
 <application android:label="@string/app_name" android:theme="@android:style/Theme.Holo.Light"/>
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```xml
 <style name="Theme.MyTheme" parent="@android:style/Theme.Holo"/>
@@ -27,3 +32,7 @@ or
 ```xml
 <application android:label="@string/app_name" android:theme="@android:style/Theme.Holo"/>
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
index b77551a30..498a78992 100644
--- a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
+++ b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
@@ -7,12 +7,17 @@
     "constantCost": "0min"
   },
   "tags": [
-    "sobriety",
     "ecocode",
-    "environment",
     "power",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Info"
+  "defaultSeverity": "Info",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
index 194c63a14..af9ba28f9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
+++ b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
@@ -1,5 +1,5 @@
 {
-  "title": "Animation Free",
+  "title": "Animations should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,11 +7,16 @@
     "constantCost": "5min"
   },
   "tags": [
-    "sobriety",
-    "environment",
     "ecocode",
     "ios",
-    "eco-design"
+    "eco-design",
+    "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc b/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
index 216df5c4b..254372a94 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
@@ -1,8 +1,13 @@
+:!sectids:
+
+== Why is this an issue?
+
 Animations play a crucial role in creating a dynamic and engaging user interface in iOS applications. Both UIKit and SwiftUI provide powerful tools to create smooth and appealing animations. Developers need to be familiar with various methods and properties to implement animations effectively.
 
 To ensure animations are used effectively without draining the device's battery, it's important to check for unnecessary animations and optimize them. This can be done by reviewing the use of functions like `withAnimation(::)`, the `animation(_:value:)` view modifier, and the binding’s `animation(_:)` method in SwiftUI, as well as checking the use of UIKit's animation methods.
 
-## Noncompliant Code Example UIKit
+== How to fix it in UIKit
+=== Noncompliant code example
 
 ```swift
 UIView.animate(withDuration:animations:)
@@ -15,7 +20,8 @@ CAKeyframeAnimation
 CATransition
 ```
 
-## Noncompliant Code Example SwiftUI
+== How to fix it in SwiftUI
+=== Noncompliant code example
 
 ```swift
 withAnimation
@@ -26,3 +32,7 @@ AnyTransition
 .onAppear(perform:)
 .onDisappear(perform:)
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
index 034168254..780df67c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
+++ b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using double quote (\"), prefer using simple quote (')",
+  "title": "Double quotes (\") should be used instead of using simple quotes (')",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc b/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
index 8af551481..63d706a11 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
@@ -1,14 +1,20 @@
+:!sectids:
+
+== Why is this an issue?
+
 PHP allows declaring a string with simple or double quotes. Using double quotes allows developers to insert variables which will be substituted during execution. When the string has no variables, using single quotes prevents PHP from searching for non-existent variables. It will save CPU cycles consumption and RAM usage.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
+// Noncompliant
 myFunction("name", "age", "IsStudent");
     $lastName = "Hugo";
     $concatenatedString = "$lastName is a student";
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 myFunction('name', 'age', 'IsStudent');
@@ -16,15 +22,23 @@ myFunction('name', 'age', 'IsStudent');
     $concatenatedString = $lastName . 'is a student';
 ```
 
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_066 (no longer exists in edition 4)]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52621866212_de15608a41_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
index 824d66d16..63d408e8e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
+++ b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use ++i instead of i++",
+  "title": "++i should be used instead of i++",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc b/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
index a0c7b961a..61d85c7b7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
@@ -1,13 +1,24 @@
+:!sectids:
+
+== Why is this an issue?
+
 The form `$i++` creates a temporary variable whereas `++$i` does not. It save CPU cycles.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
-i++  // Noncompliant
+i++;  // Noncompliant
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
-++i
+++i;
 ```
+
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_067 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc b/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
index 9a025ea99..bfee42349 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
@@ -1,26 +1,40 @@
+:!sectids:
+
+== Why is this an issue?
+
 The form `$i++` creates a temporary variable whereas `++$i` does not. It save CPU cycles.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
+// Noncompliant
 $i++
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 ++$i
 ```
 
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_067 (no longer exists in edition 4)]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622379586_f84c767111_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
index b66f24ee0..81bbe5424 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
+++ b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
@@ -1,5 +1,5 @@
 {
-  "title": "Do not call a function when declaring a for-type loop",
+  "title": "Functions should not be called when declaring a for-type loop",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/csharp/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/csharp/EC69.asciidoc
index d642bbb3d..6f8b72367 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/csharp/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/csharp/EC69.asciidoc
@@ -1,8 +1,6 @@
 :!sectids:
 
-Don't call loop invariant functions in loop conditions.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Loop invariant functions do not depend on the current loop iteration, yet they are still evaluated each time.
 This can lead to performance issues, especially when the loop is executed a large number of times, and/or if the function requires a lot of processing.
@@ -10,11 +8,12 @@ Instead, consider calling the function once before the loop and caching the resu
 
 Note that property getters are not included in this rule, as they are expected to be fast and side-effect free.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 The analyzer may return false positives when the function call actually has a side effect, despite being syntactically loop invariant. In which case this warning should be ignored.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
@@ -33,7 +32,7 @@ for (int i = 0; i < getValue(j); i++) // Noncompliant: getValue(j) is loop invar
     Console.WriteLine(i);
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -54,3 +53,7 @@ for (int i = 0; i < getValue(j); i++) { // Compliant: j is mutated in the loop,
     Console.WriteLine(i);
 }
 ----
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_069 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
index e32cd94db..14a65248e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 Do not call a function when declaring a for-type loop in order to avoid function calls each iterations. It saves CPU cycles.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 public void foo() {
@@ -11,7 +16,7 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void foo() {
@@ -22,3 +27,7 @@ public void foo() {
     }
 }
 ```
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_069 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
index 0da3cde83..65b20d7fe 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Do not call a function when declaring a for-type loop in order to avoid function calls each iteration. It saves CPU cycles.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
 for ($i = 0; $i <= foo(); $i++) {  // Noncompliant
@@ -8,7 +14,7 @@ for ($i = 0; $i <= foo(); $i++) {  // Noncompliant
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 $maxI = foo();
@@ -21,18 +27,25 @@ for ($i = 0; $i <= $maxI; $i++) {
 for ($i = 0, $maxI = foo(); $i <= $maxI; $i++) {
   .....
 }
-}
 ```
 
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_069 (no longer exists in edition 4)]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622634654_bf3c3d9ba8_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
index 3d73ce30a..71499c02c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
@@ -1,13 +1,18 @@
+:!sectids:
+
+== Why is this an issue?
+
 Do not call a function when declaring a for-type loop in order to avoid function calls each iteration. It saves CPU cycles.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
 for i in my_function():  # Noncompliant
     ......
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 limit = my_function()
@@ -15,3 +20,6 @@ for i in limit:
     ......
 ```
 
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_069 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
index 46c194d56..0e80f275e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
+++ b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid creating getter and setter methods in classes",
+  "title": "Getter and setter methods should not be used in classes",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc b/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
index 8b2970bf7..74a5a8cc4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
@@ -1,8 +1,14 @@
+:!sectids:
+
+== Why is this an issue?
+
 Avoid using getters and setters in a class, as they increase unnecessary RAM memory usage.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
+# Noncompliant
 class Client():
 
     def __init__(self, age):
@@ -15,11 +21,11 @@ class Client():
         self.age = age
 
 client = Client(25)
-client.get_age() # Getter inutile
-client.set_age(25) # Setter inutile
+client.get_age() # Useless getter
+client.set_age(26) # Useless setter
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 class Client():
@@ -28,7 +34,10 @@ class Client():
         self.age = age
 
 client = Client(25)
-client.age # Récupérer l'attribut age
-client.age = 26 # Modifier l'attribut age
+client.age
+client.age = 26
 ```
 
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_062 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
index 5fdf8c909..472a86e39 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
+++ b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid SQL request in loop",
+  "title": "SQL request in loop should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -15,5 +15,11 @@
     "memory",
     "network"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/csharp/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/csharp/EC72.asciidoc
index e1ec7a734..a3c29a7d2 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/csharp/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/csharp/EC72.asciidoc
@@ -1,18 +1,17 @@
 :!sectids:
 
-Don't execute SQL queries in loops.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Executing SQL queries in loops induces unnecessary calculation by the CPU, RAM usage and network transfer.
 This can potentially lead to severe performance issues, especially when the loop is executed a large number of times.
 Instead, consider using a single bulk query to massify the call.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 This warning shouldn't be ignored.
 
-## Non-compliant example
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
@@ -29,7 +28,7 @@ for (int i = 0; i < 20; i++) {
 }
 ----
 
-## Compliant example
+=== Compliant solution
 
 [source, cs]
 ----
@@ -41,3 +40,7 @@ using var reader = cmd.ExecuteReader(); // Compliant
 while (reader.Next())
     Console.WriteLine(reader.getString(0));
 ----
+
+== Resources
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_072_fr.md[CNumR best practices (3rd edition) BP_072]
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
index 7032eb960..ff20a6bba 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 Executing SQL queries in loop induced unnecessary calculation by the CPU, RAM usage and network transfer.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 public void foo() {
@@ -24,7 +29,7 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void foo() {
@@ -48,3 +53,7 @@ public void foo() {
     // ...
 }
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_072_fr.md[CNumR best practices (3rd edition) BP_072]
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
index 12fe0d7b7..64a2382d9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Executing SQL queries in loop induced unnecessary network transfert, calculation by the cpu and RAM usage.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
 public function foo() {
@@ -22,7 +28,7 @@ public function foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 public function foo() {
@@ -44,48 +50,56 @@ public function foo() {
 }
 ```
 
+== Resources
+
+=== Best practises
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_072_fr.md[CNumR best practices (3rd edition) BP_072]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622813465_9c453a43b1_w.jpg[ETSdiff percent comparison" style="padding: 1rem;]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
 
-## Case for a 2GB database:
+==== Case for a 2GB database
 
 image::https://live.staticflickr.com/65535/52622862388_720fd219ba_o.png[ETSdiff percent comparison" style="padding: 1rem;]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::2GB.etsdiff.csv[]
 |===
 
-## Case for a 4GB database:
+==== Case for a 4GB database
 
 image::https://live.staticflickr.com/65535/52622814395_f8aab7a5c0_o.png[ETSdiff percent comparison" style="padding: 1rem;]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::4GB.etsdiff.csv[]
 |===
 
-## Case for a 8GB database:
+==== Case for a 8GB database
 
 image::https://live.staticflickr.com/65535/52622635779_f1c5d9660e_o.png[ETSdiff percent comparison" style="padding: 1rem;]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::8GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
index ae85dfe3e..519c27c74 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Executing SQL queries in loop induced unnecessary calculation by the CPU, RAM usage and network transfer.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
 def foo():
@@ -11,7 +17,7 @@ def foo():
     ...
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 def foo():
@@ -19,5 +25,8 @@ def foo():
     ids = range(20)
     results = cursor.execute("SELECT name FROM users where id IN ({0})".format(', '.join("?" * len(ids))), ids).fetchmany() # Compliant
     ...
-}
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_072_fr.md[CNumR best practices (3rd edition) BP_072]
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
index 7a4eea182..21058e3ae 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
+++ b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
@@ -1,5 +1,5 @@
 {
-  "title": "Don't use the query SELECT * FROM",
+  "title": "SELECT * should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -13,5 +13,11 @@
     "sql",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
index 4f1299b18..27b12f15c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Database servers have to resolve schema fields when using asterisk symbol (`*`). Knowing and using the schema saves CPU cycles and network transfer.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 public void foo() {
@@ -10,7 +16,7 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void foo() {
@@ -19,3 +25,7 @@ public void foo() {
     // ...
 }
 ```
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_074 (no longer exists in edition 4)]
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
index ffb380dd5..defcaed39 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
@@ -1,6 +1,12 @@
+:!sectids:
+
+== Why is this an issue?
+
+
 Database servers have to resolve schema fields when using asterisk symbol (`*`). Knowing and using the schema saves CPU cycles and network transfer.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```php
 public function foo() {
@@ -10,7 +16,7 @@ public function foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```php
 public function foo() {
@@ -20,15 +26,23 @@ public function foo() {
 }
 ```
 
+== Resources
+
+=== Best practises
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_074 (no longer exists in edition 4)]
+
+=== Impact
+
 include::../../etsdiff-methodology.asciidoc[]
 
-## Case for a 1GB database:
+==== Case for a 1GB database
 
 image::https://live.staticflickr.com/65535/52622636584_52938fcf7e_o.png[ETSdiff percent comparison]
 
 [format=csv,cols="1h,1,1"]
 |===
-Source of impacts,Compliant,Non-compliant
+Source of impacts,Compliant,Noncompliant
 
 include::1GB.etsdiff.csv[]
 |===
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
index 3b9b41c0f..0d60b563a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 Database servers have to resolve schema fields when using asterisk symbol (`*`). Knowing and using the schema saves CPU cycles and network transfer.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```python
 public void foo() {
@@ -10,7 +15,7 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
 public void foo() {
@@ -19,3 +24,7 @@ public void foo() {
     ...
 }
 ```
+
+== Resources
+
+- https://www.greenit.fr/2019/05/07/ecoconception-web-les-115-bonnes-pratiques-3eme-edition/[CNumR best practices (3rd edition) BP_074 (no longer exists in edition 4)]
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
index bacded06d..51a9918ac 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
+++ b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
@@ -1,5 +1,5 @@
 {
-  "title": "Don't concatenate strings in loops",
+  "title": "Concatenating strings in loops should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "ecocode",
     "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
index 4da9ecb90..2eeca4dee 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
@@ -1,18 +1,17 @@
 :!sectids:
 
-Don't concatenate `strings` in loops, use a `StringBuilder` instead.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 `strings` are immutable so each time they are concatenated, a new one is created. When in a loop, this can lead to a waste of memory and CPU time.
 
 In comparison, a `StringBuilder` works with a single mutable buffer, from which a resulting `string` can be allocated when needed.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 If the number of concatenations is very small, typically 5 or less, then the overhead cost is either marginal or non-existent, and can be ignored.
 
-## Non-compliant example
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
@@ -21,7 +20,7 @@ for (int i = 0; i < 100; i++)
     myString += i; // Non compliant : this requires a new string allocation on each iteration
 ----
 
-## Compliant example
+=== Compliant solution
 
 [source, cs]
 ----
@@ -31,3 +30,7 @@ for (int i = 0; i < 100; i++)
 
 string myString = builder.ToString(); // Triggers a string allocation, but only once
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
index 95b8bc483..0ee1d9181 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
+++ b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid usage of static collections.",
+  "title": "Static collections should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -10,8 +10,15 @@
     "cwe",
     "leak",
     "eco-design",
+    "performance",
     "ecocode",
     "memory"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc b/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
index f21e5298c..e2dd7da69 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
@@ -1,15 +1,16 @@
-Avoid usage of static collections.
+:!sectids:
+
+== Why is this an issue?
 
 If you want to use static collections make them final and create for example a singleton if needed containing the collections.
 
 The static fields are more complicated for the Garbage Collector to manage and can lead to memory leaks.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
-/**
- * Not compliant
- */
+// Not compliant
 public class AvoidUsageOfStaticCollections {
     public static final List<> LIST = new ArrayList<>();
     public static final Set<> SET = new HashSet<>();
@@ -17,12 +18,9 @@ public class AvoidUsageOfStaticCollections {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
-/**
- * Compliant
- */
 public class GoodUsageOfStaticCollections {
     public static volatile GoodUsageOfStaticCollections INSTANCE = new GoodUsageOfStaticCollections();
 
@@ -34,3 +32,7 @@ public class GoodUsageOfStaticCollections {
     }
 }
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
index 2aa53debd..8e4a5b94d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
+++ b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid using Pattern.compile() in a non-static context.",
+  "title": "Pattern.compile() should be used in a static context",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -13,5 +13,11 @@
     "ecocode",
     "memory"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc b/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
index 188b8f648..1904f3efd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
@@ -1,7 +1,11 @@
-Avoid using `Pattern.compile()` in a non-static context.
-This operation requires a significant amount of computational power, Using a single match saves CPU cycles and RAM consumption.
+:!sectids:
 
-## Noncompliant Code Example
+== Why is this an issue?
+
+This operation requires a significant amount of computational power. Using a single match saves CPU cycles and RAM consumption.
+
+== How to fix it
+=== Noncompliant code example
 
 ```java
 public class AvoidRegexPatternNotStatic {
@@ -12,7 +16,7 @@ public class AvoidRegexPatternNotStatic {
 }
 ```
 
-## Compliant Solution N°1
+=== Compliant solution
 
 ```java
 public class ValidRegexPattern {
@@ -24,7 +28,7 @@ public class ValidRegexPattern {
 }
 ```
 
-## Compliant Solution N°2
+or
 
 ```java
 public class ValidRegexPattern2 {
@@ -36,7 +40,7 @@ public class ValidRegexPattern2 {
 }
 ```
 
-## Compliant Solution N°3
+or
 
 ```java
 public class ValidRegexPattern3 {
@@ -51,3 +55,7 @@ public class ValidRegexPattern3 {
     }
 }
 ```
+
+== Resources
+
+- See also https://rules.sonarsource.com/java/tag/performance/RSPEC-4248/[RSPEC-4248 rule]
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
index 6525cb823..bcf51263d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
+++ b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
@@ -1,5 +1,5 @@
 {
-  "title": "Don't set const parameter in batch update => Put its in query",
+  "title": "Const parameter should be set in queries instead of batch updates",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -13,5 +13,11 @@
     "performance",
     "memory"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc b/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
index 3153a8742..dc37f0f7b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
@@ -1,8 +1,14 @@
+:!sectids:
+
+== Why is this an issue?
+
 Don't set a constant parameter in batch update. Instead, put it in query. Creating this parameter and destroying it consumes CPU cycles and RAM unnecessarily.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
+// Noncompliant
 public void foo() {
     // ...
     String query = "insert into mytable values(?,?,?)";
@@ -17,7 +23,7 @@ public void foo() {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 public void foo() {
@@ -32,3 +38,7 @@ public void foo() {
     // ...
 }
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
index 968adfe0c..28e8b2118 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
+++ b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
@@ -1,5 +1,5 @@
 {
-  "title": "Free resources",
+  "title": "Resources should be freed",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc b/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
index ef8bc2156..13e4fd5a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
@@ -1,6 +1,11 @@
+:!sectids:
+
+== Why is this an issue?
+
 Use `try-with-resources` statement for any object that implements the `AutoCloseable` interface, it save computer resources.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 private static void printFileJava7() throws IOException {
@@ -13,7 +18,7 @@ private static void printFileJava7() throws IOException {
 }
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```java
 private static void printFileJava7() throws IOException {
@@ -26,3 +31,7 @@ private static void printFileJava7() throws IOException {
     }
 }
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
index 6e8219b63..0118b8cd9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
+++ b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
@@ -1,5 +1,5 @@
 {
-  "title": "Specify struct layout",
+  "title": "Struct layout should be specified",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "memory",
     "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
index 877aca180..c1ee58727 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
@@ -1,20 +1,17 @@
 :!sectids:
 
-Specify struct layout.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Structs that don't contain reference types (directly nor indirectly) have the `Sequential` layout by default.
 This is to prevent breaking any project that uses interop code and requires that the fields stay ordered.
 In other cases however, field reordering is usually fine and there are little reasons to use the `Sequential` layout over the `Automatic` one, as it will optimize the layout for you, potentially saving memory and improving performance in the process.
 
-You can read a much more in-depth analysis of struct packing here : http://www.catb.org/esr/structure-packing/
-
-### When can it be ignored ?
+=== When can it be ignored?
 
 It can be ignored if you know you require the `Sequential` layout for all of your structs, most likely for interop purposes.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
@@ -26,7 +23,7 @@ public struct MyStruct // Non compliant, specify the layout. Will take 24 bytes
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -49,3 +46,7 @@ public struct MyStruct // Compliant, specified layout. Will take 16 bytes with A
     public int C;
 }
 ----
+
+== Resources
+
+You can read a much more in-depth analysis of struct packing here : http://www.catb.org/esr/structure-packing/
diff --git a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
index dba18615f..c07399c2d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
+++ b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
@@ -1,5 +1,5 @@
 {
-  "title": "Variable can be made constant",
+  "title": "Non reassigned variables should be made constant",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -8,7 +8,14 @@
   },
   "tags": [
     "eco-design",
+    "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC82/csharp/EC82.asciidoc b/ecocode-rules-specifications/src/main/rules/EC82/csharp/EC82.asciidoc
index ff6e98f9f..819c8279e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC82/csharp/EC82.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC82/csharp/EC82.asciidoc
@@ -1,28 +1,23 @@
 :!sectids:
 
-Variable can be made constant.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Unlike variables, constant values are known at compile time and are injected as is in the code, requiring no runtime processing and therefore reducing the environmental footprint.
 Although good compilers will const eligible variables by themselves, it is still good practice to declare them constant, as it makes the code intent clearer.
 
-### When can it be ignored ?
-
-This rule should not be ignored.
-
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
 public void Main()
 {
-    int i = 0; // Non compliant, i is never reassigned and can be made constant
+    int i = 0; // Noncompliant, i is never reassigned and can be made constant
     Console.WriteLine(i);
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -41,3 +36,7 @@ public void Main()
     Console.WriteLine(i++);
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
index 540558cb9..da8c4bcfa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
+++ b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
@@ -1,5 +1,5 @@
 {
-  "title": "Replace Enum ToString() with nameof",
+  "title": "Enum ToString() should be renamed with nameof",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "ecocode",
     "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC83/csharp/EC83.asciidoc b/ecocode-rules-specifications/src/main/rules/EC83/csharp/EC83.asciidoc
index 397b28b44..c8ccac7c0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC83/csharp/EC83.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC83/csharp/EC83.asciidoc
@@ -1,17 +1,12 @@
 :!sectids:
 
-Replace Enum ToString() with nameof.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 When using the Enum ToString() syntax to convert an enum value to a string, without any specific format, the result will be the same as using the nameof(value) syntax.
 While the first one is resolved at runtime and requires some work, the latter is resolved at compile time and is much more efficient.
 
-### When can it be ignored ?
-
-This rule should not be ignored.
-
-## Non-compliant example
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
@@ -19,11 +14,11 @@ private enum Letter { A, B, C }
 
 public void Main()
 {
-    Console.WriteLine(Letter.A.ToString()); // Non-compliant, use nameof
+    Console.WriteLine(Letter.A.ToString()); // Noncompliant, use nameof
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -42,3 +37,7 @@ public void Main()
     Console.WriteLine(nameof(Letter.A)); // Compliant
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
index 961f19821..0d0dbb3af 100644
--- a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
+++ b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid async void methods",
+  "title": "Async void methods should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "bad-practice"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC84/csharp/EC84.asciidoc b/ecocode-rules-specifications/src/main/rules/EC84/csharp/EC84.asciidoc
index b3d45d40c..64a676baf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC84/csharp/EC84.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC84/csharp/EC84.asciidoc
@@ -1,8 +1,6 @@
 :!sectids:
 
-Avoid `async void` methods.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Using `async void` methods is strongly discouraged due to the significant drawbacks that affect both performance and environmental impact:
 
@@ -12,14 +10,16 @@ Using `async void` methods is strongly discouraged due to the significant drawba
 
 Overall, `async void` methods are considered poor practice, especially since the recommended alternative `async Task` is readily usable and provides an efficient solution for managing asynchronous operations without these downsides.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 In some edge cases, using an `async void` method can be beneficial, but you should **really know** what you're doing.
 
-## Non-compliant example
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
+// Noncompliant
 public class Test
 {
     public async void Run()
@@ -28,7 +28,7 @@ public class Test
         AsyncMethod(); // Cannot be awaited
     }
 
-    public async void AsyncMethod() // Non-compliant, use async Task
+    public async void AsyncMethod() // Noncompliant, use async Task
     {
         Console.WriteLine();
         await Task.Delay(1000);
@@ -36,7 +36,7 @@ public class Test
 }
 ----
 
-## Compliant example
+=== Compliant solution
 
 [source, cs]
 ----
@@ -55,3 +55,8 @@ public class Test
     }
 }
 ----
+
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
index 94d71b2f9..ed41639ff 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
+++ b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
@@ -11,5 +11,11 @@
     "ecocode",
     "performance"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc b/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
index 725b46d34..37dfa1267 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
@@ -1,40 +1,38 @@
 :!sectids:
 
-Make type sealed.
-
-## Why is this an issue ?
-
-A non-sealed type prevents the JIT compiler from applying strong optimizations such as devirtualization and inlining. If that type is intended to be inheritable then this is expected ; however if it doesn't, then it should be sealed explictly to bring the benefits from those optimizations.
-
-For a more in-depth explanation, see https://devblogs.microsoft.com/dotnet/performance_improvements_in_net_7/#analyzers
-
-### How does the analyzer identify sealable classes ?
-
 The analyzer will consider a type for sealing when the following conditions are met :
 
 * The type is not static, abstract, sealed or special (ie. implicit, script, auto-generated, etc)
 * The type is currently not inherited from in the solution
 * The type is not public, or it is public and has no overridable member (except for the default ones like GetHashcode, Equals, etc)
 
-### When can it be ignored ?
+== Why is this an issue?
+
+A non-sealed type prevents the JIT compiler from applying strong optimizations such as devirtualization and inlining. If that type is intended to be inheritable then this is expected ; however if it doesn't, then it should be sealed explictly to bring the benefits from those optimizations.
+
+For a more in-depth explanation, see https://devblogs.microsoft.com/dotnet/performance_improvements_in_net_7/#analyzers
+
+=== When can it be ignored?
 
 This rule can be ignored if you want a public type with no overridable member to still be inheritable from other assemblies.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
-public class Class1 // Non-compliant if not inherited from, make type sealed
+// Noncompliant
+public class Class1 // Noncompliant if not inherited from, make type sealed
 {
     public void Method();
 }
 
-public class Class2 // Non-compliant if not inherited from, make type sealed
+public class Class2 // Noncompliant if not inherited from, make type sealed
 {
     public sealed void Method();
 }
 
-internal class Class3 // Non-compliant if not inherited from because the type is not public, even with a virtual method
+internal class Class3 // Noncompliant if not inherited from because the type is not public, even with a virtual method
 {
     public virtual void Method();
 }
@@ -44,7 +42,7 @@ public class Class4 // Compliant even if not inherited from, the virtual method
     public virtual void Method();
 }
 
-public class Class5 : Class4 // Non-compliant if not inherited from, make type sealed
+public class Class5 : Class4 // Noncompliant if not inherited from, make type sealed
 {
     public sealed override void Method();
 }
@@ -55,7 +53,7 @@ public class Class6 : Class4 // Compliant, Method() is still overridable
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -89,3 +87,7 @@ public class Class6 : Class4
     public override void Method();
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
index 240c65241..93abb4ff4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
+++ b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
@@ -8,8 +8,15 @@
   },
   "tags": [
     "eco-design",
+    "performance", 
     "ecocode",
     "bad-practice"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc b/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
index 51a9f113e..363aa4749 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
@@ -1,31 +1,29 @@
 :!sectids:
 
-`GC.Collect` should not be called.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Calling `GC.Collect` forces a garbage collection to occur. This can be a very expensive operation, as it is fully blocking and can take a significant amount of time to complete.
 In most cases, the garbage collector is able to determine when it is appropriate to run a collection, and calling `GC.Collect` is not only unnecessary but also not advisable.
 
 Calling `GC.Collect` on generation 0 (ephemeral objects) is excluded from this rule, as it is very lightweight in comparison to the other generations.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 In general, it is not recommended to call GC.Collect as the cost far outweighs the benefits.
 In some cases however, typically if you know you have a lot of long-lived objects whose memory you need reclaimed immediately, calling `GC.Collect` can make sense.
 
-## Non-compliant examples
+=== Noncompliant code example
 
 [source, cs]
 ----
 public void Method();
 {
-    GC.Collect(); // Non-compliant, same as GC.Collect(generation: GC.MaxGeneration)
-    GC.Collect(generation: 2); // Non-compliant
+    GC.Collect(); // Noncompliant, same as GC.Collect(generation: GC.MaxGeneration)
+    GC.Collect(generation: 2); // Noncompliant
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -35,3 +33,7 @@ public void Method();
     GC.Collect(generation: 0, mode: GCCollectionMode.Optimized); // Compliant
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
index c4cec8131..0a0d3f6a3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
+++ b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use collection indexer",
+  "title": "Collection indexers should be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "bad-practice"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC87/csharp/EC87.asciidoc b/ecocode-rules-specifications/src/main/rules/EC87/csharp/EC87.asciidoc
index e977592c1..718ba19d7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC87/csharp/EC87.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC87/csharp/EC87.asciidoc
@@ -1,29 +1,24 @@
 :!sectids:
 
-Use collection indexer.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Linq methods like `First()`, `Last()` and `ElementAt()` can be necessary on enumerable types that don't have an indexer.
 But for those that implement `IReadOnlyList<T>`, `IList<T>` or `IList`, direct index access is cheaper at runtime and should be used instead.
 
-### When can it be ignored ?
-
-This rule shouldn't be ignored.
-
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
 public static void Test(int[] arr)
 {
-    int first = arr.First(); // Non-compliant, use arr[0]
-    int last = arr.Last(); // Non-compliant, use arr[^1], or arr[arr.Length - 1] if C# < 8
-    int third = arr.ElementAt(2); // Non-compliant, use arr[2]
+    int first = arr.First(); // Noncompliant, use arr[0]
+    int last = arr.Last(); // Noncompliant, use arr[^1], or arr[arr.Length - 1] if C# < 8
+    int third = arr.ElementAt(2); // Noncompliant, use arr[2]
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -34,3 +29,7 @@ public static void Test(List<int> list)
     int third = list[2];
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
index fe9b6cf4e..f71bfd07e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
+++ b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
@@ -1,5 +1,5 @@
 {
-  "title": "Dispose resource asynchronously",
+  "title": "Resources should be disposed asynchronously",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "bad-practice"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc b/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
index 59a2a9832..010ce0cff 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
@@ -1,28 +1,24 @@
 :!sectids:
 
-Dispose resources asynchronously.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Asynchronous operations free up the main thread, allowing it to handle other tasks or enter an idle state, which can lead to lower CPU usage and power consumption. Efficient resource utilization minimizes the overall environmental footprint of applications by reducing the time resources are held, lowering server load, and improving scalability.
 
 Therefore, resources that implement `IAsyncDisposable` should be disposed asynchronously whenever possible.
 
-### When can it be ignored ?
-
-This rule shouldn't be ignored.
-
-## Non-compliant examples
+== How to fix it
+== Noncompliant code example
 
 [source, cs]
 ----
+// Noncompliant
 public static async Task Test()
 {
-    using var stream = new MemoryStream(); // Non-compliant, can be disposed asynchronously
+    using var stream = new MemoryStream(); // Noncompliant, can be disposed asynchronously
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -39,3 +35,7 @@ public static void Test()
     using var stream = new MemoryStream(); // Compliant, method is synchronous
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
index a4b4753c8..fb9f43f6b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
+++ b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
@@ -1,5 +1,5 @@
 {
-  "title": "Avoid suspect unlimited cache size",
+  "title": "Unlimited cache size should not be used",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -13,5 +13,11 @@
     "cache",
     "ecocode"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc b/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
index dd4ebc3f3..9fc23d462 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
@@ -1,3 +1,7 @@
+:!sectids:
+
+== Why is this an issue?
+
 Python doesn't have TTL on cache with default libraries.
 
 With functools library @cache acts the same way than @lru_cache(maxsize=None).
@@ -7,21 +11,24 @@ By default, lru_cache set the size of cache to 128 entries.
 
 In this case, the cache is unlimited which is suspect.
 
-## Noncompliant Code Examples
+== How to fix it
+=== Noncompliant code example
 
 ```python
+# Noncompliant
  @cache # Noncompliant
  def cached_function():
    ...
 ```
 
 ```python
+# Noncompliant
  @lru_cache(maxsize=None) # Noncompliant
  def cached_function():
    ...
 ```
 
-## Compliant Solution
+=== Compliant solution
 
 ```python
  @lru_cache() # By default, the max size of the cache is 128
@@ -34,3 +41,7 @@ In this case, the cache is unlimited which is suspect.
  def cached_function():
     ...
 ```
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
index c5dabd5e7..965a0e50f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
+++ b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
@@ -1,9 +1,9 @@
 {
-  "title": "Should not import all from library",
+  "title": "Importing everything from library should be avoided",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
-      "MAINTAINABILITY": "MEDIUM"
+      "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
   },
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc b/ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc
index 14ac4b248..1d5cf761c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC9/javascript/EC9.asciidoc
@@ -9,6 +9,10 @@ This is especially critical in environments with limited resources, such as on m
 Smaller programs generally have better runtime performance.
 Reducing the number of unnecessary modules minimizes the amount of code that needs to be interpreted or compiled, leading to faster execution and improved overall performance.
 
+
+== How to fix it
+=== Noncompliant code example
+
 *Example with the well-known https://lodash.com/[lodash] library, if you only need
 `isEmpty` method.*
 
@@ -33,14 +37,16 @@ a|index.js - 24.42 KB
 [source,js,data-diff-id="2",data-diff-type="noncompliant"]
 ----
 // Example with lodash
-import lodash from "lodash"; // Non-compliant
-import { isEmpty } from "lodash"; // Non-compliant
-import * as lodash from "lodash"; // Non-compliant
+import lodash from "lodash"; // Noncompliant
+import { isEmpty } from "lodash"; // Noncompliant
+import * as lodash from "lodash"; // Noncompliant
 
 // Example with underscore
-import _ from "underscore"; // Non-compliant
+import _ from "underscore"; // Noncompliant
 ----
 
+=== Compliant solution
+
 [source,js,data-diff-id="2",data-diff-type="compliant"]
 ----
 // Example with lodash (uses submodules)
diff --git a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
index 253921456..f6887b5fb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
+++ b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
@@ -1,5 +1,5 @@
 {
-  "title": "Use Where before OrderBy",
+  "title": "Where should be used before OrderBy",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -12,5 +12,11 @@
     "performance",
     "bad-practice"
   ],
-  "defaultSeverity": "Major"
+  "defaultSeverity": "Major",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "MEDIUM"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC91/csharp/EC91.asciidoc b/ecocode-rules-specifications/src/main/rules/EC91/csharp/EC91.asciidoc
index cc6053d55..7688f5425 100644
--- a/ecocode-rules-specifications/src/main/rules/EC91/csharp/EC91.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC91/csharp/EC91.asciidoc
@@ -1,19 +1,19 @@
 :!sectids:
 
-Use Where before OrderBy.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 When `Orderby` is called right before `Where`, LINQ sorts all the elements before filtering them. Doing the opposite is more efficient, first filter the items then sort the remaining ones only.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 This rule shouldn't be ignored.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
+// Noncompliant
 public static async Task Test()
 {
     var query = items
@@ -55,7 +55,7 @@ public static async Task Test()
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -98,4 +98,8 @@ public static async Task Test()
                 orderby item descending
                 select item;
 }
-----
\ No newline at end of file
+----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
index d42c9add7..121fcd999 100644
--- a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
+++ b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
@@ -1,5 +1,5 @@
 {
-	"title": "Use string.Length instead of comparison with empty string",
+	"title": "string.Length should be used instead of comparison with empty string",
 	"type": "CODE_SMELL",
 	"status": "ready",
 	"remediation": {
@@ -12,5 +12,11 @@
 		"performance",
 		"bad-practice"
 	],
-	"defaultSeverity": "Minor"
+	"defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC92/csharp/EC92.asciidoc b/ecocode-rules-specifications/src/main/rules/EC92/csharp/EC92.asciidoc
index ec024f922..2a9a346cf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC92/csharp/EC92.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC92/csharp/EC92.asciidoc
@@ -1,30 +1,29 @@
 :!sectids:
 
-Use string.Length instead of comparison with empty string
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Comparing a string to an empty string is unnecessary and can be replaced by a call to `string.Length`, which is more performant and more readable.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 This rule should not be ignored.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
 public void Main()
 {
 	string s = "";
-	if (s == "") // Non-compliant
+	if (s == "") // Noncompliant
 	{
 		Console.WriteLine("Empty string");
 	}
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -37,3 +36,7 @@ public void Main()
 	}
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
index dd3cbc1d3..cbb65b2e3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
+++ b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
@@ -1,5 +1,5 @@
 {
-  "title": "Return Task directly",
+  "title": "Task should be returned directly",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "performance",
     "ecocode"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC93/csharp/EC93.asciidoc b/ecocode-rules-specifications/src/main/rules/EC93/csharp/EC93.asciidoc
index 07237306c..b1cba369a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC93/csharp/EC93.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC93/csharp/EC93.asciidoc
@@ -1,31 +1,30 @@
 :!sectids:
 
-Return Task directly.
-
-## Why is this an issue ?
+== Why is this an issue?
 
 Asynchronous methods that contain a single awaited statement can be optimized by removing the `async` modifier and returning the awaited `Task` directly. Doing so reduces the overhead of the state machine generated for the asynchronous method, leading to more efficient code and improving the resource efficiency of the application.
 
-### When can it be ignored ?
+=== When can it be ignored?
 
 When this rule is applied, exception handling is deferred to the main caller instead, which may or may not be desirable. The decision should be done with consideration to the context in which the method is used.
 
-## Non-compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, cs]
 ----
 public static async Task Test1()
 {
-	await Task.Delay(1000); // Non-compliant, return the Task directly.
+	await Task.Delay(1000); // Noncompliant, return the Task directly.
 }
 
 public static async Task Test2()
 {
-	await MyAsyncMethod(); // Non-compliant, exceptions within MyAsyncMethod are handled by the method itself.
+	await MyAsyncMethod(); // Noncompliant, exceptions within MyAsyncMethod are handled by the method itself.
 }
 ----
 
-## Compliant examples
+=== Compliant solution
 
 [source, cs]
 ----
@@ -39,3 +38,7 @@ public static Task Test2()
 	return MyAsyncMethod(); // Compliant, exceptions within MyAsyncMethod are handled by the caller of Test2.
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
index aea5000bd..f85a962a4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
+++ b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
@@ -1,5 +1,5 @@
 {
-  "title": "Performance: orElseGet instead of orElse",
+  "title": "orElseGet should be used instead of orElse",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -11,5 +11,11 @@
     "eco-design",
     "performance"
   ],
-  "defaultSeverity": "Minor"
+  "defaultSeverity": "Minor",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "LOW"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc b/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
index 77dfc09fb..685968410 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
@@ -1,16 +1,21 @@
+:!sectids:
+
+== Why is this an issue?
+
 Parameter of orElse() is evaluated, even when having a non-empty Optional.
 
 Supplier method of orElseGet passed as an argument is only executed when an Optional value isn’t present.
 
 Therefore, using orElseGet() will save computing time.
 
-## Noncompliant Code Example
+== How to fix it
+=== Noncompliant code example
 
 ```java
 Optional.of("ecoCode").orElse(getUnpredictedMethod());
 ```
 
-## Compliant Code Example
+=== Compliant solution
 
 ```java
 Optional.of("ecoCode").orElseGet(() -> getUnpredictedMethod());
@@ -19,3 +24,7 @@ Optional.of("ecoCode").orElseGet(() -> getUnpredictedMethod());
 ```java
 randomClass.orElse(getUnpredictedMethod());
 ```
+
+== Resources
+
+- https://github.com/cnumr/best-practices/blob/main/chapters/BP_042_fr.md[CNumR best practices (3rd edition) BP_042]
diff --git a/ecocode-rules-specifications/src/main/rules/etsdiff-methodology.asciidoc b/ecocode-rules-specifications/src/main/rules/etsdiff-methodology.asciidoc
index 3239fa7d4..9ce5b6477 100644
--- a/ecocode-rules-specifications/src/main/rules/etsdiff-methodology.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/etsdiff-methodology.asciidoc
@@ -1,4 +1,4 @@
-## The three sources of impacts of a code identified are:
+The three sources of impacts of a code identified are:
 
 - Energy: measured in joules (J)
 - Transfer: measured in Bytes (B)
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
new file mode 100644
index 000000000..4ed83601b
--- /dev/null
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -0,0 +1,233 @@
+/*
+ * ecoCode - Java language - Provides rules to reduce the environmental footprint of your Java programs
+ * Copyright © 2024 Green Code Initiative (https://www.ecocode.io)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package fr.greencodeinitiative;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.sonar.api.SonarRuntime;
+import org.sonar.api.issue.impact.SoftwareQuality;
+import org.sonar.api.rule.RuleScope;
+import org.sonar.api.rules.CleanCodeAttribute;
+import org.sonar.api.rules.RuleType;
+import org.sonar.api.server.rule.RuleDescriptionSection;
+import org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys;
+import org.sonar.api.server.rule.RulesDefinition;
+import org.sonar.api.server.rule.RulesDefinition.Repository;
+import org.sonar.api.server.rule.RulesDefinition.Rule;
+import org.sonar.api.server.rule.internal.DefaultNewRepository;
+import org.sonar.api.utils.Version;
+import org.sonarsource.analyzer.commons.RuleMetadataLoader;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.*;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+class RulesTest {
+    private static final Version SONAR_API_VERSION = Version.create(10, 10);
+    private static final String RESOURCE_DIR = "rules";
+    private static final String RESOURCE_BASE_PATH = "/io/ecocode/" + RESOURCE_DIR + "/";
+    private static final String[] LANGUAGES =
+            new String[] {"csharp", "html", "java", "javascript", "php", "python", "swift", "xml"};
+
+    private static final List<String> MANDATORY_TAGS =
+            Arrays.asList("performance", "ecocode", "eco-design");
+
+    private static final List<String> TECHNOLOGY_TAGS =
+            Arrays.asList("android", "ios", "spring", "react-native", "sql", "regex", "memory");
+
+    /**
+     * Built-in rule tags from
+     * https://docs.sonarsource.com/sonarqube/latest/user-guide/rules/built-in-rule-tags/
+     */
+    private static final List<String> BUILT_IN_RULE_TAGS = Arrays.asList("bad-practice");
+
+    /** Tags from https://github.com/cnumr/best-practices-mobile */
+    private static final List<String> BEST_PRACTISES_MOBILE_TAGS =
+            Arrays.asList(
+                    "optimized-api",
+                    "leakage",
+                    "bottleneck",
+                    "idleness",
+                    "power",
+                    "batch",
+                    "release",
+                    "sobriety",
+                    "longevity");
+
+    /**
+     * Let's not have too many tags, especially tags redundant with eco-design or performance, e.g.
+     * do not allow environment.
+     */
+    private static final List<String> ALL_TAGS =
+            Arrays.asList(
+                            MANDATORY_TAGS,
+                            BUILT_IN_RULE_TAGS,
+                            TECHNOLOGY_TAGS,
+                            BEST_PRACTISES_MOBILE_TAGS)
+                    .stream()
+                    .flatMap(List::stream)
+                    .collect(Collectors.toList());
+
+    private static final Pattern NONCOMPLIANT_COMMENT_PATTERN =
+            Pattern.compile(
+                    ".*(// Noncompliant|<!-- Noncompliant|# Noncompliant).*", Pattern.DOTALL);
+
+    private static SonarRuntime sonarRuntime;
+
+    @BeforeAll
+    static void init() {
+        sonarRuntime = mock(SonarRuntime.class);
+        when(sonarRuntime.getApiVersion()).thenReturn(SONAR_API_VERSION);
+    }
+
+    private static Path[] findAllLangs() throws URISyntaxException, IOException {
+        URI uri = RuleMetadataLoader.class.getResource(RESOURCE_BASE_PATH).toURI();
+        Path path = Paths.get(uri);
+        try (Stream<Path> walk = Files.walk(path, 1)) {
+            return walk.filter(p -> !RESOURCE_DIR.equals(p.toFile().getName()))
+                    .toArray(Path[]::new);
+        }
+    }
+
+    private static SortedSet<String> findAllRules(Path langPath) throws IOException {
+        SortedSet<String> rules = new TreeSet<>();
+        try (Stream<Path> langWalk = Files.walk(langPath, 1)) {
+            for (Iterator<Path> it = langWalk.iterator(); it.hasNext(); ) {
+                String ruleFile = it.next().toFile().getName();
+                int extensionIndex = ruleFile.lastIndexOf('.');
+                if (extensionIndex != -1) {
+                    String rule = ruleFile.substring(0, extensionIndex);
+                    rules.add(rule);
+                }
+            }
+        }
+        return rules;
+    }
+
+    @Test
+    void testRules() throws URISyntaxException, IOException {
+        RulesDefinition.Context context = new RulesDefinition.Context();
+        Path[] langPaths = findAllLangs();
+        assertArrayEquals(LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).toArray());
+        for (Path langPath : langPaths) {
+            String lang = langPath.toFile().getName();
+            DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
+            RuleMetadataLoader ruleMetadataLoader =
+                    new RuleMetadataLoader(RESOURCE_BASE_PATH + lang, sonarRuntime);
+            ruleMetadataLoader.addRulesByRuleKey(
+                    repository, new ArrayList<>(findAllRules(langPath)));
+            context.registerRepository(repository);
+        }
+        assertEquals(LANGUAGES.length, context.repositories().size());
+        for (Repository repo : context.repositories()) {
+            assertFalse(repo.rules().isEmpty(), repo.key() + " repository should have rules");
+            for (Rule rule : repo.rules()) {
+                assertFalse(
+                        rule.activatedByDefault(), rule + " should not be activated by default");
+                assertEquals(RuleScope.MAIN, rule.scope(), rule + " should have MAIN scope");
+                assertTrue(
+                        rule.tags().containsAll(MANDATORY_TAGS),
+                        rule + " should have tags " + MANDATORY_TAGS);
+
+                assertTrue(
+                        ALL_TAGS.containsAll(rule.tags()),
+                        rule + " should only have allowed tags but got: " + rule.tags());
+                assertEquals(
+                        RuleType.CODE_SMELL, rule.type(), rule + " should have CODE_SMELL type");
+                assertEquals(
+                        Collections.singleton(SoftwareQuality.RELIABILITY),
+                        rule.defaultImpacts().keySet(),
+                        rule + " should have RELIABILITY Software Quality");
+                assertEquals(
+                        CleanCodeAttribute.EFFICIENT,
+                        rule.cleanCodeAttribute(),
+                        rule + " should have EFFICIENT Clean Code Attribute");
+                // See guidelines in
+                // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
+                assertTrue(
+                        rule.name().contains(" should "),
+                        rule + " name should contain 'should': " + rule.name());
+                assertFalse(
+                        rule.name().endsWith("."),
+                        rule + " name should not end with a point: " + rule.name());
+                // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
+                assertFalse(
+                        rule.name().contains(":"),
+                        rule + " names should not have a prefix tag: " + rule.name());
+
+                List<String> sections =
+                        rule.ruleDescriptionSections().stream()
+                                .map(RuleDescriptionSection::getKey)
+                                .collect(Collectors.toList());
+                // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
+                assertFalse(
+                        sections.isEmpty(),
+                        rule
+                                + " should have standard description sections but gone none (is"
+                                + " :!sectids: present?)");
+                // Introduction is optional
+                if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
+                    sections.remove(0);
+                }
+                assertEquals(
+                        Arrays.asList(
+                                RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
+                                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
+                                RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
+                        sections,
+                        rule + " should have standard description sections");
+                String howToFix =
+                        rule.ruleDescriptionSections().stream()
+                                .filter(
+                                        s ->
+                                                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY
+                                                        .equals(s.getKey()))
+                                .findFirst()
+                                .orElse(null)
+                                .getHtmlContent();
+                assertTrue(
+                        NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
+                        rule
+                                + " must have Noncompliant comment in the How to fix section: "
+                                + howToFix);
+                assertTrue(
+                        howToFix.contains("<h3>Noncompliant code example</h3>"),
+                        rule
+                                + " must have <h3>Noncompliant code example</h3> in How to fix"
+                                + " section: "
+                                + howToFix);
+                assertTrue(
+                        howToFix.contains("<h3>Compliant solution</h3>"),
+                        rule
+                                + " must have <h3>Compliant solution</h3> in How to fix section: "
+                                + howToFix);
+            }
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index 5695ca2ff..e5465fa81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,8 +99,46 @@
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <assertJ.version>3.23.1</assertJ.version>
+        <mockito.version>5.3.1</mockito.version>
+        <sonarqube.version>10.10.0.2391</sonarqube.version>
+        <sonar-analyzer-commons.version>2.12.0.2964</sonar-analyzer-commons.version>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.api.plugin</groupId>
+            <artifactId>sonar-plugin-api</artifactId>
+            <version>${sonarqube.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.analyzer-commons</groupId>
+            <artifactId>sonar-analyzer-commons</artifactId>
+            <version>${sonar-analyzer-commons.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertJ.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <!-- <build>
         <plugins>
             <plugin>
@@ -134,6 +172,16 @@
         </plugins>
     </build> -->
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
+        </plugins>
+    </build>
+
     <profiles>
         <profile>
             <id>maven-central-publishing</id>

From bd8a4f1a104df43958eb274e889a8323549c9cdf Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 4 Sep 2024 09:28:06 +0200
Subject: [PATCH 02/19] Tests are now OK

---
 .../src/main/rules/EC1/java/EC1.asciidoc      |  10 +-
 .../src/main/rules/EC10/python/EC10.asciidoc  |  11 +-
 .../src/main/rules/EC2/java/EC2.asciidoc      |  11 +-
 .../src/main/rules/EC2/php/EC2.asciidoc       |   1 +
 .../src/main/rules/EC2/python/EC2.asciidoc    |   1 +
 .../main/rules/EC203/python/EC203.asciidoc    |  35 ++--
 .../src/main/rules/EC22/php/EC22.asciidoc     |  10 +-
 .../src/main/rules/EC24/EC24.json             |   2 +-
 .../src/main/rules/EC24/java/EC24.asciidoc    |   7 +-
 .../main/rules/EC24/javascript/EC24.asciidoc  |   2 +-
 .../main/rules/EC26/javascript/EC26.asciidoc  |   1 +
 .../src/main/rules/EC27/java/EC27.asciidoc    |  10 +-
 .../src/main/rules/EC28/java/EC28.asciidoc    |  10 +-
 .../src/main/rules/EC3/java/EC3.asciidoc      |  10 +-
 .../src/main/rules/EC32/java/EC32.asciidoc    |  10 +-
 .../src/main/rules/EC34/php/EC34.asciidoc     |  11 +-
 .../src/main/rules/EC34/python/EC34.asciidoc  |  11 +-
 .../src/main/rules/EC35/php/EC35.asciidoc     |  15 +-
 .../src/main/rules/EC35/python/EC35.asciidoc  |  10 +-
 .../main/rules/EC404/python/EC404.asciidoc    |  10 +-
 .../src/main/rules/EC5/java/EC5.asciidoc      |  10 +-
 .../src/main/rules/EC500/EC500.json           |   2 +-
 .../src/main/rules/EC500/java/EC500.asciidoc  |  11 +-
 .../src/main/rules/EC501/java/EC501.asciidoc  |  10 +-
 .../src/main/rules/EC502/java/EC502.asciidoc  |   5 +-
 .../src/main/rules/EC503/java/EC503.asciidoc  |  10 +-
 .../src/main/rules/EC504/java/EC504.asciidoc  |  11 +-
 .../src/main/rules/EC505/EC505.json           |   2 +-
 .../src/main/rules/EC505/java/EC505.asciidoc  |   5 +-
 .../src/main/rules/EC505/swift/EC505.asciidoc |  11 +-
 .../src/main/rules/EC505/xml/EC505.asciidoc   |  10 +-
 .../src/main/rules/EC506/EC506.json           |   5 +-
 .../src/main/rules/EC506/java/EC506.asciidoc  |  18 +-
 .../src/main/rules/EC507/java/EC507.asciidoc  |  10 +-
 .../src/main/rules/EC507/xml/EC507.asciidoc   |   9 +-
 .../src/main/rules/EC508/EC508.json           |   5 +-
 .../src/main/rules/EC508/java/EC508.asciidoc  |  10 +-
 .../src/main/rules/EC509/java/EC509.asciidoc  |  38 +++-
 .../src/main/rules/EC509/swift/EC509.asciidoc |  11 +-
 .../src/main/rules/EC510/java/EC510.asciidoc  |  10 +-
 .../src/main/rules/EC511/java/EC511.asciidoc  |  15 +-
 .../src/main/rules/EC512/EC512.json           |   8 +-
 .../src/main/rules/EC512/java/EC512.asciidoc  |  10 +-
 .../src/main/rules/EC513/java/EC513.asciidoc  |  11 +-
 .../src/main/rules/EC513/swift/EC513.asciidoc |   1 +
 .../src/main/rules/EC514/java/EC514.asciidoc  |  11 +-
 .../src/main/rules/EC514/swift/EC514.asciidoc |   1 +
 .../src/main/rules/EC515/java/EC515.asciidoc  |  10 +-
 .../src/main/rules/EC515/swift/EC515.asciidoc |   2 +-
 .../src/main/rules/EC516/java/EC516.asciidoc  |  10 +-
 .../src/main/rules/EC517/java/EC517.asciidoc  |  11 +-
 .../src/main/rules/EC518/java/EC518.asciidoc  |  13 +-
 .../src/main/rules/EC519/java/EC519.asciidoc  |  25 ++-
 .../src/main/rules/EC519/swift/EC519.asciidoc |  28 +--
 .../src/main/rules/EC519/xml/EC519.asciidoc   |  25 ++-
 .../src/main/rules/EC520/java/EC520.asciidoc  |  25 ++-
 .../src/main/rules/EC520/swift/EC520.asciidoc |  23 ++-
 .../src/main/rules/EC520/xml/EC520.asciidoc   |  13 +-
 .../src/main/rules/EC521/java/EC521.asciidoc  |  10 +-
 .../src/main/rules/EC522/java/EC522.asciidoc  |   5 +-
 .../rules/EC522/javascript/EC522.asciidoc     |   4 +-
 .../src/main/rules/EC522/swift/EC522.asciidoc |   6 +-
 .../src/main/rules/EC523/EC523.json           |   1 -
 .../src/main/rules/EC523/java/EC523.asciidoc  |  11 +-
 .../src/main/rules/EC523/java/EC523.json      |   6 +-
 .../rules/EC523/javascript/EC523.asciidoc     |   6 +
 .../main/rules/EC523/javascript/EC523.json    |   1 +
 .../src/main/rules/EC524/java/EC524.asciidoc  |  11 +-
 .../src/main/rules/EC524/swift/EC524.asciidoc |  10 +-
 .../src/main/rules/EC525/java/EC525.asciidoc  |  11 +-
 .../src/main/rules/EC526/java/EC526.asciidoc  |  11 +-
 .../src/main/rules/EC527/java/EC527.asciidoc  |  10 +-
 .../src/main/rules/EC528/EC528.json           |   2 +-
 .../src/main/rules/EC528/java/EC528.asciidoc  |  12 +-
 .../src/main/rules/EC529/EC529.json           |   3 +-
 .../src/main/rules/EC529/java/EC529.asciidoc  |  31 ++-
 .../src/main/rules/EC530/java/EC530.asciidoc  |  14 +-
 .../src/main/rules/EC530/java/EC530.json      |   5 +-
 .../rules/EC530/javascript/EC530.asciidoc     |  11 +-
 .../main/rules/EC530/javascript/EC530.json    |   5 +-
 .../src/main/rules/EC530/swift/EC530.asciidoc |  10 +-
 .../src/main/rules/EC530/swift/EC530.json     |   3 +-
 .../src/main/rules/EC531/java/EC531.asciidoc  |  16 +-
 .../src/main/rules/EC532/EC532.json           |   7 +-
 .../src/main/rules/EC532/java/EC532.asciidoc  |  22 +--
 .../src/main/rules/EC533/EC533.json           |   7 +-
 .../src/main/rules/EC533/swift/EC533.asciidoc |  11 +-
 .../src/main/rules/EC534/swift/EC534.asciidoc |  13 +-
 .../src/main/rules/EC540/EC540.json           |   2 +-
 .../src/main/rules/EC540/xml/EC540.asciidoc   |   9 +-
 .../src/main/rules/EC543/EC543.json           |   2 +-
 .../src/main/rules/EC543/xml/EC543.asciidoc   |   5 +-
 .../src/main/rules/EC544/xml/EC544.asciidoc   |   5 +-
 .../src/main/rules/EC547/xml/EC547.asciidoc   |   5 +-
 .../src/main/rules/EC548/xml/EC548.asciidoc   |  20 +-
 .../src/main/rules/EC603/swift/EC603.asciidoc |  20 +-
 .../src/main/rules/EC66/php/EC66.asciidoc     |  10 +-
 .../src/main/rules/EC67/java/EC67.asciidoc    |  10 +-
 .../src/main/rules/EC67/php/EC67.asciidoc     |  10 +-
 .../src/main/rules/EC69/java/EC69.asciidoc    |  10 +-
 .../src/main/rules/EC69/php/EC69.asciidoc     |  10 +-
 .../src/main/rules/EC69/python/EC69.asciidoc  |  10 +-
 .../src/main/rules/EC7/python/EC7.asciidoc    |  10 +-
 .../src/main/rules/EC72/java/EC72.asciidoc    |  10 +-
 .../src/main/rules/EC72/php/EC72.asciidoc     |  10 +-
 .../src/main/rules/EC72/python/EC72.asciidoc  |  10 +-
 .../src/main/rules/EC74/java/EC74.asciidoc    |  10 +-
 .../src/main/rules/EC74/php/EC74.asciidoc     |  10 +-
 .../src/main/rules/EC74/python/EC74.asciidoc  |  10 +-
 .../src/main/rules/EC75/csharp/EC75.asciidoc  |   2 +-
 .../src/main/rules/EC76/EC76.json             |   1 -
 .../src/main/rules/EC76/java/EC76.asciidoc    |  12 +-
 .../src/main/rules/EC77/java/EC77.asciidoc    |  20 +-
 .../src/main/rules/EC78/java/EC78.asciidoc    |  10 +-
 .../src/main/rules/EC79/java/EC79.asciidoc    |  11 +-
 .../src/main/rules/EC81/csharp/EC81.asciidoc  |   9 +-
 .../src/main/rules/EC85/EC85.json             |   2 +-
 .../src/main/rules/EC86/csharp/EC86.asciidoc  |   1 +
 .../src/main/rules/EC88/csharp/EC88.asciidoc  |   2 +-
 .../src/main/rules/EC89/python/EC89.asciidoc  |  20 +-
 .../src/main/rules/EC94/java/EC94.asciidoc    |  16 +-
 .../fr/greencodeinitiative/RulesTest.java     | 182 ++++++++++--------
 122 files changed, 862 insertions(+), 532 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc b/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
index 457dad28a..0924d5029 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC1/java/EC1.asciidoc
@@ -6,8 +6,7 @@ The use of Spring repository in a loop induces unnecessary calculations by the C
 Also, the use of Spring repository in a stream operation like "peek, forEach, forEachOrdered, map" induces unnecessary multiple access to the database instead of single batch call.
 
 == How to fix it
-
-=== Noncompliant Code Example
+=== Noncompliant code example
 
 [source,java]
 ----
@@ -37,7 +36,7 @@ stream.forEach(id -> {
 });
 ----
 
-== Compliant solution
+=== Compliant solution
 
 [source,java]
 ----
@@ -45,10 +44,11 @@ private final List<Integer> ids = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
 List<Employee> employees = employeeRepository.findAllById(ids);
 ----
 
-```java
+[source,java]
+----
 private final List<Integer> ids = Stream.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10).toList();
 List<Employee> employees = employeeRepository.findAllById(ids);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc b/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
index 876fdb4c6..0d4080f6a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC10/python/EC10.asciidoc
@@ -7,7 +7,9 @@ SVG images generated by common drawing softwares contains unnecessary data: calc
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
+<!-- Noncompliant -->
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
     width="210mm"
@@ -33,15 +35,16 @@ SVG images generated by common drawing softwares contains unnecessary data: calc
             r="73.177132" />
     </g>
 </svg>
-```
+----
 
 === Compliant solution
 
-```xml
+[source,xml]
+----
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 210 297" width="210mm" height="297mm">
     <circle cx="104.02724" cy="152.19028" r="73.177132" style="fill:#ff00ff;stroke-width:0.264583"/>
 </svg>
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
index 202257712..00ed4173c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
@@ -22,7 +22,9 @@ Code is noncompliant, because `nb` is used 4 times:
 - 3 times explicitly in `if` statements
 - 1 time implicitly in `else` statement
 
-```java
+[source,java]
+----
+// Noncompliant
 int index = 1;
 int nb = 2;
 ...
@@ -36,13 +38,14 @@ if (nb == 0) {
     nb = -1;
 }
 return nb;
-```
+----
 
 === Compliant solution
 
 With a `switch`:
 
-```java
+[source,java]
+----
 int index = 1;
 int nb = 2;
 ...
@@ -56,7 +59,7 @@ switch (nb) {
         nb = -1;
 }
 return nb;
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
index a8c1b2f8c..d6f264384 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
@@ -22,6 +22,7 @@ Code is noncompliant, because `$nb` is used 4 times :
 
 [source,php]
 ----
+// Noncompliant
 $index = 1;
 $nb = 2;
 ...
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
index e2217745d..a152c7246 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
@@ -22,6 +22,7 @@ Code is noncompliant, because `nb` is used 4 times:
 
 [source,python]
 ----
+# Noncompliant
 index = 1
 nb = 2
 ...
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
index 67f267e14..4d75d4438 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
@@ -22,58 +22,65 @@ Some advantages of using SVG:
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 # Noncompliant
 img_jpg = "image.jpg"
-```
+----
 
-```python
+[source,python]
+----
 # Noncompliant
 public void foo() {
     // ...
     image_format = testImage("image.jpg")
     // ...
 }
-```
+----
 
-```python
+[source,python]
+----
 # Noncompliant
 public void foo() {
     // ...
     return '<html><img src="xx/xx/image.bmp"></html>'
     // ...
 }
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 img_svg = "image.svg"
-```
+----
 
-```python
+[source,python]
+----
 public void foo() {
     // ...
     image_format = testImage("image.svg")
     // ...
 }
-```
+----
 
-```python
+[source,python]
+----
 public void foo() {
     // ...
     return '<html><img src="xx/xx/image.svg"></html>'
     // ...
 }
-```
+----
 
-```python
+[source,python]
+----
  public void foo() {
     // ...
     return ('<html><svg width="100" height="100"><circle cx="50" cy="50" r="40" stroke="green" stroke-width="4" fill="yellow"/></svg></html>')
     // ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc b/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
index 6840caf5d..ebfc821b1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC22/php/EC22.asciidoc
@@ -7,15 +7,17 @@ Using methods for basic operations consumes additional system resources. The int
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 $min = min($a, $b);  // Noncompliant
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 $min = $a < $b ? $a : $b;
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
index 79a7ef546..938a273a7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
+++ b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
@@ -1,5 +1,5 @@
 {
-  "title": "Limit the number of returns for a SQL query",
+  "title": "Returned SQL results should be limited",
   "type": "CODE_SMELL",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc b/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
index 4dcd9dcf6..72b4221a9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC24/java/EC24.asciidoc
@@ -1,7 +1,5 @@
 :!sectids:
 
-:!sectids:
-
 == Why is this an issue?
 
 SQL queries often involve processing large amounts of data, and fetching a large number of rows can consume significant CPU resources.
@@ -12,11 +10,16 @@ By restricting the result set size, you reduce the amount of data that needs to
 
 If you store data about customers, you certainly don’t need to retrieve information of all at once, because the larger the table will be, the more elements the query will return.
 
+== How to fix it
+=== Noncompliant code example
+
 [source,java,data-diff-id="1",data-diff-type="noncompliant"]
 ----
 String query = "SELECT * FROM customers"; // Noncompliant
 ----
 
+=== Compliant solution
+
 It may therefore be a good idea to limit the results and use pagination, for example.
 
 [source,java,data-diff-id="1",data-diff-type="compliant"]
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc b/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
index 7db05ba40..828256870 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC24/javascript/EC24.asciidoc
@@ -18,7 +18,7 @@ If you store data about customers, you certainly don’t need to retrieve inform
 const query = "SELECT * FROM customers"; // Noncompliant
 ----
 
-== Compliant solution
+=== Compliant solution
 
 It may therefore be a good idea to limit the results and use pagination, for example.
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc b/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
index ae140fe27..a5726770c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC26/javascript/EC26.asciidoc
@@ -13,6 +13,7 @@ For example, the `font` shorthand consolidates various font-related properties,
 
 [source,typescriptjsx,data-diff-id="1",data-diff-type="noncompliant"]
 ----
+// Noncompliant
 <div style={{ marginTop: "1em", marginRight: 0, marginBottom: "2em", marginLeft: "0.5em" }}>
     {/* Noncompliant: these properties can be grouped together in the "margin" property */}
 </div>
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc b/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
index 91ea4a3a3..f75002d4e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC27/java/EC27.asciidoc
@@ -13,22 +13,24 @@ The looping method is less efficient.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 int len = array.length;
 boolean[] copy = new boolean[array.length];
 for (int i = 0; i < len; i++) {
     copy[i] = array[i];  // Noncompliant
 }
 return copy;
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 int[] copy = new int[array.length];
 System.arraycopy(array, 0, copy, 0, array.length);
 return copy;
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc b/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
index 6d1ac0744..c88ece48e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC28/java/EC28.asciidoc
@@ -7,7 +7,8 @@ Throwing and handling exceptions is expensive and should not be used for normal
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 public void readPreferences(String filename) {
     //...
@@ -20,11 +21,12 @@ public void readPreferences(String filename) {
     in.read(...);
     //...
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void readPreferences(String filename) throws IllegalArgumentException, FileNotFoundException, IOException {
     if (filename == null) {
         throw new IllegalArgumentException ("filename is null");
@@ -33,7 +35,7 @@ public void readPreferences(String filename) throws IllegalArgumentException, Fi
     InputStream in = new FileInputStream(filename);
     //...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc b/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
index 9822f9856..cc8d57f29 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC3/java/EC3.asciidoc
@@ -8,25 +8,27 @@ When iterating over any collection, fetch the size of the collection in advance
 
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 List<String> objList = getData();
 
 for (int i = 0; i < objList.size(); i++) {  // Noncompliant
     // execute code
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 List<String> objList = getData();
 
 int size = objList.size();
 for (int i = 0; i < size; i++) {
     // execute code
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc b/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
index 8883b328c..87dab0590 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC32/java/EC32.asciidoc
@@ -9,21 +9,23 @@ This saves CPU cycles and therefore consumes less energy.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 StringBuilder sb = new StringBuilder(); // Noncompliant
 for (int i = 0; i < 100; i++) {
     sb.append(...);
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 StringBuilder sb = new StringBuilder(100);
 for (int i = 0; i < 100; i++) {
     sb.append(...);
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc b/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
index 421053b2a..11a3cff6c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC34/php/EC34.asciidoc
@@ -10,7 +10,9 @@ When an exception is thrown, a variable (the exception itself) is created in a c
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
+// Noncompliant
 try
 {
   $picture = PDF_open_image_file($PDF, "jpeg", $imgFile, "", 0); // This is the original statement, this works on PHP4
@@ -20,11 +22,12 @@ catch(Exception $ex)
   $msg = "Error opening $imgFile for Product $row['Identifier']";
   throw new Exception($msg);
 }
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 //try
 if (file_exists($imgFile)) {
     $picture = PDF_open_image_file($PDF, "jpeg", $imgFile, "", 0);
@@ -35,7 +38,7 @@ if (!$picture) {
    $msg = "Error opening $imgFile for Product $row['Identifier']";
    print $msg;
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc b/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
index 7e583a5d1..9667b4b7b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC34/python/EC34.asciidoc
@@ -9,7 +9,9 @@ When an exception is thrown, a variable (the exception itself) is created in a c
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
+# Noncompliant
 try:
     f = open(path)
     print(fh.read())
@@ -17,16 +19,17 @@ except:
     print('No such file ' + path)
 finally:
     f.close()
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 if os.path.isfile(path):
   fh = open(path, 'r')
   print(fh.read())
   fh.close
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc b/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
index 80b91db97..ab422830f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC35/php/EC35.asciidoc
@@ -10,7 +10,9 @@ When an exception is thrown, a variable (the exception itself) is created in a c
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
+// Noncompliant
 try
 {
   $picture = PDF_open_image_file($PDF, "jpeg", $imgFile, "", 0); // This is the original statement, this works on PHP4
@@ -20,22 +22,23 @@ catch(Exception $ex)
   $msg = "Error opening $imgFile for Product $row['Identifier']";
   throw new Exception($msg);
 }
-```
+----
 
 === Compliant solution
 
-```php
-//try
+[source,php]
+----
+// try
 if (file_exists($imgFile)) {
     $picture = PDF_open_image_file($PDF, "jpeg", $imgFile, "", 0);
 }
 
-//catch
+// catch
 if (!$picture) {
    $msg = "Error opening $imgFile for Product $row['Identifier']";
    print $msg;
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc b/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
index ec260efc1..b7513d7c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC35/python/EC35.asciidoc
@@ -10,7 +10,8 @@ When an exception is thrown, a variable (the exception itself) is created in a c
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 # Noncompliant
 try:
     f = open(path)
@@ -19,16 +20,17 @@ except:
     print('No such file ' + path)
 finally:
     f.close()
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 if os.path.isfile(path):
   fh = open(path, 'r')
   print(fh.read())
   fh.close
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
index d37d6e208..5c85e6673 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
@@ -7,19 +7,21 @@ Python generators resemble lazy lists from other programming languages: when ite
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 # Noncompliant
 for var in [var2 for var2 in range(100)]:
     ...
 
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 for var in (var2 for var2 in range(100)):
     ...
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc b/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
index e3e90d736..0c3a7c1a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC5/java/EC5.asciidoc
@@ -7,16 +7,18 @@ Use `PreparedStatement` instead of `Statement`, because SQL will only commit the
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 public void select() {
     Statement statement = connection.createStatement();
     statement.executeUpdate("INSERT INTO persons(id, name) VALUES(2, 'John DOE')");  // Noncompliant
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void select() {
     PreparedStatement statement = connection.prepareStatement(INSERT INTO persons(id, name) VALUES(?, ?));
 
@@ -24,7 +26,7 @@ public void select() {
     statement.setString(2, "John DOE");
     statement.executeQuery();
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
index 506324b84..a45157b5b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
+++ b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
@@ -1,5 +1,5 @@
 {
-  "title": "Batch: Sensor Coalesce",
+  "title": "Reporting latency should be used for sensor listeners",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc b/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
index 84de25491..0b0039728 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC500/java/EC500.asciidoc
@@ -11,23 +11,26 @@ Once one of the events in the FIFO needs to be reported, all the events in the F
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 SensorEventListener sensorEventListener;
 SensorManager sensorManager;
 Sensor sensor;
 
 sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 SensorEventListener sensorEventListener;
 SensorManager sensorManager;
 Sensor sensor;
 
 sensorManager.registerListener(sensorEventListener, sensor, SensorManager.SENSOR_DELAY_NORMAL, 200000);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc b/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
index c51e2dceb..f834a9acd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC501/java/EC501.asciidoc
@@ -11,7 +11,8 @@ The Android system can combine jobs so that battery consumption is reduced.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 void setAlarm(Context context) {
     AlarmManager alarmManager = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);
@@ -22,11 +23,12 @@ void setAlarm(Context context) {
 
 Alarm alarm = new Alarm();
 alarm.setAlarm(this);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 JobInfo info = new JobInfo.Builder(123, COMPONENT_NAME)
                           .setRequiresCharging(true)
                           .setRequiredNetworkType(JobInfo.NETWORK_TYPE_UNMETERED)
@@ -35,7 +37,7 @@ JobInfo info = new JobInfo.Builder(123, COMPONENT_NAME)
                           .build();
 JobScheduler scheduler = (JobScheduler) getSystemService(JOB_SCHEDULER_SERVICE);
 scheduler.schedule(info);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc b/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
index 5dd5d8c31..2fbaf1a7b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC502/java/EC502.asciidoc
@@ -9,12 +9,13 @@ Also, this bad practice must be early prevented because it is the root of anothe
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 for (int val : myArray) {
     URL.openConnection();
 }
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc b/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
index 32cbe735e..4813fbb03 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC503/java/EC503.asciidoc
@@ -9,21 +9,23 @@ Processing these extra packets can cause a noticeable battery drain and must be
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 WifiManager.MulticastLock lock = wifiManager.createMulticastLock("tag");
 lock.acquire();
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 WifiManager wifiManager = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 WifiManager.MulticastLock lock = wifiManager.createMulticastLock("tag");
 lock.acquire();
 lock.release()
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc b/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
index 0f6ef621d..0e6c30599 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC504/java/EC504.asciidoc
@@ -7,19 +7,22 @@ Transmitting a file over a network infrastructure without compressing it consume
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 Url url = new Url("https://www.ecocode.io/");
 HttpsUrlConnection con = (HttpsURLConnection) url.openConnection();
 OutputStream stream = con.getOutputStream();
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 Url url = new Url("https://www.ecocode.io/");
 HttpsUrlConnection con = (HttpsURLConnection) url.openConnection();
 OutputStream stream = new GZIPOutputStream(con.getOutputStream());
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
index 963e8ee83..02081acef 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
+++ b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Keep Screen On (addFlags)",
+  "title": "Screen should not be kept on",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
index a0b366424..96ca4d779 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/java/EC505.asciidoc
@@ -14,10 +14,11 @@ Hence, keeping the screen on should be avoided, unless it is absolutely necessar
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 getWindow().addFlags(FLAG_KEEP_SCREEN_ON);
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
index 288823382..56ea2f791 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/swift/EC505.asciidoc
@@ -4,15 +4,18 @@
 
 To avoid draining the battery, an iOS device that is left idle quickly falls asleep.
 
-Hence, keeping the screen on should be avoided, unless it is absolutely necessary. Developers typically
-disable the idle timer with `UIApplication.shared.isIdleTimerDisabled = true`.
+Hence, keeping the screen on should be avoided, unless it is absolutely necessary.
+Developers typically disable the idle timer with `UIApplication.shared.isIdleTimerDisabled = true`.
 
 == How to fix it
+
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 UIApplication.shared.isIdleTimerDisabled = true
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc b/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
index ca8981044..ccfeaf172 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC505/xml/EC505.asciidoc
@@ -9,22 +9,24 @@ Hence, keeping the screen on should be avoided, unless it is absolutely necessar
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:keepScreenOn="true"/>
-```
+----
 
 === Compliant solution
 
-```xml
+[source,xml]
+----
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 android:layout_width="match_parent"
 android:layout_height="match_parent"
 android:keepScreenOn="false"/>
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
index 09d540491..a684977c9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
+++ b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Keep Screen On (setFlags)",
+  "title": "Screen should not be kept on",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -20,6 +20,5 @@
       "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
-  },
-
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc b/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
index 065d75d7b..2ae3956e1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC506/java/EC506.asciidoc
@@ -2,17 +2,27 @@
 
 == Why is this an issue?
 
-
 To avoid draining the battery, an Android device that is left idle quickly falls asleep.
 
-Hence, keeping the screen on should be avoided, unless it is absolutely necessary. If so, developers typically use the `FLAG_KEEP_SCREEN_ON` in their activity. Another way to implement this is in their application's layout XML file, by using the `android:keepScreenOn` attribute.
+Hence, keeping the screen on should be avoided, unless it is absolutely necessary.
+
+To keep the screen on, developers typically:
+
+- use the `FLAG_KEEP_SCREEN_ON` in their activity;
+- or use the `android:keepScreenOn` attribute in their application's layout XML file.
 
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 getWindow().setFlags(FLAG_KEEP_SCREEN_ON, FLAG_KEEP_SCREEN_ON);
-```
+----
+
+=== Compliant solution
+
+Do not keep the screen on.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc b/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
index ba30469ae..b82d3b134 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC507/java/EC507.asciidoc
@@ -9,10 +9,16 @@ The bad practise includes using a Power Manager system service feature called wa
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
 WakeLock manager = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "TAG");
-```
+----
+
+=== Compliant solution
+
+Do not use wake lock.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc b/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
index ad6afc65e..36f4d90e0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC507/xml/EC507.asciidoc
@@ -13,12 +13,17 @@ along with the specific permission `WAKE_LOCK` in the manifest.
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <manifest>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 </manifest>
-```
+----
+
+=== Compliant solution
+
+Do not use wake lock.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
index d864ca6c7..1d3680527 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
+++ b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
@@ -1,5 +1,5 @@
 {
-  "title": "Idleness: Durable Wake Lock",
+  "title": "Durable wake lock should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -20,6 +20,5 @@
       "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
-  },
-
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc b/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
index bb9f7a03a..272d4649d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC508/java/EC508.asciidoc
@@ -11,16 +11,18 @@ This can be avoided by a call to `PowerManager#acquire(long timeout)` instead of
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 PowerManager.acquire()
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 PowerManager.acquire(long timeout)
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc b/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
index 17edf9536..68783d360 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC509/java/EC509.asciidoc
@@ -11,29 +11,47 @@ Similarly after API 19, `setExact()` and `setExactAndAllowWhileIdle()` can signi
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setRepeating(alarmType, triggerAtMillis, intervalMillis, operation);
-``` or
-```java
+----
+
+or
+
+[source,java]
+----
+// Noncompliant
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setExact(type,triggerAtMillis,operation);
-``` or
-```java
+----
+
+or
+
+[source,java]
+----
+// Noncompliant
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setExact(type,triggerAtMillis,tag,listener,targetHandler);
-``` or
-```java
+----
+
+or
+
+[source,java]
+----
+// Noncompliant
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setExactAndAllowWhileIdle(type,triggerAtMilllis,operation);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 AlarmManager alarmManager = (AlarmManager) this.getSystemService(Context.ALARM_SERVICE);
 alarmManager.setInexactRepeating(alarmType, triggerAtMillis, intervalMillis, operation);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc b/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
index 84b7ab577..ab5ed9645 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC509/swift/EC509.asciidoc
@@ -7,16 +7,19 @@ Setting a tolerance for timers will allow them to fire later than the scheduled
 == How to fix it
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 let timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in }
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 let timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in }
 timer.tolerance = 0.5
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc b/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
index ff2d8a959..ddd9c7f5e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC510/java/EC510.asciidoc
@@ -7,18 +7,20 @@ For developers wishing to display OpenGL rendering, when choosing the rendering
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 GLSurfaceView surfaceView = new GLSurfaceView(this);
 surfaceView.setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY)
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 GLSurfaceView surfaceView = new GLSurfaceView(this);
 surfaceView.setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY)
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc b/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
index 61bdc2749..39d98671b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC511/java/EC511.asciidoc
@@ -9,25 +9,28 @@ By default, the system holds a wake lock for it while in this state, so that it
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
-```
+----
 
 or
 
-```java
+[source,java]
+----
 // Noncompliant
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
 voiceSession.setKeepAwake(true);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 VoiceInteractionSession voiceSession = new VoiceInteractionSession(this);
 voiceSession.setKeepAwake(false);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
index d4567510b..3054e78fd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
+++ b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
@@ -14,5 +14,11 @@
     "performance"
   ],
   "ecoScore": "0.2",
-  "defaultSeverity": "Critical"
+  "defaultSeverity": "Critical",
+  "code": {
+    "impacts": {
+      "RELIABILITY": "HIGH"
+    },
+    "attribute": "EFFICIENT"
+  }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc b/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
index b186a56bf..508176799 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC512/java/EC512.asciidoc
@@ -13,17 +13,19 @@ The common point of all these sensors is that they are expensive while in use. T
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 Camera camera = Camera.open();
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 Camera camera = Camera.open();
 camera.release();
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc b/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
index ffc0ba3bf..8784e4d90 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC513/java/EC513.asciidoc
@@ -14,18 +14,21 @@ The common point of all these sensors is that they are expensive while in use. T
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000L, 1.0f, this);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 LocationManager locationManager = (LocationManager) getSystemService(LOCATION_SERVICE);
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000L, 1.0f, this);
 locationManager.removeUpdates(this);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc b/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
index ff04c7c44..d3b14088d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC513/swift/EC513.asciidoc
@@ -15,6 +15,7 @@ The common point of all these sensors is that they are power-intensive while in
 
 [source,swift]
 ----
+// Noncompliant
 import CoreLocation
 
 class LocationTracker: NSObject, CLLocationManagerDelegate {
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc b/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
index 98b481a01..8720ea764 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC514/java/EC514.asciidoc
@@ -13,20 +13,23 @@ The common point of all these sensors is that they are expensive while in use. T
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 Sensor accelerometer = sManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 sManager.registerListener(this,accelerometer,SensorManager.SENSOR_DELAY_NORMAL);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 Sensor accelerometer = sManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
 sManager.registerListener(this,accelerometer,SensorManager.SENSOR_DELAY_NORMAL);
 sManager.unregisterListener(this);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc b/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
index 7cddb4a85..3f037bb06 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC514/swift/EC514.asciidoc
@@ -14,6 +14,7 @@ The common point of all these sensors is that they consume significant power whi
 
 [source,swift]
 ----
+// Noncompliant
 import CoreMotion
 
 let motionManager = CMMotionManager()
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc b/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
index 75c376d83..f6d8fbdbe 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC515/java/EC515.asciidoc
@@ -9,17 +9,19 @@ In addition to unnecessary resources (such as memory and instances of codecs) be
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 MediaRecorder mr = new MediaRecorder();
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 MediaRecorder mr = new MediaRecorder();
 mr.release();
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc b/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
index 317873912..7483c5ada 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC515/swift/EC515.asciidoc
@@ -33,7 +33,7 @@ func startRecording() {
 }
 ----
 
-== Compliant solution
+=== Compliant solution
 
 [source,swift]
 ----
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc b/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
index b971f36f8..7e6f9292d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC516/java/EC516.asciidoc
@@ -9,17 +9,19 @@ Otherwise, in addition to unnecessary resources (such as memory and instances of
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 MediaPlayer mp = new MediaPlayer();
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 MediaPlayer mp = new MediaPlayer();
 mp.release();
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc b/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
index 251564892..0ad9744c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC517/java/EC517.asciidoc
@@ -9,15 +9,18 @@ Thus, developer has to set up Google Play Service in her gradle file with a depe
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 import android.location.*;
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 import com.google.android.gms.location.*;
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc b/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
index 7be3e3132..47b706091 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC518/java/EC518.asciidoc
@@ -9,18 +9,19 @@ From the Android client side, it means append `android.bluetooth.le.\*` imports
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 import android.bluetooth.*
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 import android.bluetooth.le.*
-```
+----
 
 == Resources
 
 - https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
-
-
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
index 1e91bd227..52bc03473 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/java/EC519.asciidoc
@@ -10,34 +10,39 @@ One can monitor the changes in charging state with a broadcast receiver register
 
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 // No IntentFilter for power charge status
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 new IntentFilter(Intent.ACTION_POWER_CONNECTED)
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 new IntentFilter(Intent.ACTION_POWER_DISCONNECTED)
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 new IntentFilter(Intent.ACTION_POWER_BATTERY_OKAY)
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 new IntentFilter(Intent.ACTION_POWER_BATTERY_LOW)
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
index b50534b73..be7fa7447 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/swift/EC519.asciidoc
@@ -7,37 +7,41 @@ An app should have a different behavior when device is connected/disconnected to
 Your app can also register to receive notifications when the battery level or state changes, using `batteryLevelDidChangeNotification` and `batteryStateDidChangeNotification`.
 
 == How to fix it
+=== Noncompliant code example
 
-=== Noncompliant code sample
-
-```swift
+[source,swift]
+----
 // Noncompliant
 // No handling of power charge status
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 let level = UIDevice.current.batteryLevel
-```
+----
 
 or
 
-```swift
+[source,swift]
+----
 let state = UIDevice.current.batteryState
-```
+----
 
 or
 
-```swift
+[source,swift]
+----
 NotificationCenter.default.addObserver(forName: UIDevice.batteryLevelDidChangeNotification, object: nil, queue: nil) { _ in }
-```
+----
 
 or
 
-```swift
+[source,swift]
+----
 NotificationCenter.default.addObserver(forName: UIDevice.batteryStateDidChangeNotification, object: nil, queue: nil) { _ in }
-```
+----
 
 
 == Resources
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc b/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
index e4f5b7229..2f94c7e54 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC519/xml/EC519.asciidoc
@@ -8,50 +8,55 @@ An app should have a different behavior when device is connected/disconnected to
 
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 // Noncompliant
 // No intent for power charge status
-```
+----
 
 === Compliant solution
 
-```xml
+[source,xml]
+----
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
     <intent-filter>
         <action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
     </intent-filter>
 </receiver>
-```
+----
 
 or
 
-```xml
+[source,xml]
+----
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
     <intent-filter>
         <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
     </intent-filter>
 </receiver>
-```
+----
 
 or
 
-```xml
+[source,xml]
+----
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
     <intent-filter>
         <action android:name="android.intent.action.ACTION_POWER_BATTERY_OKAY"/>
     </intent-filter>
 </receiver>
-```
+----
 
 or
 
-```xml
+[source,xml]
+----
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
     <intent-filter>
         <action android:name="android.intent.action.ACTION_POWER_BATTERY_LOW"/>
     </intent-filter>
 </receiver>
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
index 569de2b85..38959ee50 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/java/EC520.asciidoc
@@ -10,7 +10,8 @@ It implies the existence of a broadcast receiver registered on the action `ACTIO
 
 === Noncompliant code example
 
-```java
+[source,java]
+----
 IntentFilter filter3 = new IntentFilter(ACTION_BATTERY_CHANGED); // Noncompliant
 IntentFilter filter4 = new IntentFilter(PING_ALARM_ACTION);
 
@@ -19,31 +20,35 @@ IntentFilter.create("foo", "application/blatz");
 
 filter3.addAction(ACTION_BATTERY_CHANGED);// Noncompliant
 filter4.addAction("android.provider.Telephony.SMS_RECEIVED");
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 new IntentFilter(Intent.ACTION_POWER_SAVE_MODE_CHANGED)
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 intentFilter.addAction(ACTION_POWER_SAVE_MODE_CHANGED)
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 IntentFilter.create(ACTION_POWER_SAVE_MODE_CHANGED,"")
-```
+----
 
 Or
 
-```java
+[source,java]
+----
 powerManager.isPowerSaveMode()
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
index 8a80e0aba..8308061ec 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/swift/EC520.asciidoc
@@ -9,31 +9,34 @@ For example, you can reduce frequency of data update if low power mode is enable
 Your app can query the `ProcessInfo.processInfo.isLowPowerModeEnabled` property at any time to determine whether Low Power Mode is active. Your app can also register to receive notifications when the Low Power Mode state of a device changes, using `NSProcessInfoPowerStateDidChange`.
 
 == How to fix it
+=== Noncompliant code example
 
-=== Noncompliant code sample
-
-```swift
+[source,swift]
+----
 // Noncompliant
 // No handling of power mode
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 let isLowPowerModeEnabled = ProcessInfo.processInfo.isLowPowerModeEnabled
-```
+----
 
 or
 
-```swift
+[source,swift]
+----
 NotificationCenter.default.addObserver(forName: .NSProcessInfoPowerStateDidChange, object: nil, queue: nil) { _ in }
-```
+----
 
 or
 
-```swift
+[source,swift]
+----
 NotificationCenter.default.addObserver(forName: Notification.Name.NSProcessInfoPowerStateDidChange, object: nil, queue: nil) { _ in }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc b/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
index 067ef1fc3..ee7e831a9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC520/xml/EC520.asciidoc
@@ -7,23 +7,24 @@ Taking into account when the device is entering or exiting the power save mode i
 It implies the existence of a broadcast receiver registered on the action `ACTION_POWER_SAVE_MODE_CHANGED`, or programmatically with a call to `PowerManager#isPowerSaveMode().`
 
 == How to fix it
+=== Noncompliant code example
 
-=== Noncompliant code sample
-
-```xml
+[source,xml]
+----
 // Noncompliant
 // No BATTERY_CHANGED intent
-```
+----
 
 === Compliant solution
 
-```xml
+[source,xml]
+----
 <receiver android:name="io.ecocode.testapp.core.service.MyReceiver">
     <intent-filter>
         <action android:name="android.intent.action.BATTERY_CHANGED"/>
     </intent-filter>
 </receiver>
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc b/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
index 0553bbfb0..c07c05be1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC521/java/EC521.asciidoc
@@ -7,18 +7,20 @@ The rotation vector sensor is the most frequently used sensor for motion detecti
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 sManager.getDefaultSensor(Sensor.TYPE_ROTATION_VECTOR);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 SensorManager sManager = (SensorManager) getSystemService(Context.SENSOR_SERVICE);
 sManager.getDefaultSensor(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
index 098b9b7aa..0c96a2eeb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.asciidoc
@@ -11,10 +11,11 @@ This feature was introduced to improve battery life, be careful when deactivatin
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 getWindow().getAttributes().screenBrightness = BRIGHTNESS_OVERRIDE_FULL;
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
index f93703cc6..c982b5dda 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.asciidoc
@@ -13,7 +13,8 @@ Hence, keeping forcing the screen brightness on should be avoided, unless it is
 == How to fix it
 === Noncompliant code example
 
-```js
+[source,javascript]
+----
 // Example with expo-brightness (Expo framework library)
 import React, { useEffect } from 'react';
 import { View, Text } from 'react-native';
@@ -29,6 +30,7 @@ export default function App() {
         </View>
     );
 }
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
index b35e4c483..f16c437ac 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.asciidoc
@@ -9,9 +9,11 @@ Hence, keeping forcing the screen brightness on should be avoided, unless it is
 == How to fix it
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 UIScreen.main.brightness = CGFloat(0.3)
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
index f821491c8..f6333201d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
@@ -1,5 +1,4 @@
 {
-  "title": "Sobriety: Thrifty Geolocation (minTime)",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
index f600f4453..61cce6c02 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.asciidoc
@@ -9,21 +9,24 @@ These two must imperatively be greater than 0.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     0,
     0,
     this);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     60000L,  // refresh location at least each 60000ms
     10.0f,   // refresh location at least each 10 meters
     this);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
index fa51e410b..09b550281 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
@@ -1,7 +1,9 @@
 {
+  "title": "minTime should be used in geolocation update",
   "tags": [
     "ecocode",
-    "android",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "android"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
index 5a7b8e33b..794b91950 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.asciidoc
@@ -12,6 +12,7 @@ If the application or service does not critically require pinpoint accuracy, opt
 help minimize the strain on the device's CPU.
 
 == How to fix it in Web
+=== Noncompliant code example
 
 [source,js]
 ----
@@ -23,6 +24,8 @@ navigator.geolocation.getCurrentPosition(
 );
 ----
 
+=== Compliant solution
+
 In these examples, the enableHighAccuracy option is set to false (the default), indicating that the application prefers
 lower-accuracy geolocation to conserve resources:
 
@@ -42,6 +45,7 @@ navigator.geolocation.getCurrentPosition(
 ----
 
 == How to fix it in React Native
+=== Noncompliant code example
 
 In this example, we ask the user to turn on high accuracy location mode which enables network provider that uses Google Play services to improve location accuracy and location-based services:
 
@@ -52,6 +56,8 @@ import * as Location from 'expo-location';
 Location.enableNetworkProviderAsync(); // Noncompliant
 ----
 
+=== Compliant solution
+
 Prefer to ask the user to turn on lower-accuracy geolocation to conserve resources:
 
 [source,js]
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
index f947e415d..687e9dc32 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
@@ -1,4 +1,5 @@
 {
+  "title": "High accuracy geolocation should be avoided",
   "tags": [
     "ecocode",
     "eco-design",
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc b/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
index a7b1eef94..31527c16b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC524/java/EC524.asciidoc
@@ -9,23 +9,26 @@ An important point is to try to get the best possible provider (`LocationManager
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     1000L,
     1.0f,
     this);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 Criteria criteria = new Criteria();
 criteria.setPowerRequirement(Criteria.POWER_LOW);
 locationManager.requestLocationUpdates(locationManager.getBestProvider(criteria,true),
     1000L,
     1.0f,
     this);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc b/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
index 5068cdc43..74337ce03 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC524/swift/EC524.asciidoc
@@ -14,17 +14,19 @@ Also, setting the `CLLocationManager#activityType` property will let the system
 
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
 // Noncompliant
 let manager = CLLocationManager()
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 let manager = CLLocationManager()
 manager.desiredAccuracy = 2
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc b/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
index a7a9f55c6..5815049bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC525/java/EC525.asciidoc
@@ -9,17 +9,20 @@ The default and preferred advertising mode is `ADVERTISE_MODE_LOW_POWER` when ca
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 AdvertiseSettings.Builder builder = new AdvertiseSettings.Builder();
 builder.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_LATENCY);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 AdvertiseSettings.Builder builder = new AdvertiseSettings.Builder();
 builder.setAdvertiseMode(AdvertiseSettings.ADVERTISE_MODE_LOW_POWER);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc b/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
index a50786b75..bc0d49080 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC526/java/EC526.asciidoc
@@ -11,17 +11,20 @@ Invoking `BluetoothGatt#requestConnectionPriority(int connectionPriority)` with
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 BluetoothGatt gatt = new BluetoothGatt();
 gatt.requestConnectionPriority(CONNECTION_PRIORITY_HIGH);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 BluetoothGatt gatt = new BluetoothGatt();
 gatt.requestConnectionPriority(CONNECTION_PRIORITY_LOW_POWER);
-```
+----
 == Resources
 
 - https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc b/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
index 694bb588a..61cce6c02 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC527/java/EC527.asciidoc
@@ -9,22 +9,24 @@ These two must imperatively be greater than 0.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     0,
     0,
     this);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER,
     60000L,  // refresh location at least each 60000ms
     10.0f,   // refresh location at least each 10 meters
     this);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
index 515f583cd..d52cb22d4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
+++ b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Vibration Free",
+  "title": "Vibration should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc b/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
index 97b947256..b31f7e980 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC528/java/EC528.asciidoc
@@ -10,16 +10,20 @@ Shaking of an Android device is possible in all circumstances with a call to `ge
 === Noncompliant code example
 
 API 26:
-```java
+[source,java]
+----
+// Noncompliant
 Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
 v.vibrate(400);
-```
+----
 
 API 31:
-```java
+[source,java]
+----
+// Noncompliant
 VibratorManager vm = (VibratorManager) getSystemService(Context.VIBRATOR_MANAGER_SERVICE);
 vm.getDefaultVibrator().vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
index cd48f0393..e6ca6362b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
+++ b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
@@ -1,5 +1,5 @@
 {
-  "title": "Sobriety: Thrifty Notification",
+  "title": "Specific sound or vibration should not be used for notification",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -7,6 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
+    "sobriety",
     "ecocode",
     "android",
     "eco-design",
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc b/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
index 537af7cdd..c8e08e651 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC529/java/EC529.asciidoc
@@ -11,18 +11,22 @@ However, a notification does not necessarily need to be loud and vibrant to achi
 
 API 26:
 
-```java
+[source,java]
+----
+// Noncompliant
 Notification.Builder notificationBuilder = new Notification.Builder(getApplicationContext(), "42");
 notificationBuilder.setVibrate(new long[] {1000, 1000, 1000, 1000, 1000});
 notificationBuilder.setSound(
     RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
     Notification.AUDIO_ATTRIBUTES_DEFAULT
 );
-```
+----
 
 API 31:
 
-```java
+[source,java]
+----
+// Noncompliant
 NotificationChannel notification = new NotificationChannel("42",
     "test",
     NotificationManager.IMPORTANCE_DEFAULT
@@ -32,7 +36,26 @@ notification.setSound(
     RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
     Notification.AUDIO_ATTRIBUTES_DEFAULT
 );
-```
+----
+
+=== Compliant solution
+
+API 26:
+
+[source,java]
+----
+Notification.Builder notificationBuilder = new Notification.Builder(getApplicationContext(), "42");
+----
+
+API 31:
+
+[source,java]
+----
+NotificationChannel notification = new NotificationChannel("42",
+    "test",
+    NotificationManager.IMPORTANCE_DEFAULT
+);
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
index 3fc4fc285..4d849e266 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.asciidoc
@@ -2,14 +2,16 @@
 
 == Why is this an issue?
 
-
 Turning on the torch mode programmatically with `CameraManager#setTorchMode(..., true)` must absolutely be avoided because the flashlight is one of the most energy-intensive component.
 
 == How to fix it
+
 === Noncompliant code example
 
-```java
- CameraManager camManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
+[source,java]
+----
+// Noncompliant
+CameraManager camManager = (CameraManager) getSystemService(Context.CAMERA_SERVICE);
 String cameraId = null;
 try {
     cameraId = camManager.getCameraIdList()[0];
@@ -17,7 +19,11 @@ try {
 } catch (CameraAccessException e) {
     e.printStackTrace();
 }
-```
+----
+
+=== Compliant solution
+
+Do not set the torch programmatically.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
index fa51e410b..260276b5f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
@@ -1,7 +1,8 @@
 {
   "tags": [
     "ecocode",
-    "android",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "android"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
index 62e81b6c8..741e49b09 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.asciidoc
@@ -4,17 +4,18 @@
 
 Turning on the torch mode programmatically with `react-native-torch` must absolutely be avoided because the flashlight is one of the most energy-intensive component.
 
-## Non compliant Code Example
+== How to fix it
+
+=== Noncompliant code example
 
 [source,js,data-diff-id="2",data-diff-type="noncompliant"]
 ----
 import Torch from 'react-native-torch'; // Noncompliant
 ----
 
-[source,js,data-diff-id="2",data-diff-type="compliant"]
-----
-import axios from 'axios'; // Compliant
-----
+=== Compliant solution
+
+Do not set the torch programmatically.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
index fd663fcf5..f947e415d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
@@ -1,8 +1,9 @@
 {
   "tags": [
     "ecocode",
-    "react-native",
-    "eco-design"
+    "eco-design",
+    "performance",
+    "react-native"
   ],
   "compatibleLanguages": [
     "JAVASCRIPT",
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
index 6d9f93163..039818509 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.asciidoc
@@ -2,13 +2,15 @@
 
 == Why is this an issue?
 
-Turning on the torch mode programmatically using `AVCaptureDevice#torchMode` or `AVCaptureDevice#setTorchModeOn(level:)` 
+Turning on the torch mode programmatically using `AVCaptureDevice#torchMode` or `AVCaptureDevice#setTorchModeOn(level:)`
 methods must absolutely be avoided because the flashlight is one of the most energy-intensive component.
 
 == How to fix it
+
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
 guard let videoDevice = AVCaptureDevice.default(.builtInWideAngleCamera, for: .video, position: .back) else { return }
 guard videoDevice.hasTorch else { return }
 
@@ -16,11 +18,11 @@ videoDevice.lockForConfiguration()
 videoDevice.torchMode = .on // non-compliant
 videoDevice.setTorchModeOn(level: 1.0) // Noncompliant
 videoDevice.unlockForConfiguration()
-```
+----
 
 === Compliant solution
 
-Do not set the torch programmaticaly.
+Do not set the torch programmatically.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
index e29660370..8b5fa4d65 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
@@ -1,8 +1,9 @@
 {
   "tags": [
     "ecocode",
-    "ios",
     "eco-design",
+    "performance",
+    "ios",
     "sobriety"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc b/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
index ce7e0dc75..d701459c5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC531/java/EC531.asciidoc
@@ -2,20 +2,26 @@
 
 == Why is this an issue?
 
-In Android 11 (API level 30) or higher, a call to `Surface#setFrameRate(float frameRate, int compatibility)` results in a change to the display refresh rate. However, a regular app displays 60 frames per second (60Hz). In order to optimize content refreshes and hence saving energy, this frequency should not be raised to 90Hz or 120Hz, even if this is now supported by many devices.
+In Android 11 (API level 30) or higher, a call to `Surface#setFrameRate(float frameRate, int compatibility)` results in a change to the display refresh rate.
+However, a regular app displays 60 frames per second (60Hz).
+In order to optimize content refreshes and hence saving energy, this frequency should not be raised to 90Hz or 120Hz, even if this is now supported by many devices.
 
 == How to fix it
+
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 surface.setFrameRate(120f, FRAME_RATE_COMPATIBILITY_DEFAULT);
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 surface.setFrameRate(60f, FRAME_RATE_COMPATIBILITY_DEFAULT);
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
index 9433f8dfc..ac4486473 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
+++ b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
@@ -1,16 +1,15 @@
 {
   "title": "Google Tracker should not be used",
   "type": "CODE_SMELL",
-  "status": "deprecated",
+  "status": "ready",
   "remediation": {
     "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "tags": [
     "ecocode",
-    "android",
     "eco-design",
-    "performance"
+    "android"
   ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
@@ -18,6 +17,6 @@
     "impacts": {
       "RELIABILITY": "LOW"
     },
-    "attribute": "EFFICIENT"
+    "attribute": "TRUSTWORTHY"
   }
 }
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
index c37282843..68e388cc6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
@@ -1,27 +1,29 @@
 :!sectids:
 
-This check is deprecated since it is about privacy and not about eco-design.
-
 == Why is this an issue?
 
-Importing the `com.google.android.gms.analytics.Tracker` or `com.google.firebase.analytics.FirebaseAnalytics` classes means that the app sends hits to Google Analytics. It is not necessarily sensitive information, but it is a first step towards Google Ads and hence this practice should be discouraged at early stage.
+Importing the `com.google.android.gms.analytics.Tracker` or `com.google.firebase.analytics.FirebaseAnalytics` classes means that the app sends hits to Google Analytics.
+It is not necessarily sensitive information, but it is a first step towards Google Ads and hence this practice should be discouraged at early stage.
 
 == How to fix it
+
 === Noncompliant code example
 
 Import of Google Analytics :
 
-```java
+[source,java]
+----
 // Noncompliant
-import com.google.android.gms.analytics.Tracker
-```
+import com.google.android.gms.analytics.Tracker;
+----
 
 Import of Firebase Analytics :
 
-```java
+[source,java]
+----
 // Noncompliant
-import com.google.firebase.analytics
-```
+import com.google.firebase.analytics;
+----
 
 === Compliant solution
 
@@ -30,5 +32,3 @@ Do not use Google Analytics.
 == Resources
 
 - https://github.com/cnumr/best-practices-mobile[Mobile-specific Best Practices] by https://collectif.greenit.fr/index_en.html[CNumR]
-
-
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
index 67509a448..d481f5043 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
+++ b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
@@ -1,5 +1,5 @@
 {
-  "title": "Location updates pause disabled",
+  "title": "Location updates pause should not be disabled",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -9,7 +9,7 @@
   "tags": [
     "ecocode",
     "eco-design",
-    "performance"
+    "performance",
     "ios"
   ],
   "ecoScore": "0.4",
@@ -19,6 +19,5 @@
       "RELIABILITY": "MEDIUM"
     },
     "attribute": "EFFICIENT"
-  },
-
+  }
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc b/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
index 100e15566..658ae47e1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC533/swift/EC533.asciidoc
@@ -2,23 +2,24 @@
 
 == Why is this an issue?
 
-
 Allowing the system to pause location updates, at times when the location data is unlikely to change, can improve battery life without sacrificing location data. This is the default behavior. For example, if the user stops for food while using a navigation app, the location manager might pause updates for a period of time. It is possible to disable this behavior, by setting the `CLLocationManager#pausesLocationUpdatesAutomatically` property to `false`, but applications are strongly discouraged of doing it.
 
 == How to fix it
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
 // Noncompliant
 let manager = CLLocationManager()
 manager.pausesLocationUpdatesAutomatically = false
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 let manager = CLLocationManager()
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc b/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
index fdac3829f..eca26c2d7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC534/swift/EC534.asciidoc
@@ -6,23 +6,26 @@ Using the Core Motion API, your app can receive continuous motion updates in the
 
 == How to fix it
 
-=== Noncompliant solution
+=== Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 CMMotionManager.accelerometerUpdateInterval = 1000
 CMMotionManager.gyroUpdateInterval = 1000
 CMMotionManager.deviceMotionUpdateInterval = 1000
 CMMotionManager.magnetometerUpdateInterval = 1000
-```
+----
 
 === Compliant solution
 
-```swift
+[source,swift]
+----
 CMMotionManager.accelerometerUpdateInterval = 1000
 CMMotionManager.gyroUpdateInterval = 1000
 CMMotionManager.deviceMotionUpdateInterval = 1000
 CMMotionManager.magnetometerUpdateInterval = 1000
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
index 600f7166d..8ee2e125a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
+++ b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
@@ -1,5 +1,5 @@
 {
-  "title": "Batch: Service Boot Time",
+  "title": "Boot time service should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc b/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
index 2e7d8542c..5c1caed03 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC540/xml/EC540.asciidoc
@@ -13,14 +13,19 @@ Thus, any developer should avoid having a call to `Context#startService()` from
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <receiver>
     <intent-filter>
         <action android:name= "android.intent.action.BOOT_COMPLETED"/>
     </intent-filter>
 </receiver>
-```
+----
+
+=== Compliant solution
+
+Boot completed intent should be avoided.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
index 70310af9c..2e889dade 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
+++ b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
@@ -1,5 +1,5 @@
 {
-  "title": "Power: Compagnion In Background",
+  "title": "Compagnion in background should be avoided",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc b/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
index 2f920be0f..92222214b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC543/xml/EC543.asciidoc
@@ -7,11 +7,12 @@ There is a negative effect on the device battery when an app is paired with a co
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <manifest>
    <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"><!-- Noncompliant -->
 </manifest>
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc b/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
index 65867657c..862ef7d91 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC544/xml/EC544.asciidoc
@@ -9,12 +9,13 @@ Most applications should not use this; there are many facilities provided by the
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <manifest>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 </manifest>
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc b/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
index 02fc1cb8a..4d7a899d6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC547/xml/EC547.asciidoc
@@ -9,7 +9,8 @@ Consequently, custom resources like bright colors values and bitmap images with
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <TextView
     android:layout_width="match_parent"
@@ -17,7 +18,7 @@ Consequently, custom resources like bright colors values and bitmap images with
     android:foreground="#FFFFFF"
     android:foregroundTint="#FFFFFF">
 </TextView>
-```
+----
 
 === Compliant solution
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc b/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
index fbc18ed6e..5526f3ffa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC548/xml/EC548.asciidoc
@@ -9,29 +9,33 @@ By default, Android will set Holo to the Dark theme (parent style `Theme.Holo`)
 == How to fix it
 === Noncompliant code example
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <style name="Theme.MyTheme" parent="@android:style/Theme.Holo.Light"/>
-```
+----
 
 or
 
-```xml
+[source,xml]
+----
 <!-- Noncompliant -->
 <application android:label="@string/app_name" android:theme="@android:style/Theme.Holo.Light"/>
-```
+----
 
 === Compliant solution
 
-```xml
+[source,xml]
+----
 <style name="Theme.MyTheme" parent="@android:style/Theme.Holo"/>
-```
+----
 
 or
 
-```xml
+[source,xml]
+----
 <application android:label="@string/app_name" android:theme="@android:style/Theme.Holo"/>
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc b/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
index 254372a94..553b09a68 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC603/swift/EC603.asciidoc
@@ -9,7 +9,9 @@ To ensure animations are used effectively without draining the device's battery,
 == How to fix it in UIKit
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 UIView.animate(withDuration:animations:)
 UIView.animate(withDuration:animations:completion:)
 UIView.animate(withDuration:delay:options:animations:completion:)
@@ -18,12 +20,18 @@ UIView.transition(with:duration:options:animations:completion:)
 CABasicAnimation
 CAKeyframeAnimation
 CATransition
-```
+----
+
+=== Compliant solution
+
+Avoid animations.
 
 == How to fix it in SwiftUI
 === Noncompliant code example
 
-```swift
+[source,swift]
+----
+// Noncompliant
 withAnimation
 Animation
 AnyTransition
@@ -31,7 +39,11 @@ AnyTransition
 .transition(AnyTransition)
 .onAppear(perform:)
 .onDisappear(perform:)
-```
+----
+
+=== Compliant solution
+
+Avoid animations.
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc b/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
index 63d706a11..b95dbdf79 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC66/php/EC66.asciidoc
@@ -7,20 +7,22 @@ PHP allows declaring a string with simple or double quotes. Using double quotes
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 // Noncompliant
 myFunction("name", "age", "IsStudent");
     $lastName = "Hugo";
     $concatenatedString = "$lastName is a student";
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 myFunction('name', 'age', 'IsStudent');
     $lastName = 'Hugo';
     $concatenatedString = $lastName . 'is a student';
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc b/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
index 61d85c7b7..93a1ec296 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC67/java/EC67.asciidoc
@@ -7,15 +7,17 @@ The form `$i++` creates a temporary variable whereas `++$i` does not. It save CP
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 i++;  // Noncompliant
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 ++i;
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc b/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
index bfee42349..6b594cfdd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC67/php/EC67.asciidoc
@@ -7,16 +7,18 @@ The form `$i++` creates a temporary variable whereas `++$i` does not. It save CP
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 // Noncompliant
 $i++
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 ++$i
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
index 14a65248e..6fd0a7ba4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/java/EC69.asciidoc
@@ -7,18 +7,20 @@ Do not call a function when declaring a for-type loop in order to avoid function
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 public void foo() {
     for (int i = 0; i < getMyValue(); i++) {  // Noncompliant
         System.out.println(i);
         boolean b = getMyValue() > 6;
     }
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void foo() {
     int myValue = getMyValue();
     for (int i = 0; i < myValue; i++) {
@@ -26,7 +28,7 @@ public void foo() {
         boolean b = getMyValue() > 6;
     }
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
index 65b20d7fe..12fa6dc90 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/php/EC69.asciidoc
@@ -8,15 +8,17 @@ Do not call a function when declaring a for-type loop in order to avoid function
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 for ($i = 0; $i <= foo(); $i++) {  // Noncompliant
 	// ......
 }
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 $maxI = foo();
 for ($i = 0; $i <= $maxI; $i++) {
   .....
@@ -27,7 +29,7 @@ for ($i = 0; $i <= $maxI; $i++) {
 for ($i = 0, $maxI = foo(); $i <= $maxI; $i++) {
   .....
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc b/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
index 71499c02c..0a55ae15b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC69/python/EC69.asciidoc
@@ -7,18 +7,20 @@ Do not call a function when declaring a for-type loop in order to avoid function
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 for i in my_function():  # Noncompliant
     ......
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 limit = my_function()
 for i in limit:
     ......
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc b/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
index 74a5a8cc4..f5557316e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC7/python/EC7.asciidoc
@@ -7,7 +7,8 @@ Avoid using getters and setters in a class, as they increase unnecessary RAM mem
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 # Noncompliant
 class Client():
 
@@ -23,11 +24,12 @@ class Client():
 client = Client(25)
 client.get_age() # Useless getter
 client.set_age(26) # Useless setter
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 class Client():
 
     def __init__(self, age):
@@ -36,7 +38,7 @@ class Client():
 client = Client(25)
 client.age
 client.age = 26
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
index ff20a6bba..fe67358d5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/java/EC72.asciidoc
@@ -7,7 +7,8 @@ Executing SQL queries in loop induced unnecessary calculation by the CPU, RAM us
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 public void foo() {
     // ...
     String baseQuery = "SELECT name FROM users where id = ";
@@ -27,11 +28,12 @@ public void foo() {
     }
     // ...
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void foo() {
     // ...
     String query = "SELECT name FROM users where id in (0 ";
@@ -52,7 +54,7 @@ public void foo() {
     st.close();
     // ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
index 64a2382d9..280436290 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/php/EC72.asciidoc
@@ -8,7 +8,8 @@ Executing SQL queries in loop induced unnecessary network transfert, calculation
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 public function foo() {
     ...
     $baseQuery = "SELECT name FROM users where id = ";
@@ -26,11 +27,12 @@ public function foo() {
     }
     ...
 }
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 public function foo() {
     ...
     $query = "SELECT name FROM users where id in (";
@@ -48,7 +50,7 @@ public function foo() {
     ...
     mysql_close($connection);
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc b/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
index 519c27c74..a28328bb4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC72/python/EC72.asciidoc
@@ -8,24 +8,26 @@ Executing SQL queries in loop induced unnecessary calculation by the CPU, RAM us
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 def foo():
     ...
     results = []
     for id in range(20):
       results.append(cursor.execute("SELECT name FROM users where id = ?", (id)).fetchone()) # Noncompliant {{Avoid performing SQL queries within a loop}}
     ...
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 def foo():
     ...
     ids = range(20)
     results = cursor.execute("SELECT name FROM users where id IN ({0})".format(', '.join("?" * len(ids))), ids).fetchmany() # Compliant
     ...
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
index 27b12f15c..61d1a9a1c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/java/EC74.asciidoc
@@ -8,23 +8,25 @@ Database servers have to resolve schema fields when using asterisk symbol (`*`).
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 public void foo() {
     // ...
     String baseQuery = "SELECT * FROM users"; // Noncompliant
     // ...
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void foo() {
     // ...
     String query = "SELECT id, name, address FROM users";
     // ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
index defcaed39..5d7ebf0e0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/php/EC74.asciidoc
@@ -8,23 +8,25 @@ Database servers have to resolve schema fields when using asterisk symbol (`*`).
 == How to fix it
 === Noncompliant code example
 
-```php
+[source,php]
+----
 public function foo() {
     ...
     $baseQuery = "SELECT * FROM users"; // Noncompliant
     ...
 }
-```
+----
 
 === Compliant solution
 
-```php
+[source,php]
+----
 public function foo() {
     ...
     $baseQuery = "SELECT id,name, address FROM users ";
     ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc b/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
index 0d60b563a..bf1971bb1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC74/python/EC74.asciidoc
@@ -7,23 +7,25 @@ Database servers have to resolve schema fields when using asterisk symbol (`*`).
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 public void foo() {
     ...
     String baseQuery = "SELECT * FROM users"; // Noncompliant
     ...
 }
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
 public void foo() {
     ...
         String query = "SELECT id, name, address FROM users ";
     ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
index 2eeca4dee..9d7c05daf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
@@ -17,7 +17,7 @@ If the number of concatenations is very small, typically 5 or less, then the ove
 ----
 string myString = string.Empty;
 for (int i = 0; i < 100; i++)
-    myString += i; // Non compliant : this requires a new string allocation on each iteration
+    myString += i; // Noncompliant : this requires a new string allocation on each iteration
 ----
 
 === Compliant solution
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
index 0ee1d9181..d4ee48d36 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
+++ b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
@@ -7,7 +7,6 @@
     "constantCost": "20min"
   },
   "tags": [
-    "cwe",
     "leak",
     "eco-design",
     "performance",
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc b/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
index e2dd7da69..4d29a8c62 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC76/java/EC76.asciidoc
@@ -9,18 +9,20 @@ The static fields are more complicated for the Garbage Collector to manage and c
 == How to fix it
 === Noncompliant code example
 
-```java
-// Not compliant
+[source,java]
+----
+// Noncompliant
 public class AvoidUsageOfStaticCollections {
     public static final List<> LIST = new ArrayList<>();
     public static final Set<> SET = new HashSet<>();
     public static final Map<> MAP = new HashMap<>();
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public class GoodUsageOfStaticCollections {
     public static volatile GoodUsageOfStaticCollections INSTANCE = new GoodUsageOfStaticCollections();
 
@@ -31,7 +33,7 @@ public class GoodUsageOfStaticCollections {
     private GoodUsageOfStaticCollections() {
     }
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc b/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
index 1904f3efd..4e4aef1b7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC77/java/EC77.asciidoc
@@ -7,18 +7,20 @@ This operation requires a significant amount of computational power. Using a sin
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 public class AvoidRegexPatternNotStatic {
     public boolean foo() {
         final Pattern pattern = Pattern.compile("foo"); // Noncompliant
         return pattern.matcher("foo").find();
     }
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public class ValidRegexPattern {
     private static final Pattern pattern = Pattern.compile("foo"); // Compliant
 
@@ -26,11 +28,12 @@ public class ValidRegexPattern {
         return pattern.matcher("foo").find();
     }
 }
-```
+----
 
 or
 
-```java
+[source,java]
+----
 public class ValidRegexPattern2 {
     private final Pattern pattern = Pattern.compile("foo"); // Compliant
 
@@ -38,11 +41,12 @@ public class ValidRegexPattern2 {
         return pattern.matcher("foo").find();
     }
 }
-```
+----
 
 or
 
-```java
+[source,java]
+----
 public class ValidRegexPattern3 {
     private final Pattern pattern;
 
@@ -54,7 +58,7 @@ public class ValidRegexPattern3 {
         return pattern.matcher("foo").find();
     }
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc b/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
index dc37f0f7b..a7a5b8050 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC78/java/EC78.asciidoc
@@ -7,7 +7,8 @@ Don't set a constant parameter in batch update. Instead, put it in query. Creati
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
 // Noncompliant
 public void foo() {
     // ...
@@ -21,11 +22,12 @@ public void foo() {
     }
     // ...
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 public void foo() {
     // ...
     String query = "insert into mytable values(123,?,?)";
@@ -37,7 +39,7 @@ public void foo() {
     }
     // ...
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc b/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
index 13e4fd5a8..08726394c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC79/java/EC79.asciidoc
@@ -7,7 +7,9 @@ Use `try-with-resources` statement for any object that implements the `AutoClose
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 private static void printFileJava7() throws IOException {
     FileInputStream input = new FileInputStream("file.txt");
     int data = input.read();
@@ -16,11 +18,12 @@ private static void printFileJava7() throws IOException {
         data = input.read();
     }
 }
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 private static void printFileJava7() throws IOException {
     try(FileInputStream input = new FileInputStream("file.txt")) {
         int data = input.read();
@@ -30,7 +33,7 @@ private static void printFileJava7() throws IOException {
         }
     }
 }
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
index c1ee58727..1fa9ab1d1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
@@ -11,11 +11,12 @@ In other cases however, field reordering is usually fine and there are little re
 It can be ignored if you know you require the `Sequential` layout for all of your structs, most likely for interop purposes.
 
 == How to fix it
+
 === Noncompliant code example
 
-[source, cs]
+[source,cs]
 ----
-public struct MyStruct // Non compliant, specify the layout. Will take 24 bytes with Sequential
+public struct MyStruct // Noncompliant, specify the layout. Will take 24 bytes with Sequential
 {
     public int A;
     public double B;
@@ -25,7 +26,7 @@ public struct MyStruct // Non compliant, specify the layout. Will take 24 bytes
 
 === Compliant solution
 
-[source, cs]
+[source,cs]
 ----
 [StructLayout(LayoutKind.Sequential)]
 public struct MyStruct // Compliant, specified layout. Will take 24 bytes with Sequential
@@ -36,7 +37,7 @@ public struct MyStruct // Compliant, specified layout. Will take 24 bytes with S
 }
 ----
 
-[source, cs]
+[source,cs]
 ----
 [StructLayout(LayoutKind.Auto)]
 public struct MyStruct // Compliant, specified layout. Will take 16 bytes with Auto
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
index ed41639ff..895ce2650 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
+++ b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
@@ -1,5 +1,5 @@
 {
-  "title": "Make type sealed",
+  "title": "Type should be sealed",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc b/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
index 363aa4749..15d067b52 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC86/csharp/EC86.asciidoc
@@ -12,6 +12,7 @@ Calling `GC.Collect` on generation 0 (ephemeral objects) is excluded from this r
 In general, it is not recommended to call GC.Collect as the cost far outweighs the benefits.
 In some cases however, typically if you know you have a lot of long-lived objects whose memory you need reclaimed immediately, calling `GC.Collect` can make sense.
 
+== How to fix it
 === Noncompliant code example
 
 [source, cs]
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc b/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
index 010ce0cff..b1728e355 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC88/csharp/EC88.asciidoc
@@ -7,7 +7,7 @@ Asynchronous operations free up the main thread, allowing it to handle other tas
 Therefore, resources that implement `IAsyncDisposable` should be disposed asynchronously whenever possible.
 
 == How to fix it
-== Noncompliant code example
+=== Noncompliant code example
 
 [source, cs]
 ----
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc b/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
index 9fc23d462..9cec14bed 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC89/python/EC89.asciidoc
@@ -14,33 +14,37 @@ In this case, the cache is unlimited which is suspect.
 == How to fix it
 === Noncompliant code example
 
-```python
+[source,python]
+----
 # Noncompliant
  @cache # Noncompliant
  def cached_function():
    ...
-```
+----
 
-```python
+[source,python]
+----
 # Noncompliant
  @lru_cache(maxsize=None) # Noncompliant
  def cached_function():
    ...
-```
+----
 
 === Compliant solution
 
-```python
+[source,python]
+----
  @lru_cache() # By default, the max size of the cache is 128
  def cached_function():
     ...
-```
+----
 
-```python
+[source,python]
+----
  @lru_cache(maxsize=16) # Define a max size to the cache
  def cached_function():
     ...
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc b/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
index 685968410..76c6bfba2 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC94/java/EC94.asciidoc
@@ -11,19 +11,23 @@ Therefore, using orElseGet() will save computing time.
 == How to fix it
 === Noncompliant code example
 
-```java
+[source,java]
+----
+// Noncompliant
 Optional.of("ecoCode").orElse(getUnpredictedMethod());
-```
+----
 
 === Compliant solution
 
-```java
+[source,java]
+----
 Optional.of("ecoCode").orElseGet(() -> getUnpredictedMethod());
-```
+----
 
-```java
+[source,java]
+----
 randomClass.orElse(getUnpredictedMethod());
-```
+----
 
 == Resources
 
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index 4ed83601b..0d783243e 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -17,16 +17,38 @@
  */
 package fr.greencodeinitiative;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertIterableEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.issue.impact.SoftwareQuality;
 import org.sonar.api.rule.RuleScope;
-import org.sonar.api.rules.CleanCodeAttribute;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.server.rule.RuleDescriptionSection;
 import org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys;
@@ -37,66 +59,60 @@
 import org.sonar.api.utils.Version;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.*;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 class RulesTest {
     private static final Version SONAR_API_VERSION = Version.create(10, 10);
     private static final String RESOURCE_DIR = "rules";
     private static final String RESOURCE_BASE_PATH = "/io/ecocode/" + RESOURCE_DIR + "/";
-    private static final String[] LANGUAGES =
-            new String[] {"csharp", "html", "java", "javascript", "php", "python", "swift", "xml"};
+    private static final String[] LANGUAGES = new String[] { "csharp", "html", "java", "javascript", "php",
+            "python", "swift", "xml" };
+
+    private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode", "eco-design");
 
-    private static final List<String> MANDATORY_TAGS =
-            Arrays.asList("performance", "ecocode", "eco-design");
+    private static final String EFFICIENT_TAG = "performance";
 
-    private static final List<String> TECHNOLOGY_TAGS =
-            Arrays.asList("android", "ios", "spring", "react-native", "sql", "regex", "memory");
+    private static final List<String> AREA_TAGS = Arrays.asList("audio", "cache", "error-handling", "image",
+            "leak", "memory", "network", "video");
+
+    private static final List<String> TECHNOLOGY_TAGS = Arrays.asList("android",
+            "ios", "jsx", "nestjs", "react", "react-native", "regex", "spring", "sql");
 
     /**
      * Built-in rule tags from
      * https://docs.sonarsource.com/sonarqube/latest/user-guide/rules/built-in-rule-tags/
      */
-    private static final List<String> BUILT_IN_RULE_TAGS = Arrays.asList("bad-practice");
-
-    /** Tags from https://github.com/cnumr/best-practices-mobile */
-    private static final List<String> BEST_PRACTISES_MOBILE_TAGS =
-            Arrays.asList(
-                    "optimized-api",
-                    "leakage",
-                    "bottleneck",
-                    "idleness",
-                    "power",
-                    "batch",
-                    "release",
-                    "sobriety",
-                    "longevity");
+    private static final List<String> BUILT_IN_RULE_TAGS = Arrays.asList("bad-practice", "user-experience");
 
     /**
-     * Let's not have too many tags, especially tags redundant with eco-design or performance, e.g.
+     * Tags from https://github.com/cnumr/best-practices-mobile
+     */
+    private static final List<String> BEST_PRACTISES_MOBILE_TAGS = Arrays.asList(
+            "optimized-api",
+            "leakage",
+            "bottleneck",
+            "idleness",
+            "power",
+            "batch",
+            "release",
+            "sobriety",
+            "longevity");
+
+    /**
+     * Let's not have too many tags, especially tags redundant with eco-design or
+     * performance, e.g.
      * do not allow environment.
      */
-    private static final List<String> ALL_TAGS =
-            Arrays.asList(
-                            MANDATORY_TAGS,
-                            BUILT_IN_RULE_TAGS,
-                            TECHNOLOGY_TAGS,
-                            BEST_PRACTISES_MOBILE_TAGS)
-                    .stream()
-                    .flatMap(List::stream)
-                    .collect(Collectors.toList());
-
-    private static final Pattern NONCOMPLIANT_COMMENT_PATTERN =
-            Pattern.compile(
-                    ".*(// Noncompliant|<!-- Noncompliant|# Noncompliant).*", Pattern.DOTALL);
+    private static final List<String> ALL_TAGS = Stream.of(
+            MANDATORY_TAGS,
+            Collections.singletonList(EFFICIENT_TAG),
+            BUILT_IN_RULE_TAGS,
+            AREA_TAGS,
+            TECHNOLOGY_TAGS,
+            BEST_PRACTISES_MOBILE_TAGS)
+            .flatMap(List::stream)
+            .collect(Collectors.toList());
+
+    private static final Pattern NONCOMPLIANT_COMMENT_PATTERN = Pattern.compile(
+            ".*(// Noncompliant|!-- Noncompliant|# Noncompliant).*", Pattern.DOTALL);
 
     private static SonarRuntime sonarRuntime;
 
@@ -118,7 +134,7 @@ private static Path[] findAllLangs() throws URISyntaxException, IOException {
     private static SortedSet<String> findAllRules(Path langPath) throws IOException {
         SortedSet<String> rules = new TreeSet<>();
         try (Stream<Path> langWalk = Files.walk(langPath, 1)) {
-            for (Iterator<Path> it = langWalk.iterator(); it.hasNext(); ) {
+            for (Iterator<Path> it = langWalk.iterator(); it.hasNext();) {
                 String ruleFile = it.next().toFile().getName();
                 int extensionIndex = ruleFile.lastIndexOf('.');
                 if (extensionIndex != -1) {
@@ -138,8 +154,8 @@ void testRules() throws URISyntaxException, IOException {
         for (Path langPath : langPaths) {
             String lang = langPath.toFile().getName();
             DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
-            RuleMetadataLoader ruleMetadataLoader =
-                    new RuleMetadataLoader(RESOURCE_BASE_PATH + lang, sonarRuntime);
+            RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH + lang,
+                    sonarRuntime);
             ruleMetadataLoader.addRulesByRuleKey(
                     repository, new ArrayList<>(findAllRules(langPath)));
             context.registerRepository(repository);
@@ -149,25 +165,37 @@ void testRules() throws URISyntaxException, IOException {
             assertFalse(repo.rules().isEmpty(), repo.key() + " repository should have rules");
             for (Rule rule : repo.rules()) {
                 assertFalse(
-                        rule.activatedByDefault(), rule + " should not be activated by default");
+                        rule.activatedByDefault(),
+                        rule + " should not be activated by default");
                 assertEquals(RuleScope.MAIN, rule.scope(), rule + " should have MAIN scope");
-                assertTrue(
-                        rule.tags().containsAll(MANDATORY_TAGS),
-                        rule + " should have tags " + MANDATORY_TAGS);
 
-                assertTrue(
-                        ALL_TAGS.containsAll(rule.tags()),
-                        rule + " should only have allowed tags but got: " + rule.tags());
                 assertEquals(
-                        RuleType.CODE_SMELL, rule.type(), rule + " should have CODE_SMELL type");
+                        RuleType.CODE_SMELL, rule.type(),
+                        rule + " should have CODE_SMELL type");
                 assertEquals(
                         Collections.singleton(SoftwareQuality.RELIABILITY),
                         rule.defaultImpacts().keySet(),
                         rule + " should have RELIABILITY Software Quality");
-                assertEquals(
-                        CleanCodeAttribute.EFFICIENT,
-                        rule.cleanCodeAttribute(),
-                        rule + " should have EFFICIENT Clean Code Attribute");
+                assertTrue(
+                        rule.tags().containsAll(MANDATORY_TAGS),
+                        rule + " should have tags " + MANDATORY_TAGS);
+                assertTrue(
+                        ALL_TAGS.containsAll(rule.tags()),
+                        rule + " should only have allowed tags but got: " + rule.tags());
+                switch (rule.cleanCodeAttribute()) {
+                    case EFFICIENT:
+                        assertTrue(
+                                rule.tags().contains(EFFICIENT_TAG),
+                                rule + " should have tag " + EFFICIENT_TAG);
+                        break;
+                    case TRUSTWORTHY:
+                        assertFalse(
+                                rule.tags().contains(EFFICIENT_TAG),
+                                rule + " should not have tag " + EFFICIENT_TAG);
+                        break;
+                    default:
+                        fail(rule + " should have EFFICIENT or TRUSTWORTHY Clean Code Attribute");
+                }
                 // See guidelines in
                 // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
                 assertTrue(
@@ -181,36 +209,34 @@ void testRules() throws URISyntaxException, IOException {
                         rule.name().contains(":"),
                         rule + " names should not have a prefix tag: " + rule.name());
 
-                List<String> sections =
-                        rule.ruleDescriptionSections().stream()
-                                .map(RuleDescriptionSection::getKey)
-                                .collect(Collectors.toList());
+                List<String> sections = rule.ruleDescriptionSections().stream()
+                        .map(RuleDescriptionSection::getKey)
+                        .collect(Collectors.toList());
                 // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
                 assertFalse(
                         sections.isEmpty(),
                         rule
-                                + " should have standard description sections but gone none (is"
+                                + " should have standard description sections but got none (is"
                                 + " :!sectids: present?)");
                 // Introduction is optional
                 if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
                     sections.remove(0);
                 }
-                assertEquals(
+                assertIterableEquals(
                         Arrays.asList(
                                 RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
                                 RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
                                 RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
-                        sections,
+                        // Using set since "how to fix" sections might be repeated"
+                        new LinkedHashSet<String>(sections),
                         rule + " should have standard description sections");
-                String howToFix =
-                        rule.ruleDescriptionSections().stream()
-                                .filter(
-                                        s ->
-                                                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY
-                                                        .equals(s.getKey()))
-                                .findFirst()
-                                .orElse(null)
-                                .getHtmlContent();
+                String howToFix = rule.ruleDescriptionSections().stream()
+                        .filter(
+                                s -> RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY
+                                        .equals(s.getKey()))
+                        .findFirst()
+                        .orElse(null)
+                        .getHtmlContent();
                 assertTrue(
                         NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
                         rule

From 706c181f436333499e5d3c6003822434b9dd07d4 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 4 Sep 2024 09:40:26 +0200
Subject: [PATCH 03/19] Add tests for title length and prefix

---
 .../src/main/rules/EC404/EC404.json                  |  4 ++--
 .../src/main/rules/EC404/python/EC404.asciidoc       |  2 +-
 .../test/java/fr/greencodeinitiative/RulesTest.java  | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
index ab4be1b08..4a54125e6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
+++ b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
@@ -1,5 +1,5 @@
 {
-  "title": "Generator comprehension should be used instead of list comprehension in for loop declaration",
+  "title": "Generators should be used instead of list comprehensions in for loops",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
@@ -18,4 +18,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
+}
\ No newline at end of file
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
index 5c85e6673..020c755f8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC404/python/EC404.asciidoc
@@ -2,7 +2,7 @@
 
 == Why is this an issue?
 
-Python generators resemble lazy lists from other programming languages: when iterated over, they compute their values on the fly. They lack some list behaviors (indexing, len method, ...) but are memory-efficient, as they do not store each of their values in memory, unlike lists. Thus, when declared in a for-loop declaration, list comprehensions can be safely replaced with generator comprehensions.
+Python generators resemble lazy lists from other programming languages: when iterated over, they compute their values on the fly. They lack some list behaviors (indexing, len method,...) but are memory-efficient, as they do not store each of their values in memory, unlike lists. Thus, when declared in a for-loop declaration, list comprehensions can be safely replaced with generator comprehensions.
 
 == How to fix it
 === Noncompliant code example
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index 0d783243e..faf9bafb1 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -200,14 +200,18 @@ void testRules() throws URISyntaxException, IOException {
                 // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
                 assertTrue(
                         rule.name().contains(" should "),
-                        rule + " name should contain 'should': " + rule.name());
+                        rule + " title should match the pattern \"X should [not] Y\": " + rule.name());
                 assertFalse(
                         rule.name().endsWith("."),
-                        rule + " name should not end with a point: " + rule.name());
+                        rule + " title should not end with a point: " + rule.name());
                 // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
+                // or "Accessibility - Image tags should have an alternate text attribute"
                 assertFalse(
-                        rule.name().contains(":"),
-                        rule + " names should not have a prefix tag: " + rule.name());
+                        rule.name().contains(":") || rule.name().contains(" - "),
+                        rule + " title should not have a category/tag prefix: " + rule.name());
+                assertTrue(
+                        rule.name().length() < 80,
+                        rule + " title length should be less than 80 characters: " + rule.name());
 
                 List<String> sections = rule.ruleDescriptionSections().stream()
                         .map(RuleDescriptionSection::getKey)

From 06e0173073439d879545fddcf2ad9febb0460d81 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 4 Sep 2024 09:51:04 +0200
Subject: [PATCH 04/19] Add java version

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index e5465fa81..57710771d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,11 @@
     </issueManagement>
 
     <properties>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <!-- to prevent message: system modules path not set in conjunction with -source 11 -->
+        <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>

From dabb897c4751f9309f740b45fd549f42de9eda77 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 4 Sep 2024 09:57:32 +0200
Subject: [PATCH 05/19] Fix test unsing unsorted list

---
 .../src/test/java/fr/greencodeinitiative/RulesTest.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index faf9bafb1..087531ad2 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -150,7 +150,7 @@ private static SortedSet<String> findAllRules(Path langPath) throws IOException
     void testRules() throws URISyntaxException, IOException {
         RulesDefinition.Context context = new RulesDefinition.Context();
         Path[] langPaths = findAllLangs();
-        assertArrayEquals(LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).toArray());
+        assertArrayEquals(LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).sorted().toArray());
         for (Path langPath : langPaths) {
             String lang = langPath.toFile().getName();
             DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);

From a0a2c2e25ee52f5ab2b28fcb45543cdef72aa33a Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 15:23:29 +0200
Subject: [PATCH 06/19] Add license-maven-plugin and spotless-maven-plugin

---
 ecocode-rules-specifications/pom.xml          | 377 ++++++++---------
 .../src/main/rules/EC1/EC1.json               |   9 +-
 .../src/main/rules/EC10/EC10.json             |   8 +-
 .../src/main/rules/EC11/EC11.json             |  13 +-
 .../src/main/rules/EC12/EC12.json             |  15 +-
 .../src/main/rules/EC13/EC13.json             |  13 +-
 .../src/main/rules/EC2/EC2.json               |   8 +-
 .../src/main/rules/EC203/EC203.json           |   9 +-
 .../src/main/rules/EC22/EC22.json             |  10 +-
 .../src/main/rules/EC24/EC24.json             |  15 +-
 .../src/main/rules/EC25/EC25.json             |  15 +-
 .../src/main/rules/EC26/EC26.json             |  15 +-
 .../src/main/rules/EC27/EC27.json             |   8 +-
 .../src/main/rules/EC28/EC28.json             |   9 +-
 .../src/main/rules/EC29/EC29.json             |  15 +-
 .../src/main/rules/EC3/EC3.json               |   9 +-
 .../src/main/rules/EC30/EC30.json             |  15 +-
 .../src/main/rules/EC31/EC31.json             |  14 +-
 .../src/main/rules/EC32/EC32.json             |   8 +-
 .../src/main/rules/EC34/EC34.json             |   8 +-
 .../src/main/rules/EC35/EC35.json             |   8 +-
 .../src/main/rules/EC36/EC36.json             |  10 +-
 .../src/main/rules/EC4/EC4.json               |   8 +-
 .../src/main/rules/EC404/EC404.json           |  10 +-
 .../src/main/rules/EC5/EC5.json               |   9 +-
 .../src/main/rules/EC500/EC500.json           |  12 +-
 .../src/main/rules/EC501/EC501.json           |  12 +-
 .../src/main/rules/EC502/EC502.json           |  12 +-
 .../src/main/rules/EC503/EC503.json           |  12 +-
 .../src/main/rules/EC504/EC504.json           |  10 +-
 .../src/main/rules/EC505/EC505.json           |  13 +-
 .../src/main/rules/EC506/EC506.json           |  12 +-
 .../src/main/rules/EC507/EC507.json           |  12 +-
 .../src/main/rules/EC508/EC508.json           |  12 +-
 .../src/main/rules/EC509/EC509.json           |  13 +-
 .../src/main/rules/EC510/EC510.json           |  12 +-
 .../src/main/rules/EC511/EC511.json           |  12 +-
 .../src/main/rules/EC512/EC512.json           |  12 +-
 .../src/main/rules/EC513/EC513.json           |  12 +-
 .../src/main/rules/EC514/EC514.json           |  12 +-
 .../src/main/rules/EC515/EC515.json           |  12 +-
 .../src/main/rules/EC516/EC516.json           |  12 +-
 .../src/main/rules/EC517/EC517.json           |  12 +-
 .../src/main/rules/EC518/EC518.json           |  12 +-
 .../src/main/rules/EC519/EC519.json           |  13 +-
 .../src/main/rules/EC520/EC520.json           |  13 +-
 .../src/main/rules/EC521/EC521.json           |  12 +-
 .../src/main/rules/EC522/EC522.json           |   2 +-
 .../src/main/rules/EC522/java/EC522.json      |   7 +-
 .../main/rules/EC522/javascript/EC522.json    |  13 +-
 .../src/main/rules/EC522/swift/EC522.json     |   8 +-
 .../src/main/rules/EC523/EC523.json           |   2 +-
 .../src/main/rules/EC523/java/EC523.json      |   7 +-
 .../main/rules/EC523/javascript/EC523.json    |  12 +-
 .../src/main/rules/EC524/EC524.json           |  10 +-
 .../src/main/rules/EC525/EC525.json           |  11 +-
 .../src/main/rules/EC526/EC526.json           |  12 +-
 .../src/main/rules/EC527/EC527.json           |  11 +-
 .../src/main/rules/EC528/EC528.json           |  12 +-
 .../src/main/rules/EC529/EC529.json           |  10 +-
 .../src/main/rules/EC530/EC530.json           |   2 +-
 .../src/main/rules/EC530/java/EC530.json      |   7 +-
 .../main/rules/EC530/javascript/EC530.json    |  12 +-
 .../src/main/rules/EC530/swift/EC530.json     |   8 +-
 .../src/main/rules/EC531/EC531.json           |  12 +-
 .../src/main/rules/EC532/EC532.json           |  10 +-
 .../src/main/rules/EC533/EC533.json           |   9 +-
 .../src/main/rules/EC534/EC534.json           |   7 +-
 .../src/main/rules/EC540/EC540.json           |  12 +-
 .../src/main/rules/EC543/EC543.json           |  13 +-
 .../src/main/rules/EC544/EC544.json           |  12 +-
 .../src/main/rules/EC547/EC547.json           |  12 +-
 .../src/main/rules/EC548/EC548.json           |  12 +-
 .../src/main/rules/EC602/EC602.json           |   8 +-
 .../src/main/rules/EC603/EC603.json           |   7 +-
 .../src/main/rules/EC66/EC66.json             |   9 +-
 .../src/main/rules/EC67/EC67.json             |   8 +-
 .../src/main/rules/EC69/EC69.json             |   8 +-
 .../src/main/rules/EC7/EC7.json               |   8 +-
 .../src/main/rules/EC72/EC72.json             |  12 +-
 .../src/main/rules/EC74/EC74.json             |  10 +-
 .../src/main/rules/EC75/EC75.json             |   9 +-
 .../src/main/rules/EC76/EC76.json             |  10 +-
 .../src/main/rules/EC77/EC77.json             |  10 +-
 .../src/main/rules/EC78/EC78.json             |  10 +-
 .../src/main/rules/EC79/EC79.json             |   8 +-
 .../src/main/rules/EC81/EC81.json             |   9 +-
 .../src/main/rules/EC82/EC82.json             |   8 +-
 .../src/main/rules/EC83/EC83.json             |   8 +-
 .../src/main/rules/EC84/EC84.json             |   9 +-
 .../src/main/rules/EC85/EC85.json             |   8 +-
 .../src/main/rules/EC86/EC86.json             |   9 +-
 .../src/main/rules/EC87/EC87.json             |   9 +-
 .../src/main/rules/EC88/EC88.json             |   9 +-
 .../src/main/rules/EC89/EC89.json             |  10 +-
 .../src/main/rules/EC9/EC9.json               |  13 +-
 .../src/main/rules/EC91/EC91.json             |  11 +-
 .../src/main/rules/EC92/EC92.json             |  25 +-
 .../src/main/rules/EC93/EC93.json             |   8 +-
 .../src/main/rules/EC94/EC94.json             |   8 +-
 .../fr/greencodeinitiative/RulesTest.java     | 381 +++++++++---------
 pom.xml                                       |  75 +++-
 102 files changed, 671 insertions(+), 1195 deletions(-)

diff --git a/ecocode-rules-specifications/pom.xml b/ecocode-rules-specifications/pom.xml
index a6fd3d2eb..105fcad5f 100644
--- a/ecocode-rules-specifications/pom.xml
+++ b/ecocode-rules-specifications/pom.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>io.ecocode</groupId>
-		<artifactId>ecocode-parent</artifactId>
-		<version>1.6.4-SNAPSHOT</version>
-	</parent>
+  <parent>
+    <groupId>io.ecocode</groupId>
+    <artifactId>ecocode-parent</artifactId>
+    <version>1.6.4-SNAPSHOT</version>
+  </parent>
 
-	<artifactId>ecocode-rules-specifications</artifactId>
+  <artifactId>ecocode-rules-specifications</artifactId>
 
-	<name>ecoCode Rules Specifications repository</name>
-	<description>Repository that contains the specifications of every static-analysis rules available in ecoCode plugins.</description>
-	<url>https://github.com/green-code-initiative/ecoCode/tree/main/ecocode-rules-specifications</url>
+  <name>ecoCode Rules Specifications repository</name>
+  <description>Repository that contains the specifications of every static-analysis rules available in ecoCode plugins.</description>
+  <url>https://github.com/green-code-initiative/ecoCode/tree/main/ecocode-rules-specifications</url>
 
-	<build>
-		<plugins>
-			<plugin><!--
+  <build>
+    <plugins>
+      <plugin>
+        <!--
 					This plugin convert ASCIIDOC rule specification in HTML format
 					ASCIIDOC format is used with custom features such as :
 					- syntax highlighting (see code blocks on ASCIIDOC rules)
@@ -28,78 +29,80 @@
 
 					This issue is fixed in 3.x release of asciidoctor-maven-plugin
 				-->
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<version>2.2.4</version>
-				<executions>
-					<execution>
-						<id>convert-to-html</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>process-asciidoc</goal>
-						</goals>
-						<configuration>
-							<sourceDirectory>${project.basedir}/src/main/rules</sourceDirectory>
-							<outputDirectory>${project.build.directory}/rules-html</outputDirectory>
-							<attributes>
-								<source-highlighter>coderay</source-highlighter>
-								<coderay-css>style</coderay-css>
-							</attributes>
-							<preserveDirectories>true</preserveDirectories>
-							<embedAssets>true</embedAssets>
-							<headerFooter>false</headerFooter>
-							<relativeBaseDir>true</relativeBaseDir>
-							<logHandler>
-								<failIf>
-									<severity>ERROR</severity>
-								</failIf>
-							</logHandler>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin><!--
+        <groupId>org.asciidoctor</groupId>
+        <artifactId>asciidoctor-maven-plugin</artifactId>
+        <version>2.2.4</version>
+        <executions>
+          <execution>
+            <id>convert-to-html</id>
+            <goals>
+              <goal>process-asciidoc</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <sourceDirectory>${project.basedir}/src/main/rules</sourceDirectory>
+              <outputDirectory>${project.build.directory}/rules-html</outputDirectory>
+              <attributes>
+                <source-highlighter>coderay</source-highlighter>
+                <coderay-css>style</coderay-css>
+              </attributes>
+              <preserveDirectories>true</preserveDirectories>
+              <embedAssets>true</embedAssets>
+              <headerFooter>false</headerFooter>
+              <relativeBaseDir>true</relativeBaseDir>
+              <logHandler>
+                <failIf>
+                  <severity>ERROR</severity>
+                </failIf>
+              </logHandler>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!--
 					Prepare resources tree needed by language.
 					Each metadata JSON file must be in the same folder as the HTML description file for the corresponding language.
 				-->
-				<groupId>com.github.johnpoth</groupId>
-				<artifactId>jshell-maven-plugin</artifactId>
-				<version>1.4</version>
-				<executions>
-					<execution>
-						<id>prepare-rules-resources</id>
-						<phase>generate-resources</phase>
-						<goals>
-							<goal>run</goal>
-						</goals>
-						<configuration>
-							<scripts>
-								<script>${project.basedir}/src/main/script/PrepareResources.jsh</script>
-							</scripts>
-							<options>
-								<option>-R "-DsourceDir=${project.build.directory}/rules-html"</option>
-								<option>-R "-DtargetDir=${project.build.outputDirectory}/io/ecocode/rules"</option>
-							</options>
-						</configuration>
-					</execution>
-				</executions>
+        <groupId>com.github.johnpoth</groupId>
+        <artifactId>jshell-maven-plugin</artifactId>
+        <version>1.4</version>
 
-				<dependencies>
-					<dependency>
-						<groupId>jakarta.json</groupId>
-						<artifactId>jakarta.json-api</artifactId>
-						<version>2.1.2</version>
-					</dependency>
+        <dependencies>
+          <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <version>2.1.2</version>
+          </dependency>
 
-					<dependency>
-						<groupId>org.glassfish</groupId>
-						<artifactId>jakarta.json</artifactId>
-						<version>2.0.1</version>
-						<classifier>module</classifier>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<plugin><!--
+          <dependency>
+            <groupId>org.glassfish</groupId>
+            <artifactId>jakarta.json</artifactId>
+            <version>2.0.1</version>
+            <classifier>module</classifier>
+          </dependency>
+        </dependencies>
+        <executions>
+          <execution>
+            <id>prepare-rules-resources</id>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <phase>generate-resources</phase>
+            <configuration>
+              <scripts>
+                <script>${project.basedir}/src/main/script/PrepareResources.jsh</script>
+              </scripts>
+              <options>
+                <option>-R "-DsourceDir=${project.build.directory}/rules-html"</option>
+                <option>-R "-DtargetDir=${project.build.outputDirectory}/io/ecocode/rules"</option>
+              </options>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <!--
 					This module produce one artifact by language (with corresponding classifier)
 					For example, to add rule specifications for Python language, add following dependency in python sonarqube plugin:
 
@@ -110,111 +113,111 @@
 			            <classifier>python</classifier>
 			        </dependency>
 				-->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.6.0</version>
-				<executions>
-					<execution>
-						<id>assembly-java</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/java.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-php</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/php.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-python</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/python.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-javascript</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/javascript.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-swift</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/swift.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-xml</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/xml.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-csharp</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/csharp.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assembly-html</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/main/assembly/html.xml</descriptor>
-							</descriptors>
-						</configuration>
-					</execution>
-				</executions>
-				<configuration>
-					<appendAssemblyId>true</appendAssemblyId>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>3.6.0</version>
+        <configuration>
+          <appendAssemblyId>true</appendAssemblyId>
+        </configuration>
+        <executions>
+          <execution>
+            <id>assembly-java</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/java.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-php</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/php.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-python</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/python.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-javascript</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/javascript.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-swift</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/swift.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-xml</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/xml.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-csharp</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/csharp.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+          <execution>
+            <id>assembly-html</id>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <phase>prepare-package</phase>
+            <configuration>
+              <descriptors>
+                <descriptor>${project.basedir}/src/main/assembly/html.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
index 257f041c0..7e971798c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
+++ b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "50min"
   },
-  "tags": [
-    "performance",
-    "spring",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "spring", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
index f6377762a..a92cbf284 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
+++ b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "60min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
index 6efe68c92..48cc6ed6b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
+++ b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -18,8 +14,5 @@
     },
     "attribute": "EFFICIENT"
   },
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
index 1998ae15b..5d93ecfda 100644
--- a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
+++ b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -18,8 +14,5 @@
     },
     "attribute": "EFFICIENT"
   },
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
-}
\ No newline at end of file
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
index 6093a90c6..87294adf9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
+++ b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
@@ -9,17 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "30min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "nestjs",
-    "performance"
-  ],
+  "tags": [ "ecocode", "eco-design", "nestjs", "performance" ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
index 44c8af003..535bf1982 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
+++ b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
index f635e1683..d7222c666 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
+++ b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "60min"
   },
-  "tags": [
-    "performance",
-    "user-experience",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "user-experience", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
index 89a3dd333..3772eb778 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
+++ b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
@@ -18,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
index 938a273a7..22e09bba8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
+++ b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
@@ -9,19 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "sql"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance", "sql" ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [
-    "JAVA",
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVA", "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
index 78a83b2d9..d09096dde 100644
--- a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
+++ b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
@@ -9,19 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "jsx",
-    "performance",
-    "react"
-  ],
+  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
index 18cb60eb5..e02310b78 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
+++ b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
@@ -9,19 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "jsx",
-    "performance",
-    "react"
-  ],
+  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
index ac25fff41..16c60b618 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
+++ b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
index 7181623c8..10aed9a15 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
+++ b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "performance",
-    "error-handling",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "error-handling", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
index 01d96ed30..fa821e6ae 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
+++ b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
@@ -9,19 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "jsx",
-    "performance",
-    "react"
-  ],
+  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
index 7b37df14f..ce4dd0f1d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
+++ b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "bad-practice",
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "bad-practice", "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
index 060ab9982..3e5027a94 100644
--- a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
+++ b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
@@ -9,19 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "30min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "jsx",
-    "performance",
-    "react"
-  ],
+  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
index 70f360780..4d5d998c2 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
+++ b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
@@ -9,18 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "image"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance", "image" ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
index 9f70aa74c..23929ff8f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
+++ b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
index 1d8b43332..72e8cb6c3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
+++ b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
index 8d505e769..bf4824625 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
+++ b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
index 726c09260..29323f309 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
+++ b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
@@ -9,15 +9,9 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "video",
-    "audio"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance", "video", "audio" ],
   "defaultSeverity": "Major"
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
index 299ed5af0..25ac977d8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
+++ b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
index 4a54125e6..ac4ea39cb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
+++ b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
@@ -18,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
index 2ac3540eb..71fc67677 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
+++ b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "performance",
-    "sql",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "sql", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
index a45157b5b..6e2a6b4bd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
+++ b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "batch",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
index 04a684088..9e6401a6a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
+++ b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "3h"
   },
-  "tags": [
-    "batch",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
index 8b0666cdc..c1263ddcb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
+++ b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "3h"
   },
-  "tags": [
-    "bottleneck",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.2",
   "defaultSeverity": "Critical",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
index 66e05a144..3898f7389 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
+++ b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "bottleneck",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.6",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
index bbf77b40b..9a374d9bd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
+++ b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "bottleneck",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
index 02081acef..6bc946ff7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
+++ b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
@@ -3,17 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "ios", "eco-design", "performance" ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
@@ -22,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
index a684977c9..0597d3dbf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
+++ b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
index 3aaa70f6b..27ce3c1c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
+++ b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1h"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
index 1d3680527..0a023fcea 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
+++ b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
index 9b0adf81e..f61537a8a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
+++ b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
@@ -3,17 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1d"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "ios", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -22,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
index aeb65d39d..eda8cde69 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
+++ b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
index f9232da6a..bbcb8927d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
+++ b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "idleness",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
index 3054e78fd..579ce612a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
+++ b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leakage",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.2",
   "defaultSeverity": "Critical",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
index 7153387ef..a389b9bcc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
+++ b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leakage",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.2",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
index 71404fa48..3086ecf5f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
+++ b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leakage",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.2",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
index 759c6ad94..497d56bef 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
+++ b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leakage",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
index 6bda872b9..2894b073c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
+++ b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leakage",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
index 60f0f93b6..956c946f0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
+++ b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "optimized-api",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "optimized-api", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
index 11076a4c6..6eb2d0049 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
+++ b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "optimized-api",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "optimized-api", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
index 193a8b3c7..02b4a8e46 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
+++ b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
@@ -3,17 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "0min"
   },
-  "tags": [
-    "power",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance",
-    "ios"
-  ],
+  "tags": [ "power", "ecocode", "android", "eco-design", "performance", "ios" ],
   "ecoScore": "1.0",
   "defaultSeverity": "Info",
   "code": {
@@ -22,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
index 04dbc2843..3f0ecf464 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
+++ b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
@@ -3,17 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "0min"
   },
-  "tags": [
-    "power",
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "power", "ecocode", "android", "ios", "eco-design", "performance" ],
   "ecoScore": "1.0",
   "defaultSeverity": "Info",
   "code": {
@@ -22,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
index fc98c5efa..c2127799e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
+++ b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
index e33e659f4..3e5fb5a66 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
@@ -3,7 +3,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
index 1796c21cb..9702fc22b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
@@ -1,8 +1,3 @@
 {
-  "tags": [
-    "android",
-    "ecocode",
-    "eco-design",
-    "performance"
-  ]
+  "tags": [ "android", "ecocode", "eco-design", "performance" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
index c3c32f884..daf0864d8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
@@ -1,13 +1,4 @@
 {
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "react-native",
-    "sobriety"
-  ],
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "react-native", "sobriety" ],
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
index a256661cc..05bf01318 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
@@ -1,9 +1,3 @@
 {
-  "tags": [
-    "ios",
-    "ecocode",
-    "eco-design",
-    "performance",
-    "sobriety"
-  ]
+  "tags": [ "ios", "ecocode", "eco-design", "performance", "sobriety" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
index f6333201d..6ba4e7927 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
@@ -2,7 +2,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
index 09b550281..fecf54530 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
@@ -1,9 +1,4 @@
 {
   "title": "minTime should be used in geolocation update",
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "android"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "android" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
index 687e9dc32..e0695ddf3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
@@ -1,13 +1,5 @@
 {
   "title": "High accuracy geolocation should be avoided",
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "react-native"
-  ],
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "react-native" ],
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
index e644d5885..eb081dd3b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
+++ b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
index 012ff950c..2fac4a4b0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
+++ b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -20,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
index 17c043eb3..79fedd9c9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
+++ b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "sobriety",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
index 8c969250b..f31b7d4f3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
+++ b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -20,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
index d52cb22d4..ed42edd65 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
+++ b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "sobriety",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
index e6ca6362b..5bfd244e0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
+++ b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "sobriety",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
index 73107a1ad..7a6031d5d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
@@ -3,7 +3,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
index 260276b5f..1b242f962 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
@@ -1,8 +1,3 @@
 {
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "android"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "android" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
index f947e415d..ceed58e9e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
@@ -1,12 +1,4 @@
 {
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "react-native"
-  ],
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "react-native" ],
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
index 8b5fa4d65..7ffe51c39 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
@@ -1,9 +1,3 @@
 {
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "ios",
-    "sobriety"
-  ]
+  "tags": [ "ecocode", "eco-design", "performance", "ios", "sobriety" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
index 7b365c386..c0ac4640c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
+++ b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance",
-    "sobriety"
-  ],
+  "tags": [ "ecocode", "android", "eco-design", "performance", "sobriety" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
@@ -21,4 +15,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
index ac4486473..b8039a85f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
+++ b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "android"
-  ],
+  "tags": [ "ecocode", "eco-design", "android" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
@@ -19,4 +15,4 @@
     },
     "attribute": "TRUSTWORTHY"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
index d481f5043..0b1732b2e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
+++ b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance",
-    "ios"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance", "ios" ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
index ceda606be..b7dcad2d7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
+++ b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
@@ -6,12 +6,7 @@
     "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "ios", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
index 8ee2e125a..4ccaa0308 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
+++ b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "batch",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -20,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
index 2e889dade..0757d8a26 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
+++ b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
@@ -3,17 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "power",
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "power", "ecocode", "android", "ios", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -21,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
index fb6a39aab..3051359cb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
+++ b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1h"
   },
-  "tags": [
-    "power",
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "power", "ecocode", "android", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -20,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
index 349ac8bd7..c6b8c3d3e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
+++ b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1h"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -20,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
index 1fa28410a..a475240e7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
+++ b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1h"
   },
-  "tags": [
-    "ecocode",
-    "android",
-    "eco-design",
-    "performance",
-    "sobriety"
-  ],
+  "tags": [ "ecocode", "android", "eco-design", "performance", "sobriety" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -20,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
index 498a78992..e4535331d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
+++ b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
@@ -6,13 +6,7 @@
     "func": "Constant/Issue",
     "constantCost": "0min"
   },
-  "tags": [
-    "ecocode",
-    "power",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "power", "ios", "eco-design", "performance" ],
   "defaultSeverity": "Info",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
index af9ba28f9..b2201ca91 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
+++ b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
@@ -6,12 +6,7 @@
     "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "ecocode",
-    "ios",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "ios", "eco-design", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
index 780df67c8..6c6789a95 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
+++ b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "bad-practice",
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "bad-practice", "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
index 63d408e8e..14631beca 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
+++ b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
index 81bbe5424..52717eabe 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
+++ b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
index 0e80f275e..ed1692a8b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
+++ b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
index 472a86e39..dd5fafbdc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
+++ b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
@@ -3,18 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "performance",
-    "sql",
-    "spring",
-    "eco-design",
-    "ecocode",
-    "memory",
-    "network"
-  ],
+  "tags": [ "performance", "sql", "spring", "eco-design", "ecocode", "memory", "network" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
index 21058e3ae..43c0c4adc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
+++ b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "network",
-    "sql",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "network", "sql", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
index 51a9918ac..e2cbf03a9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
+++ b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "bad-practice",
-    "eco-design",
-    "ecocode",
-    "performance"
-  ],
+  "tags": [ "bad-practice", "eco-design", "ecocode", "performance" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
index d4ee48d36..d3715851e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
+++ b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "leak",
-    "eco-design",
-    "performance",
-    "ecocode",
-    "memory"
-  ],
+  "tags": [ "leak", "eco-design", "performance", "ecocode", "memory" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
index 8e4a5b94d..49011c6df 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
+++ b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "20min"
   },
-  "tags": [
-    "performance",
-    "regex",
-    "eco-design",
-    "ecocode",
-    "memory"
-  ],
+  "tags": [ "performance", "regex", "eco-design", "ecocode", "memory" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
index bcf51263d..857c11b8d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
+++ b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "sql",
-    "performance",
-    "memory"
-  ],
+  "tags": [ "eco-design", "ecocode", "sql", "performance", "memory" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
index 28e8b2118..aac3734a5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
+++ b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "performance",
-    "eco-design",
-    "ecocode"
-  ],
+  "tags": [ "performance", "eco-design", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
index 0118b8cd9..b63eb0a5b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
+++ b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "memory",
-    "performance"
-  ],
+  "tags": [ "eco-design", "ecocode", "memory", "performance" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
index c07399c2d..f95a85417 100644
--- a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
+++ b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
index da8c4bcfa..00000a9d1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
+++ b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
index 0d0dbb3af..4d0cd9baf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
+++ b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance",
-    "bad-practice"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
index 895ce2650..bd375ef77 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
+++ b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
index 93abb4ff4..fa0206d67 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
+++ b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "10min"
   },
-  "tags": [
-    "eco-design",
-    "performance", 
-    "ecocode",
-    "bad-practice"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode", "bad-practice" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
index 0a0d3f6a3..a3a6e41a5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
+++ b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance",
-    "bad-practice"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
index f71bfd07e..ab3d21da9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
+++ b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance",
-    "bad-practice"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
index fb9f43f6b..fadc76a6b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
+++ b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
@@ -3,16 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "network",
-    "cache",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "network", "cache", "ecocode" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
index 965a0e50f..00bad4179 100644
--- a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
+++ b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
@@ -9,17 +9,10 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "15min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance" ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
-  ]
+  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
index f6887b5fb..0c3debc0b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
+++ b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
@@ -3,15 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "ecocode",
-    "performance",
-    "bad-practice"
-  ],
+  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -19,4 +14,4 @@
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
index 121fcd999..c75847240 100644
--- a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
+++ b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
@@ -1,22 +1,17 @@
 {
-	"title": "string.Length should be used instead of comparison with empty string",
-	"type": "CODE_SMELL",
-	"status": "ready",
-	"remediation": {
-		"func": "Constant\/Issue",
-		"constantCost": "5min"
-	},
-	"tags": [
-		"eco-design",
-		"ecocode",
-		"performance",
-		"bad-practice"
-	],
-	"defaultSeverity": "Minor",
+  "title": "string.Length should be used instead of comparison with empty string",
+  "type": "CODE_SMELL",
+  "status": "ready",
+  "remediation": {
+    "func": "Constant/Issue",
+    "constantCost": "5min"
+  },
+  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "defaultSeverity": "Minor",
   "code": {
     "impacts": {
       "RELIABILITY": "LOW"
     },
     "attribute": "EFFICIENT"
   }
-}
\ No newline at end of file
+}
diff --git a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
index cbb65b2e3..17c2ccab5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
+++ b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "5min"
   },
-  "tags": [
-    "eco-design",
-    "performance",
-    "ecocode"
-  ],
+  "tags": [ "eco-design", "performance", "ecocode" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
index f85a962a4..5191d26f9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
+++ b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
@@ -3,14 +3,10 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant\/Issue",
+    "func": "Constant/Issue",
     "constantCost": "1min"
   },
-  "tags": [
-    "ecocode",
-    "eco-design",
-    "performance"
-  ],
+  "tags": [ "ecocode", "eco-design", "performance" ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index 087531ad2..cffd435c6 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -1,6 +1,6 @@
 /*
- * ecoCode - Java language - Provides rules to reduce the environmental footprint of your Java programs
- * Copyright © 2024 Green Code Initiative (https://www.ecocode.io)
+ * ecoCode Rules Specifications repository - Repository that contains the specifications of every static-analysis rules available in ecoCode plugins.
+ * Copyright © 2023 Green Code Initiative (https://www.ecocode.io)
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +43,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.sonar.api.SonarRuntime;
@@ -60,204 +59,194 @@
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
 class RulesTest {
-    private static final Version SONAR_API_VERSION = Version.create(10, 10);
-    private static final String RESOURCE_DIR = "rules";
-    private static final String RESOURCE_BASE_PATH = "/io/ecocode/" + RESOURCE_DIR + "/";
-    private static final String[] LANGUAGES = new String[] { "csharp", "html", "java", "javascript", "php",
-            "python", "swift", "xml" };
-
-    private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode", "eco-design");
-
-    private static final String EFFICIENT_TAG = "performance";
-
-    private static final List<String> AREA_TAGS = Arrays.asList("audio", "cache", "error-handling", "image",
-            "leak", "memory", "network", "video");
-
-    private static final List<String> TECHNOLOGY_TAGS = Arrays.asList("android",
-            "ios", "jsx", "nestjs", "react", "react-native", "regex", "spring", "sql");
-
-    /**
-     * Built-in rule tags from
-     * https://docs.sonarsource.com/sonarqube/latest/user-guide/rules/built-in-rule-tags/
-     */
-    private static final List<String> BUILT_IN_RULE_TAGS = Arrays.asList("bad-practice", "user-experience");
-
-    /**
-     * Tags from https://github.com/cnumr/best-practices-mobile
-     */
-    private static final List<String> BEST_PRACTISES_MOBILE_TAGS = Arrays.asList(
-            "optimized-api",
-            "leakage",
-            "bottleneck",
-            "idleness",
-            "power",
-            "batch",
-            "release",
-            "sobriety",
-            "longevity");
-
-    /**
-     * Let's not have too many tags, especially tags redundant with eco-design or
-     * performance, e.g.
-     * do not allow environment.
-     */
-    private static final List<String> ALL_TAGS = Stream.of(
-            MANDATORY_TAGS,
-            Collections.singletonList(EFFICIENT_TAG),
-            BUILT_IN_RULE_TAGS,
-            AREA_TAGS,
-            TECHNOLOGY_TAGS,
-            BEST_PRACTISES_MOBILE_TAGS)
-            .flatMap(List::stream)
-            .collect(Collectors.toList());
-
-    private static final Pattern NONCOMPLIANT_COMMENT_PATTERN = Pattern.compile(
-            ".*(// Noncompliant|!-- Noncompliant|# Noncompliant).*", Pattern.DOTALL);
-
-    private static SonarRuntime sonarRuntime;
-
-    @BeforeAll
-    static void init() {
-        sonarRuntime = mock(SonarRuntime.class);
-        when(sonarRuntime.getApiVersion()).thenReturn(SONAR_API_VERSION);
+  private static final Version SONAR_API_VERSION = Version.create(10, 10);
+  private static final String RESOURCE_DIR = "rules";
+  private static final String RESOURCE_BASE_PATH = "/io/ecocode/" + RESOURCE_DIR + "/";
+  private static final String[] LANGUAGES =
+      new String[] {"csharp", "html", "java", "javascript", "php", "python", "swift", "xml"};
+
+  private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode", "eco-design");
+
+  private static final String EFFICIENT_TAG = "performance";
+
+  private static final List<String> AREA_TAGS =
+      Arrays.asList(
+          "audio", "cache", "error-handling", "image", "leak", "memory", "network", "video");
+
+  private static final List<String> TECHNOLOGY_TAGS =
+      Arrays.asList(
+          "android", "ios", "jsx", "nestjs", "react", "react-native", "regex", "spring", "sql");
+
+  /**
+   * Built-in rule tags from
+   * https://docs.sonarsource.com/sonarqube/latest/user-guide/rules/built-in-rule-tags/
+   */
+  private static final List<String> BUILT_IN_RULE_TAGS =
+      Arrays.asList("bad-practice", "user-experience");
+
+  /** Tags from https://github.com/cnumr/best-practices-mobile */
+  private static final List<String> BEST_PRACTISES_MOBILE_TAGS =
+      Arrays.asList(
+          "optimized-api",
+          "leakage",
+          "bottleneck",
+          "idleness",
+          "power",
+          "batch",
+          "release",
+          "sobriety",
+          "longevity");
+
+  /**
+   * Let's not have too many tags, especially tags redundant with eco-design or performance, e.g. do
+   * not allow environment.
+   */
+  private static final List<String> ALL_TAGS =
+      Stream.of(
+              MANDATORY_TAGS,
+              Collections.singletonList(EFFICIENT_TAG),
+              BUILT_IN_RULE_TAGS,
+              AREA_TAGS,
+              TECHNOLOGY_TAGS,
+              BEST_PRACTISES_MOBILE_TAGS)
+          .flatMap(List::stream)
+          .collect(Collectors.toList());
+
+  private static final Pattern NONCOMPLIANT_COMMENT_PATTERN =
+      Pattern.compile(".*(// Noncompliant|!-- Noncompliant|# Noncompliant).*", Pattern.DOTALL);
+
+  private static SonarRuntime sonarRuntime;
+
+  @BeforeAll
+  static void init() {
+    sonarRuntime = mock(SonarRuntime.class);
+    when(sonarRuntime.getApiVersion()).thenReturn(SONAR_API_VERSION);
+  }
+
+  private static Path[] findAllLangs() throws URISyntaxException, IOException {
+    URI uri = RuleMetadataLoader.class.getResource(RESOURCE_BASE_PATH).toURI();
+    Path path = Paths.get(uri);
+    try (Stream<Path> walk = Files.walk(path, 1)) {
+      return walk.filter(p -> !RESOURCE_DIR.equals(p.toFile().getName())).toArray(Path[]::new);
     }
-
-    private static Path[] findAllLangs() throws URISyntaxException, IOException {
-        URI uri = RuleMetadataLoader.class.getResource(RESOURCE_BASE_PATH).toURI();
-        Path path = Paths.get(uri);
-        try (Stream<Path> walk = Files.walk(path, 1)) {
-            return walk.filter(p -> !RESOURCE_DIR.equals(p.toFile().getName()))
-                    .toArray(Path[]::new);
+  }
+
+  private static SortedSet<String> findAllRules(Path langPath) throws IOException {
+    SortedSet<String> rules = new TreeSet<>();
+    try (Stream<Path> langWalk = Files.walk(langPath, 1)) {
+      for (Iterator<Path> it = langWalk.iterator(); it.hasNext(); ) {
+        String ruleFile = it.next().toFile().getName();
+        int extensionIndex = ruleFile.lastIndexOf('.');
+        if (extensionIndex != -1) {
+          String rule = ruleFile.substring(0, extensionIndex);
+          rules.add(rule);
         }
+      }
     }
-
-    private static SortedSet<String> findAllRules(Path langPath) throws IOException {
-        SortedSet<String> rules = new TreeSet<>();
-        try (Stream<Path> langWalk = Files.walk(langPath, 1)) {
-            for (Iterator<Path> it = langWalk.iterator(); it.hasNext();) {
-                String ruleFile = it.next().toFile().getName();
-                int extensionIndex = ruleFile.lastIndexOf('.');
-                if (extensionIndex != -1) {
-                    String rule = ruleFile.substring(0, extensionIndex);
-                    rules.add(rule);
-                }
-            }
-        }
-        return rules;
+    return rules;
+  }
+
+  @Test
+  void testRules() throws URISyntaxException, IOException {
+    RulesDefinition.Context context = new RulesDefinition.Context();
+    Path[] langPaths = findAllLangs();
+    assertArrayEquals(
+        LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).sorted().toArray());
+    for (Path langPath : langPaths) {
+      String lang = langPath.toFile().getName();
+      DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
+      RuleMetadataLoader ruleMetadataLoader =
+          new RuleMetadataLoader(RESOURCE_BASE_PATH + lang, sonarRuntime);
+      ruleMetadataLoader.addRulesByRuleKey(repository, new ArrayList<>(findAllRules(langPath)));
+      context.registerRepository(repository);
     }
-
-    @Test
-    void testRules() throws URISyntaxException, IOException {
-        RulesDefinition.Context context = new RulesDefinition.Context();
-        Path[] langPaths = findAllLangs();
-        assertArrayEquals(LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).sorted().toArray());
-        for (Path langPath : langPaths) {
-            String lang = langPath.toFile().getName();
-            DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
-            RuleMetadataLoader ruleMetadataLoader = new RuleMetadataLoader(RESOURCE_BASE_PATH + lang,
-                    sonarRuntime);
-            ruleMetadataLoader.addRulesByRuleKey(
-                    repository, new ArrayList<>(findAllRules(langPath)));
-            context.registerRepository(repository);
+    assertEquals(LANGUAGES.length, context.repositories().size());
+    for (Repository repo : context.repositories()) {
+      assertFalse(repo.rules().isEmpty(), repo.key() + " repository should have rules");
+      for (Rule rule : repo.rules()) {
+        assertFalse(rule.activatedByDefault(), rule + " should not be activated by default");
+        assertEquals(RuleScope.MAIN, rule.scope(), rule + " should have MAIN scope");
+
+        assertEquals(RuleType.CODE_SMELL, rule.type(), rule + " should have CODE_SMELL type");
+        assertEquals(
+            Collections.singleton(SoftwareQuality.RELIABILITY),
+            rule.defaultImpacts().keySet(),
+            rule + " should have RELIABILITY Software Quality");
+        assertTrue(
+            rule.tags().containsAll(MANDATORY_TAGS), rule + " should have tags " + MANDATORY_TAGS);
+        assertTrue(
+            ALL_TAGS.containsAll(rule.tags()),
+            rule + " should only have allowed tags but got: " + rule.tags());
+        switch (rule.cleanCodeAttribute()) {
+          case EFFICIENT:
+            assertTrue(
+                rule.tags().contains(EFFICIENT_TAG), rule + " should have tag " + EFFICIENT_TAG);
+            break;
+          case TRUSTWORTHY:
+            assertFalse(
+                rule.tags().contains(EFFICIENT_TAG),
+                rule + " should not have tag " + EFFICIENT_TAG);
+            break;
+          default:
+            fail(rule + " should have EFFICIENT or TRUSTWORTHY Clean Code Attribute");
         }
-        assertEquals(LANGUAGES.length, context.repositories().size());
-        for (Repository repo : context.repositories()) {
-            assertFalse(repo.rules().isEmpty(), repo.key() + " repository should have rules");
-            for (Rule rule : repo.rules()) {
-                assertFalse(
-                        rule.activatedByDefault(),
-                        rule + " should not be activated by default");
-                assertEquals(RuleScope.MAIN, rule.scope(), rule + " should have MAIN scope");
-
-                assertEquals(
-                        RuleType.CODE_SMELL, rule.type(),
-                        rule + " should have CODE_SMELL type");
-                assertEquals(
-                        Collections.singleton(SoftwareQuality.RELIABILITY),
-                        rule.defaultImpacts().keySet(),
-                        rule + " should have RELIABILITY Software Quality");
-                assertTrue(
-                        rule.tags().containsAll(MANDATORY_TAGS),
-                        rule + " should have tags " + MANDATORY_TAGS);
-                assertTrue(
-                        ALL_TAGS.containsAll(rule.tags()),
-                        rule + " should only have allowed tags but got: " + rule.tags());
-                switch (rule.cleanCodeAttribute()) {
-                    case EFFICIENT:
-                        assertTrue(
-                                rule.tags().contains(EFFICIENT_TAG),
-                                rule + " should have tag " + EFFICIENT_TAG);
-                        break;
-                    case TRUSTWORTHY:
-                        assertFalse(
-                                rule.tags().contains(EFFICIENT_TAG),
-                                rule + " should not have tag " + EFFICIENT_TAG);
-                        break;
-                    default:
-                        fail(rule + " should have EFFICIENT or TRUSTWORTHY Clean Code Attribute");
-                }
-                // See guidelines in
-                // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
-                assertTrue(
-                        rule.name().contains(" should "),
-                        rule + " title should match the pattern \"X should [not] Y\": " + rule.name());
-                assertFalse(
-                        rule.name().endsWith("."),
-                        rule + " title should not end with a point: " + rule.name());
-                // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
-                // or "Accessibility - Image tags should have an alternate text attribute"
-                assertFalse(
-                        rule.name().contains(":") || rule.name().contains(" - "),
-                        rule + " title should not have a category/tag prefix: " + rule.name());
-                assertTrue(
-                        rule.name().length() < 80,
-                        rule + " title length should be less than 80 characters: " + rule.name());
-
-                List<String> sections = rule.ruleDescriptionSections().stream()
-                        .map(RuleDescriptionSection::getKey)
-                        .collect(Collectors.toList());
-                // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
-                assertFalse(
-                        sections.isEmpty(),
-                        rule
-                                + " should have standard description sections but got none (is"
-                                + " :!sectids: present?)");
-                // Introduction is optional
-                if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
-                    sections.remove(0);
-                }
-                assertIterableEquals(
-                        Arrays.asList(
-                                RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
-                                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
-                                RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
-                        // Using set since "how to fix" sections might be repeated"
-                        new LinkedHashSet<String>(sections),
-                        rule + " should have standard description sections");
-                String howToFix = rule.ruleDescriptionSections().stream()
-                        .filter(
-                                s -> RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY
-                                        .equals(s.getKey()))
-                        .findFirst()
-                        .orElse(null)
-                        .getHtmlContent();
-                assertTrue(
-                        NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
-                        rule
-                                + " must have Noncompliant comment in the How to fix section: "
-                                + howToFix);
-                assertTrue(
-                        howToFix.contains("<h3>Noncompliant code example</h3>"),
-                        rule
-                                + " must have <h3>Noncompliant code example</h3> in How to fix"
-                                + " section: "
-                                + howToFix);
-                assertTrue(
-                        howToFix.contains("<h3>Compliant solution</h3>"),
-                        rule
-                                + " must have <h3>Compliant solution</h3> in How to fix section: "
-                                + howToFix);
-            }
+        // See guidelines in
+        // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
+        assertTrue(
+            rule.name().contains(" should "),
+            rule + " title should match the pattern \"X should [not] Y\": " + rule.name());
+        assertFalse(
+            rule.name().endsWith("."), rule + " title should not end with a point: " + rule.name());
+        // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
+        // or "Accessibility - Image tags should have an alternate text attribute"
+        assertFalse(
+            rule.name().contains(":") || rule.name().contains(" - "),
+            rule + " title should not have a category/tag prefix: " + rule.name());
+        assertTrue(
+            rule.name().length() < 80,
+            rule + " title length should be less than 80 characters: " + rule.name());
+
+        List<String> sections =
+            rule.ruleDescriptionSections().stream()
+                .map(RuleDescriptionSection::getKey)
+                .collect(Collectors.toList());
+        // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
+        assertFalse(
+            sections.isEmpty(),
+            rule
+                + " should have standard description sections but got none (is"
+                + " :!sectids: present?)");
+        // Introduction is optional
+        if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
+          sections.remove(0);
         }
+        assertIterableEquals(
+            Arrays.asList(
+                RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
+                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
+                RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
+            // Using set since "how to fix" sections might be repeated"
+            new LinkedHashSet<String>(sections),
+            rule + " should have standard description sections");
+        String howToFix =
+            rule.ruleDescriptionSections().stream()
+                .filter(s -> RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY.equals(s.getKey()))
+                .findFirst()
+                .orElse(null)
+                .getHtmlContent();
+        assertTrue(
+            NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
+            rule + " must have Noncompliant comment in the How to fix section: " + howToFix);
+        assertTrue(
+            howToFix.contains("<h3>Noncompliant code example</h3>"),
+            rule
+                + " must have <h3>Noncompliant code example</h3> in How to fix"
+                + " section: "
+                + howToFix);
+        assertTrue(
+            howToFix.contains("<h3>Compliant solution</h3>"),
+            rule + " must have <h3>Compliant solution</h3> in How to fix section: " + howToFix);
+      }
     }
+  }
 }
diff --git a/pom.xml b/pom.xml
index 57710771d..60b049aba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.ecocode</groupId>
@@ -97,7 +99,8 @@
         <java.version>11</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <!-- to prevent message: system modules path not set in conjunction with -source 11 -->
+        <!-- to prevent message: system modules path not set in conjunction with
+        -source 11 -->
         <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <encoding>UTF-8</encoding>
@@ -144,12 +147,17 @@
         </dependency>
     </dependencies>
 
-    <!-- <build>
+    <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>4.1</version>
+                <version>4.5</version>
                 <configuration>
                     <properties>
                         <owner>Green Code Initiative</owner>
@@ -157,7 +165,8 @@
                     </properties>
                     <licenseSets>
                         <licenseSet>
-                            <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
+                            <header>
+                                com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
                             <includes>
                                 <include>**/*.java</include>
                             </includes>
@@ -174,15 +183,38 @@
                     </execution>
                 </executions>
             </plugin>
-        </plugins>
-    </build> -->
-
-    <build>
-        <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <pom>
+                        <includes>
+                            <include>pom.xml</include>
+                        </includes>
+                        <sortPom />
+                    </pom>
+                    <json>
+                        <includes>
+                            <include>src/**/*.json</include>
+                        </includes>
+                        <jackson />
+                        <endWithNewline />
+                    </json>
+                    <java>
+                        <googleJavaFormat>
+                            <version>1.23.0</version>
+                        </googleJavaFormat>
+                    </java>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -205,11 +237,11 @@
             </distributionManagement>
             <build>
                 <plugins>
-                    <plugin><!--
-
+                    <plugin>
+                        <!--
                         For publishing in Maven Central,
-                        see: https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication
-
+                        see:
+                        https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication
                         -->
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -218,17 +250,20 @@
                         <configuration>
                             <serverId>ossrh</serverId>
                             <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <!-- if true : automatic publish / if false : manual publish on Nexus GUI ("staging repository" tab) -->
+                            <!-- if true : automatic publish / if false : manual
+                            publish on Nexus GUI ("staging repository" tab) -->
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                         </configuration>
                     </plugin>
                     <plugin><!--
-                            For publishing in Maven Central, GPG key must be published to one of following servers:
+                            For publishing in Maven Central, GPG key must be published to one of following
+                        servers:
                             - keyserver.ubuntu.com
                             - keys.openpgp.org
                             - pgp.mit.edu
 
-                            For more informatino: https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
+                            For more informatino:
+                        https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
                         -->
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>

From f23f81dc6ea79190b0a706b0f031f45498618a5b Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 15:36:07 +0200
Subject: [PATCH 07/19] Revert section change for EC31

---
 .../src/main/rules/EC31/javascript/EC31.asciidoc   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc b/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
index fe5362e25..f8d8d4dd5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC31/javascript/EC31.asciidoc
@@ -6,6 +6,13 @@ Using appropriate image formats and optimizing image sizes is essential for impr
 Larger image file sizes consume more bandwidth, increasing the data transfer required to load a web page.
 Some image formats are generally considered better for eco-friendly web design and should be used in most cases.
 
+We recommend using the following formats:
+
+- *WebP*, developed by Google, is a modern image format that provides high compression efficiency without significant loss of quality.
+- *AVIF* (AV1 Image File Format) is a relatively new and highly efficient image format that is based on the AV1 video codec.
+- *SVG* (Scalable Vector Graphics) is a vector image format that is based on XML.
+Files are lightweight and can be scaled without loss of quality.
+
 == How to fix it
 
 === Noncompliant code example
@@ -17,13 +24,6 @@ Some image formats are generally considered better for eco-friendly web design a
 
 === Compliant solution
 
-We recommend using the following formats:
-
-- *WebP*, developed by Google, is a modern image format that provides high compression efficiency without significant loss of quality.
-- *AVIF* (AV1 Image File Format) is a relatively new and highly efficient image format that is based on the AV1 video codec.
-- *SVG* (Scalable Vector Graphics) is a vector image format that is based on XML.
-Files are lightweight and can be scaled without loss of quality.
-
 [source,html,data-diff-id="1",data-diff-type="compliant"]
 ----
 <img src="./assets/images/cat.webp" alt="Optimized image of a cat"/> // Compliant

From 613a4188ee5553070e85a817de7e3de911ce4b7c Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 15:45:36 +0200
Subject: [PATCH 08/19] Better section titles in EC36

---
 .../src/main/rules/EC36/html/EC36.asciidoc                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc b/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
index 438590a1f..049c7b6a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC36/html/EC36.asciidoc
@@ -11,7 +11,7 @@ However, even without autoplay, segments of video or audio files might still dow
 This leads to unnecessary data usage, especially if users don't commence playback.
 To mitigate this, it's crucial to prevent browsers from preloading any content by configuring the appropriate settings.
 
-== How to fix it in video
+== How to fix it in a video element
 
 === Noncompliant code example
 
@@ -27,7 +27,7 @@ To mitigate this, it's crucial to prevent browsers from preloading any content b
 <video src="videofile.webm" preload="none"></video> // Compliant
 ----
 
-== How to fix it in audio
+== How to fix it in an audio element
 
 === Noncompliant code example
 

From 3975cd01788141111137db9faef2d476d7a4d516 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:06:33 +0200
Subject: [PATCH 09/19] Revert tag changes

---
 .../src/main/rules/EC1/EC1.json               |  9 ++-
 .../src/main/rules/EC10/EC10.json             |  8 ++-
 .../src/main/rules/EC11/EC11.json             | 13 +++-
 .../src/main/rules/EC12/EC12.json             | 13 +++-
 .../src/main/rules/EC13/EC13.json             | 13 +++-
 .../src/main/rules/EC2/EC2.json               |  8 ++-
 .../src/main/rules/EC203/EC203.json           |  9 ++-
 .../src/main/rules/EC22/EC22.json             |  8 ++-
 .../src/main/rules/EC24/EC24.json             | 15 +++-
 .../src/main/rules/EC25/EC25.json             | 15 +++-
 .../src/main/rules/EC26/EC26.json             | 15 +++-
 .../src/main/rules/EC27/EC27.json             |  8 ++-
 .../src/main/rules/EC28/EC28.json             |  9 ++-
 .../src/main/rules/EC29/EC29.json             | 15 +++-
 .../src/main/rules/EC3/EC3.json               |  9 ++-
 .../src/main/rules/EC30/EC30.json             | 15 +++-
 .../src/main/rules/EC31/EC31.json             | 14 +++-
 .../src/main/rules/EC32/EC32.json             |  8 ++-
 .../src/main/rules/EC34/EC34.json             |  8 ++-
 .../src/main/rules/EC35/EC35.json             |  8 ++-
 .../src/main/rules/EC36/EC36.json             | 10 ++-
 .../src/main/rules/EC4/EC4.json               |  8 ++-
 .../src/main/rules/EC404/EC404.json           |  8 ++-
 .../src/main/rules/EC5/EC5.json               |  9 ++-
 .../src/main/rules/EC500/EC500.json           | 10 ++-
 .../src/main/rules/EC501/EC501.json           | 10 ++-
 .../src/main/rules/EC502/EC502.json           | 10 ++-
 .../src/main/rules/EC503/EC503.json           | 10 ++-
 .../src/main/rules/EC504/EC504.json           | 10 ++-
 .../src/main/rules/EC505/EC505.json           | 11 ++-
 .../src/main/rules/EC506/EC506.json           | 10 ++-
 .../src/main/rules/EC507/EC507.json           | 10 ++-
 .../src/main/rules/EC508/EC508.json           | 10 ++-
 .../src/main/rules/EC509/EC509.json           | 11 ++-
 .../src/main/rules/EC510/EC510.json           | 10 ++-
 .../src/main/rules/EC511/EC511.json           | 10 ++-
 .../src/main/rules/EC512/EC512.json           | 10 ++-
 .../src/main/rules/EC513/EC513.json           | 10 ++-
 .../src/main/rules/EC514/EC514.json           | 10 ++-
 .../src/main/rules/EC515/EC515.json           | 10 ++-
 .../src/main/rules/EC516/EC516.json           | 10 ++-
 .../src/main/rules/EC517/EC517.json           | 10 ++-
 .../src/main/rules/EC518/EC518.json           | 10 ++-
 .../src/main/rules/EC519/EC519.json           | 11 ++-
 .../src/main/rules/EC520/EC520.json           | 11 ++-
 .../src/main/rules/EC521/EC521.json           | 11 ++-
 .../src/main/rules/EC522/EC522.json           |  2 +-
 .../src/main/rules/EC522/java/EC522.json      |  8 ++-
 .../main/rules/EC522/javascript/EC522.json    | 13 +++-
 .../src/main/rules/EC522/swift/EC522.json     |  8 ++-
 .../src/main/rules/EC523/EC523.json           |  2 +-
 .../src/main/rules/EC523/java/EC523.json      |  8 ++-
 .../main/rules/EC523/javascript/EC523.json    | 13 +++-
 .../src/main/rules/EC524/EC524.json           | 11 ++-
 .../src/main/rules/EC525/EC525.json           | 10 ++-
 .../src/main/rules/EC526/EC526.json           | 10 ++-
 .../src/main/rules/EC527/EC527.json           | 10 ++-
 .../src/main/rules/EC528/EC528.json           | 10 ++-
 .../src/main/rules/EC529/EC529.json           | 10 ++-
 .../src/main/rules/EC530/EC530.json           |  2 +-
 .../src/main/rules/EC530/java/EC530.json      |  8 ++-
 .../main/rules/EC530/javascript/EC530.json    | 13 +++-
 .../src/main/rules/EC530/swift/EC530.json     |  8 ++-
 .../src/main/rules/EC531/EC531.json           | 10 ++-
 .../src/main/rules/EC532/EC532.json           | 10 ++-
 .../src/main/rules/EC533/EC533.json           | 10 ++-
 .../src/main/rules/EC534/EC534.json           | 10 ++-
 .../src/main/rules/EC540/EC540.json           | 10 ++-
 .../src/main/rules/EC543/EC543.json           | 11 ++-
 .../src/main/rules/EC544/EC544.json           | 10 ++-
 .../src/main/rules/EC547/EC547.json           | 11 ++-
 .../src/main/rules/EC548/EC548.json           | 10 ++-
 .../src/main/rules/EC602/EC602.json           | 11 ++-
 .../src/main/rules/EC603/EC603.json           | 10 ++-
 .../src/main/rules/EC66/EC66.json             |  9 ++-
 .../src/main/rules/EC67/EC67.json             |  8 ++-
 .../src/main/rules/EC69/EC69.json             |  8 ++-
 .../src/main/rules/EC7/EC7.json               |  8 ++-
 .../src/main/rules/EC72/EC72.json             | 12 +++-
 .../src/main/rules/EC74/EC74.json             | 10 ++-
 .../src/main/rules/EC75/EC75.json             |  9 ++-
 .../src/main/rules/EC76/EC76.json             | 10 ++-
 .../src/main/rules/EC77/EC77.json             | 10 ++-
 .../src/main/rules/EC78/EC78.json             | 10 ++-
 .../src/main/rules/EC79/EC79.json             |  8 ++-
 .../src/main/rules/EC81/EC81.json             |  9 ++-
 .../src/main/rules/EC82/EC82.json             |  8 ++-
 .../src/main/rules/EC83/EC83.json             |  8 ++-
 .../src/main/rules/EC84/EC84.json             |  9 ++-
 .../src/main/rules/EC85/EC85.json             |  8 ++-
 .../src/main/rules/EC86/EC86.json             |  9 ++-
 .../src/main/rules/EC87/EC87.json             |  9 ++-
 .../src/main/rules/EC88/EC88.json             |  9 ++-
 .../src/main/rules/EC89/EC89.json             | 10 ++-
 .../src/main/rules/EC9/EC9.json               | 13 +++-
 .../src/main/rules/EC91/EC91.json             |  9 ++-
 .../src/main/rules/EC92/EC92.json             |  9 ++-
 .../src/main/rules/EC93/EC93.json             |  8 ++-
 .../src/main/rules/EC94/EC94.json             |  8 ++-
 .../fr/greencodeinitiative/RulesTest.java     | 71 +++++++++++++------
 pom.xml                                       | 24 ++++---
 101 files changed, 832 insertions(+), 230 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
index 7e971798c..257f041c0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
+++ b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "50min"
   },
-  "tags": [ "performance", "spring", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "spring",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
index a92cbf284..f6377762a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
+++ b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "60min"
   },
-  "tags": [ "eco-design", "ecocode", "performance" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
index 48cc6ed6b..6efe68c92 100644
--- a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
+++ b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "performance" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -14,5 +18,8 @@
     },
     "attribute": "EFFICIENT"
   },
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
index 5d93ecfda..d59e53d35 100644
--- a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
+++ b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "ecocode", "eco-design", "performance" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
@@ -14,5 +18,8 @@
     },
     "attribute": "EFFICIENT"
   },
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
index 87294adf9..6093a90c6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
+++ b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
@@ -9,10 +9,17 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "30min"
   },
-  "tags": [ "ecocode", "eco-design", "nestjs", "performance" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "nestjs",
+    "performance"
+  ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [ "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
index 535bf1982..44c8af003 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
+++ b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
index d7222c666..f635e1683 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
+++ b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "60min"
   },
-  "tags": [ "performance", "user-experience", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "user-experience",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
index 3772eb778..dd50d7d34 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
+++ b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
index 22e09bba8..938a273a7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
+++ b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
@@ -9,10 +9,19 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "ecocode", "eco-design", "performance", "sql" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance",
+    "sql"
+  ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [ "JAVA", "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVA",
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
index d09096dde..78a83b2d9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
+++ b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
@@ -9,10 +9,19 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "jsx",
+    "performance",
+    "react"
+  ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
index e02310b78..18cb60eb5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
+++ b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
@@ -9,10 +9,19 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "jsx",
+    "performance",
+    "react"
+  ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
index 16c60b618..ac25fff41 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
+++ b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
index 10aed9a15..7181623c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
+++ b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "performance", "error-handling", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "error-handling",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
index fa821e6ae..01d96ed30 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
+++ b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
@@ -9,10 +9,19 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "jsx",
+    "performance",
+    "react"
+  ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
index ce4dd0f1d..7b37df14f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
+++ b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "bad-practice", "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "bad-practice",
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
index 3e5027a94..060ab9982 100644
--- a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
+++ b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
@@ -9,10 +9,19 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "30min"
   },
-  "tags": [ "ecocode", "eco-design", "jsx", "performance", "react" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "jsx",
+    "performance",
+    "react"
+  ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
index 4d5d998c2..70f360780 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
+++ b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
@@ -9,10 +9,18 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "performance", "image" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance",
+    "image"
+  ],
   "defaultSeverity": "Minor",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
index 23929ff8f..9f70aa74c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
+++ b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
index 72e8cb6c3..1d8b43332 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
+++ b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
index bf4824625..8d505e769 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
+++ b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
index 29323f309..726c09260 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
+++ b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
@@ -9,9 +9,15 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "performance", "video", "audio" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance",
+    "video",
+    "audio"
+  ],
   "defaultSeverity": "Major"
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
index 25ac977d8..299ed5af0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
+++ b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
index ac4ea39cb..8da3d7ae1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
+++ b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
index 71fc67677..2ac3540eb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
+++ b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "performance", "sql", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "sql",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
index 6e2a6b4bd..b3409dae8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
+++ b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "batch",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
index 9e6401a6a..6316ca510 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
+++ b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "3h"
   },
-  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "batch",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
index c1263ddcb..6e5b51d4a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
+++ b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "3h"
   },
-  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "bottleneck",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.2",
   "defaultSeverity": "Critical",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
index 3898f7389..7d19034c5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
+++ b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "bottleneck",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.6",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
index 9a374d9bd..bbf77b40b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
+++ b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "bottleneck", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "bottleneck",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
index 6bc946ff7..cc9f0d7e5 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
+++ b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "idleness", "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
index 0597d3dbf..e0a02bd37 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
+++ b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
index 27ce3c1c8..422ef5903 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
+++ b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1h"
   },
-  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
index 0a023fcea..36a3ddf3c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
+++ b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
index f61537a8a..4a4261adc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
+++ b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1d"
   },
-  "tags": [ "idleness", "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
index eda8cde69..f907e94bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
+++ b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
index bbcb8927d..41fac4e1f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
+++ b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "idleness", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "idleness",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
index 579ce612a..a98e9848c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
+++ b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "leakage",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.2",
   "defaultSeverity": "Critical",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
index a389b9bcc..5de3a0164 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
+++ b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "leakage",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.2",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
index 3086ecf5f..916497fee 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
+++ b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "leakage",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.2",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
index 497d56bef..7706980bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
+++ b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "leakage",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
index 2894b073c..d55d895e0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
+++ b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leakage", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "leakage",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
index 956c946f0..c1bfb285a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
+++ b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "optimized-api", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "optimized-api",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
index 6eb2d0049..4f456af5f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
+++ b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "optimized-api", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "optimized-api",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.6",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
index 02b4a8e46..04cf687cc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
+++ b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "0min"
   },
-  "tags": [ "power", "ecocode", "android", "eco-design", "performance", "ios" ],
+  "tags": [
+    "power",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance",
+    "ios"
+  ],
   "ecoScore": "1.0",
   "defaultSeverity": "Info",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
index 3f0ecf464..f994fa508 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
+++ b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "0min"
   },
-  "tags": [ "power", "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "power",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "1.0",
   "defaultSeverity": "Info",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
index c2127799e..e1d13c06b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
+++ b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
index 3e5fb5a66..e33e659f4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/EC522.json
@@ -3,7 +3,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
index 9702fc22b..a082dda41 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
@@ -1,3 +1,9 @@
 {
-  "tags": [ "android", "ecocode", "eco-design", "performance" ]
+  "tags": [
+    "sobriety",
+    "android",
+    "ecocode",
+    "eco-design",
+    "performance"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
index daf0864d8..e12778a8e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
@@ -1,4 +1,13 @@
 {
-  "tags": [ "ecocode", "eco-design", "performance", "react-native", "sobriety" ],
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "react-native"
+  ],
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
index 05bf01318..a256661cc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
@@ -1,3 +1,9 @@
 {
-  "tags": [ "ios", "ecocode", "eco-design", "performance", "sobriety" ]
+  "tags": [
+    "ios",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "sobriety"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
index 6ba4e7927..f6333201d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/EC523.json
@@ -2,7 +2,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
index fecf54530..7f93745b8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
@@ -1,4 +1,10 @@
 {
   "title": "minTime should be used in geolocation update",
-  "tags": [ "ecocode", "eco-design", "performance", "android" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "android"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
index e0695ddf3..0c566e1b3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
@@ -1,5 +1,14 @@
 {
   "title": "High accuracy geolocation should be avoided",
-  "tags": [ "ecocode", "eco-design", "performance", "react-native" ],
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "react-native"
+  ],
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
index eb081dd3b..f1332a240 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
+++ b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
index 2fac4a4b0..7dfe63bd1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
+++ b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
index 79fedd9c9..80b41c83a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
+++ b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
index f31b7d4f3..13e41063e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
+++ b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
index ed42edd65..6944f1a4e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
+++ b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
index 5bfd244e0..e6ca6362b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
+++ b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "sobriety", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
index 7a6031d5d..73107a1ad 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/EC530.json
@@ -3,7 +3,7 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
index 1b242f962..82bf296a6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
@@ -1,3 +1,9 @@
 {
-  "tags": [ "ecocode", "eco-design", "performance", "android" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "android"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
index ceed58e9e..e12778a8e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
@@ -1,4 +1,13 @@
 {
-  "tags": [ "ecocode", "eco-design", "performance", "react-native" ],
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "react-native"
+  ],
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
index 7ffe51c39..d9f12db4d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
@@ -1,3 +1,9 @@
 {
-  "tags": [ "ecocode", "eco-design", "performance", "ios", "sobriety" ]
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "ios"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
index c0ac4640c..7a4a2375f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
+++ b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "android", "eco-design", "performance", "sobriety" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
index b8039a85f..a037b0ec9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
+++ b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "ecocode", "eco-design", "android" ],
+  "tags": [
+    "privacy",
+    "social",
+    "ecocode",
+    "eco-design",
+    "android"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Minor",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
index 0b1732b2e..8dba61b0a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
+++ b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "eco-design", "performance", "ios" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "eco-design",
+    "performance",
+    "ios"
+  ],
   "ecoScore": "0.4",
   "defaultSeverity": "Major",
   "code": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
index b7dcad2d7..a00678028 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
+++ b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
index 4ccaa0308..245e79079 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
+++ b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "batch", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "batch",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
index 0757d8a26..574435d58 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
+++ b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "power", "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "power",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
index 3051359cb..a3fed02ca 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
+++ b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1h"
   },
-  "tags": [ "power", "ecocode", "android", "eco-design", "performance" ],
+  "tags": [
+    "power",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
index c6b8c3d3e..84ece653c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
+++ b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1h"
   },
-  "tags": [ "ecocode", "android", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
index a475240e7..3e5c6ad51 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
+++ b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1h"
   },
-  "tags": [ "ecocode", "android", "eco-design", "performance", "sobriety" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "android",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
index e4535331d..54ae2bc72 100644
--- a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
+++ b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
@@ -3,10 +3,17 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "0min"
   },
-  "tags": [ "ecocode", "power", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "power",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Info",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
index b2201ca91..278016563 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
+++ b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "ecocode", "ios", "eco-design", "performance" ],
+  "tags": [
+    "sobriety",
+    "ecocode",
+    "ios",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
index 6c6789a95..780df67c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
+++ b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "bad-practice", "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "bad-practice",
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
index 14631beca..63d408e8e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
+++ b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
index 52717eabe..81bbe5424 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
+++ b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
index ed1692a8b..0e80f275e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
+++ b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
index dd5fafbdc..472a86e39 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
+++ b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
@@ -3,10 +3,18 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "performance", "sql", "spring", "eco-design", "ecocode", "memory", "network" ],
+  "tags": [
+    "performance",
+    "sql",
+    "spring",
+    "eco-design",
+    "ecocode",
+    "memory",
+    "network"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
index 43c0c4adc..21058e3ae 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
+++ b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "eco-design", "performance", "network", "sql", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "network",
+    "sql",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
index e2cbf03a9..51a9918ac 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
+++ b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "bad-practice", "eco-design", "ecocode", "performance" ],
+  "tags": [
+    "bad-practice",
+    "eco-design",
+    "ecocode",
+    "performance"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
index d3715851e..d4ee48d36 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
+++ b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "leak", "eco-design", "performance", "ecocode", "memory" ],
+  "tags": [
+    "leak",
+    "eco-design",
+    "performance",
+    "ecocode",
+    "memory"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
index 49011c6df..8e4a5b94d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
+++ b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "20min"
   },
-  "tags": [ "performance", "regex", "eco-design", "ecocode", "memory" ],
+  "tags": [
+    "performance",
+    "regex",
+    "eco-design",
+    "ecocode",
+    "memory"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
index 857c11b8d..bcf51263d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
+++ b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "eco-design", "ecocode", "sql", "performance", "memory" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "sql",
+    "performance",
+    "memory"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
index aac3734a5..28e8b2118 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
+++ b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "performance", "eco-design", "ecocode" ],
+  "tags": [
+    "performance",
+    "eco-design",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
index b63eb0a5b..0118b8cd9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
+++ b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "memory", "performance" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "memory",
+    "performance"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
index f95a85417..c07399c2d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
+++ b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
index 00000a9d1..da8c4bcfa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
+++ b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
index 4d0cd9baf..0d0dbb3af 100644
--- a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
+++ b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance",
+    "bad-practice"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
index bd375ef77..895ce2650 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
+++ b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
index fa0206d67..0b91bb78a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
+++ b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "10min"
   },
-  "tags": [ "eco-design", "performance", "ecocode", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode",
+    "bad-practice"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
index a3a6e41a5..0a0d3f6a3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
+++ b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance",
+    "bad-practice"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
index ab3d21da9..f71bfd07e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
+++ b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance",
+    "bad-practice"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
index fadc76a6b..fb9f43f6b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
+++ b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
@@ -3,10 +3,16 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "network", "cache", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "network",
+    "cache",
+    "ecocode"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
index 00bad4179..965a0e50f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
+++ b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
@@ -9,10 +9,17 @@
   },
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "15min"
   },
-  "tags": [ "ecocode", "eco-design", "performance" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Major",
-  "compatibleLanguages": [ "JAVASCRIPT", "TYPESCRIPT" ]
+  "compatibleLanguages": [
+    "JAVASCRIPT",
+    "TYPESCRIPT"
+  ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
index 0c3debc0b..f55489038 100644
--- a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
+++ b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance",
+    "bad-practice"
+  ],
   "defaultSeverity": "Major",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
index c75847240..99bb482e8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
+++ b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
@@ -3,10 +3,15 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "ecocode", "performance", "bad-practice" ],
+  "tags": [
+    "eco-design",
+    "ecocode",
+    "performance",
+    "bad-practice"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
index 17c2ccab5..cbb65b2e3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
+++ b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "5min"
   },
-  "tags": [ "eco-design", "performance", "ecocode" ],
+  "tags": [
+    "eco-design",
+    "performance",
+    "ecocode"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
index 5191d26f9..f85a962a4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
+++ b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
@@ -3,10 +3,14 @@
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {
-    "func": "Constant/Issue",
+    "func": "Constant\/Issue",
     "constantCost": "1min"
   },
-  "tags": [ "ecocode", "eco-design", "performance" ],
+  "tags": [
+    "ecocode",
+    "eco-design",
+    "performance"
+  ],
   "defaultSeverity": "Minor",
   "code": {
     "impacts": {
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index cffd435c6..0fdb5c399 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -22,7 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -35,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -48,6 +48,7 @@
 import org.sonar.api.SonarRuntime;
 import org.sonar.api.issue.impact.SoftwareQuality;
 import org.sonar.api.rule.RuleScope;
+import org.sonar.api.rules.CleanCodeAttribute;
 import org.sonar.api.rules.RuleType;
 import org.sonar.api.server.rule.RuleDescriptionSection;
 import org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys;
@@ -67,7 +68,25 @@ class RulesTest {
 
   private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode", "eco-design");
 
-  private static final String EFFICIENT_TAG = "performance";
+  private static final EnumMap<CleanCodeAttribute, List<String>>
+      MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS = new EnumMap<>(CleanCodeAttribute.class);
+
+  static {
+    MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
+        CleanCodeAttribute.EFFICIENT, Collections.singletonList("performance"));
+    MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
+        CleanCodeAttribute.TRUSTWORTHY, Arrays.asList("social"));
+  }
+
+  private static final EnumMap<CleanCodeAttribute, List<String>>
+      OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS = new EnumMap<>(CleanCodeAttribute.class);
+
+  static {
+    OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
+        CleanCodeAttribute.EFFICIENT, Collections.emptyList());
+    OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
+        CleanCodeAttribute.TRUSTWORTHY, Arrays.asList("privacy"));
+  }
 
   private static final List<String> AREA_TAGS =
       Arrays.asList(
@@ -102,13 +121,16 @@ class RulesTest {
    * not allow environment.
    */
   private static final List<String> ALL_TAGS =
-      Stream.of(
-              MANDATORY_TAGS,
-              Collections.singletonList(EFFICIENT_TAG),
-              BUILT_IN_RULE_TAGS,
-              AREA_TAGS,
-              TECHNOLOGY_TAGS,
-              BEST_PRACTISES_MOBILE_TAGS)
+      Stream.concat(
+              MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.values().stream(),
+              Stream.concat(
+                  OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.values().stream(),
+                  Stream.of(
+                      MANDATORY_TAGS,
+                      BUILT_IN_RULE_TAGS,
+                      AREA_TAGS,
+                      TECHNOLOGY_TAGS,
+                      BEST_PRACTISES_MOBILE_TAGS)))
           .flatMap(List::stream)
           .collect(Collectors.toList());
 
@@ -177,19 +199,24 @@ void testRules() throws URISyntaxException, IOException {
         assertTrue(
             ALL_TAGS.containsAll(rule.tags()),
             rule + " should only have allowed tags but got: " + rule.tags());
-        switch (rule.cleanCodeAttribute()) {
-          case EFFICIENT:
-            assertTrue(
-                rule.tags().contains(EFFICIENT_TAG), rule + " should have tag " + EFFICIENT_TAG);
-            break;
-          case TRUSTWORTHY:
-            assertFalse(
-                rule.tags().contains(EFFICIENT_TAG),
-                rule + " should not have tag " + EFFICIENT_TAG);
-            break;
-          default:
-            fail(rule + " should have EFFICIENT or TRUSTWORTHY Clean Code Attribute");
-        }
+        assertTrue(
+            MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.keySet().contains(rule.cleanCodeAttribute()),
+            rule
+                + " should have Clean Code Attribute in "
+                + MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.keySet());
+        assertTrue(
+            rule.tags()
+                .containsAll(MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(rule.cleanCodeAttribute())),
+            rule
+                + " should have tags "
+                + MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(rule.cleanCodeAttribute()));
+        assertFalse(
+            Stream.concat(
+                    MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream(),
+                    OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream())
+                .filter(e -> !rule.cleanCodeAttribute().equals(e.getKey()))
+                .anyMatch(e -> new ArrayList<>(rule.tags()).removeAll(e.getValue())),
+            rule + " should not have a tag from another Clean Code Attribute");
         // See guidelines in
         // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
         assertTrue(
diff --git a/pom.xml b/pom.xml
index 60b049aba..bf17fef1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,18 +194,26 @@
                         </includes>
                         <sortPom />
                     </pom>
-                    <json>
-                        <includes>
-                            <include>src/**/*.json</include>
-                        </includes>
-                        <jackson />
-                        <endWithNewline />
-                    </json>
                     <java>
                         <googleJavaFormat>
                             <version>1.23.0</version>
                         </googleJavaFormat>
                     </java>
+                    <formats>
+                        <format>
+                            <includes>
+                                <include>src/**/*.json</include>
+                            </includes>
+                            <eclipseWtp>
+                                <type>JSON</type>
+                            </eclipseWtp>
+                            <endWithNewline />
+                            <indent>
+                                <spaces>true</spaces>
+                                <spacesPerTab>2</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
                 </configuration>
                 <executions>
                     <execution>
@@ -288,4 +296,4 @@
             </build>
         </profile>
     </profiles>
-</project>
+</project>
\ No newline at end of file

From 7d53fc222be27ac227d177a0468b4831dbda6486 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:17:33 +0200
Subject: [PATCH 10/19] Consistent descriptions for EC2

---
 .../src/main/rules/EC2/java/EC2.asciidoc                  | 8 ++++----
 .../src/main/rules/EC2/php/EC2.asciidoc                   | 4 ++--
 .../src/main/rules/EC2/python/EC2.asciidoc                | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
index 00ed4173c..f8699f809 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/java/EC2.asciidoc
@@ -7,14 +7,12 @@ One variable should be used at most twice in `if...else if...else` statements:
 
 == Why is this an issue?
 
-Performance is impacted by many conditional `if`, `else if` or `else` statements, which is sometimes called "complexity cyclomatic".
+Performance is impacted by many conditional `if`, `else if` or `else` statements, which is sometimes called "cyclomatic complexity".
 
 Switch statement has a performance advantage over `if...else`.
 
 == How to fix it
 
-A switch statement can be used instead of multiple `if...else` if possible, or code can be refactored to reduce number of `if...else if...else` statements.
-
 === Noncompliant code example
 
 Code is noncompliant, because `nb` is used 4 times:
@@ -42,7 +40,9 @@ return nb;
 
 === Compliant solution
 
-With a `switch`:
+A switch statement can be used instead of multiple `if...else` if possible, or code can be refactored to reduce number of `if...else if...else` statements.
+
+With a `switch` statement:
 
 [source,java]
 ----
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
index d6f264384..ab039333f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/php/EC2.asciidoc
@@ -7,7 +7,7 @@ One variable should be used at most twice in `if...elseif...else` statements:
 
 == Why is this an issue?
 
-Performance is impacted by many conditional `if`, `elseif` or `else` statements, which is sometimes called "complexity cyclomatic".
+Performance is impacted by many conditional `if`, `elseif` or `else` statements, which is sometimes called "cyclomatic complexity".
 
 Switch statement has a performance advantage over `if...else`.
 
@@ -15,7 +15,7 @@ Switch statement has a performance advantage over `if...else`.
 
 === Noncompliant code example
 
-Code is noncompliant, because `$nb` is used 4 times :
+Code is noncompliant, because `$nb` is used 4 times:
 
 - 3 times explicitly in `if` and `elseif` statements
 - 1 time implicitly in `else` statement
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
index a152c7246..6b2ba0af4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC2/python/EC2.asciidoc
@@ -7,7 +7,7 @@ One variable should be used at most twice in `if...elif...else` statements:
 
 == Why is this an issue?
 
-Performance is impacted by many conditional `if`, `elif` or `else` statements, which is sometimes called "complexity cyclomatic".
+Performance is impacted by many conditional `if`, `elif` or `else` statements, which is sometimes called "cyclomatic complexity".
 
 Switch statement has a performance advantage over `if...else`.
 

From 0fa8fc7c566586fee293a86bb1b95610880f5137 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:37:38 +0200
Subject: [PATCH 11/19] Move pom changes to ecocode-rules-specifications

---
 ecocode-rules-specifications/pom.xml | 136 ++++++++++++++++++++++++++-
 pom.xml                              | 122 +++---------------------
 2 files changed, 145 insertions(+), 113 deletions(-)

diff --git a/ecocode-rules-specifications/pom.xml b/ecocode-rules-specifications/pom.xml
index 105fcad5f..94217cfa4 100644
--- a/ecocode-rules-specifications/pom.xml
+++ b/ecocode-rules-specifications/pom.xml
@@ -14,8 +14,132 @@
   <description>Repository that contains the specifications of every static-analysis rules available in ecoCode plugins.</description>
   <url>https://github.com/green-code-initiative/ecoCode/tree/main/ecocode-rules-specifications</url>
 
+  <properties>
+    <java.version>11</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <!-- to prevent message: system modules path not set in conjunction with
+		      -source 11 -->
+    <maven.compiler.release>${java.version}</maven.compiler.release>
+
+    <encoding>UTF-8</encoding>
+    <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
+
+    <junit.jupiter.version>5.9.1</junit.jupiter.version>
+    <assertJ.version>3.23.1</assertJ.version>
+    <mockito.version>5.3.1</mockito.version>
+    <sonarqube.version>10.10.0.2391</sonarqube.version>
+    <sonar-analyzer-commons.version>2.12.0.2964</sonar-analyzer-commons.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.api.plugin</groupId>
+      <artifactId>sonar-plugin-api</artifactId>
+      <version>${sonarqube.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.analyzer-commons</groupId>
+      <artifactId>sonar-analyzer-commons</artifactId>
+      <version>${sonar-analyzer-commons.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>${assertJ.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.1.2</version>
+      </plugin>
+      <plugin>
+        <groupId>com.mycila</groupId>
+        <artifactId>license-maven-plugin</artifactId>
+        <version>4.5</version>
+        <configuration>
+          <properties>
+            <owner>Green Code Initiative</owner>
+            <email>https://www.ecocode.io</email>
+          </properties>
+          <licenseSets>
+            <licenseSet>
+              <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
+              <includes>
+                <include>**/*.java</include>
+              </includes>
+            </licenseSet>
+          </licenseSets>
+        </configuration>
+        <executions>
+          <execution>
+            <id>validate</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>validate</phase>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.43.0</version>
+        <configuration>
+          <pom>
+            <includes>
+              <include>pom.xml</include>
+            </includes>
+            <sortPom></sortPom>
+          </pom>
+          <java>
+            <googleJavaFormat>
+              <version>1.23.0</version>
+            </googleJavaFormat>
+          </java>
+          <formats>
+            <format>
+              <includes>
+                <include>src/**/*.json</include>
+              </includes>
+              <eclipseWtp>
+                <type>JSON</type>
+              </eclipseWtp>
+              <endWithNewline></endWithNewline>
+              <indent>
+                <spaces>true</spaces>
+                <spacesPerTab>2</spacesPerTab>
+              </indent>
+            </format>
+          </formats>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <phase>process-sources</phase>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <!--
 					This plugin convert ASCIIDOC rule specification in HTML format
@@ -62,7 +186,8 @@
       <plugin>
         <!--
 					Prepare resources tree needed by language.
-					Each metadata JSON file must be in the same folder as the HTML description file for the corresponding language.
+					Each metadata JSON file must be in the same folder as the HTML description file
+			for the corresponding language.
 				-->
         <groupId>com.github.johnpoth</groupId>
         <artifactId>jshell-maven-plugin</artifactId>
@@ -94,8 +219,10 @@
                 <script>${project.basedir}/src/main/script/PrepareResources.jsh</script>
               </scripts>
               <options>
-                <option>-R "-DsourceDir=${project.build.directory}/rules-html"</option>
-                <option>-R "-DtargetDir=${project.build.outputDirectory}/io/ecocode/rules"</option>
+                <option>-R
+									"-DsourceDir=${project.build.directory}/rules-html"</option>
+                <option>-R
+									"-DtargetDir=${project.build.outputDirectory}/io/ecocode/rules"</option>
               </options>
             </configuration>
           </execution>
@@ -104,7 +231,8 @@
       <plugin>
         <!--
 					This module produce one artifact by language (with corresponding classifier)
-					For example, to add rule specifications for Python language, add following dependency in python sonarqube plugin:
+					For example, to add rule specifications for Python language, add following
+			dependency in python sonarqube plugin:
 
 			        <dependency>
 			            <groupId>io.ecocode</groupId>
diff --git a/pom.xml b/pom.xml
index bf17fef1a..5695ca2ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>io.ecocode</groupId>
@@ -96,68 +94,19 @@
     </issueManagement>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <!-- to prevent message: system modules path not set in conjunction with
-        -source 11 -->
-        <maven.compiler.release>${java.version}</maven.compiler.release>
 
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
-        <junit.jupiter.version>5.9.1</junit.jupiter.version>
-        <assertJ.version>3.23.1</assertJ.version>
-        <mockito.version>5.3.1</mockito.version>
-        <sonarqube.version>10.10.0.2391</sonarqube.version>
-        <sonar-analyzer-commons.version>2.12.0.2964</sonar-analyzer-commons.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.sonarsource.api.plugin</groupId>
-            <artifactId>sonar-plugin-api</artifactId>
-            <version>${sonarqube.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.sonarsource.analyzer-commons</groupId>
-            <artifactId>sonar-analyzer-commons</artifactId>
-            <version>${sonar-analyzer-commons.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertJ.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-junit-jupiter</artifactId>
-            <version>${mockito.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
+    <!-- <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
-            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>4.5</version>
+                <version>4.1</version>
                 <configuration>
                     <properties>
                         <owner>Green Code Initiative</owner>
@@ -165,8 +114,7 @@
                     </properties>
                     <licenseSets>
                         <licenseSet>
-                            <header>
-                                com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
+                            <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
                             <includes>
                                 <include>**/*.java</include>
                             </includes>
@@ -183,49 +131,8 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>com.diffplug.spotless</groupId>
-                <artifactId>spotless-maven-plugin</artifactId>
-                <version>2.43.0</version>
-                <configuration>
-                    <pom>
-                        <includes>
-                            <include>pom.xml</include>
-                        </includes>
-                        <sortPom />
-                    </pom>
-                    <java>
-                        <googleJavaFormat>
-                            <version>1.23.0</version>
-                        </googleJavaFormat>
-                    </java>
-                    <formats>
-                        <format>
-                            <includes>
-                                <include>src/**/*.json</include>
-                            </includes>
-                            <eclipseWtp>
-                                <type>JSON</type>
-                            </eclipseWtp>
-                            <endWithNewline />
-                            <indent>
-                                <spaces>true</spaces>
-                                <spacesPerTab>2</spacesPerTab>
-                            </indent>
-                        </format>
-                    </formats>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>process-sources</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
-    </build>
+    </build> -->
 
     <profiles>
         <profile>
@@ -245,11 +152,11 @@
             </distributionManagement>
             <build>
                 <plugins>
-                    <plugin>
-                        <!--
+                    <plugin><!--
+
                         For publishing in Maven Central,
-                        see:
-                        https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication
+                        see: https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication
+
                         -->
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -258,20 +165,17 @@
                         <configuration>
                             <serverId>ossrh</serverId>
                             <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                            <!-- if true : automatic publish / if false : manual
-                            publish on Nexus GUI ("staging repository" tab) -->
+                            <!-- if true : automatic publish / if false : manual publish on Nexus GUI ("staging repository" tab) -->
                             <autoReleaseAfterClose>true</autoReleaseAfterClose>
                         </configuration>
                     </plugin>
                     <plugin><!--
-                            For publishing in Maven Central, GPG key must be published to one of following
-                        servers:
+                            For publishing in Maven Central, GPG key must be published to one of following servers:
                             - keyserver.ubuntu.com
                             - keys.openpgp.org
                             - pgp.mit.edu
 
-                            For more informatino:
-                        https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
+                            For more informatino: https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
                         -->
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
@@ -296,4 +200,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>

From a3add9e0e5fbc2abff93cee914df32a6040c2051 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:49:33 +0200
Subject: [PATCH 12/19] Move link to resources

---
 .../src/main/rules/EC85/csharp/EC85.asciidoc                | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc b/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
index 37dfa1267..86fa8791b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC85/csharp/EC85.asciidoc
@@ -1,6 +1,6 @@
 :!sectids:
 
-The analyzer will consider a type for sealing when the following conditions are met :
+The analyzer will consider a type for sealing when the following conditions are met:
 
 * The type is not static, abstract, sealed or special (ie. implicit, script, auto-generated, etc)
 * The type is currently not inherited from in the solution
@@ -10,8 +10,6 @@ The analyzer will consider a type for sealing when the following conditions are
 
 A non-sealed type prevents the JIT compiler from applying strong optimizations such as devirtualization and inlining. If that type is intended to be inheritable then this is expected ; however if it doesn't, then it should be sealed explictly to bring the benefits from those optimizations.
 
-For a more in-depth explanation, see https://devblogs.microsoft.com/dotnet/performance_improvements_in_net_7/#analyzers
-
 === When can it be ignored?
 
 This rule can be ignored if you want a public type with no overridable member to still be inheritable from other assemblies.
@@ -90,4 +88,4 @@ public class Class6 : Class4
 
 == Resources
 
-Reference/Validation is unknown.
+For a more in-depth explanation, see https://devblogs.microsoft.com/dotnet/performance_improvements_in_net_7/#analyzers

From 52c0d7827aa42782131bc57e3853f6fa6d0eabf3 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:50:42 +0200
Subject: [PATCH 13/19] Typography

---
 .../src/main/rules/EC203/python/EC203.asciidoc                | 2 +-
 .../src/main/rules/EC29/javascript/EC29.asciidoc              | 2 +-
 .../src/main/rules/EC532/java/EC532.asciidoc                  | 4 ++--
 .../src/main/rules/EC75/csharp/EC75.asciidoc                  | 2 +-
 .../src/main/rules/EC81/csharp/EC81.asciidoc                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
index 4d75d4438..ae892ac03 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC203/python/EC203.asciidoc
@@ -6,7 +6,7 @@ If possible, the utilisation of svg image format (or `<svg/>` html tag) is recom
 
 Because SVGs are generally smaller than other image format, they’re less taxing on your server despite needing to render on load.
 
-When to use SVG :
+When to use SVG:
 
 - Your image is used for decorative website graphics, logos, icons, graphs and diagrams, and other simple images.
 - You image require animation.
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc b/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
index 7a03fe5fe..43eae1a6a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC29/javascript/EC29.asciidoc
@@ -24,7 +24,7 @@ Limiting the usage of CSS animations helps in creating a more energy-efficient a
 ----
 
 It's important to note that while limiting animations is generally advisable for certain scenarios, there are cases where animations contribute positively to the user experience and overall design.
-In this case they should be limited to the CSS properties `opacity` and `transform` with it's associated functions : `translate`, `rotate` and `scale`.
+In this case they should be limited to the CSS properties `opacity` and `transform` with it's associated functions: `translate`, `rotate` and `scale`.
 You can also inform the navigator of upcoming changes with the `will-change` instruction for more optimization.
 
 == Resources
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
index 68e388cc6..8b5ec3794 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC532/java/EC532.asciidoc
@@ -9,7 +9,7 @@ It is not necessarily sensitive information, but it is a first step towards Goog
 
 === Noncompliant code example
 
-Import of Google Analytics :
+Import of Google Analytics:
 
 [source,java]
 ----
@@ -17,7 +17,7 @@ Import of Google Analytics :
 import com.google.android.gms.analytics.Tracker;
 ----
 
-Import of Firebase Analytics :
+Import of Firebase Analytics:
 
 [source,java]
 ----
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
index 9d7c05daf..5775ecc25 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC75/csharp/EC75.asciidoc
@@ -17,7 +17,7 @@ If the number of concatenations is very small, typically 5 or less, then the ove
 ----
 string myString = string.Empty;
 for (int i = 0; i < 100; i++)
-    myString += i; // Noncompliant : this requires a new string allocation on each iteration
+    myString += i; // Noncompliant: this requires a new string allocation on each iteration
 ----
 
 === Compliant solution
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
index 1fa9ab1d1..cf3f368d8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
+++ b/ecocode-rules-specifications/src/main/rules/EC81/csharp/EC81.asciidoc
@@ -50,4 +50,4 @@ public struct MyStruct // Compliant, specified layout. Will take 16 bytes with A
 
 == Resources
 
-You can read a much more in-depth analysis of struct packing here : http://www.catb.org/esr/structure-packing/
+You can read a much more in-depth analysis of struct packing here: http://www.catb.org/esr/structure-packing/

From abfcfea25a9e6732c5e08f08bf94167845d7139c Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 25 Sep 2024 18:52:13 +0200
Subject: [PATCH 14/19] Better EC69 title

---
 ecocode-rules-specifications/src/main/rules/EC69/EC69.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
index 81bbe5424..efc06bbdf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
+++ b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
@@ -1,5 +1,5 @@
 {
-  "title": "Functions should not be called when declaring a for-type loop",
+  "title": "Functions should not be called inside a for-loop condition",
   "type": "CODE_SMELL",
   "status": "ready",
   "remediation": {

From 94c42dc41000e2f74216a291328081a62afbabd3 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Thu, 26 Sep 2024 09:49:06 +0200
Subject: [PATCH 15/19] Style

---
 ecocode-rules-specifications/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecocode-rules-specifications/pom.xml b/ecocode-rules-specifications/pom.xml
index 94217cfa4..e7d7f9f9c 100644
--- a/ecocode-rules-specifications/pom.xml
+++ b/ecocode-rules-specifications/pom.xml
@@ -187,7 +187,7 @@
         <!--
 					Prepare resources tree needed by language.
 					Each metadata JSON file must be in the same folder as the HTML description file
-			for the corresponding language.
+			    for the corresponding language.
 				-->
         <groupId>com.github.johnpoth</groupId>
         <artifactId>jshell-maven-plugin</artifactId>

From 8470f608833113de6df335d570908c24e3b09585 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Thu, 26 Sep 2024 10:03:26 +0200
Subject: [PATCH 16/19] Test refactoring

---
 .../fr/greencodeinitiative/RulesTest.java     | 179 ++++++++++--------
 1 file changed, 96 insertions(+), 83 deletions(-)

diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index 0fdb5c399..b0df7f8fc 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -38,6 +38,7 @@
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.Pattern;
@@ -59,6 +60,8 @@
 import org.sonar.api.utils.Version;
 import org.sonarsource.analyzer.commons.RuleMetadataLoader;
 
+// Still using RuleType.CODE_SMELL to support old SonarQube instances
+@SuppressWarnings("deprecation")
 class RulesTest {
   private static final Version SONAR_API_VERSION = Version.create(10, 10);
   private static final String RESOURCE_DIR = "rules";
@@ -174,106 +177,116 @@ void testRules() throws URISyntaxException, IOException {
     Path[] langPaths = findAllLangs();
     assertArrayEquals(
         LANGUAGES, Stream.of(langPaths).map(p -> p.toFile().getName()).sorted().toArray());
-    for (Path langPath : langPaths) {
-      String lang = langPath.toFile().getName();
-      DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
-      RuleMetadataLoader ruleMetadataLoader =
-          new RuleMetadataLoader(RESOURCE_BASE_PATH + lang, sonarRuntime);
-      ruleMetadataLoader.addRulesByRuleKey(repository, new ArrayList<>(findAllRules(langPath)));
-      context.registerRepository(repository);
-    }
+    addRules(context, langPaths);
     assertEquals(LANGUAGES.length, context.repositories().size());
     for (Repository repo : context.repositories()) {
       assertFalse(repo.rules().isEmpty(), repo.key() + " repository should have rules");
       for (Rule rule : repo.rules()) {
         assertFalse(rule.activatedByDefault(), rule + " should not be activated by default");
         assertEquals(RuleScope.MAIN, rule.scope(), rule + " should have MAIN scope");
-
         assertEquals(RuleType.CODE_SMELL, rule.type(), rule + " should have CODE_SMELL type");
         assertEquals(
             Collections.singleton(SoftwareQuality.RELIABILITY),
             rule.defaultImpacts().keySet(),
             rule + " should have RELIABILITY Software Quality");
-        assertTrue(
-            rule.tags().containsAll(MANDATORY_TAGS), rule + " should have tags " + MANDATORY_TAGS);
-        assertTrue(
-            ALL_TAGS.containsAll(rule.tags()),
-            rule + " should only have allowed tags but got: " + rule.tags());
         assertTrue(
             MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.keySet().contains(rule.cleanCodeAttribute()),
             rule
                 + " should have Clean Code Attribute in "
                 + MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.keySet());
-        assertTrue(
-            rule.tags()
-                .containsAll(MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(rule.cleanCodeAttribute())),
-            rule
-                + " should have tags "
-                + MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(rule.cleanCodeAttribute()));
-        assertFalse(
-            Stream.concat(
-                    MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream(),
-                    OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream())
-                .filter(e -> !rule.cleanCodeAttribute().equals(e.getKey()))
-                .anyMatch(e -> new ArrayList<>(rule.tags()).removeAll(e.getValue())),
-            rule + " should not have a tag from another Clean Code Attribute");
-        // See guidelines in
-        // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
-        assertTrue(
-            rule.name().contains(" should "),
-            rule + " title should match the pattern \"X should [not] Y\": " + rule.name());
-        assertFalse(
-            rule.name().endsWith("."), rule + " title should not end with a point: " + rule.name());
-        // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
-        // or "Accessibility - Image tags should have an alternate text attribute"
-        assertFalse(
-            rule.name().contains(":") || rule.name().contains(" - "),
-            rule + " title should not have a category/tag prefix: " + rule.name());
-        assertTrue(
-            rule.name().length() < 80,
-            rule + " title length should be less than 80 characters: " + rule.name());
-
-        List<String> sections =
-            rule.ruleDescriptionSections().stream()
-                .map(RuleDescriptionSection::getKey)
-                .collect(Collectors.toList());
-        // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
-        assertFalse(
-            sections.isEmpty(),
-            rule
-                + " should have standard description sections but got none (is"
-                + " :!sectids: present?)");
-        // Introduction is optional
-        if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
-          sections.remove(0);
-        }
-        assertIterableEquals(
-            Arrays.asList(
-                RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
-                RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
-                RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
-            // Using set since "how to fix" sections might be repeated"
-            new LinkedHashSet<String>(sections),
-            rule + " should have standard description sections");
-        String howToFix =
-            rule.ruleDescriptionSections().stream()
-                .filter(s -> RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY.equals(s.getKey()))
-                .findFirst()
-                .orElse(null)
-                .getHtmlContent();
-        assertTrue(
-            NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
-            rule + " must have Noncompliant comment in the How to fix section: " + howToFix);
-        assertTrue(
-            howToFix.contains("<h3>Noncompliant code example</h3>"),
-            rule
-                + " must have <h3>Noncompliant code example</h3> in How to fix"
-                + " section: "
-                + howToFix);
-        assertTrue(
-            howToFix.contains("<h3>Compliant solution</h3>"),
-            rule + " must have <h3>Compliant solution</h3> in How to fix section: " + howToFix);
+        checkTags(rule.key(), rule.cleanCodeAttribute(), rule.tags());
+        checkName(rule.key(), rule.name());
+        checkDescription(rule.key(), rule.ruleDescriptionSections());
       }
     }
   }
+
+  private void addRules(RulesDefinition.Context context, Path[] langPaths) throws IOException {
+    for (Path langPath : langPaths) {
+      String lang = langPath.toFile().getName();
+      DefaultNewRepository repository = new DefaultNewRepository(context, lang, lang, false);
+      RuleMetadataLoader ruleMetadataLoader =
+          new RuleMetadataLoader(RESOURCE_BASE_PATH + lang, sonarRuntime);
+      ruleMetadataLoader.addRulesByRuleKey(repository, new ArrayList<>(findAllRules(langPath)));
+      context.registerRepository(repository);
+    }
+  }
+
+  private void checkDescription(
+      String ruleKey, List<RuleDescriptionSection> ruleDescriptionSections) {
+    List<String> sections =
+        ruleDescriptionSections.stream()
+            .map(RuleDescriptionSection::getKey)
+            .collect(Collectors.toList());
+    // see https://docs.asciidoctor.org/asciidoc/latest/sections/auto-ids/
+    assertFalse(
+        sections.isEmpty(),
+        ruleKey
+            + " should have standard description sections but got none"
+            + " (is :!sectids: present?)");
+    // Introduction is optional
+    if (RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY.equals(sections.get(0))) {
+      sections.remove(0);
+    }
+    assertIterableEquals(
+        Arrays.asList(
+            RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY,
+            RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY,
+            RuleDescriptionSectionKeys.RESOURCES_SECTION_KEY),
+        // Using set since "how to fix" sections might be repeated
+        new LinkedHashSet<String>(sections),
+        ruleKey + " should have standard description sections");
+    String howToFix =
+        ruleDescriptionSections.stream()
+            .filter(s -> RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY.equals(s.getKey()))
+            .findFirst()
+            .orElse(null)
+            .getHtmlContent();
+    assertTrue(
+        NONCOMPLIANT_COMMENT_PATTERN.matcher(howToFix).matches(),
+        ruleKey + " must have Noncompliant comment in the How to fix section: " + howToFix);
+    assertTrue(
+        howToFix.contains("<h3>Noncompliant code example</h3>"),
+        ruleKey
+            + " must have <h3>Noncompliant code example</h3> in How to fix"
+            + " section: "
+            + howToFix);
+    assertTrue(
+        howToFix.contains("<h3>Compliant solution</h3>"),
+        ruleKey + " must have <h3>Compliant solution</h3> in How to fix section: " + howToFix);
+  }
+
+  private void checkName(String ruleKey, String name) {
+    // See guidelines in
+    // https://docs.sonarsource.com/sonarqube/latest/extension-guide/adding-coding-rules/#coding-rule-guidelines
+    assertTrue(
+        name.contains(" should "),
+        ruleKey + " title should match the pattern \"X should [not] Y\": " + name);
+    assertFalse(name.endsWith("."), ruleKey + " title should not end with a point: " + name);
+    // Avoid rules such as "Idleness: Keep Screen On (addFlags)"
+    // or "Accessibility - Image tags should have an alternate text attribute"
+    assertFalse(
+        name.contains(":") || name.contains(" - "),
+        ruleKey + " title should not have a category/tag prefix: " + name);
+    assertTrue(
+        name.length() < 80, ruleKey + " title length should be less than 80 characters: " + name);
+  }
+
+  private void checkTags(String ruleKey, CleanCodeAttribute cleanCodeAttribute, Set<String> tags) {
+    assertTrue(tags.containsAll(MANDATORY_TAGS), ruleKey + " should have tags " + MANDATORY_TAGS);
+    assertTrue(
+        ALL_TAGS.containsAll(tags), ruleKey + " should only have allowed tags but got: " + tags);
+    assertTrue(
+        tags.containsAll(MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(cleanCodeAttribute)),
+        ruleKey
+            + " should have tags "
+            + MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.get(cleanCodeAttribute));
+    assertFalse(
+        Stream.concat(
+                MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream(),
+                OPTIONAL_CLEAN_CODE_ATTRIBUTE_TO_TAGS.entrySet().stream())
+            .filter(e -> !cleanCodeAttribute.equals(e.getKey()))
+            .anyMatch(e -> new ArrayList<>(tags).removeAll(e.getValue())),
+        ruleKey + " should not have a tag from another Clean Code Attribute");
+  }
 }

From ee7f50709674faaae990f69a81571438031ebcc4 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Wed, 20 Nov 2024 10:17:17 +0100
Subject: [PATCH 17/19] Use standard sustainability tag instead of eco-design

---
 .../src/main/rules/EC1/EC1.json                       |  2 +-
 .../src/main/rules/EC10/EC10.json                     |  2 +-
 .../src/main/rules/EC11/EC11.json                     |  2 +-
 .../src/main/rules/EC12/EC12.json                     |  2 +-
 .../src/main/rules/EC13/EC13.json                     |  2 +-
 .../src/main/rules/EC2/EC2.json                       |  2 +-
 .../src/main/rules/EC203/EC203.json                   |  2 +-
 .../src/main/rules/EC22/EC22.json                     |  2 +-
 .../src/main/rules/EC24/EC24.json                     |  2 +-
 .../src/main/rules/EC25/EC25.json                     |  2 +-
 .../src/main/rules/EC26/EC26.json                     |  2 +-
 .../src/main/rules/EC27/EC27.json                     |  2 +-
 .../src/main/rules/EC28/EC28.json                     |  2 +-
 .../src/main/rules/EC29/EC29.json                     |  2 +-
 .../src/main/rules/EC3/EC3.json                       |  2 +-
 .../src/main/rules/EC30/EC30.json                     |  2 +-
 .../src/main/rules/EC31/EC31.json                     |  2 +-
 .../src/main/rules/EC32/EC32.json                     |  2 +-
 .../src/main/rules/EC34/EC34.json                     |  2 +-
 .../src/main/rules/EC35/EC35.json                     |  2 +-
 .../src/main/rules/EC36/EC36.json                     |  2 +-
 .../src/main/rules/EC4/EC4.json                       |  2 +-
 .../src/main/rules/EC404/EC404.json                   |  2 +-
 .../src/main/rules/EC5/EC5.json                       |  2 +-
 .../src/main/rules/EC500/EC500.json                   |  2 +-
 .../src/main/rules/EC501/EC501.json                   |  2 +-
 .../src/main/rules/EC502/EC502.json                   |  2 +-
 .../src/main/rules/EC503/EC503.json                   |  2 +-
 .../src/main/rules/EC504/EC504.json                   |  2 +-
 .../src/main/rules/EC505/EC505.json                   |  2 +-
 .../src/main/rules/EC506/EC506.json                   |  2 +-
 .../src/main/rules/EC507/EC507.json                   |  2 +-
 .../src/main/rules/EC508/EC508.json                   |  2 +-
 .../src/main/rules/EC509/EC509.json                   |  2 +-
 .../src/main/rules/EC510/EC510.json                   |  2 +-
 .../src/main/rules/EC511/EC511.json                   |  2 +-
 .../src/main/rules/EC512/EC512.json                   |  2 +-
 .../src/main/rules/EC513/EC513.json                   |  2 +-
 .../src/main/rules/EC514/EC514.json                   |  2 +-
 .../src/main/rules/EC515/EC515.json                   |  2 +-
 .../src/main/rules/EC516/EC516.json                   |  2 +-
 .../src/main/rules/EC517/EC517.json                   |  2 +-
 .../src/main/rules/EC518/EC518.json                   |  2 +-
 .../src/main/rules/EC519/EC519.json                   |  2 +-
 .../src/main/rules/EC520/EC520.json                   |  2 +-
 .../src/main/rules/EC521/EC521.json                   |  2 +-
 .../src/main/rules/EC522/java/EC522.json              |  2 +-
 .../src/main/rules/EC522/javascript/EC522.json        |  2 +-
 .../src/main/rules/EC522/swift/EC522.json             |  2 +-
 .../src/main/rules/EC523/java/EC523.json              |  2 +-
 .../src/main/rules/EC523/javascript/EC523.json        |  2 +-
 .../src/main/rules/EC524/EC524.json                   |  2 +-
 .../src/main/rules/EC525/EC525.json                   |  2 +-
 .../src/main/rules/EC526/EC526.json                   |  2 +-
 .../src/main/rules/EC527/EC527.json                   |  2 +-
 .../src/main/rules/EC528/EC528.json                   |  2 +-
 .../src/main/rules/EC529/EC529.json                   |  2 +-
 .../src/main/rules/EC530/java/EC530.json              |  2 +-
 .../src/main/rules/EC530/javascript/EC530.json        |  2 +-
 .../src/main/rules/EC530/swift/EC530.json             |  2 +-
 .../src/main/rules/EC531/EC531.json                   |  2 +-
 .../src/main/rules/EC532/EC532.json                   |  1 -
 .../src/main/rules/EC533/EC533.json                   |  2 +-
 .../src/main/rules/EC534/EC534.json                   |  2 +-
 .../src/main/rules/EC540/EC540.json                   |  2 +-
 .../src/main/rules/EC543/EC543.json                   |  2 +-
 .../src/main/rules/EC544/EC544.json                   |  2 +-
 .../src/main/rules/EC547/EC547.json                   |  2 +-
 .../src/main/rules/EC548/EC548.json                   |  2 +-
 .../src/main/rules/EC602/EC602.json                   |  2 +-
 .../src/main/rules/EC603/EC603.json                   |  2 +-
 .../src/main/rules/EC66/EC66.json                     |  2 +-
 .../src/main/rules/EC67/EC67.json                     |  2 +-
 .../src/main/rules/EC69/EC69.json                     |  2 +-
 .../src/main/rules/EC7/EC7.json                       |  2 +-
 .../src/main/rules/EC72/EC72.json                     |  2 +-
 .../src/main/rules/EC74/EC74.json                     |  2 +-
 .../src/main/rules/EC75/EC75.json                     |  2 +-
 .../src/main/rules/EC76/EC76.json                     |  2 +-
 .../src/main/rules/EC77/EC77.json                     |  2 +-
 .../src/main/rules/EC78/EC78.json                     |  2 +-
 .../src/main/rules/EC79/EC79.json                     |  2 +-
 .../src/main/rules/EC81/EC81.json                     |  2 +-
 .../src/main/rules/EC82/EC82.json                     |  2 +-
 .../src/main/rules/EC83/EC83.json                     |  2 +-
 .../src/main/rules/EC84/EC84.json                     |  2 +-
 .../src/main/rules/EC85/EC85.json                     |  2 +-
 .../src/main/rules/EC86/EC86.json                     |  2 +-
 .../src/main/rules/EC87/EC87.json                     |  2 +-
 .../src/main/rules/EC88/EC88.json                     |  2 +-
 .../src/main/rules/EC89/EC89.json                     |  2 +-
 .../src/main/rules/EC9/EC9.json                       |  2 +-
 .../src/main/rules/EC91/EC91.json                     |  2 +-
 .../src/main/rules/EC92/EC92.json                     |  2 +-
 .../src/main/rules/EC93/EC93.json                     |  2 +-
 .../src/main/rules/EC94/EC94.json                     |  2 +-
 .../test/java/fr/greencodeinitiative/RulesTest.java   | 11 +++++++----
 97 files changed, 102 insertions(+), 100 deletions(-)

diff --git a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
index 257f041c0..39a9947a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
+++ b/ecocode-rules-specifications/src/main/rules/EC1/EC1.json
@@ -9,7 +9,7 @@
   "tags": [
     "performance",
     "spring",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
index f6377762a..8147d89f1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
+++ b/ecocode-rules-specifications/src/main/rules/EC10/EC10.json
@@ -7,7 +7,7 @@
     "constantCost": "60min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
index 6efe68c92..79d85442e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
+++ b/ecocode-rules-specifications/src/main/rules/EC11/EC11.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
index d59e53d35..56fe65e4e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
+++ b/ecocode-rules-specifications/src/main/rules/EC12/EC12.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
index 6093a90c6..6c201f7a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
+++ b/ecocode-rules-specifications/src/main/rules/EC13/EC13.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "nestjs",
     "performance"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
index 44c8af003..16ca97119 100644
--- a/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
+++ b/ecocode-rules-specifications/src/main/rules/EC2/EC2.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
index f635e1683..663223bd7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
+++ b/ecocode-rules-specifications/src/main/rules/EC203/EC203.json
@@ -9,7 +9,7 @@
   "tags": [
     "performance",
     "user-experience",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
index dd50d7d34..af4c989c8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
+++ b/ecocode-rules-specifications/src/main/rules/EC22/EC22.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
index 938a273a7..ad4f55e6a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
+++ b/ecocode-rules-specifications/src/main/rules/EC24/EC24.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "sql"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
index 78a83b2d9..4072d7803 100644
--- a/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
+++ b/ecocode-rules-specifications/src/main/rules/EC25/EC25.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "jsx",
     "performance",
     "react"
diff --git a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
index 18cb60eb5..d77efa520 100644
--- a/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
+++ b/ecocode-rules-specifications/src/main/rules/EC26/EC26.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "jsx",
     "performance",
     "react"
diff --git a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
index ac25fff41..7afeb873f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
+++ b/ecocode-rules-specifications/src/main/rules/EC27/EC27.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
index 7181623c8..6cef575fb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
+++ b/ecocode-rules-specifications/src/main/rules/EC28/EC28.json
@@ -9,7 +9,7 @@
   "tags": [
     "performance",
     "error-handling",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
index 01d96ed30..83e4a34fa 100644
--- a/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
+++ b/ecocode-rules-specifications/src/main/rules/EC29/EC29.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "jsx",
     "performance",
     "react"
diff --git a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
index 7b37df14f..9e7f4642a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
+++ b/ecocode-rules-specifications/src/main/rules/EC3/EC3.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "bad-practice",
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
index 060ab9982..0017164ba 100644
--- a/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
+++ b/ecocode-rules-specifications/src/main/rules/EC30/EC30.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "jsx",
     "performance",
     "react"
diff --git a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
index 70f360780..aeda0904f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
+++ b/ecocode-rules-specifications/src/main/rules/EC31/EC31.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "image"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
index 9f70aa74c..f3ef141d9 100644
--- a/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
+++ b/ecocode-rules-specifications/src/main/rules/EC32/EC32.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
index 1d8b43332..d667ce3cd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
+++ b/ecocode-rules-specifications/src/main/rules/EC34/EC34.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
index 8d505e769..7fee43c7f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
+++ b/ecocode-rules-specifications/src/main/rules/EC35/EC35.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
index 726c09260..a2596eb73 100644
--- a/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
+++ b/ecocode-rules-specifications/src/main/rules/EC36/EC36.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "video",
     "audio"
diff --git a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
index 299ed5af0..e5bc51623 100644
--- a/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
+++ b/ecocode-rules-specifications/src/main/rules/EC4/EC4.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
index 8da3d7ae1..604c6807b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
+++ b/ecocode-rules-specifications/src/main/rules/EC404/EC404.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
index 2ac3540eb..e132c23a6 100644
--- a/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
+++ b/ecocode-rules-specifications/src/main/rules/EC5/EC5.json
@@ -9,7 +9,7 @@
   "tags": [
     "performance",
     "sql",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
index b3409dae8..7134993bf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
+++ b/ecocode-rules-specifications/src/main/rules/EC500/EC500.json
@@ -10,7 +10,7 @@
     "batch",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
index 6316ca510..20f08b056 100644
--- a/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
+++ b/ecocode-rules-specifications/src/main/rules/EC501/EC501.json
@@ -10,7 +10,7 @@
     "batch",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
index 6e5b51d4a..200ca72bc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
+++ b/ecocode-rules-specifications/src/main/rules/EC502/EC502.json
@@ -10,7 +10,7 @@
     "bottleneck",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.2",
diff --git a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
index 7d19034c5..1016f98f7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
+++ b/ecocode-rules-specifications/src/main/rules/EC503/EC503.json
@@ -10,7 +10,7 @@
     "bottleneck",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.6",
diff --git a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
index bbf77b40b..cd5321225 100644
--- a/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
+++ b/ecocode-rules-specifications/src/main/rules/EC504/EC504.json
@@ -10,7 +10,7 @@
     "bottleneck",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
index cc9f0d7e5..7856e9c02 100644
--- a/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
+++ b/ecocode-rules-specifications/src/main/rules/EC505/EC505.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.6",
diff --git a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
index e0a02bd37..38459340a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
+++ b/ecocode-rules-specifications/src/main/rules/EC506/EC506.json
@@ -10,7 +10,7 @@
     "idleness",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.6",
diff --git a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
index 422ef5903..13ebb9590 100644
--- a/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
+++ b/ecocode-rules-specifications/src/main/rules/EC507/EC507.json
@@ -10,7 +10,7 @@
     "idleness",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
index 36a3ddf3c..1dc725a2b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
+++ b/ecocode-rules-specifications/src/main/rules/EC508/EC508.json
@@ -10,7 +10,7 @@
     "idleness",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
index 4a4261adc..13e10b324 100644
--- a/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
+++ b/ecocode-rules-specifications/src/main/rules/EC509/EC509.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
index f907e94bf..60614d8b4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
+++ b/ecocode-rules-specifications/src/main/rules/EC510/EC510.json
@@ -10,7 +10,7 @@
     "idleness",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
index 41fac4e1f..ce3313bed 100644
--- a/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
+++ b/ecocode-rules-specifications/src/main/rules/EC511/EC511.json
@@ -10,7 +10,7 @@
     "idleness",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
index a98e9848c..bcaf2a507 100644
--- a/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
+++ b/ecocode-rules-specifications/src/main/rules/EC512/EC512.json
@@ -10,7 +10,7 @@
     "leakage",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.2",
diff --git a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
index 5de3a0164..f07cb379e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
+++ b/ecocode-rules-specifications/src/main/rules/EC513/EC513.json
@@ -10,7 +10,7 @@
     "leakage",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.2",
diff --git a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
index 916497fee..5db7b20a3 100644
--- a/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
+++ b/ecocode-rules-specifications/src/main/rules/EC514/EC514.json
@@ -10,7 +10,7 @@
     "leakage",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.2",
diff --git a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
index 7706980bf..7cfc968f0 100644
--- a/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
+++ b/ecocode-rules-specifications/src/main/rules/EC515/EC515.json
@@ -10,7 +10,7 @@
     "leakage",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
index d55d895e0..f65e034b8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
+++ b/ecocode-rules-specifications/src/main/rules/EC516/EC516.json
@@ -10,7 +10,7 @@
     "leakage",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
index c1bfb285a..8b5e47711 100644
--- a/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
+++ b/ecocode-rules-specifications/src/main/rules/EC517/EC517.json
@@ -10,7 +10,7 @@
     "optimized-api",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.6",
diff --git a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
index 4f456af5f..17392fbf4 100644
--- a/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
+++ b/ecocode-rules-specifications/src/main/rules/EC518/EC518.json
@@ -10,7 +10,7 @@
     "optimized-api",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.6",
diff --git a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
index 04cf687cc..3f64f7002 100644
--- a/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
+++ b/ecocode-rules-specifications/src/main/rules/EC519/EC519.json
@@ -10,7 +10,7 @@
     "power",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance",
     "ios"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
index f994fa508..78a28e638 100644
--- a/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
+++ b/ecocode-rules-specifications/src/main/rules/EC520/EC520.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "1.0",
diff --git a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
index e1d13c06b..a4c4c2466 100644
--- a/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
+++ b/ecocode-rules-specifications/src/main/rules/EC521/EC521.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
index a082dda41..0aa45068d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/java/EC522.json
@@ -3,7 +3,7 @@
     "sobriety",
     "android",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance"
   ]
 }
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
index e12778a8e..ed27ef750 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/javascript/EC522.json
@@ -2,7 +2,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "react-native"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
index a256661cc..1e3df38c7 100644
--- a/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
+++ b/ecocode-rules-specifications/src/main/rules/EC522/swift/EC522.json
@@ -2,7 +2,7 @@
   "tags": [
     "ios",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "sobriety"
   ]
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
index 7f93745b8..b83369b18 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/java/EC523.json
@@ -3,7 +3,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "android"
   ]
diff --git a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
index 0c566e1b3..594b4486c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
+++ b/ecocode-rules-specifications/src/main/rules/EC523/javascript/EC523.json
@@ -3,7 +3,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "react-native"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
index f1332a240..4b3f04f51 100644
--- a/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
+++ b/ecocode-rules-specifications/src/main/rules/EC524/EC524.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
index 7dfe63bd1..de04c7aae 100644
--- a/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
+++ b/ecocode-rules-specifications/src/main/rules/EC525/EC525.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
index 80b41c83a..424ab4c18 100644
--- a/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
+++ b/ecocode-rules-specifications/src/main/rules/EC526/EC526.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
index 13e41063e..ebfae215d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
+++ b/ecocode-rules-specifications/src/main/rules/EC527/EC527.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
index 6944f1a4e..cb8ace938 100644
--- a/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
+++ b/ecocode-rules-specifications/src/main/rules/EC528/EC528.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
index e6ca6362b..4ef5fcc32 100644
--- a/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
+++ b/ecocode-rules-specifications/src/main/rules/EC529/EC529.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
index 82bf296a6..953d26446 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/java/EC530.json
@@ -2,7 +2,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "android"
   ]
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
index e12778a8e..ed27ef750 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/javascript/EC530.json
@@ -2,7 +2,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "react-native"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
index d9f12db4d..3625fa740 100644
--- a/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
+++ b/ecocode-rules-specifications/src/main/rules/EC530/swift/EC530.json
@@ -2,7 +2,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "ios"
   ]
diff --git a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
index 7a4a2375f..c1af413db 100644
--- a/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
+++ b/ecocode-rules-specifications/src/main/rules/EC531/EC531.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
index a037b0ec9..18d81a95a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
+++ b/ecocode-rules-specifications/src/main/rules/EC532/EC532.json
@@ -10,7 +10,6 @@
     "privacy",
     "social",
     "ecocode",
-    "eco-design",
     "android"
   ],
   "ecoScore": "0.4",
diff --git a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
index 8dba61b0a..26cdce160 100644
--- a/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
+++ b/ecocode-rules-specifications/src/main/rules/EC533/EC533.json
@@ -9,7 +9,7 @@
   "tags": [
     "sobriety",
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance",
     "ios"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
index a00678028..97d156c49 100644
--- a/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
+++ b/ecocode-rules-specifications/src/main/rules/EC534/EC534.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
index 245e79079..e0315da30 100644
--- a/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
+++ b/ecocode-rules-specifications/src/main/rules/EC540/EC540.json
@@ -10,7 +10,7 @@
     "batch",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
index 574435d58..6f8cff147 100644
--- a/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
+++ b/ecocode-rules-specifications/src/main/rules/EC543/EC543.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
index a3fed02ca..28b7caff8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
+++ b/ecocode-rules-specifications/src/main/rules/EC544/EC544.json
@@ -10,7 +10,7 @@
     "power",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
index 84ece653c..8b97359cd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
+++ b/ecocode-rules-specifications/src/main/rules/EC547/EC547.json
@@ -11,7 +11,7 @@
     "ecocode",
     "android",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
index 3e5c6ad51..5237f5f11 100644
--- a/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
+++ b/ecocode-rules-specifications/src/main/rules/EC548/EC548.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "android",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
index 54ae2bc72..c388698ea 100644
--- a/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
+++ b/ecocode-rules-specifications/src/main/rules/EC602/EC602.json
@@ -11,7 +11,7 @@
     "ecocode",
     "power",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Info",
diff --git a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
index 278016563..61fe516fd 100644
--- a/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
+++ b/ecocode-rules-specifications/src/main/rules/EC603/EC603.json
@@ -10,7 +10,7 @@
     "sobriety",
     "ecocode",
     "ios",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
index 780df67c8..63e4b76a8 100644
--- a/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
+++ b/ecocode-rules-specifications/src/main/rules/EC66/EC66.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "bad-practice",
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
index 63d408e8e..5c7fc477e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
+++ b/ecocode-rules-specifications/src/main/rules/EC67/EC67.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
index efc06bbdf..c509fafd1 100644
--- a/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
+++ b/ecocode-rules-specifications/src/main/rules/EC69/EC69.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
index 0e80f275e..988822a7a 100644
--- a/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
+++ b/ecocode-rules-specifications/src/main/rules/EC7/EC7.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
index 472a86e39..aaead3fdc 100644
--- a/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
+++ b/ecocode-rules-specifications/src/main/rules/EC72/EC72.json
@@ -10,7 +10,7 @@
     "performance",
     "sql",
     "spring",
-    "eco-design",
+    "sustainability",
     "ecocode",
     "memory",
     "network"
diff --git a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
index 21058e3ae..59e5b9d59 100644
--- a/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
+++ b/ecocode-rules-specifications/src/main/rules/EC74/EC74.json
@@ -7,7 +7,7 @@
     "constantCost": "20min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "network",
     "sql",
diff --git a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
index 51a9918ac..efe7dcf9e 100644
--- a/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
+++ b/ecocode-rules-specifications/src/main/rules/EC75/EC75.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "bad-practice",
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
index d4ee48d36..2934879ab 100644
--- a/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
+++ b/ecocode-rules-specifications/src/main/rules/EC76/EC76.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "leak",
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode",
     "memory"
diff --git a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
index 8e4a5b94d..97200b03b 100644
--- a/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
+++ b/ecocode-rules-specifications/src/main/rules/EC77/EC77.json
@@ -9,7 +9,7 @@
   "tags": [
     "performance",
     "regex",
-    "eco-design",
+    "sustainability",
     "ecocode",
     "memory"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
index bcf51263d..d69a6daeb 100644
--- a/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
+++ b/ecocode-rules-specifications/src/main/rules/EC78/EC78.json
@@ -7,7 +7,7 @@
     "constantCost": "15min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "sql",
     "performance",
diff --git a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
index 28e8b2118..c44d446cf 100644
--- a/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
+++ b/ecocode-rules-specifications/src/main/rules/EC79/EC79.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "performance",
-    "eco-design",
+    "sustainability",
     "ecocode"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
index 0118b8cd9..566888e7f 100644
--- a/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
+++ b/ecocode-rules-specifications/src/main/rules/EC81/EC81.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "memory",
     "performance"
diff --git a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
index c07399c2d..e98d1ce07 100644
--- a/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
+++ b/ecocode-rules-specifications/src/main/rules/EC82/EC82.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
index da8c4bcfa..524cfe7f2 100644
--- a/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
+++ b/ecocode-rules-specifications/src/main/rules/EC83/EC83.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
index 0d0dbb3af..a3e70d348 100644
--- a/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
+++ b/ecocode-rules-specifications/src/main/rules/EC84/EC84.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
index 895ce2650..e79730e67 100644
--- a/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
+++ b/ecocode-rules-specifications/src/main/rules/EC85/EC85.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
index 0b91bb78a..4fa08ed44 100644
--- a/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
+++ b/ecocode-rules-specifications/src/main/rules/EC86/EC86.json
@@ -7,7 +7,7 @@
     "constantCost": "10min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
index 0a0d3f6a3..9f48b7840 100644
--- a/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
+++ b/ecocode-rules-specifications/src/main/rules/EC87/EC87.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
index f71bfd07e..d5c18411c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
+++ b/ecocode-rules-specifications/src/main/rules/EC88/EC88.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
index fb9f43f6b..1a03dba88 100644
--- a/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
+++ b/ecocode-rules-specifications/src/main/rules/EC89/EC89.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "network",
     "cache",
diff --git a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
index 965a0e50f..dc51a042d 100644
--- a/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
+++ b/ecocode-rules-specifications/src/main/rules/EC9/EC9.json
@@ -14,7 +14,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Major",
diff --git a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
index f55489038..743a1c3ca 100644
--- a/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
+++ b/ecocode-rules-specifications/src/main/rules/EC91/EC91.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
index 99bb482e8..2bfba688c 100644
--- a/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
+++ b/ecocode-rules-specifications/src/main/rules/EC92/EC92.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "ecocode",
     "performance",
     "bad-practice"
diff --git a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
index cbb65b2e3..2b6fbf578 100644
--- a/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
+++ b/ecocode-rules-specifications/src/main/rules/EC93/EC93.json
@@ -7,7 +7,7 @@
     "constantCost": "5min"
   },
   "tags": [
-    "eco-design",
+    "sustainability",
     "performance",
     "ecocode"
   ],
diff --git a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
index f85a962a4..2d59fd4ed 100644
--- a/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
+++ b/ecocode-rules-specifications/src/main/rules/EC94/EC94.json
@@ -8,7 +8,7 @@
   },
   "tags": [
     "ecocode",
-    "eco-design",
+    "sustainability",
     "performance"
   ],
   "defaultSeverity": "Minor",
diff --git a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
index b0df7f8fc..c44373488 100644
--- a/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
+++ b/ecocode-rules-specifications/src/test/java/fr/greencodeinitiative/RulesTest.java
@@ -69,14 +69,17 @@ class RulesTest {
   private static final String[] LANGUAGES =
       new String[] {"csharp", "html", "java", "javascript", "php", "python", "swift", "xml"};
 
-  private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode", "eco-design");
+  private static final List<String> MANDATORY_TAGS = Arrays.asList("ecocode");
 
   private static final EnumMap<CleanCodeAttribute, List<String>>
       MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS = new EnumMap<>(CleanCodeAttribute.class);
 
   static {
+    // performance and sustainability are already used by Sonar standard rules:
+    // https://rules.sonarsource.com/java/tag/sustainability/
+    // https://rules.sonarsource.com/java/tag/performance/
     MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
-        CleanCodeAttribute.EFFICIENT, Collections.singletonList("performance"));
+        CleanCodeAttribute.EFFICIENT, Arrays.asList("performance", "sustainability"));
     MANDATORY_CLEAN_CODE_ATTRIBUTE_TO_TAGS.put(
         CleanCodeAttribute.TRUSTWORTHY, Arrays.asList("social"));
   }
@@ -120,8 +123,8 @@ class RulesTest {
           "longevity");
 
   /**
-   * Let's not have too many tags, especially tags redundant with eco-design or performance, e.g. do
-   * not allow environment.
+   * Let's not have too many tags, especially tags redundant with sustainability or performance,
+   * e.g. do not allow environment or eco-design.
    */
   private static final List<String> ALL_TAGS =
       Stream.concat(

From 7fc9af07902d3ba3e634f8150caa8314ec59f607 Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Mon, 6 Jan 2025 13:48:25 +0100
Subject: [PATCH 18/19] Fix GCI82 description

---
 src/main/rules/GCI82/java/GCI82.asciidoc | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/rules/GCI82/java/GCI82.asciidoc b/src/main/rules/GCI82/java/GCI82.asciidoc
index 243a32b2d..95453e4c5 100644
--- a/src/main/rules/GCI82/java/GCI82.asciidoc
+++ b/src/main/rules/GCI82/java/GCI82.asciidoc
@@ -1,17 +1,12 @@
 :!sectids:
 
-Variable can be made constant.
-
-== Why is this an issue ?
+== Why is this an issue?
 
 Unlike variables, constant values are known at compile time and are injected as is in the code, requiring no runtime processing and therefore reducing the environmental footprint.
 Although good compilers will const eligible variables by themselves, it is still good practice to declare them constant, as it makes the code intent clearer.
 
-=== When can it be ignored ?
-
-This rule should not be ignored.
-
-== Non compliant examples
+== How to fix it
+=== Noncompliant code example
 
 [source, java]
 ----
@@ -33,7 +28,7 @@ public class MyClass {
 }
 ----
 
-== Compliant examples
+=== Compliant solution
 
 [source, java]
 ----
@@ -94,3 +89,7 @@ public class MyClass {
 
 }
 ----
+
+== Resources
+
+Reference/Validation is unknown.

From 3d041ce776736171a7e31f5321b11da39972660d Mon Sep 17 00:00:00 2001
From: Pierre Baumard <pierre.baumard@cnav.fr>
Date: Mon, 13 Jan 2025 13:18:32 +0100
Subject: [PATCH 19/19] Revert pom formatting changes

---
 pom.xml | 1118 +++++++++++++++++++++++++++----------------------------
 1 file changed, 552 insertions(+), 566 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd8f7bdf2..af6c971e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,594 +1,580 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.green-code-initiative</groupId>
-  <artifactId>creedengo-rules-specifications</artifactId>
-  <version>${revision}</version>
+    <groupId>org.green-code-initiative</groupId>
+    <artifactId>creedengo-rules-specifications</artifactId>
+    <version>${revision}</version>
 
-  <name>creedengo Rules Specifications repository</name>
-  <description>Repository that contains the specifications of every static-analysis rules available in creedengo plugins.</description>
-  <url>https://github.com/green-code-initiative/creedengo-rules-specifications</url>
+    <name>creedengo Rules Specifications repository</name>
+    <description>Repository that contains the specifications of every static-analysis rules available in creedengo plugins.</description>
+    <url>https://github.com/green-code-initiative/creedengo-rules-specifications</url>
 
-  <inceptionYear>2024</inceptionYear>
-  <organization>
-    <name>green-code-initiative</name>
-    <url>https://github.com/green-code-initiative</url>
-  </organization>
-  <licenses>
-    <license>
-      <name>GPL v3</name>
-      <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+    <inceptionYear>2024</inceptionYear>
+    <organization>
+        <name>green-code-initiative</name>
+        <url>https://github.com/green-code-initiative</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>GPL v3</name>
+            <url>https://www.gnu.org/licenses/gpl-3.0.en.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
-  <developers>
-    <developer>
-      <name>Gilles GROUSSET</name>
-      <email>zippy1978@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Maxime MALGORN</name>
-      <email>utarwyn@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Geoffrey LALLOUÉ</name>
-      <email>glalloue@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>David DE CARVALHO</name>
-      <email>dedece35@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Olivier LE GOAËR</name>
-      <email>olegoaer@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Julien HERTOUT</name>
-      <email>jhertout@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Jules DELECOUR</name>
-      <email>jules-delecour-dav@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Maxime DUBOIS</name>
-      <email>mdubois81@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Vianney DE BELLABRE</name>
-      <email>Djoums@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Jérôme CARDON</name>
-      <email>jay-79@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Justin BERQUE</name>
-      <email>JBerque@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Johanna DUIGOU</name>
-      <email>jduigoudev@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-    <developer>
-      <name>Jean-Yves CRONIER</name>
-      <email>jycr@users.noreply.github.com</email>
-      <organization>green-code-initiative</organization>
-      <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
-    </developer>
-  </developers>
+    <developers>
+        <developer>
+            <name>Gilles GROUSSET</name>
+            <email>zippy1978@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Maxime MALGORN</name>
+            <email>utarwyn@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Geoffrey LALLOUÉ</name>
+            <email>glalloue@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>David DE CARVALHO</name>
+            <email>dedece35@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Olivier LE GOAËR</name>
+            <email>olegoaer@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Julien HERTOUT</name>
+            <email>jhertout@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Jules DELECOUR</name>
+            <email>jules-delecour-dav@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Maxime DUBOIS</name>
+            <email>mdubois81@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Vianney DE BELLABRE</name>
+            <email>Djoums@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Jérôme CARDON</name>
+            <email>jay-79@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Justin BERQUE</name>
+            <email>JBerque@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Johanna DUIGOU</name>
+            <email>jduigoudev@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+        <developer>
+            <name>Jean-Yves CRONIER</name>
+            <email>jycr@users.noreply.github.com</email>
+            <organization>green-code-initiative</organization>
+            <organizationUrl>https://github.com/green-code-initiative</organizationUrl>
+        </developer>
+    </developers>
 
-  <scm>
-    <connection>scm:git:https://github.com/green-code-initiative/creedengo-rules-specifications</connection>
-    <developerConnection>scm:git:https://github.com/green-code-initiative/creedengo-rules-specifications</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://github.com/green-code-initiative/creedengo-rules-specifications</url>
-  </scm>
-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/green-code-initiative/creedengo-rules-specifications/issues</url>
-  </issueManagement>
+    <scm>
+        <connection>scm:git:https://github.com/green-code-initiative/creedengo-rules-specifications</connection>
+        <developerConnection>scm:git:https://github.com/green-code-initiative/creedengo-rules-specifications</developerConnection>
+        <url>https://github.com/green-code-initiative/creedengo-rules-specifications</url>
+        <tag>HEAD</tag>
+    </scm>
+    <issueManagement>
+        <system>GitHub</system>
+        <url>https://github.com/green-code-initiative/creedengo-rules-specifications/issues</url>
+    </issueManagement>
 
-  <properties>
-    <!-- Default version when disabling Maven `maven-git-versioning-extension`
-    extension, see
-    https://github.com/qoomon/maven-git-versioning-extension#intellij&#45;&#45;-multi-modules-projects
-    -->
-    <revision>current-SNAPSHOT</revision>
+    <properties>
+        <!--
+            Default version when disabling Maven `maven-git-versioning-extension` extension
+            cf. https://github.com/qoomon/maven-git-versioning-extension#intellij&#45;&#45;-multi-modules-projects
+        -->
+        <revision>current-SNAPSHOT</revision>
 
-    <!-- Helps ensure build reproducibility (cf.
-    https://maven.apache.org/guides/mini/guide-reproducible-builds.html) -->
-    <!-- suppress UnresolvedMavenProperty -->
-    <project.build.outputTimestamp>${git.commit.timestamp.datetime}</project.build.outputTimestamp>
+        <!-- Helps ensure build reproducibility (cf. https://maven.apache.org/guides/mini/guide-reproducible-builds.html) -->
+        <!--suppress UnresolvedMavenProperty -->
+        <project.build.outputTimestamp>${git.commit.timestamp.datetime}</project.build.outputTimestamp>
 
-    <java.version>11</java.version>
-    <maven.compiler.source>${java.version}</maven.compiler.source>
-    <maven.compiler.target>${java.version}</maven.compiler.target>
-    <!-- to prevent message:
-    system modules path not set in conjunction with -source 11 -->
-    <maven.compiler.release>${java.version}</maven.compiler.release>
+        <java.version>11</java.version>
+        <maven.compiler.source>${java.version}</maven.compiler.source>
+        <maven.compiler.target>${java.version}</maven.compiler.target>
+        <!-- to prevent message: system modules path not set in conjunction with -source 11 -->
+        <maven.compiler.release>${java.version}</maven.compiler.release>
 
-    <encoding>UTF-8</encoding>
-    <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
+        <encoding>UTF-8</encoding>
+        <project.build.sourceEncoding>${encoding}</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>${encoding}</project.reporting.outputEncoding>
 
-    <sonar.organization>green-code-initiative</sonar.organization>
-    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <sonar.organization>green-code-initiative</sonar.organization>
+        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
 
-    <junit.jupiter.version>5.9.1</junit.jupiter.version>
-    <assertJ.version>3.23.1</assertJ.version>
-    <mockito.version>5.3.1</mockito.version>
-    <sonarqube.version>10.10.0.2391</sonarqube.version>
-    <sonar-analyzer-commons.version>2.12.0.2964</sonar-analyzer-commons.version>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>${junit.jupiter.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.api.plugin</groupId>
-      <artifactId>sonar-plugin-api</artifactId>
-      <version>${sonarqube.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.analyzer-commons</groupId>
-      <artifactId>sonar-analyzer-commons</artifactId>
-      <version>${sonar-analyzer-commons.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>${assertJ.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-junit-jupiter</artifactId>
-      <version>${mockito.version}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <!-- TO KEEP : to fix sonar plugin version for CICD and execute
-        sonar:sonar on github CI -->
-        <plugin>
-          <groupId>org.sonarsource.scanner.maven</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>5.0.0.4389</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.1.2</version>
-      </plugin>
-      <plugin>
-        <groupId>com.mycila</groupId>
-        <artifactId>license-maven-plugin</artifactId>
-        <version>4.5</version>
-        <configuration>
-          <properties>
-            <owner>Green Code Initiative</owner>
-            <email>https://green-code-initiative.org</email>
-          </properties>
-          <licenseSets>
-            <licenseSet>
-              <header>com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
-              <includes>
-                <include>**/*.java</include>
-              </includes>
-            </licenseSet>
-          </licenseSets>
-        </configuration>
-        <executions>
-          <execution>
-            <id>validate</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>validate</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>com.diffplug.spotless</groupId>
-        <artifactId>spotless-maven-plugin</artifactId>
-        <version>2.43.0</version>
-        <configuration>
-          <pom>
-            <includes>
-              <include>pom.xml</include>
-            </includes>
-            <sortPom></sortPom>
-          </pom>
-          <java>
-            <googleJavaFormat>
-              <version>1.23.0</version>
-            </googleJavaFormat>
-          </java>
-          <formats>
-            <format>
-              <includes>
-                <include>src/**/*.json</include>
-              </includes>
-              <eclipseWtp>
-                <type>JSON</type>
-              </eclipseWtp>
-              <endWithNewline></endWithNewline>
-              <indent>
-                <spaces>true</spaces>
-                <spacesPerTab>2</spacesPerTab>
-              </indent>
-            </format>
-          </formats>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <phase>process-sources</phase>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.5.0</version>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <!-- Do not specify version upper maven wrapper (cf.
-                  ./.mvn/wrapper/maven-wrapper.properties#line=19 -->
-                  <version>3.8.5</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!--
+        <junit.jupiter.version>5.9.1</junit.jupiter.version>
+        <assertJ.version>3.23.1</assertJ.version>
+        <mockito.version>5.3.1</mockito.version>
+        <sonarqube.version>10.10.0.2391</sonarqube.version>
+        <sonar-analyzer-commons.version>2.12.0.2964</sonar-analyzer-commons.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.api.plugin</groupId>
+            <artifactId>sonar-plugin-api</artifactId>
+            <version>${sonarqube.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.sonarsource.analyzer-commons</groupId>
+            <artifactId>sonar-analyzer-commons</artifactId>
+            <version>${sonar-analyzer-commons.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertJ.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>${mockito.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <!-- TO KEEP : to fix sonar plugin version for CICD and execute sonar:sonar on github CI -->
+                <plugin>
+                    <groupId>org.sonarsource.scanner.maven</groupId>
+                    <artifactId>sonar-maven-plugin</artifactId>
+                    <version>5.0.0.4389</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+            </plugin>
+            <plugin>
+                <groupId>com.mycila</groupId>
+                <artifactId>license-maven-plugin</artifactId>
+                <version>4.5</version>
+                <configuration>
+                    <properties>
+                        <owner>Green Code Initiative</owner>
+                        <email>https://green-code-initiative.org</email>
+                    </properties>
+                    <licenseSets>
+                        <licenseSet>
+                            <header>
+                                com/mycila/maven/plugin/license/templates/GPL-3.txt</header>
+                            <includes>
+                                <include>**/*.java</include>
+                            </includes>
+                        </licenseSet>
+                    </licenseSets>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>validate</id>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>validate</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
+                <configuration>
+                    <java>
+                        <googleJavaFormat>
+                            <version>1.23.0</version>
+                        </googleJavaFormat>
+                    </java>
+                    <formats>
+                        <format>
+                            <includes>
+                                <include>src/**/*.json</include>
+                            </includes>
+                            <eclipseWtp>
+                                <type>JSON</type>
+                            </eclipseWtp>
+                            <endWithNewline></endWithNewline>
+                            <indent>
+                                <spaces>true</spaces>
+                                <spacesPerTab>2</spacesPerTab>
+                            </indent>
+                        </format>
+                    </formats>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <phase>process-sources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.5.0</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <!-- Do not specify version upper maven wrapper (cf. ./.mvn/wrapper/maven-wrapper.properties#line=19 -->
+                                    <version>3.8.5</version>
+                                </requireMavenVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!--
 					This plugin convert ASCIIDOC rule specification in HTML format
 					ASCIIDOC format is used with custom features such as :
 					- syntax highlighting (see code blocks on ASCIIDOC rules)
 					- inclusions (see: php/EC74.asciidoc)
 					- table data generation from CSV (see: php/EC69.asciidoc)
 				-->
-        <groupId>org.asciidoctor</groupId>
-        <artifactId>asciidoctor-maven-plugin</artifactId>
-        <version>3.1.1</version>
-        <executions>
-          <execution>
-            <id>convert-to-html</id>
-            <goals>
-              <goal>process-asciidoc</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <sourceDirectory>${project.basedir}/src/main/rules</sourceDirectory>
-              <outputDirectory>${project.build.directory}/rules-html</outputDirectory>
-              <attributes>
-                <source-highlighter>coderay</source-highlighter>
-                <coderay-css>style</coderay-css>
-              </attributes>
-              <preserveDirectories>true</preserveDirectories>
-              <embedAssets>true</embedAssets>
-              <standalone>false</standalone>
-              <relativeBaseDir>true</relativeBaseDir>
-              <logHandler>
-                <failIf>
-                  <severity>ERROR</severity>
-                </failIf>
-              </logHandler>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!--
+                <groupId>org.asciidoctor</groupId>
+                <artifactId>asciidoctor-maven-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <id>convert-to-html</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>process-asciidoc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceDirectory>${project.basedir}/src/main/rules</sourceDirectory>
+                            <outputDirectory>${project.build.directory}/rules-html</outputDirectory>
+                            <attributes>
+                                <source-highlighter>coderay</source-highlighter>
+                                <coderay-css>style</coderay-css>
+                            </attributes>
+                            <preserveDirectories>true</preserveDirectories>
+                            <embedAssets>true</embedAssets>
+                            <standalone>false</standalone>
+                            <relativeBaseDir>true</relativeBaseDir>
+                            <logHandler>
+                                <failIf>
+                                    <severity>ERROR</severity>
+                                </failIf>
+                            </logHandler>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!--
 					Prepare resources tree needed by language.
-					Each metadata JSON file must be in the same folder as the HTML description file
-          for the corresponding language.
+					Each metadata JSON file must be in the same folder as the HTML description file for the corresponding language.
 				-->
-        <groupId>com.github.johnpoth</groupId>
-        <artifactId>jshell-maven-plugin</artifactId>
-        <version>1.4</version>
-        <dependencies>
-          <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
-            <version>2.1.3</version>
-          </dependency>
-          <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>jakarta.json</artifactId>
-            <version>2.0.1</version>
-            <classifier>module</classifier>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <id>prepare-rules-resources</id>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <phase>generate-resources</phase>
-            <configuration>
-              <scripts>
-                <script>${project.basedir}/src/main/script/PrepareResources.jsh</script>
-              </scripts>
-              <options>
-                <option>-R "-DsourceDir=${project.build.directory}/rules-html"</option>
-                <option>-R
-                  "-DtargetDir=${project.build.outputDirectory}/org/green-code-initiative/rules"</option>
-              </options>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!--
+                <groupId>com.github.johnpoth</groupId>
+                <artifactId>jshell-maven-plugin</artifactId>
+                <version>1.4</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.json</groupId>
+                        <artifactId>jakarta.json-api</artifactId>
+                        <version>2.1.3</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.glassfish</groupId>
+                        <artifactId>jakarta.json</artifactId>
+                        <version>2.0.1</version>
+                        <classifier>module</classifier>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>prepare-rules-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <scripts>
+                                <script>${project.basedir}/src/main/script/PrepareResources.jsh</script>
+                            </scripts>
+                            <options>
+                                <option>-R "-DsourceDir=${project.build.directory}/rules-html"</option>
+                                <option>-R "-DtargetDir=${project.build.outputDirectory}/org/green-code-initiative/rules"</option>
+                            </options>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <!--
 					This module produce one artifact by language (with corresponding classifier)
 				-->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>3.7.1</version>
-        <configuration>
-          <appendAssemblyId>true</appendAssemblyId>
-        </configuration>
-        <executions>
-          <execution>
-            <id>assembly-java</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/java.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-php</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/php.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-python</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/python.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-javascript</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/javascript.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-swift</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/swift.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-xml</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/xml.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-csharp</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/csharp.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-          <execution>
-            <id>assembly-html</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>prepare-package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/src/main/assembly/html.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!--
-        Plugin to configure reading sonar-project.properties
-        (via Maven Properties Plugin)
-        because SonarQube Scanner for Maven does not support reading
-        sonar-project.properties
-        -->
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <version>1.2.1</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>read-project-properties</goal>
-            </goals>
-            <phase>initialize</phase>
-            <configuration>
-              <files>
-                <file>sonar-project.properties</file>
-              </files>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.7.1</version>
+                <executions>
+                    <execution>
+                        <id>assembly-java</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/java.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-php</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/php.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-python</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/python.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-javascript</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/javascript.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-swift</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/swift.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-xml</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/xml.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-csharp</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/csharp.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>assembly-html</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>${project.basedir}/src/main/assembly/html.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <appendAssemblyId>true</appendAssemblyId>
+                </configuration>
+            </plugin>
+            <plugin>
+                <!--
+                Plugin to configure reading sonar-project.properties (via Maven Properties Plugin)
+                because SonarQube Scanner for Maven does not support reading sonar-project.properties
+                -->
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>read-project-properties</goal>
+                        </goals>
+                        <configuration>
+                            <files>
+                                <file>sonar-project.properties</file>
+                            </files>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
-  <profiles>
-    <profile>
-      <id>maven-central-publishing</id>
-      <!--
-        For publishing in Maven Central.
-        For more information:
-        - https://central.sonatype.org/publish/publish-guide/#deployment
-        - https://central.sonatype.org/publish/release/#login-into-ossrh
-      -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-                <phase>verify</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.11.2</version>
-            <configuration>
-              <stylesheet>java</stylesheet>
-              <doclint>none</doclint>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-javadoc</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
+    <profiles>
+        <profile>
+            <id>maven-central-publishing</id>
             <!--
-              For publishing in Maven Central, GPG key must be published to one of following
-              servers:
-              - keyserver.ubuntu.com
-              - keys.openpgp.org
-              - pgp.mit.edu
+                For publishing in Maven Central.
+                For more information:
+                - https://central.sonatype.org/publish/publish-guide/#deployment
+                - https://central.sonatype.org/publish/release/#login-into-ossrh
+            -->
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.11.2</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadoc</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <stylesheet>java</stylesheet>
+                            <doclint>none</doclint>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <!--
+                            For publishing in Maven Central, GPG key must be published to one of following servers:
+                            - keyserver.ubuntu.com
+                            - keys.openpgp.org
+                            - pgp.mit.edu
 
-            For more information:
-            https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
+                            For more informatino: https://central.sonatype.org/publish/requirements/gpg/#distributing-your-public-key
                         -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.7</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <phase>verify</phase>
-                <configuration>
-                  <gpgArguments>
-                    <arg>--pinentry-mode</arg>
-                    <arg>loopback</arg>
-                  </gpgArguments>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.sonatype.central</groupId>
-            <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.6.0</version>
-            <extensions>true</extensions>
-            <configuration>
-              <publishingServerId>central</publishingServerId>
-              <tokenAuth>true</tokenAuth>
-              <autoPublish>true</autoPublish>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.2.7</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                                <configuration>
+                                    <gpgArguments>
+                                        <arg>--pinentry-mode</arg>
+                                        <arg>loopback</arg>
+                                    </gpgArguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.6.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                            <tokenAuth>true</tokenAuth>
+                            <autoPublish>true</autoPublish>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>