From 9f463a5710a2a70cb12b20dbbe23fe894bd780ae Mon Sep 17 00:00:00 2001
From: Costin Zaharia
 <56015273+costin-zaharia-sonarsource@users.noreply.github.com>
Date: Fri, 22 Apr 2022 11:20:28 +0200
Subject: [PATCH] Update RSPEC (#5585)

---
 analyzers/rspec/cs/S1104_c#.html              |  2 +-
 analyzers/rspec/cs/S1121_c#.html              |  2 +-
 analyzers/rspec/cs/S112_c#.html               |  2 +-
 analyzers/rspec/cs/S1134_c#.html              |  2 +-
 analyzers/rspec/cs/S1135_c#.html              |  2 +-
 analyzers/rspec/cs/S1206_c#.html              |  3 +--
 analyzers/rspec/cs/S131_c#.html               |  2 +-
 analyzers/rspec/cs/S1696_c#.html              |  4 +--
 analyzers/rspec/cs/S1698_c#.html              |  4 +--
 analyzers/rspec/cs/S1854_c#.html              |  2 +-
 analyzers/rspec/cs/S1944_c#.html              |  4 +--
 analyzers/rspec/cs/S2053_c#.html              |  4 +--
 analyzers/rspec/cs/S2068_c#.html              |  6 ++---
 analyzers/rspec/cs/S2077_c#.html              |  9 +++----
 analyzers/rspec/cs/S2092_c#.html              |  7 +++--
 analyzers/rspec/cs/S2115_c#.html              |  2 +-
 analyzers/rspec/cs/S2184_c#.html              |  2 +-
 analyzers/rspec/cs/S2221_c#.html              |  2 +-
 analyzers/rspec/cs/S2222_c#.html              |  2 +-
 analyzers/rspec/cs/S2225_c#.html              |  2 +-
 analyzers/rspec/cs/S2245_c#.html              | 10 +++----
 analyzers/rspec/cs/S2255_c#.html              |  4 +--
 analyzers/rspec/cs/S2257_c#.html              |  2 +-
 analyzers/rspec/cs/S2259_c#.html              |  2 +-
 analyzers/rspec/cs/S2386_c#.html              |  4 +--
 analyzers/rspec/cs/S2486_c#.html              |  2 +-
 analyzers/rspec/cs/S2583_c#.html              |  4 +--
 analyzers/rspec/cs/S2589_c#.html              |  4 +--
 analyzers/rspec/cs/S2612_c#.html              |  4 +--
 analyzers/rspec/cs/S2681_c#.html              |  2 +-
 analyzers/rspec/cs/S2755_c#.html              |  4 +--
 analyzers/rspec/cs/S2930_c#.html              |  2 +-
 analyzers/rspec/cs/S2931_c#.html              |  2 +-
 analyzers/rspec/cs/S2952_c#.html              |  2 +-
 analyzers/rspec/cs/S3242_c#.html              |  2 +-
 analyzers/rspec/cs/S3329_c#.html              |  8 +++---
 analyzers/rspec/cs/S3330_c#.html              |  2 +-
 analyzers/rspec/cs/S3655_c#.html              |  2 +-
 analyzers/rspec/cs/S3884_c#.html              |  2 +-
 analyzers/rspec/cs/S4036_c#.html              |  4 +--
 analyzers/rspec/cs/S4423_c#.html              |  4 +--
 analyzers/rspec/cs/S4426_c#.html              |  2 +-
 analyzers/rspec/cs/S4433_c#.html              |  2 +-
 analyzers/rspec/cs/S4487_c#.html              |  2 +-
 analyzers/rspec/cs/S4502_c#.html              |  2 +-
 analyzers/rspec/cs/S4507_c#.html              |  4 +--
 analyzers/rspec/cs/S4564_c#.html              |  2 +-
 analyzers/rspec/cs/S4787_c#.html              | 14 +++++-----
 analyzers/rspec/cs/S4790_c#.html              |  2 +-
 analyzers/rspec/cs/S4792_c#.html              |  4 +--
 analyzers/rspec/cs/S4818_c#.html              |  6 ++---
 analyzers/rspec/cs/S4823_c#.html              |  4 +--
 analyzers/rspec/cs/S4829_c#.html              |  2 +-
 analyzers/rspec/cs/S4830_c#.html              |  2 +-
 analyzers/rspec/cs/S4834_c#.html              |  8 +++---
 analyzers/rspec/cs/S5042_c#.html              |  2 +-
 analyzers/rspec/cs/S5122_c#.html              | 26 ++++++++++++++-----
 analyzers/rspec/cs/S5332_c#.html              |  4 +--
 analyzers/rspec/cs/S5443_c#.html              |  6 ++---
 analyzers/rspec/cs/S5445_c#.html              |  6 ++---
 analyzers/rspec/cs/S5542_c#.html              |  2 +-
 analyzers/rspec/cs/S5547_c#.html              |  2 +-
 analyzers/rspec/cs/S5659_c#.html              |  2 +-
 analyzers/rspec/cs/S5693_c#.html              |  4 +--
 analyzers/rspec/cs/S5753_c#.html              |  2 +-
 analyzers/rspec/cs/S5766_c#.html              |  2 +-
 analyzers/rspec/cs/S5773_c#.html              |  4 +--
 analyzers/rspec/vbnet/S112_vb.net.html        |  2 +-
 analyzers/rspec/vbnet/S1134_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S1135_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S131_vb.net.html        |  2 +-
 analyzers/rspec/vbnet/S2068_vb.net.html       |  6 ++---
 analyzers/rspec/vbnet/S2077_vb.net.html       |  9 +++----
 analyzers/rspec/vbnet/S2222_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S2255_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S2257_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S2612_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S3884_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S4036_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S4423_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S4507_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S4787_vb.net.html       | 14 +++++-----
 analyzers/rspec/vbnet/S4790_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S4792_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S4818_vb.net.html       |  6 ++---
 analyzers/rspec/vbnet/S4823_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S4829_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S4830_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S4834_vb.net.html       |  8 +++---
 analyzers/rspec/vbnet/S5042_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S5443_vb.net.html       |  6 ++---
 analyzers/rspec/vbnet/S5445_vb.net.html       |  6 ++---
 analyzers/rspec/vbnet/S5542_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S5547_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S5659_vb.net.html       |  2 +-
 analyzers/rspec/vbnet/S5693_vb.net.html       |  4 +--
 analyzers/rspec/vbnet/S5753_vb.net.html       |  2 +-
 .../SonarAnalyzer.CSharp/RspecStrings.resx    |  2 +-
 .../src/SonarAnalyzer.CSharp/sonarpedia.json  |  2 +-
 .../Rules.Description/S1104.html              |  2 +-
 .../Rules.Description/S1121.html              |  2 +-
 .../Rules.Description/S112_cs.html            |  2 +-
 .../Rules.Description/S112_vb.html            |  2 +-
 .../Rules.Description/S1134_cs.html           |  2 +-
 .../Rules.Description/S1134_vb.html           |  2 +-
 .../Rules.Description/S1135_cs.html           |  2 +-
 .../Rules.Description/S1135_vb.html           |  2 +-
 .../Rules.Description/S1206.html              |  3 +--
 .../Rules.Description/S131_cs.html            |  2 +-
 .../Rules.Description/S131_vb.html            |  2 +-
 .../Rules.Description/S1696.html              |  4 +--
 .../Rules.Description/S1698.html              |  4 +--
 .../Rules.Description/S1854.html              |  2 +-
 .../Rules.Description/S1944.html              |  4 +--
 .../Rules.Description/S2053.html              |  4 +--
 .../Rules.Description/S2068_cs.html           |  6 ++---
 .../Rules.Description/S2068_vb.html           |  6 ++---
 .../Rules.Description/S2077_cs.html           |  9 +++----
 .../Rules.Description/S2077_vb.html           |  9 +++----
 .../Rules.Description/S2092.html              |  7 +++--
 .../Rules.Description/S2115.html              |  2 +-
 .../Rules.Description/S2184.html              |  2 +-
 .../Rules.Description/S2221.html              |  2 +-
 .../Rules.Description/S2222_cs.html           |  2 +-
 .../Rules.Description/S2222_vb.html           |  2 +-
 .../Rules.Description/S2225.html              |  2 +-
 .../Rules.Description/S2245.html              | 10 +++----
 .../Rules.Description/S2255_cs.html           |  4 +--
 .../Rules.Description/S2255_vb.html           |  4 +--
 .../Rules.Description/S2257_cs.html           |  2 +-
 .../Rules.Description/S2257_vb.html           |  2 +-
 .../Rules.Description/S2259.html              |  2 +-
 .../Rules.Description/S2386.html              |  4 +--
 .../Rules.Description/S2486.html              |  2 +-
 .../Rules.Description/S2583.html              |  4 +--
 .../Rules.Description/S2589.html              |  4 +--
 .../Rules.Description/S2612_cs.html           |  4 +--
 .../Rules.Description/S2612_vb.html           |  4 +--
 .../Rules.Description/S2681.html              |  2 +-
 .../Rules.Description/S2755.html              |  4 +--
 .../Rules.Description/S2930.html              |  2 +-
 .../Rules.Description/S2931.html              |  2 +-
 .../Rules.Description/S2952.html              |  2 +-
 .../Rules.Description/S3242.html              |  2 +-
 .../Rules.Description/S3329.html              |  8 +++---
 .../Rules.Description/S3330.html              |  2 +-
 .../Rules.Description/S3655.html              |  2 +-
 .../Rules.Description/S3884_cs.html           |  2 +-
 .../Rules.Description/S3884_vb.html           |  2 +-
 .../Rules.Description/S4036_cs.html           |  4 +--
 .../Rules.Description/S4036_vb.html           |  4 +--
 .../Rules.Description/S4423_cs.html           |  4 +--
 .../Rules.Description/S4423_vb.html           |  4 +--
 .../Rules.Description/S4426.html              |  2 +-
 .../Rules.Description/S4433.html              |  2 +-
 .../Rules.Description/S4487.html              |  2 +-
 .../Rules.Description/S4502.html              |  2 +-
 .../Rules.Description/S4507_cs.html           |  4 +--
 .../Rules.Description/S4507_vb.html           |  4 +--
 .../Rules.Description/S4564.html              |  2 +-
 .../Rules.Description/S4787_cs.html           | 14 +++++-----
 .../Rules.Description/S4787_vb.html           | 14 +++++-----
 .../Rules.Description/S4790_cs.html           |  2 +-
 .../Rules.Description/S4790_vb.html           |  2 +-
 .../Rules.Description/S4792_cs.html           |  4 +--
 .../Rules.Description/S4792_vb.html           |  4 +--
 .../Rules.Description/S4818_cs.html           |  6 ++---
 .../Rules.Description/S4818_vb.html           |  6 ++---
 .../Rules.Description/S4823_cs.html           |  4 +--
 .../Rules.Description/S4823_vb.html           |  4 +--
 .../Rules.Description/S4829_cs.html           |  2 +-
 .../Rules.Description/S4829_vb.html           |  2 +-
 .../Rules.Description/S4830_cs.html           |  2 +-
 .../Rules.Description/S4830_vb.html           |  2 +-
 .../Rules.Description/S4834_cs.html           |  8 +++---
 .../Rules.Description/S4834_vb.html           |  8 +++---
 .../Rules.Description/S5042_cs.html           |  2 +-
 .../Rules.Description/S5042_vb.html           |  2 +-
 .../Rules.Description/S5122.html              | 26 ++++++++++++++-----
 .../Rules.Description/S5332.html              |  4 +--
 .../Rules.Description/S5443_cs.html           |  6 ++---
 .../Rules.Description/S5443_vb.html           |  6 ++---
 .../Rules.Description/S5445_cs.html           |  6 ++---
 .../Rules.Description/S5445_vb.html           |  6 ++---
 .../Rules.Description/S5542_cs.html           |  2 +-
 .../Rules.Description/S5542_vb.html           |  2 +-
 .../Rules.Description/S5547_cs.html           |  2 +-
 .../Rules.Description/S5547_vb.html           |  2 +-
 .../Rules.Description/S5659_cs.html           |  2 +-
 .../Rules.Description/S5659_vb.html           |  2 +-
 .../Rules.Description/S5693_cs.html           |  4 +--
 .../Rules.Description/S5693_vb.html           |  4 +--
 .../Rules.Description/S5753_cs.html           |  2 +-
 .../Rules.Description/S5753_vb.html           |  2 +-
 .../Rules.Description/S5766.html              |  2 +-
 .../Rules.Description/S5773.html              |  4 +--
 .../SonarAnalyzer.VisualBasic/sonarpedia.json |  2 +-
 197 files changed, 385 insertions(+), 365 deletions(-)

diff --git a/analyzers/rspec/cs/S1104_c#.html b/analyzers/rspec/cs/S1104_c#.html
index 10ebd95450c..e7a03756098 100644
--- a/analyzers/rspec/cs/S1104_c#.html
+++ b/analyzers/rspec/cs/S1104_c#.html
@@ -32,6 +32,6 @@ <h2>Exceptions</h2>
 <p>Fields inside classes or structs annotated with the <code>StructLayoutAttribute</code> are ignored by this rule.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/493.html">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/493">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1121_c#.html b/analyzers/rspec/cs/S1121_c#.html
index 3b098ce7abd..a778ccf5ba8 100644
--- a/analyzers/rspec/cs/S1121_c#.html
+++ b/analyzers/rspec/cs/S1121_c#.html
@@ -39,6 +39,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/481.html">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/481">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S112_c#.html b/analyzers/rspec/cs/S112_c#.html
index 37c44167f3b..ed81a195b5f 100644
--- a/analyzers/rspec/cs/S112_c#.html
+++ b/analyzers/rspec/cs/S112_c#.html
@@ -26,6 +26,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1134_c#.html b/analyzers/rspec/cs/S1134_c#.html
index 17df41a5b6e..f86c1f4b686 100644
--- a/analyzers/rspec/cs/S1134_c#.html
+++ b/analyzers/rspec/cs/S1134_c#.html
@@ -10,6 +10,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1135_c#.html b/analyzers/rspec/cs/S1135_c#.html
index c3d3910da66..c6a6b6aa554 100644
--- a/analyzers/rspec/cs/S1135_c#.html
+++ b/analyzers/rspec/cs/S1135_c#.html
@@ -10,6 +10,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1206_c#.html b/analyzers/rspec/cs/S1206_c#.html
index 48903456c45..6f7bd8d38b3 100644
--- a/analyzers/rspec/cs/S1206_c#.html
+++ b/analyzers/rspec/cs/S1206_c#.html
@@ -30,7 +30,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/581.html">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/581">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S131_c#.html b/analyzers/rspec/cs/S131_c#.html
index 95c3467762b..7a53116e24b 100644
--- a/analyzers/rspec/cs/S131_c#.html
+++ b/analyzers/rspec/cs/S131_c#.html
@@ -31,6 +31,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/478">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1696_c#.html b/analyzers/rspec/cs/S1696_c#.html
index dad7eb0d8e2..4feb71edcb5 100644
--- a/analyzers/rspec/cs/S1696_c#.html
+++ b/analyzers/rspec/cs/S1696_c#.html
@@ -36,7 +36,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/395.html">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer
-  Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/395">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer Dereference
+  </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1698_c#.html b/analyzers/rspec/cs/S1698_c#.html
index 195ca00dd72..7a3d57792e6 100644
--- a/analyzers/rspec/cs/S1698_c#.html
+++ b/analyzers/rspec/cs/S1698_c#.html
@@ -59,7 +59,7 @@ <h2>Exceptions</h2>
 in this case we want to ensure reference equality even if some <code>==</code> overload is present).</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/595">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/597">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1854_c#.html b/analyzers/rspec/cs/S1854_c#.html
