diff --git a/notify/fixes.sum b/notify/fixes.sum
index d0a1ecae..71926581 100644
--- a/notify/fixes.sum
+++ b/notify/fixes.sum
@@ -2,8 +2,8 @@
 
 Running g++:g++.dg/modules/modules.exp ...
 FAIL: g++.dg/modules/class-11_a.H -std=c++14 (test for excess errors)
-FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
 FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
+FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
 
 		=== Results Summary ===
 
diff --git a/notify/lnt_report.json b/notify/lnt_report.json
index 93141ed5..6d47ac9d 100644
--- a/notify/lnt_report.json
+++ b/notify/lnt_report.json
@@ -44,18 +44,18 @@
 	   ,
         {
             "Data": [
-                19
+                917
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.FAIL.nb_FAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.FAIL.nb_FAIL"
         }
 	   ,
         {
             "Data": [
-                2
+                4336
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -63,7 +63,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -71,15 +71,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.ERROR.nb_ERROR"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                2
+                4
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.XPASS.nb_XPASS"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -87,7 +87,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.OTHER.nb_OTHER"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -95,63 +95,63 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.KFAIL.nb_KFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                137
+                959
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.XFAIL.nb_XFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                17392
+                171222
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.PASS.nb_PASS"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                1067
+                10238
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                18596
+                182419
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.good.nb_good"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                23
+                5257
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.bad.nb_bad"
+            "Name": "tcwg_gnu_embed_check_gcc.gcc.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                917
+                16
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.FAIL.nb_FAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.FAIL.nb_FAIL"
         }
 	   ,
         {
             "Data": [
-                4336
+                1
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -159,7 +159,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -167,15 +167,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.ERROR.nb_ERROR"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                4
+                5
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.XPASS.nb_XPASS"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -183,7 +183,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.OTHER.nb_OTHER"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -191,63 +191,63 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.KFAIL.nb_KFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                959
+                1437
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.XFAIL.nb_XFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                171222
+                217730
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.PASS.nb_PASS"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                10238
+                2570
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                182419
+                221737
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.good.nb_good"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                5257
+                22
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.gcc.bad.nb_bad"
+            "Name": "tcwg_gnu_embed_check_gcc.g++.bad.nb_bad"
         }
 	   ,
         {
             "Data": [
-                16
+                19
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.FAIL.nb_FAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.FAIL.nb_FAIL"
         }
 	   ,
         {
             "Data": [
-                1
+                2
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.UNRESOLVED.nb_UNRESOLVED"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNRESOLVED.nb_UNRESOLVED"
         }
 	   ,
         {
@@ -255,7 +255,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.UNTESTED.nb_UNTESTED"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNTESTED.nb_UNTESTED"
         }
 	   ,
         {
@@ -263,15 +263,15 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.ERROR.nb_ERROR"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.ERROR.nb_ERROR"
         }
 	   ,
         {
             "Data": [
-                5
+                2
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.XPASS.nb_XPASS"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.XPASS.nb_XPASS"
         }
 	   ,
         {
@@ -279,7 +279,7 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.OTHER.nb_OTHER"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.OTHER.nb_OTHER"
         }
 	   ,
         {
@@ -287,47 +287,47 @@
                 0
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.KFAIL.nb_KFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.KFAIL.nb_KFAIL"
         }
 	   ,
         {
             "Data": [
-                1437
+                137
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.XFAIL.nb_XFAIL"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.XFAIL.nb_XFAIL"
         }
 	   ,
         {
             "Data": [
-                217730
+                17392
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.PASS.nb_PASS"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.PASS.nb_PASS"
         }
 	   ,
         {
             "Data": [
-                2570
+                1067
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.UNSUPPORTED.nb_UNSUPPORTED"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.UNSUPPORTED.nb_UNSUPPORTED"
         }
 	   ,
         {
             "Data": [
-                221737
+                18596
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.good.nb_good"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.good.nb_good"
         }
 	   ,
         {
             "Data": [
-                22
+                23
             ],
             "Info": {},
-            "Name": "tcwg_gnu_embed_check_gcc.g++.bad.nb_bad"
+            "Name": "tcwg_gnu_embed_check_gcc.libstdc++.bad.nb_bad"
         }
 	   ,
         {
diff --git a/notify/mail-body.txt b/notify/mail-body.txt
index 1481db5f..38882a41 100644
--- a/notify/mail-body.txt
+++ b/notify/mail-body.txt
@@ -16,8 +16,8 @@ Produces  3 fixes:
   | fixes.sum:
   | Running g++:g++.dg/modules/modules.exp ...
   | FAIL: g++.dg/modules/class-11_a.H -std=c++14 (test for excess errors)
-  | FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
   | FAIL: g++.dg/modules/class-11_b.C -std=c++14 (test for excess errors)
+  | FAIL: g++.dg/modules/class-11_b.C -std=c++14  (test for warnings, line 10)
 
 Used configuration :
  *CI config* tcwg_gnu_embed_check_gcc arm-eabi -mthumb -march=armv8.1-m.main+mve.fp+fp.dp -mtune=cortex-m55 -mfloat-abi=hard -mfpu=auto
diff --git a/notify/results.compare.txt b/notify/results.compare.txt
index b3c8af2a..43fe678c 100644
--- a/notify/results.compare.txt
+++ b/notify/results.compare.txt
@@ -1,14 +1,14 @@
 # Comparing directories
 # REFERENCE: base-artifacts/sumfiles
-# CURRENT:   artifacts/sumfiles
+# CURRENT:   artifacts/99-rewrite/artifacts.old/sumfiles
 
 # Comparing 3 common sum files:
 g++.sum
 gcc.sum
 libstdc++.sum
 Comparing:
-REFERENCE:/tmp/gxx-sum1.9982
-CURRENT:  /tmp/gxx-sum2.9982
+REFERENCE:/tmp/gxx-sum1.29639
+CURRENT:  /tmp/gxx-sum2.29639
 
                                              +---------+---------+
 o  RUN STATUS:                               |   REF   |   RES   |