diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Critical.html
similarity index 95%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Critical.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Critical.html
index 273423124..a3b0e5a74 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Critical.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Critical.html
@@ -10,4 +10,4 @@
     CPU load has exceeded 95%
     </p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Warning.html b/ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Warning.html
similarity index 95%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Warning.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Warning.html
index a6c15546d..5c2d4639f 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/CPU-Warning.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/CPUOverload-Warning.html
@@ -10,4 +10,4 @@
     CPU load has exceeded 80%
     </p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Critical.html
similarity index 54%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Critical.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Critical.html
index b1fa75164..892c338e8 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Critical.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Critical.html
@@ -7,7 +7,11 @@
   <body>
     <h1>Memory: Critical</h1>
     <p>
-    Either the remaining heap space or the IRQ stack has fallen below the <b>critical</b> limit (1000 bytes heap, 80 entries IRQ stack).
+    Either the remaining heap space or the IRQ stack has fallen below the <b>critical</b> limit.
     </p>
+    <ul>
+      <li>Revo    : 500 bytes heap, 80 entries IRQ stack.</li>
+      <li>CC/CC3D : 40 bytes heap, 60 entries IRQ stack.</li>
+    <ul>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Warning.html b/ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Warning.html
similarity index 72%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Warning.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Warning.html
index e4ebf94a6..3a2e6ded9 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/Memory-Warning.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/OutOfMemory-Warning.html
@@ -9,8 +9,12 @@
     <p>
     Either the remaining heap space or the IRQ stack has fallen below the <b>warning</b> limit (4000 bytes heap, 150 entries IRQ stack).
     </p>
+    <ul>
+      <li>Revo    : 1000 bytes heap, 150 entries IRQ stack.</li>
+      <li>CC/CC3D : 220 bytes heap, 100 entries IRQ stack.</li>
+    <ul>
     <p>
     <b>Note:</b> if this is an original CC board (not CC3D or Revo), this condition is normal.
     </p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Stack-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/StackOverflow-Critical.html
similarity index 95%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/fr/Stack-Critical.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/StackOverflow-Critical.html
index ad5e8c7ef..4d012421f 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Stack-Critical.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/StackOverflow-Critical.html
@@ -10,4 +10,4 @@
     Stack overflow
     </p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPU-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPUOverload-Critical.html
similarity index 100%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPU-Critical.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPUOverload-Critical.html
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPU-Warning.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPUOverload-Warning.html
similarity index 100%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPU-Warning.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/fr/CPUOverload-Warning.html
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Critical.html
deleted file mode 100644
index 0851cd13b..000000000
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Critical.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-  <head>
-    <title></title>
-    <meta content="">
-    <style></style>
-  </head>
-  <body>
-    <h1>Mémoire : Critique</h1>
-    <p>
-    Either the remaining heap space or the IRQ stack has fallen below the <b>critical</b> limit (1000 bytes heap, 80 entries IRQ stack).
-    </p>
-  </body>
-</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Critical.html
new file mode 100644
index 000000000..892c338e8
--- /dev/null
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Critical.html
@@ -0,0 +1,17 @@
+<html>
+  <head>
+    <title></title>
+    <meta content="">
+    <style></style>
+  </head>
+  <body>
+    <h1>Memory: Critical</h1>
+    <p>
+    Either the remaining heap space or the IRQ stack has fallen below the <b>critical</b> limit.
+    </p>
+    <ul>
+      <li>Revo    : 500 bytes heap, 80 entries IRQ stack.</li>
+      <li>CC/CC3D : 40 bytes heap, 60 entries IRQ stack.</li>
+    <ul>
+  </body>
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Warning.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Warning.html
similarity index 68%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Warning.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Warning.html
index 8a26b886f..3a2e6ded9 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/fr/Memory-Warning.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/OutOfMemory-Warning.html
@@ -5,10 +5,14 @@
     <style></style>
   </head>
   <body>
-    <h1>Mémoire : Avertissement</h1>
+    <h1>Memory: Warning</h1>
     <p>
     Either the remaining heap space or the IRQ stack has fallen below the <b>warning</b> limit (4000 bytes heap, 150 entries IRQ stack).
     </p>
+    <ul>
+      <li>Revo    : 1000 bytes heap, 150 entries IRQ stack.</li>
+      <li>CC/CC3D : 220 bytes heap, 100 entries IRQ stack.</li>
+    <ul>
     <p>
     <b>Note:</b> if this is an original CC board (not CC3D or Revo), this condition is normal.
     </p>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/html/Stack-Critical.html b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/StackOverflow-Critical.html