index 687ad44df0c..6c9813ce0da 100644
--- a/analyzers/rspec/cs/S1854_c#.html
+++ b/analyzers/rspec/cs/S1854_c#.html
@@ -22,6 +22,6 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S1944_c#.html b/analyzers/rspec/cs/S1944_c#.html
index 818174f9e53..2c52af286e0 100644
--- a/analyzers/rspec/cs/S1944_c#.html
+++ b/analyzers/rspec/cs/S1944_c#.html
@@ -57,7 +57,7 @@ <h2>Exceptions</h2>
 <p>No issue is reported if the interface has no implementing class in the assembly.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/588.html">MITRE, CWE-588</a> - Attempt to Access Child of a Non-structure Pointer </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/704.html">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/588">MITRE, CWE-588</a> - Attempt to Access Child of a Non-structure Pointer </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/704">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2053_c#.html b/analyzers/rspec/cs/S2053_c#.html
index 99ba07279e7..f6a86d1a7f5 100644
--- a/analyzers/rspec/cs/S2053_c#.html
+++ b/analyzers/rspec/cs/S2053_c#.html
@@ -36,8 +36,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/759">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/760">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2068_c#.html b/analyzers/rspec/cs/S2068_c#.html
index 9deb810d296..dcc3b720a2d 100644
--- a/analyzers/rspec/cs/S2068_c#.html
+++ b/analyzers/rspec/cs/S2068_c#.html
@@ -11,7 +11,7 @@
 <p>It’s recommended to customize the configuration of this rule with additional credential words such as "oauthToken", "secret", …​</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> Credentials allows access to a sensitive component like a database, a file storage, an API or a service. </li>
+  <li> Credentials allow access to a sensitive component like a database, a file storage, an API or a service. </li>
   <li> Credentials are used in production environments. </li>
   <li> Application re-distribution is required before updating the credentials. </li>
 </ul>
@@ -50,8 +50,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
 </ul>
diff --git a/analyzers/rspec/cs/S2077_c#.html b/analyzers/rspec/cs/S2077_c#.html
index bde90ef9171..41192508a08 100644
--- a/analyzers/rspec/cs/S2077_c#.html
+++ b/analyzers/rspec/cs/S2077_c#.html
@@ -50,12 +50,11 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/943.html">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic
+  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/564">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/943">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
diff --git a/analyzers/rspec/cs/S2092_c#.html b/analyzers/rspec/cs/S2092_c#.html
index a3fc942a268..b5a1398b9d4 100644
--- a/analyzers/rspec/cs/S2092_c#.html
+++ b/analyzers/rspec/cs/S2092_c#.html
@@ -46,10 +46,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/311.html">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/614.html">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/311">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/614">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2115_c#.html b/analyzers/rspec/cs/S2115_c#.html
index ebedbb36f30..abd3dce6060 100644
--- a/analyzers/rspec/cs/S2115_c#.html
+++ b/analyzers/rspec/cs/S2115_c#.html
@@ -40,6 +40,6 @@ <h2>See</h2>
   Authentication </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data
   Exposure </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521">MITRE, CWE-521</a> - Weak Password Requirements </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2184_c#.html b/analyzers/rspec/cs/S2184_c#.html
index 8d5b77fbb75..3c7e4566482 100644
--- a/analyzers/rspec/cs/S2184_c#.html
+++ b/analyzers/rspec/cs/S2184_c#.html
@@ -24,7 +24,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/190.html">MITRE, CWE-190</a> - Integer Overflow or Wraparound </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/190">MITRE, CWE-190</a> - Integer Overflow or Wraparound </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2221_c#.html b/analyzers/rspec/cs/S2221_c#.html
index a0be996c8e3..fc36ffaeb16 100644
--- a/analyzers/rspec/cs/S2221_c#.html
+++ b/analyzers/rspec/cs/S2221_c#.html
@@ -45,6 +45,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/396">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2222_c#.html b/analyzers/rspec/cs/S2222_c#.html
index 571f37cf64f..fb90d1d7324 100644
--- a/analyzers/rspec/cs/S2222_c#.html
+++ b/analyzers/rspec/cs/S2222_c#.html
@@ -68,7 +68,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
   <li> <a
   href="https://docs.microsoft.com/en-us/dotnet/standard/threading/overview-of-synchronization-primitives#synchronization-of-access-to-a-shared-resource">Synchronization of access to a shared resource</a>. </li>
 </ul>
diff --git a/analyzers/rspec/cs/S2225_c#.html b/analyzers/rspec/cs/S2225_c#.html
index b53d2be5ce3..b721ba148b9 100644
--- a/analyzers/rspec/cs/S2225_c#.html
+++ b/analyzers/rspec/cs/S2225_c#.html
@@ -30,6 +30,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2245_c#.html b/analyzers/rspec/cs/S2245_c#.html
index 1a4efe84983..f1cfe75ef14 100644
--- a/analyzers/rspec/cs/S2245_c#.html
+++ b/analyzers/rspec/cs/S2245_c#.html
@@ -51,11 +51,11 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/338.html">MITRE, CWE-338</a> - Use of Cryptographically Weak Pseudo-Random Number Generator
-  (PRNG) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1241.html">MITRE, CWE-1241</a> - Use of Predictable Algorithm in Random Number Generator </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/338">MITRE, CWE-338</a> - Use of Cryptographically Weak Pseudo-Random Number Generator (PRNG)
+  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1241">MITRE, CWE-1241</a> - Use of Predictable Algorithm in Random Number Generator </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#PREDICTABLE_RANDOM">Predictable Pseudo Random Number
   Generator</a> </li>
 </ul>
diff --git a/analyzers/rspec/cs/S2255_c#.html b/analyzers/rspec/cs/S2255_c#.html
index bca31bf1a0f..dd60f9f6339 100644
--- a/analyzers/rspec/cs/S2255_c#.html
+++ b/analyzers/rspec/cs/S2255_c#.html
@@ -41,8 +41,8 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/312.html">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/312">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#COOKIE_USAGE">COOKIE_USAGE</a> </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/cs/S2257_c#.html b/analyzers/rspec/cs/S2257_c#.html
index 9eb059424ad..17e43e90d37 100644
--- a/analyzers/rspec/cs/S2257_c#.html
+++ b/analyzers/rspec/cs/S2257_c#.html
@@ -38,7 +38,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#CUSTOM_MESSAGE_DIGEST">MessageDigest is Custom</a>
   </li>
diff --git a/analyzers/rspec/cs/S2259_c#.html b/analyzers/rspec/cs/S2259_c#.html
index c685052d2e0..e3c68214e4d 100644
--- a/analyzers/rspec/cs/S2259_c#.html
+++ b/analyzers/rspec/cs/S2259_c#.html
@@ -47,6 +47,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2386_c#.html b/analyzers/rspec/cs/S2386_c#.html
index 80fa1283f8e..c52d2af99b0 100644
--- a/analyzers/rspec/cs/S2386_c#.html
+++ b/analyzers/rspec/cs/S2386_c#.html
@@ -39,7 +39,7 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/582.html">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/607.html">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/582">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/607">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2486_c#.html b/analyzers/rspec/cs/S2486_c#.html
index cf27f12c76e..b8e6bb3d6fe 100644
--- a/analyzers/rspec/cs/S2486_c#.html
+++ b/analyzers/rspec/cs/S2486_c#.html
@@ -31,6 +31,6 @@ <h2>See</h2>
   Monitoring Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/390.html">MITRE, CWE-390</a> - Detection of Error Condition Without Action </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/390">MITRE, CWE-390</a> - Detection of Error Condition Without Action </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2583_c#.html b/analyzers/rspec/cs/S2583_c#.html
index 121f9e9cdec..422d681d64d 100644
--- a/analyzers/rspec/cs/S2583_c#.html
+++ b/analyzers/rspec/cs/S2583_c#.html
@@ -65,7 +65,7 @@ <h2>Exceptions</h2>
 <p>In these cases it is obvious the code is as intended.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2589_c#.html b/analyzers/rspec/cs/S2589_c#.html
index 35a9e7b46be..8c0fbffbdb2 100644
--- a/analyzers/rspec/cs/S2589_c#.html
+++ b/analyzers/rspec/cs/S2589_c#.html
@@ -51,7 +51,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2612_c#.html b/analyzers/rspec/cs/S2612_c#.html
index 8dc32e8a3d8..44bf8881f36 100644
--- a/analyzers/rspec/cs/S2612_c#.html
+++ b/analyzers/rspec/cs/S2612_c#.html
@@ -62,8 +62,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/266">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2681_c#.html b/analyzers/rspec/cs/S2681_c#.html
index 615968bbc2b..3cfc50349bf 100644
--- a/analyzers/rspec/cs/S2681_c#.html
+++ b/analyzers/rspec/cs/S2681_c#.html
@@ -39,6 +39,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/483.html">MITRE, CWE-483</a> - Incorrect Block Delimitation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/483">MITRE, CWE-483</a> - Incorrect Block Delimitation </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2755_c#.html b/analyzers/rspec/cs/S2755_c#.html
index 061f248161d..39250c54d3b 100644
--- a/analyzers/rspec/cs/S2755_c#.html
+++ b/analyzers/rspec/cs/S2755_c#.html
@@ -107,7 +107,7 @@ <h2>See</h2>
   (XXE) </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#net">OWASP XXE Prevention Cheat
   Sheet</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/611">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/827">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2930_c#.html b/analyzers/rspec/cs/S2930_c#.html
index 1a1bb7423a8..faab67d528c 100644
--- a/analyzers/rspec/cs/S2930_c#.html
+++ b/analyzers/rspec/cs/S2930_c#.html
@@ -104,6 +104,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2931_c#.html b/analyzers/rspec/cs/S2931_c#.html
index df692d957b4..6ed6f3685cc 100644
--- a/analyzers/rspec/cs/S2931_c#.html
+++ b/analyzers/rspec/cs/S2931_c#.html
@@ -44,6 +44,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S2952_c#.html b/analyzers/rspec/cs/S2952_c#.html
index 44546f59794..e2719325171 100644
--- a/analyzers/rspec/cs/S2952_c#.html
+++ b/analyzers/rspec/cs/S2952_c#.html
@@ -49,6 +49,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S3242_c#.html b/analyzers/rspec/cs/S3242_c#.html
index be9313f37f4..2ca0a7266ef 100644
--- a/analyzers/rspec/cs/S3242_c#.html
+++ b/analyzers/rspec/cs/S3242_c#.html
@@ -1,5 +1,5 @@
 <p>When a derived type is used as a parameter instead of the base type, it limits the uses of the method. If the additional functionality that is
-provided in the derived type is not requires then that limitation isn’t required, and should be removed.</p>
+provided in the derived type is not required then that limitation isn’t required, and should be removed.</p>
 <p>This rule raises an issue when a method declaration includes a parameter that is a derived type and accesses only members of the base type.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
diff --git a/analyzers/rspec/cs/S3329_c#.html b/analyzers/rspec/cs/S3329_c#.html
index a609740d29b..932e369d7d0 100644
--- a/analyzers/rspec/cs/S3329_c#.html
+++ b/analyzers/rspec/cs/S3329_c#.html
@@ -37,10 +37,10 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/329.html">MITRE, CWE-329</a> - Not Using an Unpredictable IV with CBC Mode </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/340.html">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1204.html">MITRE, CWE-1204</a> - Generation of Weak Initialization Vector (IV) </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/329">MITRE, CWE-329</a> - Not Using an Unpredictable IV with CBC Mode </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/340">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1204">MITRE, CWE-1204</a> - Generation of Weak Initialization Vector (IV) </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38a.pdf">NIST, SP-800-38A</a> - Recommendation for Block Cipher
   Modes of Operation </li>
 </ul>
diff --git a/analyzers/rspec/cs/S3330_c#.html b/analyzers/rspec/cs/S3330_c#.html
index 2a910d9775a..26dc70f3d9d 100644
--- a/analyzers/rspec/cs/S3330_c#.html
+++ b/analyzers/rspec/cs/S3330_c#.html
@@ -48,7 +48,7 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/HttpOnly">OWASP HttpOnly</a> </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1004">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#HTTPONLY_COOKIE">HTTPONLY_COOKIE</a> </li>
 </ul>
diff --git a/analyzers/rspec/cs/S3655_c#.html b/analyzers/rspec/cs/S3655_c#.html
index a58afc0a8d9..cfbe5b8488d 100644
--- a/analyzers/rspec/cs/S3655_c#.html
+++ b/analyzers/rspec/cs/S3655_c#.html
@@ -27,6 +27,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S3884_c#.html b/analyzers/rspec/cs/S3884_c#.html
index 6ce44e3b78a..0e483a4d99f 100644
--- a/analyzers/rspec/cs/S3884_c#.html
+++ b/analyzers/rspec/cs/S3884_c#.html
@@ -66,6 +66,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/648.html">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/648">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4036_c#.html b/analyzers/rspec/cs/S4036_c#.html
index dfcf38f1e60..4ec6d6cf370 100644
--- a/analyzers/rspec/cs/S4036_c#.html
+++ b/analyzers/rspec/cs/S4036_c#.html
@@ -23,7 +23,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
   Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/426.html">MITRE, CWE-426</a> - Untrusted Search Path </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/427.html">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/426">MITRE, CWE-426</a> - Untrusted Search Path </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/427">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4423_c#.html b/analyzers/rspec/cs/S4423_c#.html
index 96a1d45f0bb..a26aea83c01 100644
--- a/analyzers/rspec/cs/S4423_c#.html
+++ b/analyzers/rspec/cs/S4423_c#.html
@@ -43,8 +43,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> <a href="https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#22-use-secure-protocols">SSL and TLS Deployment Best
   Practices - Use secure protocols</a> </li>
diff --git a/analyzers/rspec/cs/S4426_c#.html b/analyzers/rspec/cs/S4426_c#.html
index 5511426b2f5..3c6feb0b843 100644
--- a/analyzers/rspec/cs/S4426_c#.html
+++ b/analyzers/rspec/cs/S4426_c#.html
@@ -87,6 +87,6 @@ <h2>See</h2>
   Insufficient Cryptography </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf">NIST 800-131A</a> - Recommendation for Transitioning the
   Use of Cryptographic Algorithms and Key Lengths </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4433_c#.html b/analyzers/rspec/cs/S4433_c#.html
index aaff0c4bf19..3008a116afb 100644
--- a/analyzers/rspec/cs/S4433_c#.html
+++ b/analyzers/rspec/cs/S4433_c#.html
@@ -28,7 +28,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521">MITRE, CWE-521</a> - Weak Password Requirements </li>
   <li> <a href="https://ldapwiki.com/wiki/Simple%20Authentication">ldapwiki.com</a>- Simple Authentication </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4487_c#.html b/analyzers/rspec/cs/S4487_c#.html
index be1d69f6846..aff4acab80a 100644
--- a/analyzers/rspec/cs/S4487_c#.html
+++ b/analyzers/rspec/cs/S4487_c#.html
@@ -46,6 +46,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4502_c#.html b/analyzers/rspec/cs/S4502_c#.html
index 3de3050bc6b..b88806fbbea 100644
--- a/analyzers/rspec/cs/S4502_c#.html
+++ b/analyzers/rspec/cs/S4502_c#.html
@@ -54,7 +54,7 @@ <h2>Compliant Solution</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/352">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://owasp.org/www-community/attacks/csrf">OWASP: Cross-Site Request Forgery</a> </li>
diff --git a/analyzers/rspec/cs/S4507_c#.html b/analyzers/rspec/cs/S4507_c#.html
index e38ab22795c..03f9eefb619 100644
--- a/analyzers/rspec/cs/S4507_c#.html
+++ b/analyzers/rspec/cs/S4507_c#.html
@@ -68,7 +68,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4564_c#.html b/analyzers/rspec/cs/S4564_c#.html
index 26482cd61b6..80d16ab1d56 100644
--- a/analyzers/rspec/cs/S4564_c#.html
+++ b/analyzers/rspec/cs/S4564_c#.html
@@ -38,7 +38,7 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> <a href="https://www.owasp.org/index.php/ASP.NET_Request_Validation">OWASP ASP.NET Request Validation</a> </li>
diff --git a/analyzers/rspec/cs/S4787_c#.html b/analyzers/rspec/cs/S4787_c#.html
index 230221b4f98..50e83266ebc 100644
--- a/analyzers/rspec/cs/S4787_c#.html
+++ b/analyzers/rspec/cs/S4787_c#.html
@@ -107,13 +107,13 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/322">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/323">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/324">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/325">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/cs/S4790_c#.html b/analyzers/rspec/cs/S4790_c#.html
index f06f7eb7350..ea56ccdc39b 100644
--- a/analyzers/rspec/cs/S4790_c#.html
+++ b/analyzers/rspec/cs/S4790_c#.html
@@ -38,7 +38,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4792_c#.html b/analyzers/rspec/cs/S4792_c#.html
index 15becc95af4..e8bdcbd6a7c 100644
--- a/analyzers/rspec/cs/S4792_c#.html
+++ b/analyzers/rspec/cs/S4792_c#.html
@@ -203,8 +203,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/117">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4818_c#.html b/analyzers/rspec/cs/S4818_c#.html
index 4022c02720a..dcddc33db61 100644
--- a/analyzers/rspec/cs/S4818_c#.html
+++ b/analyzers/rspec/cs/S4818_c#.html
@@ -47,9 +47,9 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
diff --git a/analyzers/rspec/cs/S4823_c#.html b/analyzers/rspec/cs/S4823_c#.html
index 6cb74ba074c..7f127393c5e 100644
--- a/analyzers/rspec/cs/S4823_c#.html
+++ b/analyzers/rspec/cs/S4823_c#.html
@@ -37,8 +37,8 @@ <h2>Sensitive Code Example</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/88.html">MITRE, CWE-88</a> - Argument Injection or Modification </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/214.html">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/88">MITRE, CWE-88</a> - Argument Injection or Modification </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/214">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/cs/S4829_c#.html b/analyzers/rspec/cs/S4829_c#.html
index 0d192338bb0..df601505963 100644
--- a/analyzers/rspec/cs/S4829_c#.html
+++ b/analyzers/rspec/cs/S4829_c#.html
@@ -44,7 +44,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/rspec/cs/S4830_c#.html b/analyzers/rspec/cs/S4830_c#.html
index 8a151557aff..1cbad790064 100644
--- a/analyzers/rspec/cs/S4830_c#.html
+++ b/analyzers/rspec/cs/S4830_c#.html
@@ -38,6 +38,6 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/295">MITRE, CWE-295</a> - Improper Certificate Validation </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S4834_c#.html b/analyzers/rspec/cs/S4834_c#.html
index d079d1dbb16..4200d8388ff 100644
--- a/analyzers/rspec/cs/S4834_c#.html
+++ b/analyzers/rspec/cs/S4834_c#.html
@@ -75,10 +75,10 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/276.html">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/668.html">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/277.html">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/276">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/668">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/277">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/rspec/cs/S5042_c#.html b/analyzers/rspec/cs/S5042_c#.html
index e5e8f44f329..f30f1edb802 100644
--- a/analyzers/rspec/cs/S5042_c#.html
+++ b/analyzers/rspec/cs/S5042_c#.html
@@ -79,7 +79,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
+  <li> <a href="https://cwe.mitre.org/data/definitions/409">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
   </li>
   <li> <a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb </li>
 </ul>