similarity index 95%
rename from ground/openpilotgcs/src/plugins/systemhealth/html/Stack-Critical.html
rename to ground/openpilotgcs/src/plugins/systemhealth/html/fr/StackOverflow-Critical.html
index ad5e8c7ef..4d012421f 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/html/Stack-Critical.html
+++ b/ground/openpilotgcs/src/plugins/systemhealth/html/fr/StackOverflow-Critical.html
@@ -10,4 +10,4 @@
     Stack overflow
     </p>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc b/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
index d25b01ef8..c9f1723a0 100644
--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
@@ -3,8 +3,8 @@
         <file>html/Actuator-Critical.html</file>
         <file>html/Receiver-Critical.html</file>
         <file>html/Receiver-Warning.html</file>
-        <file>html/CPU-Critical.html</file>
-        <file>html/CPU-Warning.html</file>
+        <file>html/CPUOverload-Critical.html</file>
+        <file>html/CPUOverload-Warning.html</file>
         <file>html/FlightTime-Error.html</file>
         <file>html/Battery-Warning.html</file>
         <file>html/BootFault-Critical.html</file>
@@ -20,11 +20,11 @@
         <file>html/GPS-Error.html</file>
         <file>html/GPS-Warning.html</file>
         <file>html/Guidance-Warning.html</file>
-        <file>html/Memory-Critical.html</file>
-        <file>html/Memory-Warning.html</file>
+        <file>html/OutOfMemory-Critical.html</file>
+        <file>html/OutOfMemory-Warning.html</file>
         <file>html/Sensors-Critical.html</file>
         <file>html/Stabilization-Warning.html</file>
-        <file>html/Stack-Critical.html</file>
+        <file>html/StackOverflow-Critical.html</file>
         <file>html/Telemetry-Error.html</file>
         <file>html/SystemConfiguration-Critical.html</file>
         <file>html/PathPlan-Warning.html</file>
@@ -36,8 +36,8 @@
         <file alias="html/Actuator-Critical.html">html/fr/Actuator-Critical.html</file>
         <file alias="html/Receiver-Critical.html">html/fr/Receiver-Critical.html</file>
         <file alias="html/Receiver-Warning.html">html/fr/Receiver-Warning.html</file>
-        <file alias="html/CPU-Critical.html">html/fr/CPU-Critical.html</file>
-        <file alias="html/CPU-Warning.html">html/fr/CPU-Warning.html</file>
+        <file alias="html/CPUOverload-Critical.html">html/fr/CPUOverload-Critical.html</file>
+        <file alias="html/CPUOverload-Warning.html">html/fr/CPUOverload-Critical.html</file>
         <file alias="html/FlightTime-Error.html">html/fr/FlightTime-Error.html</file>
         <file alias="html/Battery-Warning.html">html/fr/Battery-Warning.html</file>
         <file alias="html/BootFault-Critical.html">html/fr/BootFault-Critical.html</file>
@@ -53,11 +53,11 @@
         <file alias="html/GPS-Error.html">html/fr/GPS-Error.html</file>
         <file alias="html/GPS-Warning.html">html/fr/GPS-Warning.html</file>
         <file alias="html/Guidance-Warning.html">html/fr/Guidance-Warning.html</file>
-        <file alias="html/Memory-Critical.html">html/fr/Memory-Critical.html</file>
-        <file alias="html/Memory-Warning.html">html/fr/Memory-Warning.html</file>
+        <file alias="html/OutOfMemory-Critical.html">html/fr/OutOfMemory-Critical.html</file>
+        <file alias="html/OutOfMemory-Warning.html">html/fr/OutOfMemory-Warning.html</file>
         <file alias="html/Sensors-Critical.html">html/fr/Sensors-Critical.html</file>
         <file alias="html/Stabilization-Warning.html">html/fr/Stabilization-Warning.html</file>
-        <file alias="html/Stack-Critical.html">html/fr/Stack-Critical.html</file>
+        <file alias="html/StackOverflow-Critical.html">html/fr/StackOverflow-Critical.html</file>
         <file alias="html/Telemetry-Error.html">html/fr/Telemetry-Error.html</file>
         <file alias="html/SystemConfiguration-Critical.html">html/fr/SystemConfiguration-Critical.html</file>
         <file alias="html/PathPlan-Warning.html">html/fr/PathPlan-Warning.html</file>