diff --git a/analyzers/rspec/cs/S5122_c#.html b/analyzers/rspec/cs/S5122_c#.html
index e1e75b5bd40..14eb84edd2e 100644
--- a/analyzers/rspec/cs/S5122_c#.html
+++ b/analyzers/rspec/cs/S5122_c#.html
@@ -23,7 +23,7 @@ <h2>Recommended Secure Coding Practices</h2>
   allowing any domain (do not use * wildcard nor blindly return the <code>Origin</code> header content without any checks). </li>
 </ul>
 <h2>Sensitive Code Example</h2>
-<h3>ASP.NET Core MVC</h3>
+<p>ASP.NET Core MVC:</p>
 <pre>
 [HttpGet]
 public string Get()
@@ -56,7 +56,7 @@ <h3>ASP.NET Core MVC</h3>
     services.AddControllers();
 }
 </pre>
-<h3>ASP.NET MVC</h3>
+<p>ASP.NET MVC:</p>
 <pre>
 public class HomeController : ApiController
 {
@@ -77,8 +77,13 @@ <h3>ASP.NET MVC</h3>
     Content = new StringContent("content")
 };
 </pre>
+<p>User-controlled origin:</p>
+<pre>
+String origin = Request.Headers["Origin"];
+Response.Headers.Add("Access-Control-Allow-Origin", origin); // Sensitive
+</pre>
 <h2>Compliant Solution</h2>
-<h3>ASP.NET Core MVC</h3>
+<p>ASP.NET Core MVC:</p>
 <pre>
 [HttpGet]
 public string Get()
@@ -106,7 +111,7 @@ <h3>ASP.NET Core MVC</h3>
     services.AddControllers();
 }
 </pre>
-<h3>ASP.Net MVC</h3>
+<p>ASP.Net MVC:</p>
 <pre>
 public class HomeController : ApiController
 {
@@ -127,6 +132,15 @@ <h3>ASP.Net MVC</h3>
     Content = new StringContent("content")
 };
 </pre>
+<p>User-controlled origin validated with an allow-list:</p>
+<pre>
+String origin = Request.Headers["Origin"];
+
+if (trustedOrigins.Contains(origin))
+{
+    Response.Headers.Add("Access-Control-Allow-Origin", origin);
+}
+</pre>
 <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
@@ -138,8 +152,8 @@ <h2>See</h2>
   Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/HTML5_Security_Cheat_Sheet#Cross_Origin_Resource_Sharing">OWASP HTML5 Security Cheat Sheet</a> - Cross
   Origin Resource Sharing </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/346.html">MITRE, CWE-346</a> - Origin Validation Error </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/942.html">MITRE, CWE-942</a> - Overly Permissive Cross-domain Whitelist </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/346">MITRE, CWE-346</a> - Origin Validation Error </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/942">MITRE, CWE-942</a> - Overly Permissive Cross-domain Whitelist </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5332_c#.html b/analyzers/rspec/cs/S5332_c#.html
index 9bf127c23b7..1f1a003bb7c 100644
--- a/analyzers/rspec/cs/S5332_c#.html
+++ b/analyzers/rspec/cs/S5332_c#.html
@@ -86,8 +86,8 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/319.html">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/319">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
   <li> <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Google, Moving towards more secure web</a> </li>
   <li> <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Mozilla, Deprecating non secure http</a> </li>
 </ul>
diff --git a/analyzers/rspec/cs/S5443_c#.html b/analyzers/rspec/cs/S5443_c#.html
index 4eea35d4488..308c866dfef 100644
--- a/analyzers/rspec/cs/S5443_c#.html
+++ b/analyzers/rspec/cs/S5443_c#.html
@@ -66,9 +66,9 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5445_c#.html b/analyzers/rspec/cs/S5445_c#.html
index 435f2c89072..709afd588ed 100644
--- a/analyzers/rspec/cs/S5445_c#.html
+++ b/analyzers/rspec/cs/S5445_c#.html
@@ -45,9 +45,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5542_c#.html b/analyzers/rspec/cs/S5542_c#.html
index d2a3bb801f0..5dde383f4e0 100644
--- a/analyzers/rspec/cs/S5542_c#.html
+++ b/analyzers/rspec/cs/S5542_c#.html
@@ -55,7 +55,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5547_c#.html b/analyzers/rspec/cs/S5547_c#.html
index 06a06135612..e756d1bf4ae 100644
--- a/analyzers/rspec/cs/S5547_c#.html
+++ b/analyzers/rspec/cs/S5547_c#.html
@@ -32,7 +32,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5659_c#.html b/analyzers/rspec/cs/S5659_c#.html
index 2e9d2d5d0a1..889df7d88f5 100644
--- a/analyzers/rspec/cs/S5659_c#.html
+++ b/analyzers/rspec/cs/S5659_c#.html
@@ -28,6 +28,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/347">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5693_c#.html b/analyzers/rspec/cs/S5693_c#.html
index b8317a92b08..5ffc9a78a39 100644
--- a/analyzers/rspec/cs/S5693_c#.html
+++ b/analyzers/rspec/cs/S5693_c#.html
@@ -100,8 +100,8 @@ <h2>See</h2>
   Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/770">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
   <li> <a href="https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/web-config">Web.config</a> - XML-formatted config file for IIS
   applications </li>
 </ul>
diff --git a/analyzers/rspec/cs/S5753_c#.html b/analyzers/rspec/cs/S5753_c#.html
index c46b6d453dc..795bb24edaa 100644
--- a/analyzers/rspec/cs/S5753_c#.html
+++ b/analyzers/rspec/cs/S5753_c#.html
@@ -70,7 +70,7 @@ <h2>See</h2>
   Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5766_c#.html b/analyzers/rspec/cs/S5766_c#.html
index 1a8981a094a..20ce459a6d6 100644
--- a/analyzers/rspec/cs/S5766_c#.html
+++ b/analyzers/rspec/cs/S5766_c#.html
@@ -181,6 +181,6 @@ <h2>See</h2>
   </li>
   <li> <a href="https://docs.microsoft.com/en-us/dotnet/framework/misc/security-and-serialization">docs.microsoft.com</a> - security-and-serialization
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/502">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
 </ul>
 
diff --git a/analyzers/rspec/cs/S5773_c#.html b/analyzers/rspec/cs/S5773_c#.html
index caa5844ddc1..ba3cfab5489 100644
--- a/analyzers/rspec/cs/S5773_c#.html
+++ b/analyzers/rspec/cs/S5773_c#.html
@@ -99,8 +99,8 @@ <h2>See</h2>
   BinaryFormatter security guide </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A8-Insecure_Deserialization">OWASP Top 10 2017 Category A8</a> - Insecure Deserialization
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/134.html">MITRE, CWE-134</a> - Use of Externally-Controlled Format String </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/134">MITRE, CWE-134</a> - Use of Externally-Controlled Format String </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/502">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Deserialization_Cheat_Sheet.md">OWASP Deserialization Cheat
   Sheet</a> </li>
diff --git a/analyzers/rspec/vbnet/S112_vb.net.html b/analyzers/rspec/vbnet/S112_vb.net.html
index cc181b80201..5d8fb376243 100644
--- a/analyzers/rspec/vbnet/S112_vb.net.html
+++ b/analyzers/rspec/vbnet/S112_vb.net.html
@@ -23,6 +23,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S1134_vb.net.html b/analyzers/rspec/vbnet/S1134_vb.net.html
index b74c89a4afb..df8287a7c37 100644
--- a/analyzers/rspec/vbnet/S1134_vb.net.html
+++ b/analyzers/rspec/vbnet/S1134_vb.net.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S1135_vb.net.html b/analyzers/rspec/vbnet/S1135_vb.net.html
index 18d14c75a10..76e7f748762 100644
--- a/analyzers/rspec/vbnet/S1135_vb.net.html
+++ b/analyzers/rspec/vbnet/S1135_vb.net.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S131_vb.net.html b/analyzers/rspec/vbnet/S131_vb.net.html
index 198289f6cc2..2965f026c45 100644
--- a/analyzers/rspec/vbnet/S131_vb.net.html
+++ b/analyzers/rspec/vbnet/S131_vb.net.html
@@ -22,6 +22,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/478">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S2068_vb.net.html b/analyzers/rspec/vbnet/S2068_vb.net.html
index 8e8d0216ac8..e631b0899a3 100644
--- a/analyzers/rspec/vbnet/S2068_vb.net.html
+++ b/analyzers/rspec/vbnet/S2068_vb.net.html
@@ -11,7 +11,7 @@
 <p>It’s recommended to customize the configuration of this rule with additional credential words such as "oauthToken", "secret", …​</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> Credentials allows access to a sensitive component like a database, a file storage, an API or a service. </li>
+  <li> Credentials allow access to a sensitive component like a database, a file storage, an API or a service. </li>
   <li> Credentials are used in production environments. </li>
   <li> Application re-distribution is required before updating the credentials. </li>
 </ul>
@@ -50,8 +50,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
 </ul>
diff --git a/analyzers/rspec/vbnet/S2077_vb.net.html b/analyzers/rspec/vbnet/S2077_vb.net.html
index f3ad535603a..91fdabd7215 100644
--- a/analyzers/rspec/vbnet/S2077_vb.net.html
+++ b/analyzers/rspec/vbnet/S2077_vb.net.html
@@ -42,12 +42,11 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/943.html">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic
+  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/564">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/943">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
diff --git a/analyzers/rspec/vbnet/S2222_vb.net.html b/analyzers/rspec/vbnet/S2222_vb.net.html
index 31a5fe05810..e5e882a59c5 100644
--- a/analyzers/rspec/vbnet/S2222_vb.net.html
+++ b/analyzers/rspec/vbnet/S2222_vb.net.html
@@ -56,7 +56,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
   <li> <a
   href="https://docs.microsoft.com/en-us/dotnet/standard/threading/overview-of-synchronization-primitives#synchronization-of-access-to-a-shared-resource">Synchronization of access to a shared resource</a>. </li>
 </ul>
diff --git a/analyzers/rspec/vbnet/S2255_vb.net.html b/analyzers/rspec/vbnet/S2255_vb.net.html
index c9268eb68ab..ac08891314f 100644
--- a/analyzers/rspec/vbnet/S2255_vb.net.html
+++ b/analyzers/rspec/vbnet/S2255_vb.net.html
@@ -41,8 +41,8 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/312.html">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/312">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#COOKIE_USAGE">COOKIE_USAGE</a> </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/vbnet/S2257_vb.net.html b/analyzers/rspec/vbnet/S2257_vb.net.html
index 9e4fcd27336..f5874bb7379 100644
--- a/analyzers/rspec/vbnet/S2257_vb.net.html
+++ b/analyzers/rspec/vbnet/S2257_vb.net.html
@@ -46,7 +46,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#CUSTOM_MESSAGE_DIGEST">MessageDigest is Custom</a>
   </li>
diff --git a/analyzers/rspec/vbnet/S2612_vb.net.html b/analyzers/rspec/vbnet/S2612_vb.net.html
index b3b2fd5ab2b..19e4690d50e 100644
--- a/analyzers/rspec/vbnet/S2612_vb.net.html
+++ b/analyzers/rspec/vbnet/S2612_vb.net.html
@@ -62,8 +62,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/266">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S3884_vb.net.html b/analyzers/rspec/vbnet/S3884_vb.net.html
index abcbe6dcd90..a211d4dc874 100644
--- a/analyzers/rspec/vbnet/S3884_vb.net.html
+++ b/analyzers/rspec/vbnet/S3884_vb.net.html
@@ -63,6 +63,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/648.html">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/648">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4036_vb.net.html b/analyzers/rspec/vbnet/S4036_vb.net.html
index 1731035f512..5e3ea47f554 100644
--- a/analyzers/rspec/vbnet/S4036_vb.net.html
+++ b/analyzers/rspec/vbnet/S4036_vb.net.html
@@ -23,7 +23,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
   Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/426.html">MITRE, CWE-426</a> - Untrusted Search Path </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/427.html">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/426">MITRE, CWE-426</a> - Untrusted Search Path </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/427">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4423_vb.net.html b/analyzers/rspec/vbnet/S4423_vb.net.html
index d933145f727..def7fc146df 100644
--- a/analyzers/rspec/vbnet/S4423_vb.net.html
+++ b/analyzers/rspec/vbnet/S4423_vb.net.html
@@ -33,8 +33,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> <a href="https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#22-use-secure-protocols">SSL and TLS Deployment Best
   Practices - Use secure protocols</a> </li>
diff --git a/analyzers/rspec/vbnet/S4507_vb.net.html b/analyzers/rspec/vbnet/S4507_vb.net.html
index bcc4ef7fabf..f1d77731310 100644
--- a/analyzers/rspec/vbnet/S4507_vb.net.html
+++ b/analyzers/rspec/vbnet/S4507_vb.net.html
@@ -59,7 +59,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4787_vb.net.html b/analyzers/rspec/vbnet/S4787_vb.net.html
index e1894aebe78..738d88e5561 100644
--- a/analyzers/rspec/vbnet/S4787_vb.net.html
+++ b/analyzers/rspec/vbnet/S4787_vb.net.html
@@ -110,13 +110,13 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/322">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/323">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/324">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/325">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/vbnet/S4790_vb.net.html b/analyzers/rspec/vbnet/S4790_vb.net.html
index 87dd9eff034..df0620115b9 100644
--- a/analyzers/rspec/vbnet/S4790_vb.net.html
+++ b/analyzers/rspec/vbnet/S4790_vb.net.html
@@ -58,7 +58,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4792_vb.net.html b/analyzers/rspec/vbnet/S4792_vb.net.html
index 94723e31a70..5996d61fc06 100644
--- a/analyzers/rspec/vbnet/S4792_vb.net.html
+++ b/analyzers/rspec/vbnet/S4792_vb.net.html
@@ -200,8 +200,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/117">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4818_vb.net.html b/analyzers/rspec/vbnet/S4818_vb.net.html
index 57cb6a4f9ae..0224bc4c09f 100644
--- a/analyzers/rspec/vbnet/S4818_vb.net.html
+++ b/analyzers/rspec/vbnet/S4818_vb.net.html
@@ -47,9 +47,9 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
diff --git a/analyzers/rspec/vbnet/S4823_vb.net.html b/analyzers/rspec/vbnet/S4823_vb.net.html
index 4d52f4a5694..f66c74173ee 100644
--- a/analyzers/rspec/vbnet/S4823_vb.net.html
+++ b/analyzers/rspec/vbnet/S4823_vb.net.html
@@ -31,8 +31,8 @@ <h2>Sensitive Code Example</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/88.html">MITRE, CWE-88</a> - Argument Injection or Modification </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/214.html">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/88">MITRE, CWE-88</a> - Argument Injection or Modification </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/214">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/rspec/vbnet/S4829_vb.net.html b/analyzers/rspec/vbnet/S4829_vb.net.html
index 222c20f0af2..adb9ce30691 100644
--- a/analyzers/rspec/vbnet/S4829_vb.net.html
+++ b/analyzers/rspec/vbnet/S4829_vb.net.html
@@ -41,7 +41,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/rspec/vbnet/S4830_vb.net.html b/analyzers/rspec/vbnet/S4830_vb.net.html
index 2fafe6d7490..4739e08e60d 100644
--- a/analyzers/rspec/vbnet/S4830_vb.net.html
+++ b/analyzers/rspec/vbnet/S4830_vb.net.html
@@ -34,6 +34,6 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/295">MITRE, CWE-295</a> - Improper Certificate Validation </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S4834_vb.net.html b/analyzers/rspec/vbnet/S4834_vb.net.html
index 3c6df99a803..de519a0488a 100644
--- a/analyzers/rspec/vbnet/S4834_vb.net.html
+++ b/analyzers/rspec/vbnet/S4834_vb.net.html
@@ -71,10 +71,10 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/276.html">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/668.html">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/277.html">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/276">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/668">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/277">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/rspec/vbnet/S5042_vb.net.html b/analyzers/rspec/vbnet/S5042_vb.net.html
index d090e7dee59..44d7236c6ac 100644
--- a/analyzers/rspec/vbnet/S5042_vb.net.html
+++ b/analyzers/rspec/vbnet/S5042_vb.net.html
@@ -59,7 +59,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
+  <li> <a href="https://cwe.mitre.org/data/definitions/409">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
   </li>
   <li> <a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb </li>
 </ul>
diff --git a/analyzers/rspec/vbnet/S5443_vb.net.html b/analyzers/rspec/vbnet/S5443_vb.net.html
index 2a7ea78f541..1cf62b9a66f 100644
--- a/analyzers/rspec/vbnet/S5443_vb.net.html
+++ b/analyzers/rspec/vbnet/S5443_vb.net.html
@@ -71,9 +71,9 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5445_vb.net.html b/analyzers/rspec/vbnet/S5445_vb.net.html
index c64e0398f24..e7b63bea44b 100644
--- a/analyzers/rspec/vbnet/S5445_vb.net.html
+++ b/analyzers/rspec/vbnet/S5445_vb.net.html
@@ -43,9 +43,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5542_vb.net.html b/analyzers/rspec/vbnet/S5542_vb.net.html
index a1804e97745..ddd31edc10e 100644
--- a/analyzers/rspec/vbnet/S5542_vb.net.html
+++ b/analyzers/rspec/vbnet/S5542_vb.net.html
@@ -54,7 +54,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5547_vb.net.html b/analyzers/rspec/vbnet/S5547_vb.net.html
index 61801a714e4..be4f405e502 100644
--- a/analyzers/rspec/vbnet/S5547_vb.net.html
+++ b/analyzers/rspec/vbnet/S5547_vb.net.html
@@ -32,7 +32,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5659_vb.net.html b/analyzers/rspec/vbnet/S5659_vb.net.html
index cd54f3258bc..87bbd78932a 100644
--- a/analyzers/rspec/vbnet/S5659_vb.net.html
+++ b/analyzers/rspec/vbnet/S5659_vb.net.html
@@ -28,6 +28,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/347">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5693_vb.net.html b/analyzers/rspec/vbnet/S5693_vb.net.html
index 4c7c7cf519c..4a88afeb9d8 100644
--- a/analyzers/rspec/vbnet/S5693_vb.net.html
+++ b/analyzers/rspec/vbnet/S5693_vb.net.html
@@ -66,7 +66,7 @@ <h2>See</h2>
   Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/770">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
 </ul>
 
diff --git a/analyzers/rspec/vbnet/S5753_vb.net.html b/analyzers/rspec/vbnet/S5753_vb.net.html
index 4ee23114cf1..65eaab4e032 100644
--- a/analyzers/rspec/vbnet/S5753_vb.net.html
+++ b/analyzers/rspec/vbnet/S5753_vb.net.html
@@ -67,7 +67,7 @@ <h2>See</h2>
   Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.CSharp/RspecStrings.resx b/analyzers/src/SonarAnalyzer.CSharp/RspecStrings.resx
index 13fa8e4447f..1f45f6219c3 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/RspecStrings.resx
+++ b/analyzers/src/SonarAnalyzer.CSharp/RspecStrings.resx
@@ -6491,7 +6491,7 @@
     <value>Minor Code Smell</value>
   </data>
   <data name="S3242_Description" xml:space="preserve">
-    <value>When a derived type is used as a parameter instead of the base type, it limits the uses of the method. If the additional functionality that is provided in the derived type is not requires then that limitation isn’t required, and should be removed.</value>
+    <value>When a derived type is used as a parameter instead of the base type, it limits the uses of the method. If the additional functionality that is provided in the derived type is not required then that limitation isn’t required, and should be removed.</value>
   </data>
   <data name="S3242_IsActivatedByDefault" xml:space="preserve">
     <value>False</value>
diff --git a/analyzers/src/SonarAnalyzer.CSharp/sonarpedia.json b/analyzers/src/SonarAnalyzer.CSharp/sonarpedia.json
index d1d3aad9b13..77a10536225 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/sonarpedia.json
+++ b/analyzers/src/SonarAnalyzer.CSharp/sonarpedia.json
@@ -3,5 +3,5 @@
   "languages": [
     "CSH"
   ],
-  "latest-update": "2022-03-24T07:43:45.993838Z"
+  "latest-update": "2022-04-22T07:27:18.625879900Z"
 }
\ No newline at end of file
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1104.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1104.html
index 10ebd95450c..e7a03756098 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1104.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1104.html
@@ -32,6 +32,6 @@ <h2>Exceptions</h2>
 <p>Fields inside classes or structs annotated with the <code>StructLayoutAttribute</code> are ignored by this rule.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/493.html">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/493">MITRE, CWE-493</a> - Critical Public Variable Without Final Modifier </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1121.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1121.html
index 3b098ce7abd..a778ccf5ba8 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1121.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1121.html
@@ -39,6 +39,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/481.html">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/481">MITRE, CWE-481</a> - Assigning instead of Comparing </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_cs.html
index 37c44167f3b..ed81a195b5f 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_cs.html
@@ -26,6 +26,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_vb.html
index cc181b80201..5d8fb376243 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S112_vb.html
@@ -23,6 +23,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/397.html">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/397">MITRE, CWE-397</a> - Declaration of Throws for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_cs.html
index 17df41a5b6e..f86c1f4b686 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_cs.html
@@ -10,6 +10,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_vb.html
index b74c89a4afb..df8287a7c37 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1134_vb.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_cs.html
index c3d3910da66..c6a6b6aa554 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_cs.html
@@ -10,6 +10,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_vb.html
index 18d14c75a10..76e7f748762 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1135_vb.html
@@ -9,6 +9,6 @@ <h2>Noncompliant Code Example</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/546.html">MITRE, CWE-546</a> - Suspicious Comment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/546">MITRE, CWE-546</a> - Suspicious Comment </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1206.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1206.html
index 48903456c45..6f7bd8d38b3 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1206.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1206.html
@@ -30,7 +30,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/581.html">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/581">MITRE, CWE-581</a> - Object Model Violation: Just One of Equals and Hashcode Defined </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_cs.html
index 95c3467762b..7a53116e24b 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_cs.html
@@ -31,6 +31,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/478">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_vb.html
index 198289f6cc2..2965f026c45 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S131_vb.html
@@ -22,6 +22,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/478.html">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/478">MITRE, CWE-478</a> - Missing Default Case in Switch Statement </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1696.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1696.html
index dad7eb0d8e2..4feb71edcb5 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1696.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1696.html
@@ -36,7 +36,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/395.html">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer
-  Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/395">MITRE, CWE-395</a> - Use of NullPointerException Catch to Detect NULL Pointer Dereference
+  </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1698.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1698.html
index 195ca00dd72..7a3d57792e6 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1698.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1698.html
@@ -59,7 +59,7 @@ <h2>Exceptions</h2>
 in this case we want to ensure reference equality even if some <code>==</code> overload is present).</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/595.html">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/597.html">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/595">MITRE, CWE-595</a> - Comparison of Object References Instead of Object Contents </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/597">MITRE, CWE-597</a> - Use of Wrong Operator in String Comparison </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1854.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1854.html
index 687ad44df0c..6c9813ce0da 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1854.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1854.html
@@ -22,6 +22,6 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1944.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1944.html
index 818174f9e53..2c52af286e0 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1944.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S1944.html
@@ -57,7 +57,7 @@ <h2>Exceptions</h2>
 <p>No issue is reported if the interface has no implementing class in the assembly.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/588.html">MITRE, CWE-588</a> - Attempt to Access Child of a Non-structure Pointer </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/704.html">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/588">MITRE, CWE-588</a> - Attempt to Access Child of a Non-structure Pointer </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/704">MITRE, CWE-704</a> - Incorrect Type Conversion or Cast </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2053.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2053.html
index 99ba07279e7..f6a86d1a7f5 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2053.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2053.html
@@ -36,8 +36,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/759.html">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/760.html">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/759">MITRE, CWE-759</a> - Use of a One-Way Hash without a Salt </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/760">MITRE, CWE-760</a> - Use of a One-Way Hash with a Predictable Salt </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_cs.html
index 9deb810d296..dcc3b720a2d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_cs.html
@@ -11,7 +11,7 @@
 <p>It’s recommended to customize the configuration of this rule with additional credential words such as "oauthToken", "secret", …​</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> Credentials allows access to a sensitive component like a database, a file storage, an API or a service. </li>
+  <li> Credentials allow access to a sensitive component like a database, a file storage, an API or a service. </li>
   <li> Credentials are used in production environments. </li>
   <li> Application re-distribution is required before updating the credentials. </li>
 </ul>
@@ -50,8 +50,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_vb.html
index 8e8d0216ac8..e631b0899a3 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2068_vb.html
@@ -11,7 +11,7 @@
 <p>It’s recommended to customize the configuration of this rule with additional credential words such as "oauthToken", "secret", …​</p>
 <h2>Ask Yourself Whether</h2>
 <ul>
-  <li> Credentials allows access to a sensitive component like a database, a file storage, an API or a service. </li>
+  <li> Credentials allow access to a sensitive component like a database, a file storage, an API or a service. </li>
   <li> Credentials are used in production environments. </li>
   <li> Application re-distribution is required before updating the credentials. </li>
 </ul>
@@ -50,8 +50,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/798.html">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/259.html">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/798">MITRE, CWE-798</a> - Use of Hard-coded Credentials </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/259">MITRE, CWE-259</a> - Use of Hard-coded Password </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#HARD_CODE_PASSWORD">Hard Coded Password</a> </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_cs.html
index bde90ef9171..41192508a08 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_cs.html
@@ -50,12 +50,11 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/943.html">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic
+  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/564">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/943">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_vb.html
index f3ad535603a..91fdabd7215 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2077_vb.html
@@ -42,12 +42,11 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A03_2021-Injection/">OWASP Top 10 2021 Category A3</a> - Injection </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/89.html">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
-  </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/564.html">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/943.html">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic
+  <li> <a href="https://cwe.mitre.org/data/definitions/89">MITRE, CWE-89</a> - Improper Neutralization of Special Elements used in an SQL Command
   </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/564">MITRE, CWE-564</a> - SQL Injection: Hibernate </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/943">MITRE, CWE-943</a> - Improper Neutralization of Special Elements in Data Query Logic </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rules <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JPA">Potential SQL/JPQL Injection
   (JPA)</a>, <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#SQL_INJECTION_JDO">Potential SQL/JDOQL Injection (JDO)</a>, <a
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2092.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2092.html
index a3fc942a268..b5a1398b9d4 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2092.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2092.html
@@ -46,10 +46,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/311.html">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/614.html">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute
-  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/311">MITRE, CWE-311</a> - Missing Encryption of Sensitive Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/614">MITRE, CWE-614</a> - Sensitive Cookie in HTTPS Session Without 'Secure' Attribute </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2115.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2115.html
index ebedbb36f30..abd3dce6060 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2115.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2115.html
@@ -40,6 +40,6 @@ <h2>See</h2>
   Authentication </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data
   Exposure </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521">MITRE, CWE-521</a> - Weak Password Requirements </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2184.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2184.html
index 8d5b77fbb75..3c7e4566482 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2184.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2184.html
@@ -24,7 +24,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/190.html">MITRE, CWE-190</a> - Integer Overflow or Wraparound </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/190">MITRE, CWE-190</a> - Integer Overflow or Wraparound </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2221.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2221.html
index a0be996c8e3..fc36ffaeb16 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2221.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2221.html
@@ -45,6 +45,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/396.html">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/396">MITRE, CWE-396</a> - Declaration of Catch for Generic Exception </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_cs.html
index 571f37cf64f..fb90d1d7324 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_cs.html
@@ -68,7 +68,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
   <li> <a
   href="https://docs.microsoft.com/en-us/dotnet/standard/threading/overview-of-synchronization-primitives#synchronization-of-access-to-a-shared-resource">Synchronization of access to a shared resource</a>. </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_vb.html
index 31a5fe05810..e5e882a59c5 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2222_vb.html
@@ -56,7 +56,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
   <li> <a
   href="https://docs.microsoft.com/en-us/dotnet/standard/threading/overview-of-synchronization-primitives#synchronization-of-access-to-a-shared-resource">Synchronization of access to a shared resource</a>. </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2225.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2225.html
index b53d2be5ce3..b721ba148b9 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2225.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2225.html
@@ -30,6 +30,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2245.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2245.html
index 1a4efe84983..f1cfe75ef14 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2245.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2245.html
@@ -51,11 +51,11 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/338.html">MITRE, CWE-338</a> - Use of Cryptographically Weak Pseudo-Random Number Generator
-  (PRNG) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1241.html">MITRE, CWE-1241</a> - Use of Predictable Algorithm in Random Number Generator </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/338">MITRE, CWE-338</a> - Use of Cryptographically Weak Pseudo-Random Number Generator (PRNG)
+  </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1241">MITRE, CWE-1241</a> - Use of Predictable Algorithm in Random Number Generator </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#PREDICTABLE_RANDOM">Predictable Pseudo Random Number
   Generator</a> </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_cs.html
index bca31bf1a0f..dd60f9f6339 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_cs.html
@@ -41,8 +41,8 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/312.html">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/312">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#COOKIE_USAGE">COOKIE_USAGE</a> </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_vb.html
index c9268eb68ab..ac08891314f 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2255_vb.html
@@ -41,8 +41,8 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/312.html">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/315.html">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/312">MITRE, CWE-312</a> - Cleartext Storage of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/315">MITRE, CWE-315</a> - Cleartext Storage of Sensitive Information in a Cookie </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#COOKIE_USAGE">COOKIE_USAGE</a> </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_cs.html
index 9eb059424ad..17e43e90d37 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_cs.html
@@ -38,7 +38,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#CUSTOM_MESSAGE_DIGEST">MessageDigest is Custom</a>
   </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_vb.html
index 9e4fcd27336..f5874bb7379 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2257_vb.html
@@ -46,7 +46,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> Derived from FindSecBugs rule <a href="https://h3xstream.github.io/find-sec-bugs/bugs.htm#CUSTOM_MESSAGE_DIGEST">MessageDigest is Custom</a>
   </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2259.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2259.html
index c685052d2e0..e3c68214e4d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2259.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2259.html
@@ -47,6 +47,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2386.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2386.html
index 80fa1283f8e..c52d2af99b0 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2386.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2386.html
@@ -39,7 +39,7 @@ <h2>Exceptions</h2>
 </ul>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/582.html">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/607.html">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/582">MITRE, CWE-582</a> - Array Declared Public, Final, and Static </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/607">MITRE, CWE-607</a> - Public Static Final Field References Mutable Object </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2486.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2486.html
index cf27f12c76e..b8e6bb3d6fe 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2486.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2486.html
@@ -31,6 +31,6 @@ <h2>See</h2>
   Monitoring Failures </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/390.html">MITRE, CWE-390</a> - Detection of Error Condition Without Action </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/390">MITRE, CWE-390</a> - Detection of Error Condition Without Action </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2583.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2583.html
index 121f9e9cdec..422d681d64d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2583.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2583.html
@@ -65,7 +65,7 @@ <h2>Exceptions</h2>
 <p>In these cases it is obvious the code is as intended.</p>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2589.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2589.html
index 35a9e7b46be..8c0fbffbdb2 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2589.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2589.html
@@ -51,7 +51,7 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/571.html">MITRE, CWE-571</a> - Expression is Always True </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/570.html">MITRE, CWE-570</a> - Expression is Always False </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/571">MITRE, CWE-571</a> - Expression is Always True </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/570">MITRE, CWE-570</a> - Expression is Always False </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_cs.html
index 8dc32e8a3d8..44bf8881f36 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_cs.html
@@ -62,8 +62,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/266">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_vb.html
index b3b2fd5ab2b..19e4690d50e 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2612_vb.html
@@ -62,8 +62,8 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">OWASP Top 10 2021 Category A4</a> - Insecure Design </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Test_File_Permission_(OTG-CONFIG-009)">OWASP File Permission</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/266.html">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/266">MITRE, CWE-266</a> - Incorrect Privilege Assignment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2681.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2681.html
index 615968bbc2b..3cfc50349bf 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2681.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2681.html
@@ -39,6 +39,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/483.html">MITRE, CWE-483</a> - Incorrect Block Delimitation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/483">MITRE, CWE-483</a> - Incorrect Block Delimitation </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2755.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2755.html
index 061f248161d..39250c54d3b 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2755.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2755.html
@@ -107,7 +107,7 @@ <h2>See</h2>
   (XXE) </li>
   <li> <a href="https://cheatsheetseries.owasp.org/cheatsheets/XML_External_Entity_Prevention_Cheat_Sheet.html#net">OWASP XXE Prevention Cheat
   Sheet</a> </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/611.html">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/827.html">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/611">MITRE, CWE-611</a> - Information Exposure Through XML External Entity Reference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/827">MITRE, CWE-827</a> - Improper Control of Document Type Definition </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2930.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2930.html
index 1a1bb7423a8..faab67d528c 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2930.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2930.html
@@ -104,6 +104,6 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2931.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2931.html
index df692d957b4..6ed6f3685cc 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2931.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2931.html
@@ -44,6 +44,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2952.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2952.html
index 44546f59794..e2719325171 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2952.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S2952.html
@@ -49,6 +49,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/459.html">MITRE, CWE-459</a> - Incomplete Cleanup </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/459">MITRE, CWE-459</a> - Incomplete Cleanup </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3242.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3242.html
index be9313f37f4..2ca0a7266ef 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3242.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3242.html
@@ -1,5 +1,5 @@
 <p>When a derived type is used as a parameter instead of the base type, it limits the uses of the method. If the additional functionality that is
-provided in the derived type is not requires then that limitation isn’t required, and should be removed.</p>
+provided in the derived type is not required then that limitation isn’t required, and should be removed.</p>
 <p>This rule raises an issue when a method declaration includes a parameter that is a derived type and accesses only members of the base type.</p>
 <h2>Noncompliant Code Example</h2>
 <pre>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3329.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3329.html
index a609740d29b..932e369d7d0 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3329.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3329.html
@@ -37,10 +37,10 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/329.html">MITRE, CWE-329</a> - Not Using an Unpredictable IV with CBC Mode </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/330.html">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/340.html">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1204.html">MITRE, CWE-1204</a> - Generation of Weak Initialization Vector (IV) </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/329">MITRE, CWE-329</a> - Not Using an Unpredictable IV with CBC Mode </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/330">MITRE, CWE-330</a> - Use of Insufficiently Random Values </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/340">MITRE, CWE-340</a> - Generation of Predictable Numbers or Identifiers </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1204">MITRE, CWE-1204</a> - Generation of Weak Initialization Vector (IV) </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38a.pdf">NIST, SP-800-38A</a> - Recommendation for Block Cipher
   Modes of Operation </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3330.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3330.html
index 2a910d9775a..26dc70f3d9d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3330.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3330.html
@@ -48,7 +48,7 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/HttpOnly">OWASP HttpOnly</a> </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1004.html">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1004">MITRE, CWE-1004</a> - Sensitive Cookie Without 'HttpOnly' Flag </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> Derived from FindSecBugs rule <a href="https://find-sec-bugs.github.io/bugs.htm#HTTPONLY_COOKIE">HTTPONLY_COOKIE</a> </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3655.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3655.html
index a58afc0a8d9..cfbe5b8488d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3655.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3655.html
@@ -27,6 +27,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/476.html">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/476">MITRE, CWE-476</a> - NULL Pointer Dereference </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_cs.html
index 6ce44e3b78a..0e483a4d99f 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_cs.html
@@ -66,6 +66,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/648.html">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/648">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_vb.html
index abcbe6dcd90..a211d4dc874 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S3884_vb.html
@@ -63,6 +63,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/648.html">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/648">MITRE, CWE-648</a> - Incorrect Use of Privileged APIs </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_cs.html
index dfcf38f1e60..4ec6d6cf370 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_cs.html
@@ -23,7 +23,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
   Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/426.html">MITRE, CWE-426</a> - Untrusted Search Path </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/427.html">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/426">MITRE, CWE-426</a> - Untrusted Search Path </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/427">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_vb.html
index 1731035f512..5e3ea47f554 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4036_vb.html
@@ -23,7 +23,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A08_2021-Software_and_Data_Integrity_Failures/">OWASP Top 10 2021 Category A8</a> - Software and Data
   Integrity Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/426.html">MITRE, CWE-426</a> - Untrusted Search Path </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/427.html">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/426">MITRE, CWE-426</a> - Untrusted Search Path </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/427">MITRE, CWE-427</a> - Uncontrolled Search Path Element </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_cs.html
index 96a1d45f0bb..a26aea83c01 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_cs.html
@@ -43,8 +43,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> <a href="https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#22-use-secure-protocols">SSL and TLS Deployment Best
   Practices - Use secure protocols</a> </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_vb.html
index d933145f727..def7fc146df 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4423_vb.html
@@ -33,8 +33,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-327</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-326</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
   <li> <a href="https://github.com/ssllabs/research/wiki/SSL-and-TLS-Deployment-Best-Practices#22-use-secure-protocols">SSL and TLS Deployment Best
   Practices - Use secure protocols</a> </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4426.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4426.html
index 5511426b2f5..3c6feb0b843 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4426.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4426.html
@@ -87,6 +87,6 @@ <h2>See</h2>
   Insufficient Cryptography </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf">NIST 800-131A</a> - Recommendation for Transitioning the
   Use of Cryptographic Algorithms and Key Lengths </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4433.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4433.html
index aaff0c4bf19..3008a116afb 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4433.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4433.html
@@ -28,7 +28,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A07_2021-Identification_and_Authentication_Failures/">OWASP Top 10 2021 Category A7</a> - Identification and
   Authentication Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A2-Broken_Authentication">OWASP Top 10 2017 Category A2</a> - Broken Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/521.html">MITRE, CWE-521</a> - Weak Password Requirements </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/521">MITRE, CWE-521</a> - Weak Password Requirements </li>
   <li> <a href="https://ldapwiki.com/wiki/Simple%20Authentication">ldapwiki.com</a>- Simple Authentication </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4487.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4487.html
index be1d69f6846..aff4acab80a 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4487.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4487.html
@@ -46,6 +46,6 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/563.html">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/563">MITRE, CWE-563</a> - Assignment to Variable without Use ('Unused Variable') </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4502.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4502.html
index 3de3050bc6b..b88806fbbea 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4502.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4502.html
@@ -54,7 +54,7 @@ <h2>Compliant Solution</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/352.html">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/352">MITRE, CWE-352</a> - Cross-Site Request Forgery (CSRF) </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
   <li> <a href="https://owasp.org/www-community/attacks/csrf">OWASP: Cross-Site Request Forgery</a> </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_cs.html
index e38ab22795c..03f9eefb619 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_cs.html
@@ -68,7 +68,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_vb.html
index bcc4ef7fabf..f1d77731310 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4507_vb.html
@@ -59,7 +59,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/489.html">MITRE, CWE-489</a> - Active Debug Code </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/215.html">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/489">MITRE, CWE-489</a> - Active Debug Code </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/215">MITRE, CWE-215</a> - Information Exposure Through Debug Information </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4564.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4564.html
index 26482cd61b6..80d16ab1d56 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4564.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4564.html
@@ -38,7 +38,7 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
   <li> <a href="https://www.owasp.org/index.php/ASP.NET_Request_Validation">OWASP ASP.NET Request Validation</a> </li>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_cs.html
index 230221b4f98..50e83266ebc 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_cs.html
@@ -107,13 +107,13 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/322">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/323">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/324">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/325">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_vb.html
index e1894aebe78..738d88e5561 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4787_vb.html
@@ -110,13 +110,13 @@ <h2>See</h2>
   </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/321.html">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/322.html">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/323.html">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/324.html">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/325.html">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/326.html">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/321">MITRE, CWE-321</a> - Use of Hard-coded Cryptographic Key </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/322">MITRE, CWE-322</a> - Key Exchange without Entity Authentication </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/323">MITRE, CWE-323</a> - Reusing a Nonce, Key Pair in Encryption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/324">MITRE, CWE-324</a> - Use of a Key Past its Expiration Date </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/325">MITRE, CWE-325</a> - Missing Required Cryptographic Step </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/326">MITRE, CWE-326</a> - Inadequate Encryption Strength </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_cs.html
index f06f7eb7350..ea56ccdc39b 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_cs.html
@@ -38,7 +38,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_vb.html
index 87dd9eff034..df0620115b9 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4790_vb.html
@@ -58,7 +58,7 @@ <h2>See</h2>
   Verification Standard</a> - Cryptography Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">OWASP Mobile Top 10 2016 Category M5</a> -
   Insufficient Cryptography </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/1240.html">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/1240">MITRE, CWE-1240</a> - Use of a Risky Cryptographic Primitive </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_cs.html
index 15becc95af4..e8bdcbd6a7c 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_cs.html
@@ -203,8 +203,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/117">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_vb.html
index 94723e31a70..5996d61fc06 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4792_vb.html
@@ -200,8 +200,8 @@ <h2>See</h2>
   </li>
   <li> <a href="https://owasp.org/www-project-top-ten/2017/A10_2017-Insufficient_Logging%2526Monitoring">OWASP Top 10 2017 Category A10</a> -
   Insufficient Logging &amp; Monitoring </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/117.html">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/532.html">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/117">MITRE, CWE-117</a> - Improper Output Neutralization for Logs </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/532">MITRE, CWE-532</a> - Information Exposure Through Log Files </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_cs.html
index 4022c02720a..dcddc33db61 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_cs.html
@@ -47,9 +47,9 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_vb.html
index 57cb6a4f9ae..0224bc4c09f 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4818_vb.html
@@ -47,9 +47,9 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption ('Resource Exhaustion') </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_cs.html
index 6cb74ba074c..7f127393c5e 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_cs.html
@@ -37,8 +37,8 @@ <h2>Sensitive Code Example</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/88.html">MITRE, CWE-88</a> - Argument Injection or Modification </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/214.html">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/88">MITRE, CWE-88</a> - Argument Injection or Modification </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/214">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_vb.html
index 4d52f4a5694..f66c74173ee 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4823_vb.html
@@ -31,8 +31,8 @@ <h2>Sensitive Code Example</h2>
 <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A1-Injection">OWASP Top 10 2017 Category A1</a> - Injection </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/88.html">MITRE, CWE-88</a> - Argument Injection or Modification </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/214.html">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/88">MITRE, CWE-88</a> - Argument Injection or Modification </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/214">MITRE, CWE-214</a> - Information Exposure Through Process Environment </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat1">SANS Top 25</a> - Insecure Interaction Between Components </li>
 </ul>
 <h2>Deprecated</h2>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_cs.html
index 0d192338bb0..df601505963 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_cs.html
@@ -44,7 +44,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_vb.html
index 222c20f0af2..adb9ce30691 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4829_vb.html
@@ -41,7 +41,7 @@ <h2>Exceptions</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> <a href="https://cwe.mitre.org/data/definitions/20.html">MITRE, CWE-20</a> - Improper Input Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/20">MITRE, CWE-20</a> - Improper Input Validation </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_cs.html
index 8a151557aff..1cbad790064 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_cs.html
@@ -38,6 +38,6 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/295">MITRE, CWE-295</a> - Improper Certificate Validation </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_vb.html
index 2fafe6d7490..4739e08e60d 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4830_vb.html
@@ -34,6 +34,6 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/295.html">MITRE, CWE-295</a> - Improper Certificate Validation </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/295">MITRE, CWE-295</a> - Improper Certificate Validation </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_cs.html
index d079d1dbb16..4200d8388ff 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_cs.html
@@ -75,10 +75,10 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/276.html">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/668.html">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/277.html">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/276">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/668">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/277">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_vb.html
index 3c6df99a803..de519a0488a 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S4834_vb.html
@@ -71,10 +71,10 @@ <h2>See</h2>
 <ul>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/276.html">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/732.html">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/668.html">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/277.html">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/276">MITRE, CWE-276</a> - Incorrect Default Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/732">MITRE, CWE-732</a> - Incorrect Permission Assignment for Critical Resource </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/668">MITRE, CWE-668</a> - Exposure of Resource to Wrong Sphere </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/277">MITRE, CWE-277</a> - Insecure Inherited Permissions </li>
 </ul>
 <h2>Deprecated</h2>
 <p>This rule is deprecated, and will eventually be removed.</p>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_cs.html
index e5e8f44f329..f30f1edb802 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_cs.html
@@ -79,7 +79,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
+  <li> <a href="https://cwe.mitre.org/data/definitions/409">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
   </li>
   <li> <a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_vb.html
index d090e7dee59..44d7236c6ac 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5042_vb.html
@@ -59,7 +59,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
   <li> <a href="https://owasp.org/www-project-top-ten/OWASP_Top_Ten_2017/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> -
   Security Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/409.html">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
+  <li> <a href="https://cwe.mitre.org/data/definitions/409">MITRE, CWE-409</a> - Improper Handling of Highly Compressed Data (Data Amplification)
   </li>
   <li> <a href="https://www.bamsoftware.com/hacks/zipbomb/">bamsoftware.com</a> - A better Zip Bomb </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5122.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5122.html
index e1e75b5bd40..14eb84edd2e 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5122.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5122.html
@@ -23,7 +23,7 @@ <h2>Recommended Secure Coding Practices</h2>
   allowing any domain (do not use * wildcard nor blindly return the <code>Origin</code> header content without any checks). </li>
 </ul>
 <h2>Sensitive Code Example</h2>
-<h3>ASP.NET Core MVC</h3>
+<p>ASP.NET Core MVC:</p>
 <pre>
 [HttpGet]
 public string Get()
@@ -56,7 +56,7 @@ <h3>ASP.NET Core MVC</h3>
     services.AddControllers();
 }
 </pre>
-<h3>ASP.NET MVC</h3>
+<p>ASP.NET MVC:</p>
 <pre>
 public class HomeController : ApiController
 {
@@ -77,8 +77,13 @@ <h3>ASP.NET MVC</h3>
     Content = new StringContent("content")
 };
 </pre>
+<p>User-controlled origin:</p>
+<pre>
+String origin = Request.Headers["Origin"];
+Response.Headers.Add("Access-Control-Allow-Origin", origin); // Sensitive
+</pre>
 <h2>Compliant Solution</h2>
-<h3>ASP.NET Core MVC</h3>
+<p>ASP.NET Core MVC:</p>
 <pre>
 [HttpGet]
 public string Get()
@@ -106,7 +111,7 @@ <h3>ASP.NET Core MVC</h3>
     services.AddControllers();
 }
 </pre>
-<h3>ASP.Net MVC</h3>
+<p>ASP.Net MVC:</p>
 <pre>
 public class HomeController : ApiController
 {
@@ -127,6 +132,15 @@ <h3>ASP.Net MVC</h3>
     Content = new StringContent("content")
 };
 </pre>
+<p>User-controlled origin validated with an allow-list:</p>
+<pre>
+String origin = Request.Headers["Origin"];
+
+if (trustedOrigins.Contains(origin))
+{
+    Response.Headers.Add("Access-Control-Allow-Origin", origin);
+}
+</pre>
 <h2>See</h2>
 <ul>
   <li> <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">OWASP Top 10 2021 Category A5</a> - Security Misconfiguration </li>
@@ -138,8 +152,8 @@ <h2>See</h2>
   Misconfiguration </li>
   <li> <a href="https://www.owasp.org/index.php/HTML5_Security_Cheat_Sheet#Cross_Origin_Resource_Sharing">OWASP HTML5 Security Cheat Sheet</a> - Cross
   Origin Resource Sharing </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/346.html">MITRE, CWE-346</a> - Origin Validation Error </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/942.html">MITRE, CWE-942</a> - Overly Permissive Cross-domain Whitelist </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/346">MITRE, CWE-346</a> - Origin Validation Error </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/942">MITRE, CWE-942</a> - Overly Permissive Cross-domain Whitelist </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5332.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5332.html
index 9bf127c23b7..1f1a003bb7c 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5332.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5332.html
@@ -86,8 +86,8 @@ <h2>See</h2>
   Standard</a> - Network Communication Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">OWASP Mobile Top 10 2016 Category M3</a> - Insecure
   Communication </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/200.html">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/319.html">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/200">MITRE, CWE-200</a> - Exposure of Sensitive Information to an Unauthorized Actor </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/319">MITRE, CWE-319</a> - Cleartext Transmission of Sensitive Information </li>
   <li> <a href="https://security.googleblog.com/2016/09/moving-towards-more-secure-web.html">Google, Moving towards more secure web</a> </li>
   <li> <a href="https://blog.mozilla.org/security/2015/04/30/deprecating-non-secure-http/">Mozilla, Deprecating non secure http</a> </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_cs.html
index 4eea35d4488..308c866dfef 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_cs.html
@@ -66,9 +66,9 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_vb.html
index 2a7ea78f541..1cf62b9a66f 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5443_vb.html
@@ -71,9 +71,9 @@ <h2>See</h2>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A5-Broken_Access_Control">OWASP Top 10 2017 Category A5</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_cs.html
index 435f2c89072..709afd588ed 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_cs.html
@@ -45,9 +45,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_vb.html
index c64e0398f24..e7b63bea44b 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5445_vb.html
@@ -43,9 +43,9 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A01_2021-Broken_Access_Control/">OWASP Top 10 2021 Category A1</a> - Broken Access Control </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A9-Using_Components_with_Known_Vulnerabilities">OWASP Top 10 2017 Category A9</a> - Using
   Components with Known Vulnerabilities </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/377.html">MITRE, CWE-377</a> - Insecure Temporary File </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/379.html">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect
-  Permissions </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/377">MITRE, CWE-377</a> - Insecure Temporary File </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/379">MITRE, CWE-379</a> - Creation of Temporary File in Directory with Incorrect Permissions
+  </li>
   <li> <a href="https://www.owasp.org/index.php/Insecure_Temporary_File">OWASP, Insecure Temporary File</a> </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_cs.html
index d2a3bb801f0..5dde383f4e0 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_cs.html
@@ -55,7 +55,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_vb.html
index a1804e97745..ddd31edc10e 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5542_vb.html
@@ -54,7 +54,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_cs.html
index 06a06135612..e756d1bf4ae 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_cs.html
@@ -32,7 +32,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_vb.html
index 61801a714e4..be4f405e502 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5547_vb.html
@@ -32,7 +32,7 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/327.html">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/327">MITRE, CWE-327</a> - Use of a Broken or Risky Cryptographic Algorithm </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat3">SANS Top 25</a> - Porous Defenses </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_cs.html
index 2e9d2d5d0a1..889df7d88f5 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_cs.html
@@ -28,6 +28,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/347">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_vb.html
index cd54f3258bc..87bbd78932a 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5659_vb.html
@@ -28,6 +28,6 @@ <h2>See</h2>
   <li> <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">OWASP Top 10 2021 Category A2</a> - Cryptographic Failures </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A3-Sensitive_Data_Exposure">OWASP Top 10 2017 Category A3</a> - Sensitive Data Exposure
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/347.html">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/347">MITRE, CWE-347</a> - Improper Verification of Cryptographic Signature </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_cs.html
index b8317a92b08..5ffc9a78a39 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_cs.html
@@ -100,8 +100,8 @@ <h2>See</h2>
   Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/770">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
   <li> <a href="https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/web-config">Web.config</a> - XML-formatted config file for IIS
   applications </li>
 </ul>
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_vb.html
index 4c7c7cf519c..4a88afeb9d8 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5693_vb.html
@@ -66,7 +66,7 @@ <h2>See</h2>
   Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A6-Security_Misconfiguration">OWASP Top 10 2017 Category A6</a> - Security
   Misconfiguration </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/770.html">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/400.html">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/770">MITRE, CWE-770</a> - Allocation of Resources Without Limits or Throttling </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/400">MITRE, CWE-400</a> - Uncontrolled Resource Consumption </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_cs.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_cs.html
index c46b6d453dc..795bb24edaa 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_cs.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_cs.html
@@ -70,7 +70,7 @@ <h2>See</h2>
   Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_vb.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_vb.html
index 4ee23114cf1..65eaab4e032 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_vb.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5753_vb.html
@@ -67,7 +67,7 @@ <h2>See</h2>
   Prevention Cheat Sheet </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A7-Cross-Site_Scripting_(XSS)">OWASP Top 10 2017 Category A7</a> - Cross-Site Scripting
   (XSS) </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/79.html">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
+  <li> <a href="https://cwe.mitre.org/data/definitions/79">MITRE, CWE-79</a> - Improper Neutralization of Input During Web Page Generation
   ('Cross-site Scripting') </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5766.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5766.html
index 1a8981a094a..20ce459a6d6 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5766.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5766.html
@@ -181,6 +181,6 @@ <h2>See</h2>
   </li>
   <li> <a href="https://docs.microsoft.com/en-us/dotnet/framework/misc/security-and-serialization">docs.microsoft.com</a> - security-and-serialization
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/502">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
 </ul>
 
diff --git a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5773.html b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5773.html
index caa5844ddc1..ba3cfab5489 100644
--- a/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5773.html
+++ b/analyzers/src/SonarAnalyzer.Utilities/Rules.Description/S5773.html
@@ -99,8 +99,8 @@ <h2>See</h2>
   BinaryFormatter security guide </li>
   <li> <a href="https://www.owasp.org/index.php/Top_10-2017_A8-Insecure_Deserialization">OWASP Top 10 2017 Category A8</a> - Insecure Deserialization
   </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/134.html">MITRE, CWE-134</a> - Use of Externally-Controlled Format String </li>
-  <li> <a href="https://cwe.mitre.org/data/definitions/502.html">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/134">MITRE, CWE-134</a> - Use of Externally-Controlled Format String </li>
+  <li> <a href="https://cwe.mitre.org/data/definitions/502">MITRE, CWE-502</a> - Deserialization of Untrusted Data </li>
   <li> <a href="https://www.sans.org/top25-software-errors/#cat2">SANS Top 25</a> - Risky Resource Management </li>
   <li> <a href="https://github.com/OWASP/CheatSheetSeries/blob/master/cheatsheets/Deserialization_Cheat_Sheet.md">OWASP Deserialization Cheat
   Sheet</a> </li>
diff --git a/analyzers/src/SonarAnalyzer.VisualBasic/sonarpedia.json b/analyzers/src/SonarAnalyzer.VisualBasic/sonarpedia.json
index 46dd71758fa..0eebef04a01 100644
--- a/analyzers/src/SonarAnalyzer.VisualBasic/sonarpedia.json
+++ b/analyzers/src/SonarAnalyzer.VisualBasic/sonarpedia.json
@@ -3,5 +3,5 @@
   "languages": [
     "VBNET"
   ],
-  "latest-update": "2022-03-24T07:44:11.397051700Z"
+  "latest-update": "2022-04-22T07:27:30.347426400Z"
 }
\ No newline at end of file